27 files changed, 1594 insertions, 464 deletions

diff --git a/AUTHORS b/AUTHORS
index 5936d5744d..77695cea22 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -449,7 +449,7 @@ Robert Partington              <rjp@riffraff.plig.net>
 Robert Sanders                 <Robert.Sanders@linux.org>
 Robert Spier                   <rspier@pobox.com>
 Robin Barker                   <rmb1@cise.npl.co.uk>
-Robin Houston                  <robin@nml.guardian.co.uk>
+Robin Houston                  <robin@kitsite.com>
 Rocco Caputo                   <troc@netrus.net>
 Roderick Schertler             <roderick@argon.org>
 Rodger Anderson                <rodger@boi.hp.com>
diff --git a/MANIFEST b/MANIFEST
index 5813e308d8..09119f9f7b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1598,6 +1598,7 @@ t/op/lex_assign.t	See if ops involving lexicals or pad temps work
 t/op/lfs.t		See if large files work for perlio
 t/op/list.t		See if array lists work
 t/op/local.t		See if local works
+t/op/loopctl.t		See if next/last/redo work
 t/op/lop.t		See if logical operators work
 t/op/magic.t		See if magic variables work
 t/op/method.t		See if method calls work
diff --git a/embed.h b/embed.h
index 44ff2fd786..83afb92c1b 100644
--- a/embed.h
+++ b/embed.h
@@ -131,6 +131,7 @@
 #define sv_catpvf_mg_nocontext	Perl_sv_catpvf_mg_nocontext
 #define sv_setpvf_mg_nocontext	Perl_sv_setpvf_mg_nocontext
 #define fprintf_nocontext	Perl_fprintf_nocontext
+#define printf_nocontext	Perl_printf_nocontext
 #endif
 #define cv_ckproto		Perl_cv_ckproto
 #define cv_clone		Perl_cv_clone
@@ -3188,6 +3189,8 @@
 #define sv_setpvf_mg_nocontext	Perl_sv_setpvf_mg_nocontext
 #define Perl_fprintf_nocontext	CPerlObj::Perl_fprintf_nocontext
 #define fprintf_nocontext	Perl_fprintf_nocontext
+#define Perl_printf_nocontext	CPerlObj::Perl_printf_nocontext
+#define printf_nocontext	Perl_printf_nocontext
 #endif
 #define Perl_cv_ckproto		CPerlObj::Perl_cv_ckproto
 #define cv_ckproto		Perl_cv_ckproto
diff --git a/embed.pl b/embed.pl
index 4cd8acab26..bd46b1c29e 100755
--- a/embed.pl
+++ b/embed.pl
@@ -1073,6 +1073,16 @@ Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
     return (*PL_StdIO->pVprintf)(PL_StdIO, stream, format, arglist);
 }
 
+#undef Perl_printf_nocontext
+int
+Perl_printf_nocontext(const char *format, ...)
+{
+    dTHXo;
+    va_list(arglist);
+    va_start(arglist, format);
+    return (*PL_StdIO->pVprintf)(PL_StdIO, PerlIO_stdout(), format, arglist);
+}
+
 END_EXTERN_C
 
 #endif /* PERL_OBJECT */
@@ -1445,6 +1455,7 @@ Afnp	|void	|sv_setpvf_nocontext|SV* sv|const char* pat|...
 Afnp	|void	|sv_catpvf_mg_nocontext|SV* sv|const char* pat|...
 Afnp	|void	|sv_setpvf_mg_nocontext|SV* sv|const char* pat|...
 Afnp	|int	|fprintf_nocontext|PerlIO* stream|const char* fmt|...
+Afnp	|int	|printf_nocontext|const char* fmt|...
 #endif
 p	|void	|cv_ckproto	|CV* cv|GV* gv|char* p
 p	|CV*	|cv_clone	|CV* proto
diff --git a/global.sym b/global.sym
index 870fccfa3d..49d4e858d5 100644
--- a/global.sym
+++ b/global.sym
@@ -68,6 +68,7 @@ Perl_sv_setpvf_nocontext
 Perl_sv_catpvf_mg_nocontext
 Perl_sv_setpvf_mg_nocontext
 Perl_fprintf_nocontext
+Perl_printf_nocontext
 Perl_cv_const_sv
 Perl_cv_undef
 Perl_cx_dump
diff --git a/globals.c b/globals.c
index 0782eba226..5bf4aeabcb 100644
--- a/globals.c
+++ b/globals.c
@@ -79,4 +79,13 @@ Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
     return PerlIO_vprintf(stream, format, arglist);
 }
 
+int
+Perl_printf_nocontext(const char *format, ...)
+{
+    dTHX;
+    va_list(arglist);
+    va_start(arglist, format);
+    return PerlIO_vprintf(PerlIO_stdout(), format, arglist);
+}
+
 #include "perlapi.h"		/* bring in PL_force_link_funcs */
diff --git a/hints/hpux.sh b/hints/hpux.sh
index b01d189a44..19eeae0225 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -166,7 +166,6 @@ $define|true|[yY]*)
 64-bit compilation is not supported on HP-UX $xxOsRevMajor.
 You need at least HP-UX 11.0.
 Cannot continue, aborting.
-
 EOM
 		exit 1
     fi
@@ -179,7 +178,6 @@ EOM
 *** You do not seem to have the 64-bit libraries in /lib/pa20_64.
 *** Most importantly, I cannot find the $libc.
 *** Cannot continue, aborting.
-
 EOM
 		exit 1
     fi
@@ -334,6 +332,7 @@ case "$usethreads" in
 $define|true|[yY]*)
         if [ "$xxOsRevMajor" -lt 10 ]; then
             cat <<EOM >&4
+
 HP-UX $xxOsRevMajor cannot support POSIX threads.
 Consider upgrading to at least HP-UX 11.
 Cannot continue, aborting.
@@ -376,11 +375,17 @@ EOM
 
             if [ $libswanted = "no_threads_available" ]; then
                 cat <<EOM >&4
+
 In HP-UX 10.X for POSIX threads you need both of the files
 /usr/include/pthread.h and either /usr/lib/libcma.sl or /usr/lib/libpthread.sl.
 Either you must upgrade to HP-UX 11 or install a posix thread library:
- DCE-CoreTools from HP-UX 10.20 Hardware Extensions 3.0 CD (B3920-13941) or
- PTH package from i.e. http://hpux.tn.tudelft.nl/hppd/hpux/alpha.html
+
+    DCE-CoreTools from HP-UX 10.20 Hardware Extensions 3.0 CD (B3920-13941)
+
+or
+
+    PTH package from http://hpux.tn.tudelft.nl/hppd/hpux/alpha.html
+
 Cannot continue, aborting.
 EOM
      	        exit 1
diff --git a/iperlsys.h b/iperlsys.h
index fe03f5c53b..fdbd12a6fc 100644
--- a/iperlsys.h
+++ b/iperlsys.h
@@ -251,9 +251,9 @@ struct IPerlStdIOInfo
 #define PerlSIO_setlinebuf(f)						\
 	(*PL_StdIO->pSetlinebuf)(PL_StdIO, (f))
 #define PerlSIO_printf		Perl_fprintf_nocontext
-#define PerlSIO_stdoutf		*PL_StdIO->pPrintf
-#define PerlSIO_vprintf(f,fmt,a)					\
-	(*PL_StdIO->pVprintf)(PL_StdIO, (f),(fmt),a)
+#define PerlSIO_stdoutf		Perl_printf_nocontext
+#define PerlSIO_vprintf(f,fmt,a)						\
+	(*PL_StdIO->pVprintf)(PL_StdIO, (f),(fmt),a)          
 #define PerlSIO_ftell(f)							\
 	(*PL_StdIO->pTell)(PL_StdIO, (f))
 #define PerlSIO_fseek(f,o,w)						\
diff --git a/lib/Tie/SubstrHash.pm b/lib/Tie/SubstrHash.pm
index afe5d8dc25..cd1125eab8 100644
--- a/lib/Tie/SubstrHash.pm
+++ b/lib/Tie/SubstrHash.pm
@@ -183,21 +183,29 @@ sub ceil {
     return $num;
 }
 
