Change 19048 by [EMAIL PROTECTED] on 2003/03/23 17:56:22
Integrate:
[ 19043]
Subject: [PATCH] perlsub.pod and perlsyn.pod: better organise scoping info for
modifiers
From: Martien Verbruggen <[EMAIL PROTECTED]>
Date: Sat, 15 Mar 2003 12:31:47 +1100
Message-Id: <[EMAIL PROTECTED]>
[ 19044]
Subject: [PATCH] p4genpatch
From: [EMAIL PROTECTED] (Andreas J. Koenig)
Date: Sat, 15 Mar 2003 12:04:18 +0100
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/Porting/p4genpatch#2 integrate
... //depot/maint-5.8/perl/pod/perlsub.pod#3 integrate
... //depot/maint-5.8/perl/pod/perlsyn.pod#3 integrate
Differences ...
==== //depot/maint-5.8/perl/Porting/p4genpatch#2 (text) ====
Index: perl/Porting/p4genpatch
--- perl/Porting/p4genpatch#1~17645~ Fri Jul 19 12:29:57 2002
+++ perl/Porting/p4genpatch Sun Mar 23 09:56:22 2003
@@ -23,7 +23,7 @@
my $VERSION = '0.05';
my $TOPDIR = cwd();
my @P4opt;
-our %OPT = ( "d" => "u", b => "//depot/perl", "D" => "diff" );
+our %OPT = ( "d" => "u", b => "//depot/perl/", "D" => "diff" );
Getopt::Long::Configure("no_ignore_case");
GetOptions(\%OPT, "b=s", "p=s", "d=s", "D=s", "h", "v", "V") or die Usage;
print Usage and exit if $OPT{h};
@@ -42,6 +42,7 @@
print;
next unless m|($OPT{b})|;
my($prefix) = $1;
+ $prefix =~ s|/$||;
$prefix =~ s|/[^/]+$||; # up to the last "/" in the match is to be stripped
if (my($file,$action) = m|^\.\.\. (//depot.*)\s(\w+)$|) {
next if $action eq "delete";
@@ -160,9 +161,10 @@
-p host:port p4 port (e.g. myhost:1666)
-d diffopt option to pass to diff(1)
-D diff diff(1) to use
- -b branch(es) which branches to include (regex); everything up
- to the last slash of matched portion of path is
- stripped on local copy (default: //depot/perl)
+ -b branch(es) which branches to include (regex); the last
+ directory within the matched part will be
+ preserved on the local copy, so that patch -p1
+ will work (default: "//depot/perl/")
-v verbose
-h print this help and exit
-V print version number and exit
==== //depot/maint-5.8/perl/pod/perlsub.pod#3 (text) ====
Index: perl/pod/perlsub.pod
--- perl/pod/perlsub.pod#2~18744~ Tue Feb 18 06:46:18 2003
+++ perl/pod/perlsub.pod Sun Mar 23 09:56:22 2003
@@ -325,14 +325,8 @@
the scope of $answer extends from its declaration through the rest
of that conditional, including any C<elsif> and C<else> clauses,
-but not beyond it.
-
-B<NOTE:> The behaviour of a C<my> statement modified with a statement
-modifier conditional or loop construct (e.g. C<my $x if ...>) is
-B<undefined>. The value of the C<my> variable may be C<undef>, any
-previously assigned value, or possibly anything else. Don't rely on
-it. Future versions of perl might do something different from the
-version of perl you try it out on. Here be dragons.
+but not beyond it. See L<perlsyn/"Simple statements"> for information
+on the scope of variables in statements with modifiers.
The C<foreach> loop defaults to scoping its index variable dynamically
in the manner of C<local>. However, if the index variable is
==== //depot/maint-5.8/perl/pod/perlsyn.pod#3 (text) ====
Index: perl/pod/perlsyn.pod
--- perl/pod/perlsyn.pod#2~18535~ Mon Jan 20 18:49:55 2003
+++ perl/pod/perlsyn.pod Sun Mar 23 09:56:22 2003
@@ -134,6 +134,13 @@
} while $x++ <= $z;
}
+B<NOTE:> The behaviour of a C<my> statement modified with a statement
+modifier conditional or loop construct (e.g. C<my $x if ...>) is
+B<undefined>. The value of the C<my> variable may be C<undef>, any
+previously assigned value, or possibly anything else. Don't rely on
+it. Future versions of perl might do something different from the
+version of perl you try it out on. Here be dragons.
+
=head2 Compound statements
In Perl, a sequence of statements that defines a scope is called a block.
End of Patch.