+# See:
+#
+# http://www-groups.dcs.st-andrews.ac.uk/~history/HistTopics/Prime_numbers.html
+#
+
 sub findgteprime { # find the smallest prime integer greater than or equal to
     use integer;
 
-# It may be sufficient (and more efficient, IF IT IS CORRECT) to use
-# $max = 1 + int sqrt $num and calculate it once only, but is it correct?
-
     my $num = ceil(shift);
     return 2 if $num <= 2;
 
     $num++ unless $num % 2;
+    my $i;
+    my $sqrtnum = int sqrt $num;
+    my $sqrtnumsquared = $sqrtnum * $sqrtnum;
 
   NUM:
     for (;; $num += 2) {
-        my $max = int sqrt $num;
-        for ($i = 3; $i <= $max; $i += 2) {
+	if ($sqrtnumsquared < $num) {
+	    $sqrtnum++;
+	    $sqrtnumsquared = $sqrtnum * $sqrtnum;
+	}
+        for ($i = 3; $i <= $sqrtnum; $i += 2) {
             next NUM unless $num % $i;
         }
         return $num;
diff --git a/lib/integer.pm b/lib/integer.pm
index f720ce56d0..998574f0a7 100644
--- a/lib/integer.pm
+++ b/lib/integer.pm
@@ -1,7 +1,5 @@
 package integer;
 
-our $VERSION = '1.00';
-
 =head1 NAME
 
 integer - Perl pragma to use integer arithmetic instead of floating point
@@ -19,25 +17,34 @@ of the enclosing BLOCK.  On many machines, this doesn't matter a great
 deal for most computations, but on those without floating point
 hardware, it can make a big difference in performance.
 
-Note that this only affects how certain operators handle their operands
-and results, and not all numbers everywhere.  Specifically, C<use
-integer;> has the effect that before computing the result of X + Y, X -
-Y, X / Y, X * Y, X % Y, or -X (unary minus), the operands X and Y have
-their fractional portions truncated, and the result will have its
-fractional portion truncated as well.  For example, this code
+Note that this only affects how most of the arithmetic and relational
+B<operators> handle their operands and results, and B<not> how all
+numbers everywhere are treated.  Specifically, C<use integer;> has the
+effect that before computing the results of the arithmetic operators
+(+, -, *, /, %, +=, -=, *=, /=, %=, and unary minus), the comparison
+operators (<, <=, >, >=, ==, !=, <=>), and the bitwise operators (|, &,
+^, <<, >>, |=, &=, ^=, <<=, >>=), the operands have their fractional
+portions truncated (or floored), and the result will have its
+fractional portion truncated as well.  In addition, the range of
+operands and results is restricted to that of familiar two's complement
+integers, i.e., -(2**31) .. (2**31-1) on 32-bit architectures, and
+-(2**63) .. (2**63-1) on 64-bit architectures.  For example, this code
 
     use integer;
     $x = 5.8;
     $y = 2.5;
+    $z = 2.7;
+    $a = 2**31 - 1;  # Largest positive integer on 32-bit machines
     $, = ", ";
-    print $x, -$x, $x + $y, $x - $y, $x / $y, $x * $y;
+    print $x, -$x, $x + $y, $x - $y, $x / $y, $x * $y, $y == $z, $a, $a + 1;
 
-will print:  5.8, -5, 7, 3, 2, 10
+will print:  5.8, -5, 7, 3, 2, 10, 1, 2147483647, -2147483648
 
 Note that $x is still printed as having its true non-integer value of
-5.8 since it wasn't operated on.  Also, arguments passed to functions
-and the values returned by them are not affected by C<use integer;>.
-E.g.,
+5.8 since it wasn't operated on.  And note too the wrap-around from the
+largest positive integer to the largest negative one.   Also, arguments
+passed to functions and the values returned by them are B<not> affected
+by C<use integer;>.  E.g.,
 
     srand(1.5);
     $, = ", ";
@@ -45,13 +52,16 @@ E.g.,
 
 will give the same result with or without C<use integer;>  The power
 operator C<**> is also not affected, so that 2 ** .5 is always the
-square root of 2.
+square root of 2.  Now, it so happens that the pre- and post- increment
+and decrement operators, ++ and --, are not affected by C<use integer;>
+either.  Some may rightly consider this to be a bug -- but at least it's
+a long-standing one.
 
-Finally, C<use integer;> also has an affect on the bitwise operators
-"&", "|", "^", "~", "<<", and ">>".  Normally, the operands and results
-are treated as unsigned integers, but with C<use integer;> the operands
-and results are signed.  This means, among other things, that ~0 is -1,
-and -2 & -5 is -6.
+Finally, C<use integer;> also has an additional affect on the bitwise
+operators.  Normally, the operands and results are treated as
+B<unsigned> integers, but with C<use integer;> the operands and results
+are B<signed>.  This means, among other things, that ~0 is -1, and -2 &
+-5 is -6.
 
 Internally, native integer arithmetic (as provided by your C compiler)
 is used.  This means that Perl's own semantics for arithmetic
@@ -64,7 +74,7 @@ may do another.
     % perl -Minteger -le 'print (4 % -3)'
     1
 
-See L<perlmod/Pragmatic Modules>.
+See L<perlmodlib/"Pragmatic Modules">, L<perlop/"Integer Arithmetic">
 
 =cut
 
diff --git a/objXSUB.h b/objXSUB.h
index 7bba68a9dc..cce7f6f3b0 100644
--- a/objXSUB.h
+++ b/objXSUB.h
@@ -228,6 +228,10 @@
 #define Perl_fprintf_nocontext	pPerl->Perl_fprintf_nocontext
 #undef  fprintf_nocontext
 #define fprintf_nocontext	Perl_fprintf_nocontext
+#undef  Perl_printf_nocontext
+#define Perl_printf_nocontext	pPerl->Perl_printf_nocontext
+#undef  printf_nocontext
+#define printf_nocontext	Perl_printf_nocontext
 #endif
 #undef  Perl_cv_const_sv
 #define Perl_cv_const_sv	pPerl->Perl_cv_const_sv
diff --git a/perlapi.c b/perlapi.c
index 4f427e025c..9de87259d9 100644
--- a/perlapi.c
+++ b/perlapi.c
@@ -480,6 +480,8 @@ Perl_sv_setpvf_mg_nocontext(SV* sv, const char* pat, ...)
 }
 
 #undef  Perl_fprintf_nocontext
+
+#undef  Perl_printf_nocontext
 #endif
 
 #undef  Perl_cv_const_sv
@@ -4199,6 +4201,16 @@ Perl_fprintf_nocontext(PerlIO *stream, const char *format, ...)
     return (*PL_StdIO->pVprintf)(PL_StdIO, stream, format, arglist);
 }
 
+#undef Perl_printf_nocontext
+int
+Perl_printf_nocontext(const char *format, ...)
+{
+    dTHXo;
+    va_list(arglist);
+    va_start(arglist, format);
+    return (*PL_StdIO->pVprintf)(PL_StdIO, PerlIO_stdout(), format, arglist);
+}
+
 END_EXTERN_C
 
 #endif /* PERL_OBJECT */
diff --git a/perly.c b/perly.c
index d00102ddf8..ea28637d56 100644
--- a/perly.c
+++ b/perly.c
@@ -45,9 +45,10 @@ typedef union {
 
 #ifdef USE_PURE_BISON
 #define YYLEX_PARAM (&yychar)
+#define yylex yylex_r
 #endif
 
-#line 51 "perly.c"
+#line 52 "perly.c"
 #define YYERRCODE 256
 static short yylhs[] = {                                        -1,
    50,    0,    8,    6,    9,    7,   10,   10,   10,   11,
@@ -1357,7 +1358,7 @@ static char *yyrule[] = {
 #define YYMAXDEPTH 500
 #endif
 #endif
-#line 726 "perly.y"
+#line 734 "perly.y"
  /* PROGRAM */
 
 /* more stuff added to make perly_c.diff easier to apply */
@@ -1367,7 +1368,7 @@ static char *yyrule[] = {
 #endif
 #define yyparse() Perl_yyparse(pTHX)
 
-#line 1371 "perly.c"
+#line 1444 "perly.c"
 #define YYABORT goto yyabort
 #define YYACCEPT goto yyaccept
 #define YYERROR goto yyerrlab
@@ -1499,9 +1500,8 @@ yyinrecovery:
             {
 #if YYDEBUG
                 if (yydebug)
-                    PerlIO_printf(Perl_debug_log,
-				  "yydebug: state %d, error recovery shifting to state %d\n",
-				  *yyssp, yytable[yyn]);
+                    PerlIO_printf(Perl_debug_log, "yydebug: state %d, error recovery shifting\
+ to state %d\n", *yyssp, yytable[yyn]);
 #endif
                 if (yyssp >= yyss + yystacksize - 1)
                 {
@@ -1563,7 +1563,7 @@ yyreduce:
     switch (yyn)
     {
 case 1:
-#line 125 "perly.y"
+#line 126 "perly.y"
 {
 #if defined(YYDEBUG) && defined(DEBUGGING)
 		    yydebug = (DEBUG_p_TEST);
@@ -1572,50 +1572,50 @@ case 1:
 		}
 break;
 case 2:
-#line 132 "perly.y"
+#line 133 "perly.y"
 { newPROG(yyvsp[0].opval); }
 break;
 case 3:
-#line 136 "perly.y"
+#line 137 "perly.y"
 { if (PL_copline > (line_t)yyvsp[-3].ival)
 			      PL_copline = yyvsp[-3].ival;
 			  yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); }
 break;
 case 4:
-#line 142 "perly.y"
+#line 143 "perly.y"
 { yyval.ival = block_start(TRUE); }
 break;
 case 5:
-#line 146 "perly.y"
+#line 147 "perly.y"
 { if (PL_copline > (line_t)yyvsp[-3].ival)
 			      PL_copline = yyvsp[-3].ival;
 			  yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); }
 break;
 case 6:
-#line 152 "perly.y"
+#line 153 "perly.y"
 { yyval.ival = block_start(FALSE); }
 break;
 case 7:
-#line 156 "perly.y"
+#line 157 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 8:
-#line 158 "perly.y"
+#line 159 "perly.y"
 { yyval.opval = yyvsp[-1].opval; }
 break;
 case 9:
-#line 160 "perly.y"
+#line 161 "perly.y"
 {   yyval.opval = append_list(OP_LINESEQ,
 				(LISTOP*)yyvsp[-1].opval, (LISTOP*)yyvsp[0].opval);
 			    PL_pad_reset_pending = TRUE;
 			    if (yyvsp[-1].opval && yyvsp[0].opval) PL_hints |= HINT_BLOCK_SCOPE; }
 break;
 case 10:
-#line 167 "perly.y"
+#line 168 "perly.y"
 { yyval.opval = newSTATEOP(0, yyvsp[-1].pval, yyvsp[0].opval); }
 break;
 case 12:
-#line 170 "perly.y"
+#line 171 "perly.y"
 { if (yyvsp[-1].pval != Nullch) {
 			      yyval.opval = newSTATEOP(0, yyvsp[-1].pval, newOP(OP_NULL, 0));
 			    }
@@ -1626,75 +1626,75 @@ case 12:
 			    PL_expect = XSTATE; }
 break;
 case 13:
-#line 179 "perly.y"
+#line 180 "perly.y"
 { yyval.opval = newSTATEOP(0, yyvsp[-2].pval, yyvsp[-1].opval);
 			  PL_expect = XSTATE; }
 break;
 case 14:
-#line 184 "perly.y"
+#line 185 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 15:
-#line 186 "perly.y"
+#line 187 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 16:
-#line 188 "perly.y"
+#line 189 "perly.y"
 { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[0].opval, yyvsp[-2].opval); }
 break;
 case 17:
-#line 190 "perly.y"
+#line 191 "perly.y"
 { yyval.opval = newLOGOP(OP_OR, 0, yyvsp[0].opval, yyvsp[-2].opval); }
 break;
 case 18:
-#line 192 "perly.y"
+#line 193 "perly.y"
 { yyval.opval = newLOOPOP(OPf_PARENS, 1, scalar(yyvsp[0].opval), yyvsp[-2].opval); }
 break;
 case 19:
-#line 194 "perly.y"
+#line 195 "perly.y"
 { yyval.opval = newLOOPOP(OPf_PARENS, 1, yyvsp[0].opval, yyvsp[-2].opval);}
 break;
 case 20:
-#line 196 "perly.y"
+#line 197 "perly.y"
 { yyval.opval = newFOROP(0, Nullch, yyvsp[-1].ival,
 					Nullop, yyvsp[0].opval, yyvsp[-2].opval, Nullop); }
 break;
 case 21:
-#line 201 "perly.y"
+#line 202 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 22:
-#line 203 "perly.y"
+#line 204 "perly.y"
 { (yyvsp[0].opval)->op_flags |= OPf_PARENS; yyval.opval = scope(yyvsp[0].opval); }
 break;
 case 23:
-#line 205 "perly.y"
+#line 206 "perly.y"
 { PL_copline = yyvsp[-5].ival;
 			    yyval.opval = newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval);
 			    PL_hints |= HINT_BLOCK_SCOPE; }
 break;
 case 24:
-#line 211 "perly.y"
+#line 212 "perly.y"
 { PL_copline = yyvsp[-6].ival;
 			    yyval.opval = block_end(yyvsp[-4].ival,
 				   newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); }
 break;
 case 25:
-#line 215 "perly.y"
+#line 216 "perly.y"
 { PL_copline = yyvsp[-6].ival;
 			    yyval.opval = block_end(yyvsp[-4].ival,
 				   newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); }
 break;
 case 26:
-#line 221 "perly.y"
+#line 222 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 27:
-#line 223 "perly.y"
+#line 224 "perly.y"
 { yyval.opval = scope(yyvsp[0].opval); }
 break;
 case 28:
-#line 227 "perly.y"
+#line 228 "perly.y"
 { PL_copline = yyvsp[-6].ival;
 			    yyval.opval = block_end(yyvsp[-4].ival,
 				   newSTATEOP(0, yyvsp[-7].pval,
@@ -1702,7 +1702,7 @@ case 28:
 						yyvsp[-6].ival, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval))); }
 break;
 case 29:
-#line 233 "perly.y"
+#line 234 "perly.y"
 { PL_copline = yyvsp[-6].ival;
 			    yyval.opval = block_end(yyvsp[-4].ival,
 				   newSTATEOP(0, yyvsp[-7].pval,
@@ -1710,123 +1710,130 @@ case 29:
 						yyvsp[-6].ival, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval))); }
 break;
 case 30:
-#line 239 "perly.y"
+#line 240 "perly.y"
 { yyval.opval = block_end(yyvsp[-6].ival,
 				 newFOROP(0, yyvsp[-9].pval, yyvsp[-8].ival, yyvsp[-5].opval, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); }
 break;
 case 31:
-#line 242 "perly.y"
+#line 243 "perly.y"
 { yyval.opval = block_end(yyvsp[-4].ival,
 				 newFOROP(0, yyvsp[-8].pval, yyvsp[-7].ival, mod(yyvsp[-6].opval, OP_ENTERLOOP),
 					  yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); }
 break;
 case 32:
-#line 246 "perly.y"
+#line 247 "perly.y"
 { yyval.opval = block_end(yyvsp[-4].ival,
 				 newFOROP(0, yyvsp[-7].pval, yyvsp[-6].ival, Nullop, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); }
 break;
 case 33:
-#line 250 "perly.y"
-{ OP *forop = append_elem(OP_LINESEQ,
-					scalar(yyvsp[-6].opval),
-					newWHILEOP(0, 1, (LOOP*)Nullop,
-						   yyvsp[-9].ival, scalar(yyvsp[-4].opval),
-						   yyvsp[0].opval, scalar(yyvsp[-2].opval)));
+#line 251 "perly.y"
+{ OP *forop;
 			  PL_copline = yyvsp[-9].ival;
-			  yyval.opval = block_end(yyvsp[-7].ival, newSTATEOP(0, yyvsp[-10].pval, forop)); }
+			  forop = newSTATEOP(0, yyvsp[-10].pval,
+					    newWHILEOP(0, 1, (LOOP*)Nullop,
+						yyvsp[-9].ival, scalar(yyvsp[-4].opval),
+						yyvsp[0].opval, yyvsp[-2].opval));
+			  if (yyvsp[-6].opval) {
+				forop = append_elem(OP_LINESEQ,
+                                        newSTATEOP(0, (yyvsp[-10].pval?savepv(yyvsp[-10].pval):Nullch),
+						   yyvsp[-6].opval),
+					forop);
+			  }
+
+			  yyval.opval = block_end(yyvsp[-7].ival, forop); }
 break;
 case 34:
-#line 258 "perly.y"
+#line 266 "perly.y"
 { yyval.opval = newSTATEOP(0, yyvsp[-2].pval,
 				 newWHILEOP(0, 1, (LOOP*)Nullop,
 					    NOLINE, Nullop, yyvsp[-1].opval, yyvsp[0].opval)); }
 break;
 case 35:
-#line 264 "perly.y"
+#line 272 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 37:
-#line 269 "perly.y"
+#line 277 "perly.y"
 { (void)scan_num("1", &yylval); yyval.opval = yylval.opval; }
 break;
 case 39:
-#line 274 "perly.y"
+#line 282 "perly.y"
 { yyval.opval = invert(scalar(yyvsp[0].opval)); }
 break;
 case 40:
-#line 278 "perly.y"
+#line 286 "perly.y"
 { yyval.opval = yyvsp[0].opval; intro_my(); }
 break;
 case 41:
-#line 282 "perly.y"
+#line 290 "perly.y"
 { yyval.opval = yyvsp[0].opval; intro_my(); }
 break;
 case 42:
-#line 286 "perly.y"
+#line 294 "perly.y"
 { yyval.opval = yyvsp[0].opval; intro_my(); }
 break;
 case 43:
-#line 290 "perly.y"
+#line 298 "perly.y"
 { yyval.opval = yyvsp[0].opval; intro_my(); }
 break;
 case 44:
-#line 294 "perly.y"
+#line 302 "perly.y"
 { yyval.pval = Nullch; }
 break;
 case 46:
-#line 299 "perly.y"
+#line 307 "perly.y"
 { yyval.ival = 0; }
 break;
 case 47:
-#line 301 "perly.y"
+#line 309 "perly.y"
 { yyval.ival = 0; }
 break;
 case 48:
-#line 303 "perly.y"
+#line 311 "perly.y"
 { yyval.ival = 0; }
 break;
 case 49:
-#line 305 "perly.y"
+#line 313 "perly.y"
 { yyval.ival = 0; }
 break;
 case 50:
-#line 307 "perly.y"
+#line 315 "perly.y"
 { yyval.ival = 0; }
 break;
 case 51:
-#line 311 "perly.y"
+#line 319 "perly.y"
 { newFORM(yyvsp[-2].ival, yyvsp[-1].opval, yyvsp[0].opval); }
 break;
 case 52:
-#line 314 "perly.y"
+#line 322 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 53:
-#line 315 "perly.y"
+#line 323 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 54:
-#line 319 "perly.y"
+#line 327 "perly.y"
 { newMYSUB(yyvsp[-4].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); }
 break;
 case 55:
-#line 323 "perly.y"
+#line 331 "perly.y"
 { newATTRSUB(yyvsp[-4].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); }
 break;
 case 56:
-#line 327 "perly.y"
+#line 335 "perly.y"
 { yyval.ival = start_subparse(FALSE, 0); }
 break;
 case 57:
-#line 331 "perly.y"
+#line 339 "perly.y"
 { yyval.ival = start_subparse(FALSE, CVf_ANON); }
 break;
 case 58:
-#line 335 "perly.y"
+#line 343 "perly.y"
 { yyval.ival = start_subparse(TRUE, 0); }
 break;
 case 59:
-#line 338 "perly.y"
+#line 346 "perly.y"
 { STRLEN n_a; char *name = SvPV(((SVOP*)yyvsp[0].opval)->op_sv,n_a);
 			  if (strEQ(name, "BEGIN") || strEQ(name, "END")
 			      || strEQ(name, "INIT") || strEQ(name, "CHECK"))
@@ -1834,353 +1841,353 @@ case 59:
 			  yyval.opval = yyvsp[0].opval; }
 break;
 case 60:
-#line 346 "perly.y"
+#line 354 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 62:
-#line 351 "perly.y"
+#line 359 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 63:
-#line 353 "perly.y"
+#line 361 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 64:
-#line 355 "perly.y"
+#line 363 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 65:
-#line 359 "perly.y"
+#line 367 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 66:
-#line 361 "perly.y"
+#line 369 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 67:
-#line 364 "perly.y"
+#line 372 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 68:
-#line 365 "perly.y"
+#line 373 "perly.y"
 { yyval.opval = Nullop; PL_expect = XSTATE; }
 break;
 case 69:
-#line 369 "perly.y"
+#line 377 "perly.y"
 { package(yyvsp[-1].opval); }
 break;
 case 70:
-#line 371 "perly.y"
+#line 379 "perly.y"
 { package(Nullop); }
 break;
 case 71:
-#line 375 "perly.y"
+#line 383 "perly.y"
 { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
 break;
 case 72:
-#line 377 "perly.y"
+#line 385 "perly.y"
 { utilize(yyvsp[-6].ival, yyvsp[-5].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval); }
 break;
 case 73:
-#line 381 "perly.y"
+#line 389 "perly.y"
 { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 74:
-#line 383 "perly.y"
+#line 391 "perly.y"
 { yyval.opval = newLOGOP(yyvsp[-1].ival, 0, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 76:
-#line 388 "perly.y"
+#line 396 "perly.y"
 { yyval.opval = yyvsp[-1].opval; }
 break;
 case 77:
-#line 390 "perly.y"
+#line 398 "perly.y"
 { yyval.opval = append_elem(OP_LIST, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 79:
-#line 395 "perly.y"
+#line 403 "perly.y"
 { yyval.opval = convert(yyvsp[-2].ival, OPf_STACKED,
 				prepend_elem(OP_LIST, newGVREF(yyvsp[-2].ival,yyvsp[-1].opval), yyvsp[0].opval) ); }
 break;
 case 80:
-#line 398 "perly.y"
+#line 406 "perly.y"
 { yyval.opval = convert(yyvsp[-4].ival, OPf_STACKED,
 				prepend_elem(OP_LIST, newGVREF(yyvsp[-4].ival,yyvsp[-2].opval), yyvsp[-1].opval) ); }
 break;
 case 81:
-#line 401 "perly.y"
+#line 409 "perly.y"
 { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST,
 				    prepend_elem(OP_LIST, scalar(yyvsp[-5].opval), yyvsp[-1].opval),
 				    newUNOP(OP_METHOD, 0, yyvsp[-3].opval))); }
 break;
 case 82:
-#line 406 "perly.y"
+#line 414 "perly.y"
 { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST, scalar(yyvsp[-2].opval),
 				    newUNOP(OP_METHOD, 0, yyvsp[0].opval))); }
 break;
 case 83:
-#line 410 "perly.y"
+#line 418 "perly.y"
 { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST,
 				    prepend_elem(OP_LIST, yyvsp[-1].opval, yyvsp[0].opval),
 				    newUNOP(OP_METHOD, 0, yyvsp[-2].opval))); }
 break;
 case 84:
-#line 415 "perly.y"
+#line 423 "perly.y"
 { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST,
 				    prepend_elem(OP_LIST, yyvsp[-3].opval, yyvsp[-1].opval),
 				    newUNOP(OP_METHOD, 0, yyvsp[-4].opval))); }
 break;
 case 85:
-#line 420 "perly.y"
+#line 428 "perly.y"
 { yyval.opval = convert(yyvsp[-1].ival, 0, yyvsp[0].opval); }
 break;
 case 86:
-#line 422 "perly.y"
+#line 430 "perly.y"
 { yyval.opval = convert(yyvsp[-3].ival, 0, yyvsp[-1].opval); }
 break;
 case 87:
-#line 424 "perly.y"
+#line 432 "perly.y"
 { yyvsp[0].opval = newANONATTRSUB(yyvsp[-1].ival, 0, Nullop, yyvsp[0].opval); }
 break;
 case 88:
-#line 426 "perly.y"
+#line 434 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				 append_elem(OP_LIST,
 				   prepend_elem(OP_LIST, yyvsp[-2].opval, yyvsp[0].opval), yyvsp[-4].opval)); }
 break;
 case 91:
-#line 436 "perly.y"
+#line 444 "perly.y"
 { yyval.opval = newBINOP(OP_GELEM, 0, yyvsp[-4].opval, scalar(yyvsp[-2].opval)); }
 break;
 case 92:
-#line 438 "perly.y"
+#line 446 "perly.y"
 { yyval.opval = newBINOP(OP_AELEM, 0, oopsAV(yyvsp[-3].opval), scalar(yyvsp[-1].opval)); }
 break;
 case 93:
-#line 440 "perly.y"
+#line 448 "perly.y"
 { yyval.opval = newBINOP(OP_AELEM, 0,
 					ref(newAVREF(yyvsp[-4].opval),OP_RV2AV),
 					scalar(yyvsp[-1].opval));}
 break;
 case 94:
-#line 444 "perly.y"
+#line 452 "perly.y"
 { yyval.opval = newBINOP(OP_AELEM, 0,
 					ref(newAVREF(yyvsp[-3].opval),OP_RV2AV),
 					scalar(yyvsp[-1].opval));}
 break;
 case 95:
-#line 448 "perly.y"
+#line 456 "perly.y"
 { yyval.opval = newBINOP(OP_HELEM, 0, oopsHV(yyvsp[-4].opval), jmaybe(yyvsp[-2].opval));
 			    PL_expect = XOPERATOR; }
 break;
 case 96:
-#line 451 "perly.y"
+#line 459 "perly.y"
 { yyval.opval = newBINOP(OP_HELEM, 0,
 					ref(newHVREF(yyvsp[-5].opval),OP_RV2HV),
 					jmaybe(yyvsp[-2].opval));
 			    PL_expect = XOPERATOR; }
 break;
 case 97:
-#line 456 "perly.y"
+#line 464 "perly.y"
 { yyval.opval = newBINOP(OP_HELEM, 0,
 					ref(newHVREF(yyvsp[-4].opval),OP_RV2HV),
 					jmaybe(yyvsp[-2].opval));
 			    PL_expect = XOPERATOR; }
 break;
 case 98:
-#line 461 "perly.y"
+#line 469 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar(yyvsp[-3].opval))); }
 break;
 case 99:
-#line 464 "perly.y"
+#line 472 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   append_elem(OP_LIST, yyvsp[-1].opval,
 				       newCVREF(0, scalar(yyvsp[-4].opval)))); }
 break;
 case 100:
-#line 469 "perly.y"
+#line 477 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   append_elem(OP_LIST, yyvsp[-1].opval,
 					       newCVREF(0, scalar(yyvsp[-3].opval)))); }
 break;
 case 101:
-#line 473 "perly.y"
+#line 481 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar(yyvsp[-2].opval))); }
 break;
 case 102:
-#line 479 "perly.y"
+#line 487 "perly.y"
 { yyval.opval = newASSIGNOP(OPf_STACKED, yyvsp[-2].opval, yyvsp[-1].ival, yyvsp[0].opval); }
 break;
 case 103:
-#line 481 "perly.y"
+#line 489 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 104:
-#line 483 "perly.y"
+#line 491 "perly.y"
 {   if (yyvsp[-1].ival != OP_REPEAT)
 				scalar(yyvsp[-2].opval);
 			    yyval.opval = newBINOP(yyvsp[-1].ival, 0, yyvsp[-2].opval, scalar(yyvsp[0].opval)); }
 break;
 case 105:
-#line 487 "perly.y"
+#line 495 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 106:
-#line 489 "perly.y"
+#line 497 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 107:
-#line 491 "perly.y"
+#line 499 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 108:
-#line 493 "perly.y"
+#line 501 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 109:
-#line 495 "perly.y"
+#line 503 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 110:
-#line 497 "perly.y"
+#line 505 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 111:
-#line 499 "perly.y"
+#line 507 "perly.y"
 { yyval.opval = newRANGE(yyvsp[-1].ival, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval));}
 break;
 case 112:
-#line 501 "perly.y"
+#line 509 "perly.y"
 { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 113:
-#line 503 "perly.y"
+#line 511 "perly.y"
 { yyval.opval = newLOGOP(OP_OR, 0, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 114:
-#line 505 "perly.y"
+#line 513 "perly.y"
 { yyval.opval = newCONDOP(0, yyvsp[-4].opval, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 115:
-#line 507 "perly.y"
+#line 515 "perly.y"
 { yyval.opval = bind_match(yyvsp[-1].ival, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 116:
-#line 510 "perly.y"
+#line 518 "perly.y"
 { yyval.opval = newUNOP(OP_NEGATE, 0, scalar(yyvsp[0].opval)); }
 break;
 case 117:
-#line 512 "perly.y"
+#line 520 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 118:
-#line 514 "perly.y"
+#line 522 "perly.y"
 { yyval.opval = newUNOP(OP_NOT, 0, scalar(yyvsp[0].opval)); }
 break;
 case 119:
-#line 516 "perly.y"
+#line 524 "perly.y"
 { yyval.opval = newUNOP(OP_COMPLEMENT, 0, scalar(yyvsp[0].opval));}
 break;
 case 120:
-#line 518 "perly.y"
+#line 526 "perly.y"
 { yyval.opval = newUNOP(OP_REFGEN, 0, mod(yyvsp[0].opval,OP_REFGEN)); }
 break;
 case 121:
-#line 520 "perly.y"
+#line 528 "perly.y"
 { yyval.opval = newUNOP(OP_POSTINC, 0,
 					mod(scalar(yyvsp[-1].opval), OP_POSTINC)); }
 break;
 case 122:
-#line 523 "perly.y"
+#line 531 "perly.y"
 { yyval.opval = newUNOP(OP_POSTDEC, 0,
 					mod(scalar(yyvsp[-1].opval), OP_POSTDEC)); }
 break;
 case 123:
-#line 526 "perly.y"
+#line 534 "perly.y"
 { yyval.opval = newUNOP(OP_PREINC, 0,
 					mod(scalar(yyvsp[0].opval), OP_PREINC)); }
 break;
 case 124:
-#line 529 "perly.y"
+#line 537 "perly.y"
 { yyval.opval = newUNOP(OP_PREDEC, 0,
 					mod(scalar(yyvsp[0].opval), OP_PREDEC)); }
 break;
 case 125:
-#line 532 "perly.y"
+#line 540 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 126:
-#line 534 "perly.y"
+#line 542 "perly.y"
 { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); }
 break;
 case 127:
-#line 536 "perly.y"
+#line 544 "perly.y"
 { yyval.opval = sawparens(yyvsp[-1].opval); }
 break;
 case 128:
-#line 538 "perly.y"
+#line 546 "perly.y"
 { yyval.opval = sawparens(newNULLLIST()); }
 break;
 case 129:
-#line 540 "perly.y"
+#line 548 "perly.y"
 { yyval.opval = newANONLIST(yyvsp[-1].opval); }
 break;
 case 130:
-#line 542 "perly.y"
+#line 550 "perly.y"
 { yyval.opval = newANONLIST(Nullop); }
 break;
 case 131:
-#line 544 "perly.y"
+#line 552 "perly.y"
 { yyval.opval = newANONHASH(yyvsp[-2].opval); }
 break;
 case 132:
-#line 546 "perly.y"
+#line 554 "perly.y"
 { yyval.opval = newANONHASH(Nullop); }
 break;
 case 133:
-#line 548 "perly.y"
+#line 556 "perly.y"
 { yyval.opval = newANONATTRSUB(yyvsp[-3].ival, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); }
 break;
 case 134:
-#line 550 "perly.y"
+#line 558 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 135:
-#line 552 "perly.y"
+#line 560 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 136:
-#line 554 "perly.y"
+#line 562 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 137:
-#line 556 "perly.y"
+#line 564 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 138:
-#line 558 "perly.y"
+#line 566 "perly.y"
 { yyval.opval = newUNOP(OP_AV2ARYLEN, 0, ref(yyvsp[0].opval, OP_AV2ARYLEN));}
 break;
 case 139:
-#line 560 "perly.y"
+#line 568 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 140:
-#line 562 "perly.y"
+#line 570 "perly.y"
 { yyval.opval = newSLICEOP(0, yyvsp[-1].opval, yyvsp[-4].opval); }
 break;
 case 141:
-#line 564 "perly.y"
+#line 572 "perly.y"
 { yyval.opval = newSLICEOP(0, yyvsp[-1].opval, Nullop); }
 break;
 case 142:
-#line 566 "perly.y"
+#line 574 "perly.y"
 { yyval.opval = prepend_elem(OP_ASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_ASLICE, 0,
@@ -2188,7 +2195,7 @@ case 142:
 					ref(yyvsp[-3].opval, OP_ASLICE))); }
 break;
 case 143:
-#line 572 "perly.y"
+#line 580 "perly.y"
 { yyval.opval = prepend_elem(OP_HSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_HSLICE, 0,
@@ -2197,37 +2204,37 @@ case 143:
 			    PL_expect = XOPERATOR; }
 break;
 case 144:
-#line 579 "perly.y"
+#line 587 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 145:
-#line 581 "perly.y"
+#line 589 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, 0, scalar(yyvsp[0].opval)); }
 break;
 case 146:
-#line 583 "perly.y"
+#line 591 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar(yyvsp[-2].opval)); }
 break;
 case 147:
-#line 585 "perly.y"
+#line 593 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    append_elem(OP_LIST, yyvsp[-1].opval, scalar(yyvsp[-3].opval))); }
 break;
 case 148:
-#line 588 "perly.y"
+#line 596 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    append_elem(OP_LIST, yyvsp[0].opval, scalar(yyvsp[-1].opval))); }
 break;
 case 149:
-#line 591 "perly.y"
+#line 599 "perly.y"
 { yyval.opval = dofile(yyvsp[0].opval); }
 break;
 case 150:
-#line 593 "perly.y"
+#line 601 "perly.y"
 { yyval.opval = newUNOP(OP_NULL, OPf_SPECIAL, scope(yyvsp[0].opval)); }
 break;
 case 151:
-#line 595 "perly.y"
+#line 603 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
@@ -2237,7 +2244,7 @@ case 151:
 				)),Nullop)); dep();}
 break;
 case 152:
-#line 603 "perly.y"
+#line 611 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    append_elem(OP_LIST,
@@ -2248,170 +2255,170 @@ case 152:
 				)))); dep();}
 break;
 case 153:
-#line 612 "perly.y"
+#line 620 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
 				scalar(newCVREF(0,scalar(yyvsp[-2].opval))), Nullop)); dep();}
 break;
 case 154:
-#line 616 "perly.y"
+#line 624 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
 				yyvsp[-1].opval,
 				scalar(newCVREF(0,scalar(yyvsp[-3].opval))))); dep();}
 break;
 case 155:
-#line 621 "perly.y"
+#line 629 "perly.y"
 { yyval.opval = newOP(yyvsp[0].ival, OPf_SPECIAL);
 			    PL_hints |= HINT_BLOCK_SCOPE; }
 break;
 case 156:
-#line 624 "perly.y"
+#line 632 "perly.y"
 { yyval.opval = newLOOPEX(yyvsp[-1].ival,yyvsp[0].opval); }
 break;
 case 157:
-#line 626 "perly.y"
+#line 634 "perly.y"
 { yyval.opval = newUNOP(OP_NOT, 0, scalar(yyvsp[0].opval)); }
 break;
 case 158:
-#line 628 "perly.y"
+#line 636 "perly.y"
 { yyval.opval = newOP(yyvsp[0].ival, 0); }
 break;
 case 159:
-#line 630 "perly.y"
+#line 638 "perly.y"
 { yyval.opval = newUNOP(yyvsp[-1].ival, 0, yyvsp[0].opval); }
 break;
 case 160:
-#line 632 "perly.y"
+#line 640 "perly.y"
 { yyval.opval = newUNOP(yyvsp[-1].ival, 0, yyvsp[0].opval); }
 break;
 case 161:
-#line 634 "perly.y"
+#line 642 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    append_elem(OP_LIST, yyvsp[0].opval, scalar(yyvsp[-1].opval))); }
 break;
 case 162:
-#line 637 "perly.y"
+#line 645 "perly.y"
 { yyval.opval = newOP(yyvsp[0].ival, 0); }
 break;
 case 163:
-#line 639 "perly.y"
+#line 647 "perly.y"
 { yyval.opval = newOP(yyvsp[-2].ival, 0); }
 break;
 case 164:
-#line 641 "perly.y"
+#line 649 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				scalar(yyvsp[0].opval)); }
 break;
 case 165:
-#line 644 "perly.y"
+#line 652 "perly.y"
 { yyval.opval = newOP(yyvsp[-2].ival, OPf_SPECIAL); }
 break;
 case 166:
-#line 646 "perly.y"
+#line 654 "perly.y"
 { yyval.opval = newUNOP(yyvsp[-3].ival, 0, yyvsp[-1].opval); }
 break;
 case 167:
-#line 648 "perly.y"
+#line 656 "perly.y"
 { yyval.opval = pmruntime(yyvsp[-3].opval, yyvsp[-1].opval, Nullop); }
 break;
 case 168:
-#line 650 "perly.y"
+#line 658 "perly.y"
 { yyval.opval = pmruntime(yyvsp[-5].opval, yyvsp[-3].opval, yyvsp[-1].opval); }
 break;
 case 171:
-#line 656 "perly.y"
+#line 664 "perly.y"
 { yyval.opval = my_attrs(yyvsp[-1].opval,yyvsp[0].opval); }
 break;
 case 172:
-#line 658 "perly.y"
+#line 666 "perly.y"
 { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); }
 break;
 case 173:
-#line 662 "perly.y"
+#line 670 "perly.y"
 { yyval.opval = sawparens(yyvsp[-1].opval); }
 break;
 case 174:
-#line 664 "perly.y"
+#line 672 "perly.y"
 { yyval.opval = sawparens(newNULLLIST()); }
 break;
 case 175:
-#line 666 "perly.y"
+#line 674 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 176:
-#line 668 "perly.y"
+#line 676 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 177:
-#line 670 "perly.y"
+#line 678 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 178:
-#line 674 "perly.y"
+#line 682 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 179:
-#line 676 "perly.y"
+#line 684 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 180:
-#line 680 "perly.y"
+#line 688 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 181:
-#line 682 "perly.y"
+#line 690 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 182:
-#line 684 "perly.y"
+#line 692 "perly.y"
 { yyval.opval = yyvsp[-1].opval; }
 break;
 case 183:
-#line 688 "perly.y"
+#line 696 "perly.y"
 { PL_in_my = 0; yyval.opval = my(yyvsp[0].opval); }
 break;
 case 184:
-#line 692 "perly.y"
+#line 700 "perly.y"
 { yyval.opval = newCVREF(yyvsp[-1].ival,yyvsp[0].opval); }
 break;
 case 185:
-#line 696 "perly.y"
+#line 704 "perly.y"
 { yyval.opval = newSVREF(yyvsp[0].opval); }
 break;
 case 186:
-#line 700 "perly.y"
+#line 708 "perly.y"
 { yyval.opval = newAVREF(yyvsp[0].opval); }
 break;
 case 187:
-#line 704 "perly.y"
+#line 712 "perly.y"
 { yyval.opval = newHVREF(yyvsp[0].opval); }
 break;
 case 188:
-#line 708 "perly.y"
+#line 716 "perly.y"
 { yyval.opval = newAVREF(yyvsp[0].opval); }
 break;
 case 189:
-#line 712 "perly.y"
+#line 720 "perly.y"
 { yyval.opval = newGVREF(0,yyvsp[0].opval); }
 break;
 case 190:
-#line 716 "perly.y"
+#line 724 "perly.y"
 { yyval.opval = scalar(yyvsp[0].opval); }
 break;
 case 191:
-#line 718 "perly.y"
+#line 726 "perly.y"
 { yyval.opval = scalar(yyvsp[0].opval);  }
 break;
 case 192:
-#line 720 "perly.y"
+#line 728 "perly.y"
 { yyval.opval = scope(yyvsp[0].opval); }
 break;
 case 193:
-#line 723 "perly.y"
+#line 731 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
-#line 2412 "perly.c"
+#line 2440 "perly.c"
     }
     yyssp -= yym;
     yystate = *yyssp;
@@ -2421,9 +2428,8 @@ break;
     {
 #if YYDEBUG
         if (yydebug)
-            PerlIO_printf(Perl_debug_log,
-			  "yydebug: after reduction, shifting from state 0 to state %d\n",
-			  YYFINAL);
+            PerlIO_printf(Perl_debug_log, "yydebug: after reduction, shifting from state 0 to\
+ state %d\n", YYFINAL);
 #endif
         yystate = YYFINAL;
         *++yyssp = YYFINAL;
@@ -2452,9 +2458,8 @@ break;
         yystate = yydgoto[yym];
 #if YYDEBUG
     if (yydebug)
-        PerlIO_printf(Perl_debug_log,
-		      "yydebug: after reduction, shifting from state %d to state %d\n",
-		      *yyssp, yystate);
+        PerlIO_printf(Perl_debug_log, "yydebug: after reduction, shifting from state %d \
+to state %d\n", *yyssp, yystate);
 #endif
     if (yyssp >= yyss + yystacksize - 1)
     {
diff --git a/perly.fixer b/perly.fixer
index daa558e84e..00f583c675 100755
--- a/perly.fixer
+++ b/perly.fixer
@@ -19,6 +19,17 @@ input=$1
 output=$2
 tmp=/tmp/f$$
 
+inputh=`echo $input|sed 's:\.c$:.h:'`
+if grep '^#ifdef PERL_CORE' $inputh; then
+	: never mind
+else
+	echo "#ifdef PERL_CORE"	> $tmp
+	sed -e 's:^typedef union {:#endif /* PERL_CORE */\
+\
+typedef union {:' $inputh		>> $tmp
+	mv -f $tmp $inputh
+fi
+
 if grep 'yaccpar 1.8 (Berkeley)' $input >/dev/null 2>&1; then
     cp $input $output
     # Don't expect the diff to do everything -- do some by hand
diff --git a/perly.y b/perly.y
index bf98ac8079..f6e7053366 100644
--- a/perly.y
+++ b/perly.y
@@ -248,13 +248,20 @@ loop	:	label WHILE '(' remember mtexpr ')' mblock cont
 				 newFOROP(0, $1, $2, Nullop, $5, $7, $8)); }
 	|	label FOR '(' remember mnexpr ';' mtexpr ';' mnexpr ')' mblock
 			/* basically fake up an initialize-while lineseq */
-			{ OP *forop = append_elem(OP_LINESEQ,
-					scalar($5),
-					newWHILEOP(0, 1, (LOOP*)Nullop,
-						   $2, scalar($7),
-						   $11, scalar($9)));
+			{ OP *forop;
 			  PL_copline = $2;
-			  $$ = block_end($4, newSTATEOP(0, $1, forop)); }
+			  forop = newSTATEOP(0, $1,
+					    newWHILEOP(0, 1, (LOOP*)Nullop,
+						$2, scalar($7),
+						$11, $9));
+			  if ($5) {
+				forop = append_elem(OP_LINESEQ,
+                                        newSTATEOP(0, ($1?savepv($1):Nullch),
+						   $5),
+					forop);
+			  }
+
+			  $$ = block_end($4, forop); }
 	|	label block cont  /* a block is a loop that happens once */
 			{ $$ = newSTATEOP(0, $1,
 				 newWHILEOP(0, 1, (LOOP*)Nullop,
diff --git a/perly_c.diff b/perly_c.diff
index 0cfe10f8d7..20990601d7 100644
--- a/perly_c.diff
+++ b/perly_c.diff
@@ -1,7 +1,7 @@
 *** y.tab.c.orig	Thu Aug 26 22:31:26 1999
 --- y.tab.c	Thu Aug 26 22:32:22 1999
 ***************
-*** 1447,1456 ****
+*** 1448,1457 ****
   yyparse()
   {
       register int yym, yyn, yystate;
@@ -12,7 +12,7 @@
       if (yys = getenv("YYDEBUG"))
       {
           yyn = *yys;
---- 1447,1476 ----
+--- 1448,1477 ----
   yyparse()
   {
       register int yym, yyn, yystate;
@@ -44,8 +44,8 @@
       {
           yyn = *yys;
 ***************
-*** 1463,1468 ****
---- 1483,1498 ----
+*** 1464,1469 ****
+--- 1484,1499 ----
       yyerrflag = 0;
       yychar = (-1);
   
@@ -63,7 +63,7 @@
       yyvsp = yyvs;
       *yyssp = yystate = 0;
 ***************
-*** 1493,1499 ****
+*** 1494,1500 ****
   #endif
           if (yyssp >= yyss + yystacksize - 1)
           {
@@ -71,7 +71,7 @@
           }
           *++yyssp = yystate = yytable[yyn];
           *++yyvsp = yylval;
---- 1523,1541 ----
+--- 1524,1542 ----
   #endif
           if (yyssp >= yyss + yystacksize - 1)
           {
@@ -92,7 +92,7 @@
           *++yyssp = yystate = yytable[yyn];
           *++yyvsp = yylval;
 ***************
-*** 1534,1540 ****
+*** 1535,1541 ****
   #endif
                   if (yyssp >= yyss + yystacksize - 1)
                   {
@@ -100,7 +100,7 @@
                   }
                   *++yyssp = yystate = yytable[yyn];
                   *++yyvsp = yylval;
---- 1576,1594 ----
+--- 1577,1595 ----
   #endif
                   if (yyssp >= yyss + yystacksize - 1)
                   {
@@ -121,7 +121,7 @@
                   *++yyssp = yystate = yytable[yyn];
                   *++yyvsp = yylval;
 ***************
-*** 2473,2487 ****
+*** 2481,2495 ****
   #endif
       if (yyssp >= yyss + yystacksize - 1)
       {
@@ -137,7 +137,7 @@
   yyaccept:
 !     return (0);
   }
---- 2527,2575 ----
+--- 2535,2583 ----
   #endif
       if (yyssp >= yyss + yystacksize - 1)
       {
diff --git a/pp_ctl.c b/pp_ctl.c
index ede5abad97..93b89b14a7 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -2454,6 +2454,8 @@ PP(pp_goto)
 
     if (label && *label) {
 	OP *gotoprobe = 0;
+	bool leaving_eval = FALSE;
+        PERL_CONTEXT *last_eval_cx = 0;
 
 	/* find label */
 
@@ -2463,8 +2465,15 @@ PP(pp_goto)
 	    cx = &cxstack[ix];
 	    switch (CxTYPE(cx)) {
 	    case CXt_EVAL:
-		gotoprobe = PL_eval_root; /* XXX not good for nested eval */
-		break;
+		leaving_eval = TRUE;
+                if (CxREALEVAL(cx)) {
+		    gotoprobe = (last_eval_cx ?
+				last_eval_cx->blk_eval.old_eval_root :
+				PL_eval_root);
+		    last_eval_cx = cx;
+		    break;
+                }
+                /* else fall through */
 	    case CXt_LOOP:
 		gotoprobe = cx->blk_oldcop->op_sibling;
 		break;
@@ -2502,6 +2511,17 @@ PP(pp_goto)
 	if (!retop)
 	    DIE(aTHX_ "Can't find label %s", label);
 
+	/* if we're leaving an eval, check before we pop any frames
+           that we're not going to punt, otherwise the error
+	   won't be caught */
+
+	if (leaving_eval && *enterops && enterops[1]) {
+	    I32 i;
+            for (i = 1; enterops[i]; i++)
+                if (enterops[i]->op_type == OP_ENTERITER)
+                    DIE(aTHX_ "Can't \"goto\" into the middle of a foreach loop");
+	}
+
 	/* pop unwanted frames */
 
 	if (ix < cxstack_ix) {
@@ -3506,7 +3526,6 @@ PP(pp_entertry)
     push_return(cLOGOP->op_other->op_next);
     PUSHBLOCK(cx, (CXt_EVAL|CXp_TRYBLOCK), SP);
     PUSHEVAL(cx, 0, 0);
-    PL_eval_root = PL_op;		/* Only needed so that goto works right. */
 
     PL_in_eval = EVAL_INEVAL;
     sv_setpv(ERRSV,"");
diff --git a/proto.h b/proto.h
index 4e8abe016d..1201e64156 100644
--- a/proto.h
+++ b/proto.h
@@ -177,6 +177,11 @@ PERL_CALLCONV int	Perl_fprintf_nocontext(PerlIO* stream, const char* fmt, ...)
  __attribute__((format(printf,2,3)))
 #endif
 ;
+PERL_CALLCONV int	Perl_printf_nocontext(const char* fmt, ...)
+#ifdef CHECK_FORMAT
+ __attribute__((format(printf,1,2)))
+#endif
+;
 #endif
 PERL_CALLCONV void	Perl_cv_ckproto(pTHX_ CV* cv, GV* gv, char* p);
 PERL_CALLCONV CV*	Perl_cv_clone(pTHX_ CV* proto);
diff --git a/regcomp.c b/regcomp.c
index 4638d77047..19ad253929 100644
--- a/regcomp.c
+++ b/regcomp.c
@@ -1599,7 +1599,7 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm)
     else
         RExC_utf8 = 0;
 
-    RExC_precomp = savepvn(exp, xend - exp);
+    RExC_precomp = exp;
     DEBUG_r(if (!PL_colorset) reginitcolors());
     DEBUG_r(PerlIO_printf(Perl_debug_log, "%sCompiling REx%s `%s%*s%s'\n",
 		      PL_colors[4],PL_colors[5],PL_colors[0],
@@ -1625,7 +1625,6 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm)
     REGC((U8)REG_MAGIC, (char*)RExC_emit);
 #endif
     if (reg(pRExC_state, 0, &flags) == NULL) {
-	Safefree(RExC_precomp);
 	RExC_precomp = Nullch;
 	return(NULL);
     }
@@ -1652,7 +1651,7 @@ Perl_pregcomp(pTHX_ char *exp, char *xend, PMOP *pm)
 #endif
     r->refcnt = 1;
     r->prelen = xend - exp;
-    r->precomp = RExC_precomp;
+    r->precomp = savepvn(RExC_precomp, r->prelen);
     r->subbeg = NULL;
     r->reganch = pm->op_pmflags & PMf_COMPILETIME;
     r->nparens = RExC_npar - 1;	/* set early to validate backrefs */
diff --git a/regexec.c b/regexec.c
index a7b6411777..2420f8d3c9 100644
--- a/regexec.c
+++ b/regexec.c
@@ -2520,7 +2520,7 @@ S_regmatch(pTHX_ regnode *prog)
 			I32 osize = PL_regsize;
 			I32 onpar = PL_regnpar;
 
-			pm.op_pmflags = 0;
+			Zero(&pm, 1, PMOP);
 			re = CALLREGCOMP(aTHX_ t, t + len, &pm);
 			if (!(SvFLAGS(ret)
 			      & (SVs_TEMP | SVs_PADTMP | SVf_READONLY)))
diff --git a/scope.c b/scope.c
index f0efaf82e0..106b3dc253 100644
--- a/scope.c
+++ b/scope.c
@@ -196,7 +196,7 @@ S_save_scalar_at(pTHX_ SV **sptr)
 	if (SvGMAGICAL(osv)) {
 	    MAGIC* mg;
 	    bool oldtainted = PL_tainted;
-	    mg_get(osv);
+	    mg_get(osv);		/* note, can croak! */
 	    if (PL_tainting && PL_tainted && (mg = mg_find(osv, 't'))) {
 		SAVESPTR(mg->mg_obj);
 		mg->mg_obj = osv;
@@ -678,13 +678,19 @@ Perl_leave_scope(pTHX_ I32 base)
 		SvMAGICAL_off(sv);
 		SvMAGIC(sv) = 0;
 	    }
+	    /* XXX this branch is pretty bogus--note that we seem to
+	     * only get here if the mg_get() in save_scalar_at() ends
+	     * up croaking.  This code irretrievably clears(!) the magic
+	     * on the SV to avoid further croaking that might ensue
+	     * when the SvSETMAGIC() below is called.  This needs a
+	     * total rethink.  --GSAR */
 	    else if (SvTYPE(value) >= SVt_PVMG && SvMAGIC(value) &&
 		     SvTYPE(value) != SVt_PVGV)
 	    {
 		SvFLAGS(value) |= (SvFLAGS(value) &
 				   (SVp_IOK|SVp_NOK|SVp_POK)) >> PRIVSHIFT;
 		SvMAGICAL_off(value);
-		SvMAGIC(value) = 0;
+		mg_free(value);
 	    }
             SvREFCNT_dec(sv);
 	    *(SV**)ptr = value;
diff --git a/t/lib/1_compile.t b/t/lib/1_compile.t
index 21e0c7c8d0..f6e2ad0314 100644
--- a/t/lib/1_compile.t
+++ b/t/lib/1_compile.t
@@ -95,5 +95,5 @@ foreach my $module (@Core_Modules) {
 sub compile_module {
     my ($module) = $_[0];
     
-    return scalar `./perl -Ilib t/lib/compmod.pl $module` =~ /^ok/;
+    return scalar `$^X "-Ilib" t/lib/compmod.pl $module` =~ /^ok/;
 }
diff --git a/t/lib/sigaction.t b/t/lib/sigaction.t
index cb3380b119..8200a6f9dd 100644
--- a/t/lib/sigaction.t
+++ b/t/lib/sigaction.t
@@ -43,7 +43,8 @@ my $oldaction=POSIX::SigAction->new('::bar', new POSIX::SigSet(), 0);
 	if($bad) { print "not ok 1\n" } else { print "ok 1\n"}
 }
 
-if($oldaction->{HANDLER} eq 'DEFAULT')
+if((-t STDIN && $oldaction->{HANDLER} eq 'IGNORE') ||
+   $oldaction->{HANDLER} eq 'DEFAULT')
   { print "ok 2\n" } else { print "not ok 2\n"}
 print $SIG{HUP} eq '::foo' ? "ok 3\n" : "not ok 3\n";
 
diff --git a/t/op/eval.t b/t/op/eval.t
index 11fbfd06de..f4d4be5ab7 100755
--- a/t/op/eval.t
+++ b/t/op/eval.t
@@ -1,6 +1,6 @@
 #!./perl
 
-print "1..40\n";
+print "1..41\n";
 
 eval 'print "ok 1\n";';
 
@@ -206,3 +206,18 @@ print $@;
     print "ok $x\n";
     $x++;
 }
+
+# Check that eval catches bad goto calls
+#   (BUG ID 20010305.003)
+{
+    eval {
+	eval { goto foo; };
+	print ($@ ? "ok 41\n" : "not ok 41\n");
+	last;
+	foreach my $i (1) {
+	    foo: print "not ok 41\n";
+	    print "# jumped into foreach\n";
+	}
+    };
+    print "not ok 41\n" if $@;
+}
diff --git a/t/op/goto.t b/t/op/goto.t
index 96bb8ddb55..b2e5b2ca98 100755
--- a/t/op/goto.t
+++ b/t/op/goto.t
@@ -2,7 +2,7 @@
 
 # "This IS structured code.  It's just randomly structured."
 
-print "1..16\n";
+print "1..22\n";
 
 while ($?) {
     $foo = 1;
@@ -76,6 +76,74 @@ for (1) {
     }
 }
 print "ok 16\n";
+
+# Does goto work correctly within a for(;;) loop?
+#  (BUG ID 20010309.004)
+
+for(my $i=0;!$i++;) {
+  my $x=1;
+  goto label;
+  label: print (defined $x?"ok ": "not ok ", "17\n")
+}
+
+# Does goto work correctly going *to* a for(;;) loop?
+#  (make sure it doesn't skip the initializer)
+
+my ($z, $y) = (0);
+FORL1: for($y="ok 18\n"; $z;) {print $y; goto TEST19}
+($y,$z) = ("not ok 18\n", 1);
+goto FORL1;
+
+# Even from within the loop?
+
+TEST19: $z = 0;
+FORL2: for($y="ok 19\n"; 1;) {
+  if ($z) {
+    print $y;
+    last;
+  }
+  ($y, $z) = ("not ok 19\n", 1);
+  goto FORL2;
+}
+
+# Does goto work correctly within a try block?
+#  (BUG ID 20000313.004)
+
+my $ok = 0;
+eval {
+  my $variable = 1;
+  goto LABEL20;
+  LABEL20: $ok = 1 if $variable;
+};
+print ($ok&&!$@ ? "ok 20\n" : "not ok 20\n");
+
+# And within an eval-string?
+
+
+$ok = 0;
+eval q{
+  my $variable = 1;
+  goto LABEL21;
+  LABEL21: $ok = 1 if $variable;
+};
+print ($ok&&!$@ ? "ok 21\n" : "not ok 21\n");
+
+
+# Test that goto works in nested eval-string
+$ok = 0;
+{eval q{
+  eval q{
+    goto LABEL22;
+  };
+  $ok = 0;
+  last;
+
+  LABEL22: $ok = 1;
+};
+$ok = 0 if $@;
+}
+print ($ok ? "ok 22\n" : "not ok 22\n");
+
 exit;
 
 bypass:
diff --git a/t/op/loopctl.t b/t/op/loopctl.t
new file mode 100644
index 0000000000..a7416f2046
--- /dev/null
+++ b/t/op/loopctl.t
@@ -0,0 +1,925 @@
+#!./perl
+
+# We have the following types of loop:
+#
+# 1a)  while(A) {B}
+# 1b)  B while A;
+#
+# 2a)  until(A) {B}
+# 2b)  B until A;
+#
+# 3a)  for(@A)  {B}
+# 3b)  B for A;
+#
+# 4a)  for (A;B;C) {D}
+#
+# 5a)  { A }        # a bare block is a loop which runs once
+#
+# Loops of type (b) don't allow for next/last/redo style
+#  control, so we ignore them here. Type (a) loops can
+#  all be labelled, so there are ten possibilities (each
+#  of 5 types, labelled/unlabelled). We therefore need
+#  thirty tests to try the three control statements against
+#  the ten types of loop. For the first four types it's useful
+#  to distinguish the case where next re-iterates from the case
+#  where it leaves the loop. That makes 38.
+# All these tests rely on "last LABEL"
+#  so if they've *all* failed, maybe you broke that...
+#
+# These tests are followed by an extra test of nested loops.
+# Feel free to add more here.
+#
+#  -- .robin. <robin@kitsite.com>  2001-03-13
+
+print "1..39\n";
+
+my $ok;
+
+## while() loop without a label
+
+TEST1: { # redo
+
+  $ok = 0;
+
+  my $x = 1;
+  my $first_time = 1;
+  while($x--) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST1;
+    }
+    $ok = 0;
+    $first_time = 0;
+    redo;
+    last TEST1;
+  }
+  continue {
+    $ok = 0;
+    last TEST1;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 1\n" : "not ok 1\n");
+
+TEST2: { # next (succesful)
+
+  $ok = 0;
+
+  my $x = 2;
+  my $first_time = 1;
+  my $been_in_continue = 0;
+  while($x--) {
+    if (!$first_time) {
+      $ok = $been_in_continue;
+      last TEST2;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next;
+    last TEST2;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 2\n" : "not ok 2\n");
+
+TEST3: { # next (unsuccesful)
+
+  $ok = 0;
+
+  my $x = 1;
+  my $first_time = 1;
+  my $been_in_loop = 0;
+  my $been_in_continue = 0;
+  while($x--) {
+    $been_in_loop = 1;
+    if (!$first_time) {
+      $ok = 0;
+      last TEST3;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next;
+    last TEST3;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = $been_in_loop && $been_in_continue;
+}
+print ($ok ? "ok 3\n" : "not ok 3\n");
+
+TEST4: { # last
+
+  $ok = 0;
+
+  my $x = 1;
+  my $first_time = 1;
+  while($x++) {
+    if (!$first_time) {
+      $ok = 0;
+      last TEST4;
+    }
+    $ok = 0;
+    $first_time = 0;
+    last;
+    last TEST4;
+  }
+  continue {
+    $ok = 0;
+    last TEST4;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 4\n" : "not ok 4\n");
+
+
+## until() loop without a label
+
+TEST5: { # redo
+
+  $ok = 0;
+
+  my $x = 0;
+  my $first_time = 1;
+  until($x++) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST5;
+    }
+    $ok = 0;
+    $first_time = 0;
+    redo;
+    last TEST5;
+  }
+  continue {
+    $ok = 0;
+    last TEST5;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 5\n" : "not ok 5\n");
+
+TEST6: { # next (succesful)
+
+  $ok = 0;
+
+  my $x = 0;
+  my $first_time = 1;
+  my $been_in_continue = 0;
+  until($x++ >= 2) {
+    if (!$first_time) {
+      $ok = $been_in_continue;
+      last TEST6;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next;
+    last TEST6;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 6\n" : "not ok 6\n");
+
+TEST7: { # next (unsuccesful)
+
+  $ok = 0;
+
+  my $x = 0;
+  my $first_time = 1;
+  my $been_in_loop = 0;
+  my $been_in_continue = 0;
+  until($x++) {
+    $been_in_loop = 1;
+    if (!$first_time) {
+      $ok = 0;
+      last TEST7;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next;
+    last TEST7;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = $been_in_loop && $been_in_continue;
+}
+print ($ok ? "ok 7\n" : "not ok 7\n");
+
+TEST8: { # last
+
+  $ok = 0;
+
+  my $x = 0;
+  my $first_time = 1;
+  until($x++ == 10) {
+    if (!$first_time) {
+      $ok = 0;
+      last TEST8;
+    }
+    $ok = 0;
+    $first_time = 0;
+    last;
+    last TEST8;
+  }
+  continue {
+    $ok = 0;
+    last TEST8;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 8\n" : "not ok 8\n");
+
+## for(@array) loop without a label
+
+TEST9: { # redo
+
+  $ok = 0;
+
+  my $first_time = 1;
+  for(1) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST9;
+    }
+    $ok = 0;
+    $first_time = 0;
+    redo;
+    last TEST9;
+  }
+  continue {
+    $ok = 0;
+    last TEST9;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 9\n" : "not ok 9\n");
+
+TEST10: { # next (succesful)
+
+  $ok = 0;
+
+  my $first_time = 1;
+  my $been_in_continue = 0;
+  for(1,2) {
+    if (!$first_time) {
+      $ok = $been_in_continue;
+      last TEST10;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next;
+    last TEST10;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 10\n" : "not ok 10\n");
+
+TEST11: { # next (unsuccesful)
+
+  $ok = 0;
+
+  my $first_time = 1;
+  my $been_in_loop = 0;
+  my $been_in_continue = 0;
+  for(1) {
+    $been_in_loop = 1;
+    if (!$first_time) {
+      $ok = 0;
+      last TEST11;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next;
+    last TEST11;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = $been_in_loop && $been_in_continue;
+}
+print ($ok ? "ok 11\n" : "not ok 11\n");
+
+TEST12: { # last
+
+  $ok = 0;
+
+  my $first_time = 1;
+  for(1..10) {
+    if (!$first_time) {
+      $ok = 0;
+      last TEST12;
+    }
+    $ok = 0;
+    $first_time = 0;
+    last;
+    last TEST12;
+  }
+  continue {
+    $ok=0;
+    last TEST12;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 12\n" : "not ok 12\n");
+
+## for(;;) loop without a label
+
+TEST13: { # redo
+
+  $ok = 0;
+
+  for(my $first_time = 1; 1;) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST13;
+    }
+    $ok = 0;
+    $first_time=0;
+
+    redo;
+    last TEST13;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 13\n" : "not ok 13\n");
+
+TEST14: { # next (successful)
+
+  $ok = 0;
+
+  for(my $first_time = 1; 1; $first_time=0) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST14;
+    }
+    $ok = 0;
+    next;
+    last TEST14;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 14\n" : "not ok 14\n");
+
+TEST15: { # next (unsuccesful)
+
+  $ok = 0;
+
+  my $x=1;
+  my $been_in_loop = 0;
+  for(my $first_time = 1; $x--;) {
+    $been_in_loop = 1;
+    if (!$first_time) {
+      $ok = 0;
+      last TEST15;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next;
+    last TEST15;
+  }
+  $ok = $been_in_loop;
+}
+print ($ok ? "ok 15\n" : "not ok 15\n");
+
+TEST16: { # last
+
+  $ok = 0;
+
+  for(my $first_time = 1; 1; last TEST16) {
+    if (!$first_time) {
+      $ok = 0;
+      last TEST16;
+    }
+    $ok = 0;
+    $first_time = 0;
+    last;
+    last TEST16;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 16\n" : "not ok 16\n");
+
+## bare block without a label
+
+TEST17: { # redo
+
+  $ok = 0;
+  my $first_time = 1;
+
+  {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST17;
+    }
+    $ok = 0;
+    $first_time=0;
+
+    redo;
+    last TEST17;
+  }
+  continue {
+    $ok = 0;
+    last TEST17;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 17\n" : "not ok 17\n");
+
+TEST18: { # next
+
+  $ok = 0;
+  {
+    next;
+    last TEST18;
+  }
+  continue {
+    $ok = 1;
+    last TEST18;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 18\n" : "not ok 18\n");
+
+TEST19: { # last
+
+  $ok = 0;
+  {
+    last;
+    last TEST19;
+  }
+  continue {
+    $ok = 0;
+    last TEST19;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 19\n" : "not ok 19\n");
+
+
+### Now do it all again with labels
+
+## while() loop with a label
+
+TEST20: { # redo
+
+  $ok = 0;
+
+  my $x = 1;
+  my $first_time = 1;
+  LABEL20: while($x--) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST20;
+    }
+    $ok = 0;
+    $first_time = 0;
+    redo LABEL20;
+    last TEST20;
+  }
+  continue {
+    $ok = 0;
+    last TEST20;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 20\n" : "not ok 20\n");
+
+TEST21: { # next (succesful)
+
+  $ok = 0;
+
+  my $x = 2;
+  my $first_time = 1;
+  my $been_in_continue = 0;
+  LABEL21: while($x--) {
+    if (!$first_time) {
+      $ok = $been_in_continue;
+      last TEST21;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next LABEL21;
+    last TEST21;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 21\n" : "not ok 21\n");
+
+TEST22: { # next (unsuccesful)
+
+  $ok = 0;
+
+  my $x = 1;
+  my $first_time = 1;
+  my $been_in_loop = 0;
+  my $been_in_continue = 0;
+  LABEL22: while($x--) {
+    $been_in_loop = 1;
+    if (!$first_time) {
+      $ok = 0;
+      last TEST22;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next LABEL22;
+    last TEST22;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = $been_in_loop && $been_in_continue;
+}
+print ($ok ? "ok 22\n" : "not ok 22\n");
+
+TEST23: { # last
+
+  $ok = 0;
+
+  my $x = 1;
+  my $first_time = 1;
+  LABEL23: while($x++) {
+    if (!$first_time) {
+      $ok = 0;
+      last TEST23;
+    }
+    $ok = 0;
+    $first_time = 0;
+    last LABEL23;
+    last TEST23;
+  }
+  continue {
+    $ok = 0;
+    last TEST23;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 23\n" : "not ok 23\n");
+
+
+## until() loop with a label
+
+TEST24: { # redo
+
+  $ok = 0;
+
+  my $x = 0;
+  my $first_time = 1;
+  LABEL24: until($x++) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST24;
+    }
+    $ok = 0;
+    $first_time = 0;
+    redo LABEL24;
+    last TEST24;
+  }
+  continue {
+    $ok = 0;
+    last TEST24;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 24\n" : "not ok 24\n");
+
+TEST25: { # next (succesful)
+
+  $ok = 0;
+
+  my $x = 0;
+  my $first_time = 1;
+  my $been_in_continue = 0;
+  LABEL25: until($x++ >= 2) {
+    if (!$first_time) {
+      $ok = $been_in_continue;
+      last TEST25;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next LABEL25;
+    last TEST25;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 25\n" : "not ok 25\n");
+
+TEST26: { # next (unsuccesful)
+
+  $ok = 0;
+
+  my $x = 0;
+  my $first_time = 1;
+  my $been_in_loop = 0;
+  my $been_in_continue = 0;
+  LABEL26: until($x++) {
+    $been_in_loop = 1;
+    if (!$first_time) {
+      $ok = 0;
+      last TEST26;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next LABEL26;
+    last TEST26;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = $been_in_loop && $been_in_continue;
+}
+print ($ok ? "ok 26\n" : "not ok 26\n");
+
+TEST27: { # last
+
+  $ok = 0;
+
+  my $x = 0;
+  my $first_time = 1;
+  LABEL27: until($x++ == 10) {
+    if (!$first_time) {
+      $ok = 0;
+      last TEST27;
+    }
+    $ok = 0;
+    $first_time = 0;
+    last LABEL27;
+    last TEST27;
+  }
+  continue {
+    $ok = 0;
+    last TEST8;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 27\n" : "not ok 27\n");
+
+## for(@array) loop with a label
+
+TEST28: { # redo
+
+  $ok = 0;
+
+  my $first_time = 1;
+  LABEL28: for(1) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST28;
+    }
+    $ok = 0;
+    $first_time = 0;
+    redo LABEL28;
+    last TEST28;
+  }
+  continue {
+    $ok = 0;
+    last TEST28;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 28\n" : "not ok 28\n");
+
+TEST29: { # next (succesful)
+
+  $ok = 0;
+
+  my $first_time = 1;
+  my $been_in_continue = 0;
+  LABEL29: for(1,2) {
+    if (!$first_time) {
+      $ok = $been_in_continue;
+      last TEST29;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next LABEL29;
+    last TEST29;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 29\n" : "not ok 29\n");
+
+TEST30: { # next (unsuccesful)
+
+  $ok = 0;
+
+  my $first_time = 1;
+  my $been_in_loop = 0;
+  my $been_in_continue = 0;
+  LABEL30: for(1) {
+    $been_in_loop = 1;
+    if (!$first_time) {
+      $ok = 0;
+      last TEST30;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next LABEL30;
+    last TEST30;
+  }
+  continue {
+    $been_in_continue = 1;
+  }
+  $ok = $been_in_loop && $been_in_continue;
+}
+print ($ok ? "ok 30\n" : "not ok 30\n");
+
+TEST31: { # last
+
+  $ok = 0;
+
+  my $first_time = 1;
+  LABEL31: for(1..10) {
+    if (!$first_time) {
+      $ok = 0;
+      last TEST31;
+    }
+    $ok = 0;
+    $first_time = 0;
+    last LABEL31;
+    last TEST31;
+  }
+  continue {
+    $ok=0;
+    last TEST31;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 31\n" : "not ok 31\n");
+
+## for(;;) loop with a label
+
+TEST32: { # redo
+
+  $ok = 0;
+
+  LABEL32: for(my $first_time = 1; 1;) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST32;
+    }
+    $ok = 0;
+    $first_time=0;
+
+    redo LABEL32;
+    last TEST32;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 32\n" : "not ok 32\n");
+
+TEST33: { # next (successful)
+
+  $ok = 0;
+
+  LABEL33: for(my $first_time = 1; 1; $first_time=0) {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST33;
+    }
+    $ok = 0;
+    next LABEL33;
+    last TEST33;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 33\n" : "not ok 33\n");
+
+TEST34: { # next (unsuccesful)
+
+  $ok = 0;
+
+  my $x=1;
+  my $been_in_loop = 0;
+  LABEL34: for(my $first_time = 1; $x--;) {
+    $been_in_loop = 1;
+    if (!$first_time) {
+      $ok = 0;
+      last TEST34;
+    }
+    $ok = 0;
+    $first_time = 0;
+    next LABEL34;
+    last TEST34;
+  }
+  $ok = $been_in_loop;
+}
+print ($ok ? "ok 34\n" : "not ok 34\n");
+
+TEST35: { # last
+
+  $ok = 0;
+
+  LABEL35: for(my $first_time = 1; 1; last TEST16) {
+    if (!$first_time) {
+      $ok = 0;
+      last TEST35;
+    }
+    $ok = 0;
+    $first_time = 0;
+    last LABEL35;
+    last TEST35;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 35\n" : "not ok 35\n");
+
+## bare block with a label
+
+TEST36: { # redo
+
+  $ok = 0;
+  my $first_time = 1;
+
+  LABEL36: {
+    if (!$first_time) {
+      $ok = 1;
+      last TEST36;
+    }
+    $ok = 0;
+    $first_time=0;
+
+    redo LABEL36;
+    last TEST36;
+  }
+  continue {
+    $ok = 0;
+    last TEST36;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 36\n" : "not ok 36\n");
+
+TEST37: { # next
+
+  $ok = 0;
+  LABEL37: {
+    next LABEL37;
+    last TEST37;
+  }
+  continue {
+    $ok = 1;
+    last TEST37;
+  }
+  $ok = 0;
+}
+print ($ok ? "ok 37\n" : "not ok 37\n");
+
+TEST38: { # last
+
+  $ok = 0;
+  LABEL38: {
+    last LABEL38;
+    last TEST38;
+  }
+  continue {
+    $ok = 0;
+    last TEST38;
+  }
+  $ok = 1;
+}
+print ($ok ? "ok 38\n" : "not ok 38\n");
+
+### Now test nested constructs
+
+TEST39: {
+    $ok = 0;
+    my ($x, $y, $z) = (1,1,1);
+    one39: while ($x--) {
+      $ok = 0;
+      two39: while ($y--) {
+        $ok = 0;
+        three39: while ($z--) {
+           next two39;
+        }
+        continue {
+          $ok = 0;
+          last TEST39;
+        }
+      }
+      continue {
+        $ok = 1;
+        last TEST39;
+      }
+      $ok = 0;
+    }
+}
+print ($ok ? "ok 39\n" : "not ok 39\n");
diff --git a/vms/perly_c.vms b/vms/perly_c.vms
index 7fb0b47a09..0165f1beea 100644
--- a/vms/perly_c.vms
+++ b/vms/perly_c.vms
@@ -46,9 +46,10 @@ typedef union {
 
 #ifdef USE_PURE_BISON
 #define YYLEX_PARAM (&yychar)
+#define yylex yylex_r
 #endif
 
-#line 51 "perly.c"
+#line 52 "perly.c"
 #define YYERRCODE 256
 static short yylhs[] = {                                        -1,
    50,    0,    8,    6,    9,    7,   10,   10,   10,   11,
@@ -1358,7 +1359,7 @@ static char *yyrule[] = {
 #define YYMAXDEPTH 500
 #endif
 #endif
-#line 726 "perly.y"
+#line 734 "perly.y"
  /* PROGRAM */
 
 /* more stuff added to make perly_c.diff easier to apply */
@@ -1368,7 +1369,7 @@ static char *yyrule[] = {
 #endif
 #define yyparse() Perl_yyparse(pTHX)
 
-#line 1371 "perly.c"
+#line 1444 "perly.c"
 #define YYABORT goto yyabort
 #define YYACCEPT goto yyaccept
 #define YYERROR goto yyerrlab
@@ -1501,9 +1502,8 @@ yyinrecovery:
             {
 #if YYDEBUG
                 if (yydebug)
-                    PerlIO_printf(Perl_debug_log,
-				  "yydebug: state %d, error recovery shifting to state %d\n",
-				  *yyssp, yytable[yyn]);
+                    PerlIO_printf(Perl_debug_log, "yydebug: state %d, error recovery shifting\
+ to state %d\n", *yyssp, yytable[yyn]);
 #endif
                 if (yyssp >= yyss + yystacksize - 1)
                 {
@@ -1565,7 +1565,7 @@ yyreduce:
     switch (yyn)
     {
 case 1:
-#line 125 "perly.y"
+#line 126 "perly.y"
 {
 #if defined(YYDEBUG) && defined(DEBUGGING)
 		    yydebug = (DEBUG_p_TEST);
@@ -1574,50 +1574,50 @@ case 1:
 		}
 break;
 case 2:
-#line 132 "perly.y"
+#line 133 "perly.y"
 { newPROG(yyvsp[0].opval); }
 break;
 case 3:
-#line 136 "perly.y"
+#line 137 "perly.y"
 { if (PL_copline > (line_t)yyvsp[-3].ival)
 			      PL_copline = yyvsp[-3].ival;
 			  yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); }
 break;
 case 4:
-#line 142 "perly.y"
+#line 143 "perly.y"
 { yyval.ival = block_start(TRUE); }
 break;
 case 5:
-#line 146 "perly.y"
+#line 147 "perly.y"
 { if (PL_copline > (line_t)yyvsp[-3].ival)
 			      PL_copline = yyvsp[-3].ival;
 			  yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); }
 break;
 case 6:
-#line 152 "perly.y"
+#line 153 "perly.y"
 { yyval.ival = block_start(FALSE); }
 break;
 case 7:
-#line 156 "perly.y"
+#line 157 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 8:
-#line 158 "perly.y"
+#line 159 "perly.y"
 { yyval.opval = yyvsp[-1].opval; }
 break;
 case 9:
-#line 160 "perly.y"
+#line 161 "perly.y"
 {   yyval.opval = append_list(OP_LINESEQ,
 				(LISTOP*)yyvsp[-1].opval, (LISTOP*)yyvsp[0].opval);
 			    PL_pad_reset_pending = TRUE;
 			    if (yyvsp[-1].opval && yyvsp[0].opval) PL_hints |= HINT_BLOCK_SCOPE; }
 break;
 case 10:
-#line 167 "perly.y"
+#line 168 "perly.y"
 { yyval.opval = newSTATEOP(0, yyvsp[-1].pval, yyvsp[0].opval); }
 break;
 case 12:
-#line 170 "perly.y"
+#line 171 "perly.y"
 { if (yyvsp[-1].pval != Nullch) {
 			      yyval.opval = newSTATEOP(0, yyvsp[-1].pval, newOP(OP_NULL, 0));
 			    }
@@ -1628,75 +1628,75 @@ case 12:
 			    PL_expect = XSTATE; }
 break;
 case 13:
-#line 179 "perly.y"
+#line 180 "perly.y"
 { yyval.opval = newSTATEOP(0, yyvsp[-2].pval, yyvsp[-1].opval);
 			  PL_expect = XSTATE; }
 break;
 case 14:
-#line 184 "perly.y"
+#line 185 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 15:
-#line 186 "perly.y"
+#line 187 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 16:
-#line 188 "perly.y"
+#line 189 "perly.y"
 { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[0].opval, yyvsp[-2].opval); }
 break;
 case 17:
-#line 190 "perly.y"
+#line 191 "perly.y"
 { yyval.opval = newLOGOP(OP_OR, 0, yyvsp[0].opval, yyvsp[-2].opval); }
 break;
 case 18:
-#line 192 "perly.y"
+#line 193 "perly.y"
 { yyval.opval = newLOOPOP(OPf_PARENS, 1, scalar(yyvsp[0].opval), yyvsp[-2].opval); }
 break;
 case 19:
-#line 194 "perly.y"
+#line 195 "perly.y"
 { yyval.opval = newLOOPOP(OPf_PARENS, 1, yyvsp[0].opval, yyvsp[-2].opval);}
 break;
 case 20:
-#line 196 "perly.y"
+#line 197 "perly.y"
 { yyval.opval = newFOROP(0, Nullch, yyvsp[-1].ival,
 					Nullop, yyvsp[0].opval, yyvsp[-2].opval, Nullop); }
 break;
 case 21:
-#line 201 "perly.y"
+#line 202 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 22:
-#line 203 "perly.y"
+#line 204 "perly.y"
 { (yyvsp[0].opval)->op_flags |= OPf_PARENS; yyval.opval = scope(yyvsp[0].opval); }
 break;
 case 23:
-#line 205 "perly.y"
+#line 206 "perly.y"
 { PL_copline = yyvsp[-5].ival;
 			    yyval.opval = newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval);
 			    PL_hints |= HINT_BLOCK_SCOPE; }
 break;
 case 24:
-#line 211 "perly.y"
+#line 212 "perly.y"
 { PL_copline = yyvsp[-6].ival;
 			    yyval.opval = block_end(yyvsp[-4].ival,
 				   newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); }
 break;
 case 25:
-#line 215 "perly.y"
+#line 216 "perly.y"
 { PL_copline = yyvsp[-6].ival;
 			    yyval.opval = block_end(yyvsp[-4].ival,
 				   newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); }
 break;
 case 26:
-#line 221 "perly.y"
+#line 222 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 27:
-#line 223 "perly.y"
+#line 224 "perly.y"
 { yyval.opval = scope(yyvsp[0].opval); }
 break;
 case 28:
-#line 227 "perly.y"
+#line 228 "perly.y"
 { PL_copline = yyvsp[-6].ival;
 			    yyval.opval = block_end(yyvsp[-4].ival,
 				   newSTATEOP(0, yyvsp[-7].pval,
@@ -1704,7 +1704,7 @@ case 28:
 						yyvsp[-6].ival, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval))); }
 break;
 case 29:
-#line 233 "perly.y"
+#line 234 "perly.y"
 { PL_copline = yyvsp[-6].ival;
 			    yyval.opval = block_end(yyvsp[-4].ival,
 				   newSTATEOP(0, yyvsp[-7].pval,
@@ -1712,123 +1712,130 @@ case 29:
 						yyvsp[-6].ival, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval))); }
 break;
 case 30:
-#line 239 "perly.y"
+#line 240 "perly.y"
 { yyval.opval = block_end(yyvsp[-6].ival,
 				 newFOROP(0, yyvsp[-9].pval, yyvsp[-8].ival, yyvsp[-5].opval, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); }
 break;
 case 31:
-#line 242 "perly.y"
+#line 243 "perly.y"
 { yyval.opval = block_end(yyvsp[-4].ival,
 				 newFOROP(0, yyvsp[-8].pval, yyvsp[-7].ival, mod(yyvsp[-6].opval, OP_ENTERLOOP),
 					  yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); }
 break;
 case 32:
-#line 246 "perly.y"
+#line 247 "perly.y"
 { yyval.opval = block_end(yyvsp[-4].ival,
 				 newFOROP(0, yyvsp[-7].pval, yyvsp[-6].ival, Nullop, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); }
 break;
 case 33:
-#line 250 "perly.y"
-{ OP *forop = append_elem(OP_LINESEQ,
-					scalar(yyvsp[-6].opval),
-					newWHILEOP(0, 1, (LOOP*)Nullop,
-						   yyvsp[-9].ival, scalar(yyvsp[-4].opval),
-						   yyvsp[0].opval, scalar(yyvsp[-2].opval)));
+#line 251 "perly.y"
+{ OP *forop;
 			  PL_copline = yyvsp[-9].ival;
-			  yyval.opval = block_end(yyvsp[-7].ival, newSTATEOP(0, yyvsp[-10].pval, forop)); }
+			  forop = newSTATEOP(0, yyvsp[-10].pval,
+					    newWHILEOP(0, 1, (LOOP*)Nullop,
+						yyvsp[-9].ival, scalar(yyvsp[-4].opval),
+						yyvsp[0].opval, yyvsp[-2].opval));
+			  if (yyvsp[-6].opval) {
+				forop = append_elem(OP_LINESEQ,
+                                        newSTATEOP(0, (yyvsp[-10].pval?savepv(yyvsp[-10].pval):Nullch),
+						   yyvsp[-6].opval),
+					forop);
+			  }
+
+			  yyval.opval = block_end(yyvsp[-7].ival, forop); }
 break;
 case 34:
-#line 258 "perly.y"
+#line 266 "perly.y"
 { yyval.opval = newSTATEOP(0, yyvsp[-2].pval,
 				 newWHILEOP(0, 1, (LOOP*)Nullop,
 					    NOLINE, Nullop, yyvsp[-1].opval, yyvsp[0].opval)); }
 break;
 case 35:
-#line 264 "perly.y"
+#line 272 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 37:
-#line 269 "perly.y"
+#line 277 "perly.y"
 { (void)scan_num("1", &yylval); yyval.opval = yylval.opval; }
 break;
 case 39:
-#line 274 "perly.y"
+#line 282 "perly.y"
 { yyval.opval = invert(scalar(yyvsp[0].opval)); }
 break;
 case 40:
-#line 278 "perly.y"
+#line 286 "perly.y"
 { yyval.opval = yyvsp[0].opval; intro_my(); }
 break;
 case 41:
-#line 282 "perly.y"
+#line 290 "perly.y"
 { yyval.opval = yyvsp[0].opval; intro_my(); }
 break;
 case 42:
-#line 286 "perly.y"
+#line 294 "perly.y"
 { yyval.opval = yyvsp[0].opval; intro_my(); }
 break;
 case 43:
-#line 290 "perly.y"
+#line 298 "perly.y"
 { yyval.opval = yyvsp[0].opval; intro_my(); }
 break;
 case 44:
-#line 294 "perly.y"
+#line 302 "perly.y"
 { yyval.pval = Nullch; }
 break;
 case 46:
-#line 299 "perly.y"
+#line 307 "perly.y"
 { yyval.ival = 0; }
 break;
 case 47:
-#line 301 "perly.y"
+#line 309 "perly.y"
 { yyval.ival = 0; }
 break;
 case 48:
-#line 303 "perly.y"
+#line 311 "perly.y"
 { yyval.ival = 0; }
 break;
 case 49:
-#line 305 "perly.y"
+#line 313 "perly.y"
 { yyval.ival = 0; }
 break;
 case 50:
-#line 307 "perly.y"
+#line 315 "perly.y"
 { yyval.ival = 0; }
 break;
 case 51:
-#line 311 "perly.y"
+#line 319 "perly.y"
 { newFORM(yyvsp[-2].ival, yyvsp[-1].opval, yyvsp[0].opval); }
 break;
 case 52:
-#line 314 "perly.y"
+#line 322 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 53:
-#line 315 "perly.y"
+#line 323 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 54:
-#line 319 "perly.y"
+#line 327 "perly.y"
 { newMYSUB(yyvsp[-4].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); }
 break;
 case 55:
-#line 323 "perly.y"
+#line 331 "perly.y"
 { newATTRSUB(yyvsp[-4].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); }
 break;
 case 56:
-#line 327 "perly.y"
+#line 335 "perly.y"
 { yyval.ival = start_subparse(FALSE, 0); }
 break;
 case 57:
-#line 331 "perly.y"
+#line 339 "perly.y"
 { yyval.ival = start_subparse(FALSE, CVf_ANON); }
 break;
 case 58:
-#line 335 "perly.y"
+#line 343 "perly.y"
 { yyval.ival = start_subparse(TRUE, 0); }
 break;
 case 59:
-#line 338 "perly.y"
+#line 346 "perly.y"
 { STRLEN n_a; char *name = SvPV(((SVOP*)yyvsp[0].opval)->op_sv,n_a);
 			  if (strEQ(name, "BEGIN") || strEQ(name, "END")
 			      || strEQ(name, "INIT") || strEQ(name, "CHECK"))
@@ -1836,353 +1843,353 @@ case 59:
 			  yyval.opval = yyvsp[0].opval; }
 break;
 case 60:
-#line 346 "perly.y"
+#line 354 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 62:
-#line 351 "perly.y"
+#line 359 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 63:
-#line 353 "perly.y"
+#line 361 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 64:
-#line 355 "perly.y"
+#line 363 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 65:
-#line 359 "perly.y"
+#line 367 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 66:
-#line 361 "perly.y"
+#line 369 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 67:
-#line 364 "perly.y"
+#line 372 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 68:
-#line 365 "perly.y"
+#line 373 "perly.y"
 { yyval.opval = Nullop; PL_expect = XSTATE; }
 break;
 case 69:
-#line 369 "perly.y"
+#line 377 "perly.y"
 { package(yyvsp[-1].opval); }
 break;
 case 70:
-#line 371 "perly.y"
+#line 379 "perly.y"
 { package(Nullop); }
 break;
 case 71:
-#line 375 "perly.y"
+#line 383 "perly.y"
 { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
 break;
 case 72:
-#line 377 "perly.y"
+#line 385 "perly.y"
 { utilize(yyvsp[-6].ival, yyvsp[-5].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval); }
 break;
 case 73:
-#line 381 "perly.y"
+#line 389 "perly.y"
 { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 74:
-#line 383 "perly.y"
+#line 391 "perly.y"
 { yyval.opval = newLOGOP(yyvsp[-1].ival, 0, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 76:
-#line 388 "perly.y"
+#line 396 "perly.y"
 { yyval.opval = yyvsp[-1].opval; }
 break;
 case 77:
-#line 390 "perly.y"
+#line 398 "perly.y"
 { yyval.opval = append_elem(OP_LIST, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 79:
-#line 395 "perly.y"
+#line 403 "perly.y"
 { yyval.opval = convert(yyvsp[-2].ival, OPf_STACKED,
 				prepend_elem(OP_LIST, newGVREF(yyvsp[-2].ival,yyvsp[-1].opval), yyvsp[0].opval) ); }
 break;
 case 80:
-#line 398 "perly.y"
+#line 406 "perly.y"
 { yyval.opval = convert(yyvsp[-4].ival, OPf_STACKED,
 				prepend_elem(OP_LIST, newGVREF(yyvsp[-4].ival,yyvsp[-2].opval), yyvsp[-1].opval) ); }
 break;
 case 81:
-#line 401 "perly.y"
+#line 409 "perly.y"
 { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST,
 				    prepend_elem(OP_LIST, scalar(yyvsp[-5].opval), yyvsp[-1].opval),
 				    newUNOP(OP_METHOD, 0, yyvsp[-3].opval))); }
 break;
 case 82:
-#line 406 "perly.y"
+#line 414 "perly.y"
 { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST, scalar(yyvsp[-2].opval),
 				    newUNOP(OP_METHOD, 0, yyvsp[0].opval))); }
 break;
 case 83:
-#line 410 "perly.y"
+#line 418 "perly.y"
 { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST,
 				    prepend_elem(OP_LIST, yyvsp[-1].opval, yyvsp[0].opval),
 				    newUNOP(OP_METHOD, 0, yyvsp[-2].opval))); }
 break;
 case 84:
-#line 415 "perly.y"
+#line 423 "perly.y"
 { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST,
 				    prepend_elem(OP_LIST, yyvsp[-3].opval, yyvsp[-1].opval),
 				    newUNOP(OP_METHOD, 0, yyvsp[-4].opval))); }
 break;
 case 85:
-#line 420 "perly.y"
+#line 428 "perly.y"
 { yyval.opval = convert(yyvsp[-1].ival, 0, yyvsp[0].opval); }
 break;
 case 86:
-#line 422 "perly.y"
+#line 430 "perly.y"
 { yyval.opval = convert(yyvsp[-3].ival, 0, yyvsp[-1].opval); }
 break;
 case 87:
-#line 424 "perly.y"
+#line 432 "perly.y"
 { yyvsp[0].opval = newANONATTRSUB(yyvsp[-1].ival, 0, Nullop, yyvsp[0].opval); }
 break;
 case 88:
-#line 426 "perly.y"
+#line 434 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				 append_elem(OP_LIST,
 				   prepend_elem(OP_LIST, yyvsp[-2].opval, yyvsp[0].opval), yyvsp[-4].opval)); }
 break;
 case 91:
-#line 436 "perly.y"
+#line 444 "perly.y"
 { yyval.opval = newBINOP(OP_GELEM, 0, yyvsp[-4].opval, scalar(yyvsp[-2].opval)); }
 break;
 case 92:
-#line 438 "perly.y"
+#line 446 "perly.y"
 { yyval.opval = newBINOP(OP_AELEM, 0, oopsAV(yyvsp[-3].opval), scalar(yyvsp[-1].opval)); }
 break;
 case 93:
-#line 440 "perly.y"
+#line 448 "perly.y"
 { yyval.opval = newBINOP(OP_AELEM, 0,
 					ref(newAVREF(yyvsp[-4].opval),OP_RV2AV),
 					scalar(yyvsp[-1].opval));}
 break;
 case 94:
-#line 444 "perly.y"
+#line 452 "perly.y"
 { yyval.opval = newBINOP(OP_AELEM, 0,
 					ref(newAVREF(yyvsp[-3].opval),OP_RV2AV),
 					scalar(yyvsp[-1].opval));}
 break;
 case 95:
-#line 448 "perly.y"
+#line 456 "perly.y"
 { yyval.opval = newBINOP(OP_HELEM, 0, oopsHV(yyvsp[-4].opval), jmaybe(yyvsp[-2].opval));
 			    PL_expect = XOPERATOR; }
 break;
 case 96:
-#line 451 "perly.y"
+#line 459 "perly.y"
 { yyval.opval = newBINOP(OP_HELEM, 0,
 					ref(newHVREF(yyvsp[-5].opval),OP_RV2HV),
 					jmaybe(yyvsp[-2].opval));
 			    PL_expect = XOPERATOR; }
 break;
 case 97:
-#line 456 "perly.y"
+#line 464 "perly.y"
 { yyval.opval = newBINOP(OP_HELEM, 0,
 					ref(newHVREF(yyvsp[-4].opval),OP_RV2HV),
 					jmaybe(yyvsp[-2].opval));
 			    PL_expect = XOPERATOR; }
 break;
 case 98:
-#line 461 "perly.y"
+#line 469 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar(yyvsp[-3].opval))); }
 break;
 case 99:
-#line 464 "perly.y"
+#line 472 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   append_elem(OP_LIST, yyvsp[-1].opval,
 				       newCVREF(0, scalar(yyvsp[-4].opval)))); }
 break;
 case 100:
-#line 469 "perly.y"
+#line 477 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   append_elem(OP_LIST, yyvsp[-1].opval,
 					       newCVREF(0, scalar(yyvsp[-3].opval)))); }
 break;
 case 101:
-#line 473 "perly.y"
+#line 481 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar(yyvsp[-2].opval))); }
 break;
 case 102:
-#line 479 "perly.y"
+#line 487 "perly.y"
 { yyval.opval = newASSIGNOP(OPf_STACKED, yyvsp[-2].opval, yyvsp[-1].ival, yyvsp[0].opval); }
 break;
 case 103:
-#line 481 "perly.y"
+#line 489 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 104:
-#line 483 "perly.y"
+#line 491 "perly.y"
 {   if (yyvsp[-1].ival != OP_REPEAT)
 				scalar(yyvsp[-2].opval);
 			    yyval.opval = newBINOP(yyvsp[-1].ival, 0, yyvsp[-2].opval, scalar(yyvsp[0].opval)); }
 break;
 case 105:
-#line 487 "perly.y"
+#line 495 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 106:
-#line 489 "perly.y"
+#line 497 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 107:
-#line 491 "perly.y"
+#line 499 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 108:
-#line 493 "perly.y"
+#line 501 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 109:
-#line 495 "perly.y"
+#line 503 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 110:
-#line 497 "perly.y"
+#line 505 "perly.y"
 { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); }
 break;
 case 111:
-#line 499 "perly.y"
+#line 507 "perly.y"
 { yyval.opval = newRANGE(yyvsp[-1].ival, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval));}
 break;
 case 112:
-#line 501 "perly.y"
+#line 509 "perly.y"
 { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 113:
-#line 503 "perly.y"
+#line 511 "perly.y"
 { yyval.opval = newLOGOP(OP_OR, 0, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 114:
-#line 505 "perly.y"
+#line 513 "perly.y"
 { yyval.opval = newCONDOP(0, yyvsp[-4].opval, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 115:
-#line 507 "perly.y"
+#line 515 "perly.y"
 { yyval.opval = bind_match(yyvsp[-1].ival, yyvsp[-2].opval, yyvsp[0].opval); }
 break;
 case 116:
-#line 510 "perly.y"
+#line 518 "perly.y"
 { yyval.opval = newUNOP(OP_NEGATE, 0, scalar(yyvsp[0].opval)); }
 break;
 case 117:
-#line 512 "perly.y"
+#line 520 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 118:
-#line 514 "perly.y"
+#line 522 "perly.y"
 { yyval.opval = newUNOP(OP_NOT, 0, scalar(yyvsp[0].opval)); }
 break;
 case 119:
-#line 516 "perly.y"
+#line 524 "perly.y"
 { yyval.opval = newUNOP(OP_COMPLEMENT, 0, scalar(yyvsp[0].opval));}
 break;
 case 120:
-#line 518 "perly.y"
+#line 526 "perly.y"
 { yyval.opval = newUNOP(OP_REFGEN, 0, mod(yyvsp[0].opval,OP_REFGEN)); }
 break;
 case 121:
-#line 520 "perly.y"
+#line 528 "perly.y"
 { yyval.opval = newUNOP(OP_POSTINC, 0,
 					mod(scalar(yyvsp[-1].opval), OP_POSTINC)); }
 break;
 case 122:
-#line 523 "perly.y"
+#line 531 "perly.y"
 { yyval.opval = newUNOP(OP_POSTDEC, 0,
 					mod(scalar(yyvsp[-1].opval), OP_POSTDEC)); }
 break;
 case 123:
-#line 526 "perly.y"
+#line 534 "perly.y"
 { yyval.opval = newUNOP(OP_PREINC, 0,
 					mod(scalar(yyvsp[0].opval), OP_PREINC)); }
 break;
 case 124:
-#line 529 "perly.y"
+#line 537 "perly.y"
 { yyval.opval = newUNOP(OP_PREDEC, 0,
 					mod(scalar(yyvsp[0].opval), OP_PREDEC)); }
 break;
 case 125:
-#line 532 "perly.y"
+#line 540 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 126:
-#line 534 "perly.y"
+#line 542 "perly.y"
 { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); }
 break;
 case 127:
-#line 536 "perly.y"
+#line 544 "perly.y"
 { yyval.opval = sawparens(yyvsp[-1].opval); }
 break;
 case 128:
-#line 538 "perly.y"
+#line 546 "perly.y"
 { yyval.opval = sawparens(newNULLLIST()); }
 break;
 case 129:
-#line 540 "perly.y"
+#line 548 "perly.y"
 { yyval.opval = newANONLIST(yyvsp[-1].opval); }
 break;
 case 130:
-#line 542 "perly.y"
+#line 550 "perly.y"
 { yyval.opval = newANONLIST(Nullop); }
 break;
 case 131:
-#line 544 "perly.y"
+#line 552 "perly.y"
 { yyval.opval = newANONHASH(yyvsp[-2].opval); }
 break;
 case 132:
-#line 546 "perly.y"
+#line 554 "perly.y"
 { yyval.opval = newANONHASH(Nullop); }
 break;
 case 133:
-#line 548 "perly.y"
+#line 556 "perly.y"
 { yyval.opval = newANONATTRSUB(yyvsp[-3].ival, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); }
 break;
 case 134:
-#line 550 "perly.y"
+#line 558 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 135:
-#line 552 "perly.y"
+#line 560 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 136:
-#line 554 "perly.y"
+#line 562 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 137:
-#line 556 "perly.y"
+#line 564 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 138:
-#line 558 "perly.y"
+#line 566 "perly.y"
 { yyval.opval = newUNOP(OP_AV2ARYLEN, 0, ref(yyvsp[0].opval, OP_AV2ARYLEN));}
 break;
 case 139:
-#line 560 "perly.y"
+#line 568 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 140:
-#line 562 "perly.y"
+#line 570 "perly.y"
 { yyval.opval = newSLICEOP(0, yyvsp[-1].opval, yyvsp[-4].opval); }
 break;
 case 141:
-#line 564 "perly.y"
+#line 572 "perly.y"
 { yyval.opval = newSLICEOP(0, yyvsp[-1].opval, Nullop); }
 break;
 case 142:
-#line 566 "perly.y"
+#line 574 "perly.y"
 { yyval.opval = prepend_elem(OP_ASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_ASLICE, 0,
@@ -2190,7 +2197,7 @@ case 142:
 					ref(yyvsp[-3].opval, OP_ASLICE))); }
 break;
 case 143:
-#line 572 "perly.y"
+#line 580 "perly.y"
 { yyval.opval = prepend_elem(OP_HSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_HSLICE, 0,
@@ -2199,37 +2206,37 @@ case 143:
 			    PL_expect = XOPERATOR; }
 break;
 case 144:
-#line 579 "perly.y"
+#line 587 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 145:
-#line 581 "perly.y"
+#line 589 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, 0, scalar(yyvsp[0].opval)); }
 break;
 case 146:
-#line 583 "perly.y"
+#line 591 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar(yyvsp[-2].opval)); }
 break;
 case 147:
-#line 585 "perly.y"
+#line 593 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    append_elem(OP_LIST, yyvsp[-1].opval, scalar(yyvsp[-3].opval))); }
 break;
 case 148:
-#line 588 "perly.y"
+#line 596 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    append_elem(OP_LIST, yyvsp[0].opval, scalar(yyvsp[-1].opval))); }
 break;
 case 149:
-#line 591 "perly.y"
+#line 599 "perly.y"
 { yyval.opval = dofile(yyvsp[0].opval); }
 break;
 case 150:
-#line 593 "perly.y"
+#line 601 "perly.y"
 { yyval.opval = newUNOP(OP_NULL, OPf_SPECIAL, scope(yyvsp[0].opval)); }
 break;
 case 151:
-#line 595 "perly.y"
+#line 603 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
@@ -2239,7 +2246,7 @@ case 151:
 				)),Nullop)); dep();}
 break;
 case 152:
-#line 603 "perly.y"
+#line 611 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    append_elem(OP_LIST,
@@ -2250,170 +2257,170 @@ case 152:
 				)))); dep();}
 break;
 case 153:
-#line 612 "perly.y"
+#line 620 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
 				scalar(newCVREF(0,scalar(yyvsp[-2].opval))), Nullop)); dep();}
 break;
 case 154:
-#line 616 "perly.y"
+#line 624 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
 				yyvsp[-1].opval,
 				scalar(newCVREF(0,scalar(yyvsp[-3].opval))))); dep();}
 break;
 case 155:
-#line 621 "perly.y"
+#line 629 "perly.y"
 { yyval.opval = newOP(yyvsp[0].ival, OPf_SPECIAL);
 			    PL_hints |= HINT_BLOCK_SCOPE; }
 break;
 case 156:
-#line 624 "perly.y"
+#line 632 "perly.y"
 { yyval.opval = newLOOPEX(yyvsp[-1].ival,yyvsp[0].opval); }
 break;
 case 157:
-#line 626 "perly.y"
+#line 634 "perly.y"
 { yyval.opval = newUNOP(OP_NOT, 0, scalar(yyvsp[0].opval)); }
 break;
 case 158:
-#line 628 "perly.y"
+#line 636 "perly.y"
 { yyval.opval = newOP(yyvsp[0].ival, 0); }
 break;
 case 159:
-#line 630 "perly.y"
+#line 638 "perly.y"
 { yyval.opval = newUNOP(yyvsp[-1].ival, 0, yyvsp[0].opval); }
 break;
 case 160:
-#line 632 "perly.y"
+#line 640 "perly.y"
 { yyval.opval = newUNOP(yyvsp[-1].ival, 0, yyvsp[0].opval); }
 break;
 case 161:
-#line 634 "perly.y"
+#line 642 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    append_elem(OP_LIST, yyvsp[0].opval, scalar(yyvsp[-1].opval))); }
 break;
 case 162:
-#line 637 "perly.y"
+#line 645 "perly.y"
 { yyval.opval = newOP(yyvsp[0].ival, 0); }
 break;
 case 163:
-#line 639 "perly.y"
+#line 647 "perly.y"
 { yyval.opval = newOP(yyvsp[-2].ival, 0); }
 break;
 case 164:
-#line 641 "perly.y"
+#line 649 "perly.y"
 { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				scalar(yyvsp[0].opval)); }
 break;
 case 165:
-#line 644 "perly.y"
+#line 652 "perly.y"
 { yyval.opval = newOP(yyvsp[-2].ival, OPf_SPECIAL); }
 break;
 case 166:
-#line 646 "perly.y"
+#line 654 "perly.y"
 { yyval.opval = newUNOP(yyvsp[-3].ival, 0, yyvsp[-1].opval); }
 break;
 case 167:
-#line 648 "perly.y"
+#line 656 "perly.y"
 { yyval.opval = pmruntime(yyvsp[-3].opval, yyvsp[-1].opval, Nullop); }
 break;
 case 168:
-#line 650 "perly.y"
+#line 658 "perly.y"
 { yyval.opval = pmruntime(yyvsp[-5].opval, yyvsp[-3].opval, yyvsp[-1].opval); }
 break;
 case 171:
-#line 656 "perly.y"
+#line 664 "perly.y"
 { yyval.opval = my_attrs(yyvsp[-1].opval,yyvsp[0].opval); }
 break;
 case 172:
-#line 658 "perly.y"
+#line 666 "perly.y"
 { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); }
 break;
 case 173:
-#line 662 "perly.y"
+#line 670 "perly.y"
 { yyval.opval = sawparens(yyvsp[-1].opval); }
 break;
 case 174:
-#line 664 "perly.y"
+#line 672 "perly.y"
 { yyval.opval = sawparens(newNULLLIST()); }
 break;
 case 175:
-#line 666 "perly.y"
+#line 674 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 176:
-#line 668 "perly.y"
+#line 676 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 177:
-#line 670 "perly.y"
+#line 678 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 178:
-#line 674 "perly.y"
+#line 682 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 179:
-#line 676 "perly.y"
+#line 684 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 180:
-#line 680 "perly.y"
+#line 688 "perly.y"
 { yyval.opval = Nullop; }
 break;
 case 181:
-#line 682 "perly.y"
+#line 690 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
 case 182:
-#line 684 "perly.y"
+#line 692 "perly.y"
 { yyval.opval = yyvsp[-1].opval; }
 break;
 case 183:
-#line 688 "perly.y"
+#line 696 "perly.y"
 { PL_in_my = 0; yyval.opval = my(yyvsp[0].opval); }
 break;
 case 184:
-#line 692 "perly.y"
+#line 700 "perly.y"
 { yyval.opval = newCVREF(yyvsp[-1].ival,yyvsp[0].opval); }
 break;
 case 185:
-#line 696 "perly.y"
+#line 704 "perly.y"
 { yyval.opval = newSVREF(yyvsp[0].opval); }
 break;
 case 186:
-#line 700 "perly.y"
+#line 708 "perly.y"
 { yyval.opval = newAVREF(yyvsp[0].opval); }
 break;
 case 187:
-#line 704 "perly.y"
+#line 712 "perly.y"
 { yyval.opval = newHVREF(yyvsp[0].opval); }
 break;
 case 188:
-#line 708 "perly.y"
+#line 716 "perly.y"
 { yyval.opval = newAVREF(yyvsp[0].opval); }
 break;
 case 189:
-#line 712 "perly.y"
+#line 720 "perly.y"
 { yyval.opval = newGVREF(0,yyvsp[0].opval); }
 break;
 case 190:
-#line 716 "perly.y"
+#line 724 "perly.y"
 { yyval.opval = scalar(yyvsp[0].opval); }
 break;
 case 191:
-#line 718 "perly.y"
+#line 726 "perly.y"
 { yyval.opval = scalar(yyvsp[0].opval);  }
 break;
 case 192:
-#line 720 "perly.y"
+#line 728 "perly.y"
 { yyval.opval = scope(yyvsp[0].opval); }
 break;
 case 193:
-#line 723 "perly.y"
+#line 731 "perly.y"
 { yyval.opval = yyvsp[0].opval; }
 break;
-#line 2412 "perly.c"
+#line 2440 "perly.c"
     }
     yyssp -= yym;
     yystate = *yyssp;
@@ -2423,9 +2430,8 @@ break;
     {
 #if YYDEBUG
         if (yydebug)
-            PerlIO_printf(Perl_debug_log,
-			  "yydebug: after reduction, shifting from state 0 to state %d\n",
-			  YYFINAL);
+            PerlIO_printf(Perl_debug_log, "yydebug: after reduction, shifting from state 0 to\
+ state %d\n", YYFINAL);
 #endif
         yystate = YYFINAL;
         *++yyssp = YYFINAL;
@@ -2454,9 +2460,8 @@ break;
         yystate = yydgoto[yym];
 #if YYDEBUG
     if (yydebug)
-        PerlIO_printf(Perl_debug_log,
-		      "yydebug: after reduction, shifting from state %d to state %d\n",
-		      *yyssp, yystate);
+        PerlIO_printf(Perl_debug_log, "yydebug: after reduction, shifting from state %d \
+to state %d\n", *yyssp, yystate);
 #endif
     if (yyssp >= yyss + yystacksize - 1)
     {