refactor GRAMPROG grammar slightly

Shift the structure of the GRAMPROG production (whole-file grammar)
to more closely match that of the other top-level productions.

1 files changed, 401 insertions, 403 deletions

diff --git a/perly.act b/perly.act
index cafdff7416..99aaa39cf5 100644
--- a/perly.act
+++ b/perly.act
@@ -1,17 +1,27 @@
 case 2:
 #line 143 "perly.y"
-    { (yyval.ival) = (ps[(2) - (2)].val.ival); ;}
+    {
+			  PL_parser->expect = XSTATE;
+			;}
     break;
 
   case 3:
-#line 145 "perly.y"
+#line 147 "perly.y"
     {
-			  parser->expect = XBLOCK;
+			  newPROG(block_end((ps[(3) - (4)].val.ival),(ps[(4) - (4)].val.opval)));
+			  (yyval.ival) = 0;
 			;}
     break;
 
   case 4:
-#line 149 "perly.y"
+#line 152 "perly.y"
+    {
+			  parser->expect = XBLOCK;
+			;}
+    break;
+
+  case 5:
+#line 156 "perly.y"
     {
 			  PL_pad_reset_pending = TRUE;
 			  PL_eval_root = (ps[(3) - (3)].val.opval);
@@ -21,15 +31,15 @@ case 2:
 			;}
     break;
 
-  case 5:
-#line 157 "perly.y"
+  case 6:
+#line 164 "perly.y"
     {
 			  parser->expect = XSTATE;
 			;}
     break;
 
-  case 6:
-#line 161 "perly.y"
+  case 7:
+#line 168 "perly.y"
     {
 			  PL_pad_reset_pending = TRUE;
 			  PL_eval_root = (ps[(3) - (3)].val.opval);
@@ -39,15 +49,15 @@ case 2:
 			;}
     break;
 
-  case 7:
-#line 169 "perly.y"
+  case 8:
+#line 176 "perly.y"
     {
 			  parser->expect = XSTATE;
 			;}
     break;
 
-  case 8:
-#line 173 "perly.y"
+  case 9:
+#line 180 "perly.y"
     {
 			  PL_pad_reset_pending = TRUE;
 			  PL_eval_root = (ps[(3) - (3)].val.opval);
@@ -57,28 +67,23 @@ case 2:
 			;}
     break;
 
-  case 9:
-#line 181 "perly.y"
+  case 10:
+#line 188 "perly.y"
     {
 			  parser->expect = XSTATE;
 			;}
     break;
 
-  case 10:
-#line 185 "perly.y"
+  case 11:
+#line 192 "perly.y"
     {
 			  PL_eval_root = (ps[(3) - (3)].val.opval);
 			  (yyval.ival) = 0;
 			;}
     break;
 
-  case 11:
-#line 194 "perly.y"
-    { (yyval.ival) = (ps[(1) - (2)].val.ival); newPROG(block_end((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval))); ;}
-    break;
-
   case 12:
-#line 199 "perly.y"
+#line 200 "perly.y"
     { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval)))
 			      PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval));
 			  (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
@@ -88,24 +93,17 @@ case 2:
     break;
 
   case 13:
-#line 208 "perly.y"
+#line 209 "perly.y"
     { (yyval.ival) = block_start(TRUE); ;}
     break;
 
   case 14:
-#line 212 "perly.y"
+#line 213 "perly.y"
     { (yyval.ival) = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); ;}
     break;
 
   case 15:
-#line 216 "perly.y"
-    {
-		    PL_parser->expect = XSTATE; (yyval.ival) = block_start(TRUE);
-		;}
-    break;
-
-  case 16:
-#line 223 "perly.y"
+#line 217 "perly.y"
     { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval)))
 			      PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval));
 			  (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
@@ -114,18 +112,18 @@ case 2:
 			;}
     break;
 
-  case 17:
-#line 232 "perly.y"
+  case 16:
+#line 226 "perly.y"
     { (yyval.ival) = block_start(FALSE); ;}
     break;
 
-  case 18:
-#line 237 "perly.y"
+  case 17:
+#line 231 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 19:
-#line 239 "perly.y"
+  case 18:
+#line 233 "perly.y"
     {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval));
 			    PL_pad_reset_pending = TRUE;
 			    if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
@@ -133,8 +131,8 @@ case 2:
 			;}
     break;
 
-  case 20:
-#line 248 "perly.y"
+  case 19:
+#line 242 "perly.y"
     {
 			  if (PVAL((ps[(1) - (2)].val.p_tkval)) || (ps[(2) - (2)].val.opval)) {
 			      (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval));
@@ -146,21 +144,21 @@ case 2:
 			;}
     break;
 
-  case 21:
-#line 261 "perly.y"
+  case 20:
+#line 255 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 22:
-#line 263 "perly.y"
+  case 21:
+#line 257 "perly.y"
     {
 			  (yyval.opval) = newOP(OP_NULL,0);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p');
 			;}
     break;
 
-  case 23:
-#line 268 "perly.y"
+  case 22:
+#line 262 "perly.y"
     {
 			  CV *fmtcv = PL_compcv;
 			  SvREFCNT_inc_simple_void(PL_compcv);
@@ -180,8 +178,8 @@ case 2:
 			;}
     break;
 
-  case 24:
-#line 286 "perly.y"
+  case 23:
+#line 280 "perly.y"
     {
 			  SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
@@ -204,8 +202,8 @@ case 2:
 			;}
     break;
 
-  case 25:
-#line 307 "perly.y"
+  case 24:
+#line 301 "perly.y"
     {
 			  /* Unimplemented "my sub foo { }" */
 			  SvREFCNT_inc_simple_void(PL_compcv);
@@ -219,8 +217,8 @@ case 2:
 			;}
     break;
 
-  case 26:
-#line 319 "perly.y"
+  case 25:
+#line 313 "perly.y"
     {
 #ifdef MAD
 			  (yyval.opval) = package((ps[(3) - (4)].val.opval));
@@ -237,13 +235,13 @@ case 2:
 			;}
     break;
 
-  case 27:
-#line 334 "perly.y"
+  case 26:
+#line 328 "perly.y"
     { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
     break;
 
-  case 28:
-#line 336 "perly.y"
+  case 27:
+#line 330 "perly.y"
     {
 			  SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
@@ -260,8 +258,8 @@ case 2:
 			;}
     break;
 
-  case 29:
-#line 351 "perly.y"
+  case 28:
+#line 345 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
 			      newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -272,8 +270,8 @@ case 2:
 			;}
     break;
 
-  case 30:
-#line 360 "perly.y"
+  case 29:
+#line 354 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
 			      newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -284,8 +282,8 @@ case 2:
 			;}
     break;
 
-  case 31:
-#line 369 "perly.y"
+  case 30:
+#line 363 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
 				  newGIVENOP((ps[(5) - (7)].val.opval), op_scope((ps[(7) - (7)].val.opval)), (PADOFFSET)(ps[(4) - (7)].val.ival)));
@@ -293,18 +291,18 @@ case 2:
 			;}
     break;
 
-  case 32:
-#line 375 "perly.y"
+  case 31:
+#line 369 "perly.y"
     { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;}
     break;
 
-  case 33:
-#line 377 "perly.y"
+  case 32:
+#line 371 "perly.y"
     { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;}
     break;
 
-  case 34:
-#line 379 "perly.y"
+  case 33:
+#line 373 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (8)].val.ival),
 				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -316,8 +314,8 @@ case 2:
 			;}
     break;
 
-  case 35:
-#line 389 "perly.y"
+  case 34:
+#line 383 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (8)].val.ival),
 				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -329,8 +327,8 @@ case 2:
 			;}
     break;
 
-  case 36:
-#line 400 "perly.y"
+  case 35:
+#line 394 "perly.y"
     {
 			  OP *initop = IF_MAD((ps[(4) - (11)].val.opval) ? (ps[(4) - (11)].val.opval) : newOP(OP_NULL, 0), (ps[(4) - (11)].val.opval));
 			  OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -352,8 +350,8 @@ case 2:
 			;}
     break;
 
-  case 37:
-#line 420 "perly.y"
+  case 36:
+#line 414 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (9)].val.ival), newFOROP(0, (ps[(4) - (9)].val.opval), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (9)].val.i_tkval),(yyval.opval),'W');
@@ -364,8 +362,8 @@ case 2:
 			;}
     break;
 
-  case 38:
-#line 429 "perly.y"
+  case 37:
+#line 423 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(4) - (8)].val.ival), newFOROP(0,
 				      op_lvalue((ps[(2) - (8)].val.opval), OP_ENTERLOOP), (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval)));
@@ -376,8 +374,8 @@ case 2:
 			;}
     break;
 
-  case 39:
-#line 438 "perly.y"
+  case 38:
+#line 432 "perly.y"
     {
 			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
 				  newFOROP(0, (OP*)NULL, (ps[(4) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval)));
@@ -388,8 +386,8 @@ case 2:
 			;}
     break;
 
-  case 40:
-#line 447 "perly.y"
+  case 39:
+#line 441 "perly.y"
     {
 			  /* a block is a loop that happens once */
 			  (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -398,8 +396,8 @@ case 2:
 			;}
     break;
 
-  case 41:
-#line 454 "perly.y"
+  case 40:
+#line 448 "perly.y"
     {
 			  int save_3_latefree = (ps[(3) - (5)].val.opval)->op_latefree;
 			  (ps[(3) - (5)].val.opval)->op_latefree = 1;
@@ -414,8 +412,8 @@ case 2:
 			;}
     break;
 
-  case 42:
-#line 467 "perly.y"
+  case 41:
+#line 461 "perly.y"
     {
 			  /* a block is a loop that happens once */
 			  (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -430,8 +428,8 @@ case 2:
 			;}
     break;
 
-  case 43:
-#line 480 "perly.y"
+  case 42:
+#line 474 "perly.y"
     {
 			  PL_parser->expect = XSTATE;
 			  (yyval.opval) = (ps[(1) - (2)].val.opval);
@@ -439,8 +437,8 @@ case 2:
 			;}
     break;
 
-  case 44:
-#line 486 "perly.y"
+  case 43:
+#line 480 "perly.y"
     {
 			  PL_parser->expect = XSTATE;
 			  (yyval.opval) = IF_MAD(newOP(OP_NULL, 0), (OP*)NULL);
@@ -449,64 +447,64 @@ case 2:
 			;}
     break;
 
-  case 45:
-#line 496 "perly.y"
+  case 44:
+#line 490 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 46:
-#line 498 "perly.y"
+  case 45:
+#line 492 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 47:
-#line 500 "perly.y"
+  case 46:
+#line 494 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
 			;}
     break;
 
-  case 48:
-#line 504 "perly.y"
+  case 47:
+#line 498 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
 			;}
     break;
 
-  case 49:
-#line 508 "perly.y"
+  case 48:
+#line 502 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
 			;}
     break;
 
-  case 50:
-#line 512 "perly.y"
+  case 49:
+#line 506 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
 			;}
     break;
 
-  case 51:
-#line 516 "perly.y"
+  case 50:
+#line 510 "perly.y"
     { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL);
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
 			  PL_parser->copline = (line_t)IVAL((ps[(2) - (3)].val.i_tkval));
 			;}
     break;
 
-  case 52:
-#line 521 "perly.y"
+  case 51:
+#line 515 "perly.y"
     { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); ;}
     break;
 
-  case 53:
-#line 526 "perly.y"
+  case 52:
+#line 520 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 54:
-#line 528 "perly.y"
+  case 53:
+#line 522 "perly.y"
     {
 			  ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS;
 			  (yyval.opval) = op_scope((ps[(2) - (2)].val.opval));
@@ -514,8 +512,8 @@ case 2:
 			;}
     break;
 
-  case 55:
-#line 534 "perly.y"
+  case 54:
+#line 528 "perly.y"
     { PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval));
 			    (yyval.opval) = newCONDOP(0,
 				newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)),
@@ -527,60 +525,60 @@ case 2:
 			;}
     break;
 
-  case 56:
-#line 547 "perly.y"
+  case 55:
+#line 541 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 57:
-#line 549 "perly.y"
+  case 56:
+#line 543 "perly.y"
     {
 			  (yyval.opval) = op_scope((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 58:
-#line 557 "perly.y"
+  case 57:
+#line 551 "perly.y"
     { (yyval.ival) = (PL_min_intro_pending &&
 			    PL_max_intro_pending >=  PL_min_intro_pending);
 			  intro_my(); ;}
     break;
 
-  case 59:
-#line 563 "perly.y"
+  case 58:
+#line 557 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 61:
-#line 569 "perly.y"
+  case 60:
+#line 563 "perly.y"
     { YYSTYPE tmplval;
 			  (void)scan_num("1", &tmplval);
 			  (yyval.opval) = tmplval.opval; ;}
     break;
 
-  case 63:
-#line 577 "perly.y"
+  case 62:
+#line 571 "perly.y"
     { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 64:
-#line 582 "perly.y"
+  case 63:
+#line 576 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
-  case 65:
-#line 586 "perly.y"
+  case 64:
+#line 580 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
-  case 66:
-#line 590 "perly.y"
+  case 65:
+#line 584 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
-  case 67:
-#line 595 "perly.y"
+  case 66:
+#line 589 "perly.y"
     {
 #ifdef MAD
 			  YYSTYPE tmplval;
@@ -592,36 +590,36 @@ case 2:
 			;}
     break;
 
-  case 69:
-#line 607 "perly.y"
+  case 68:
+#line 601 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 70:
-#line 608 "perly.y"
+  case 69:
+#line 602 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 71:
-#line 612 "perly.y"
+  case 70:
+#line 606 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, 0);
 			    SAVEFREESV(PL_compcv); ;}
     break;
 
-  case 72:
-#line 618 "perly.y"
+  case 71:
+#line 612 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
 			    SAVEFREESV(PL_compcv); ;}
     break;
 
-  case 73:
-#line 623 "perly.y"
+  case 72:
+#line 617 "perly.y"
     { (yyval.ival) = start_subparse(TRUE, 0);
 			    SAVEFREESV(PL_compcv); ;}
     break;
 
-  case 74:
-#line 628 "perly.y"
+  case 73:
+#line 622 "perly.y"
     { const char *const name = SvPV_nolen_const(((SVOP*)(ps[(1) - (1)].val.opval))->op_sv);
 			  if (strEQ(name, "BEGIN") || strEQ(name, "END")
 			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
@@ -630,25 +628,25 @@ case 2:
 			  (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 75:
-#line 638 "perly.y"
+  case 74:
+#line 632 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 77:
-#line 644 "perly.y"
+  case 76:
+#line 638 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 78:
-#line 646 "perly.y"
+  case 77:
+#line 640 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
 			;}
     break;
 
-  case 79:
-#line 650 "perly.y"
+  case 78:
+#line 644 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newOP(OP_NULL, 0),
 				    (OP*)NULL
@@ -657,15 +655,15 @@ case 2:
 			;}
     break;
 
-  case 80:
-#line 660 "perly.y"
+  case 79:
+#line 654 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
 			;}
     break;
 
-  case 81:
-#line 664 "perly.y"
+  case 80:
+#line 658 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newOP(OP_NULL, 0),
 				    (OP*)NULL
@@ -674,13 +672,13 @@ case 2:
 			;}
     break;
 
-  case 82:
-#line 673 "perly.y"
+  case 81:
+#line 667 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 83:
-#line 674 "perly.y"
+  case 82:
+#line 668 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newOP(OP_NULL,0),
 				    (OP*)NULL
@@ -690,29 +688,29 @@ case 2:
 			;}
     break;
 
-  case 84:
-#line 685 "perly.y"
+  case 83:
+#line 679 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 85:
-#line 689 "perly.y"
+  case 84:
+#line 683 "perly.y"
     { (yyval.opval) = newLOGOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 86:
-#line 693 "perly.y"
+  case 85:
+#line 687 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 88:
-#line 701 "perly.y"
+  case 87:
+#line 695 "perly.y"
     {
 #ifdef MAD
 			  OP* op = newNULLLIST();
@@ -724,8 +722,8 @@ case 2:
 			;}
     break;
 
-  case 89:
-#line 711 "perly.y"
+  case 88:
+#line 705 "perly.y"
     { 
 			  OP* term = (ps[(3) - (3)].val.opval);
 			  DO_MAD(
@@ -736,16 +734,16 @@ case 2:
 			;}
     break;
 
-  case 91:
-#line 724 "perly.y"
+  case 90:
+#line 718 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED,
 				op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (3)].val.i_tkval)),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) );
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 92:
-#line 729 "perly.y"
+  case 91:
+#line 723 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED,
 				op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (5)].val.i_tkval)),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) );
 			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
@@ -754,8 +752,8 @@ case 2:
 			;}
     break;
 
-  case 93:
-#line 736 "perly.y"
+  case 92:
+#line 730 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)),
@@ -766,8 +764,8 @@ case 2:
 			;}
     break;
 
-  case 94:
-#line 745 "perly.y"
+  case 93:
+#line 739 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)),
 				    newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval))));
@@ -775,8 +773,8 @@ case 2:
 			;}
     break;
 
-  case 95:
-#line 751 "perly.y"
+  case 94:
+#line 745 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)),
@@ -784,8 +782,8 @@ case 2:
 			;}
     break;
 
-  case 96:
-#line 757 "perly.y"
+  case 95:
+#line 751 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)),
@@ -795,15 +793,15 @@ case 2:
 			;}
     break;
 
-  case 97:
-#line 765 "perly.y"
+  case 96:
+#line 759 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 98:
-#line 769 "perly.y"
+  case 97:
+#line 763 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
@@ -811,22 +809,22 @@ case 2:
 			;}
     break;
 
-  case 99:
-#line 775 "perly.y"
+  case 98:
+#line 769 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 			  (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;}
     break;
 
-  case 100:
-#line 778 "perly.y"
+  case 99:
+#line 772 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				 op_append_elem(OP_LIST,
 				   op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval)));
 			;}
     break;
 
-  case 103:
-#line 793 "perly.y"
+  case 102:
+#line 787 "perly.y"
     { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), scalar((ps[(3) - (5)].val.opval)));
 			    PL_parser->expect = XOPERATOR;
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
@@ -835,16 +833,16 @@ case 2:
 			;}
     break;
 
-  case 104:
-#line 800 "perly.y"
+  case 103:
+#line 794 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
 			;}
     break;
 
-  case 105:
-#line 805 "perly.y"
+  case 104:
+#line 799 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV),
 					scalar((ps[(4) - (5)].val.opval)));
@@ -854,8 +852,8 @@ case 2:
 			;}
     break;
 
-  case 106:
-#line 813 "perly.y"
+  case 105:
+#line 807 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV),
 					scalar((ps[(3) - (4)].val.opval)));
@@ -864,8 +862,8 @@ case 2:
 			;}
     break;
 
-  case 107:
-#line 820 "perly.y"
+  case 106:
+#line 814 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), jmaybe((ps[(3) - (5)].val.opval)));
 			    PL_parser->expect = XOPERATOR;
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
@@ -874,8 +872,8 @@ case 2:
 			;}
     break;
 
-  case 108:
-#line 827 "perly.y"
+  case 107:
+#line 821 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV),
 					jmaybe((ps[(4) - (6)].val.opval)));
@@ -887,8 +885,8 @@ case 2:
 			;}
     break;
 
-  case 109:
-#line 837 "perly.y"
+  case 108:
+#line 831 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV),
 					jmaybe((ps[(3) - (5)].val.opval)));
@@ -899,8 +897,8 @@ case 2:
 			;}
     break;
 
-  case 110:
-#line 846 "perly.y"
+  case 109:
+#line 840 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar((ps[(1) - (4)].val.opval))));
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'a');
@@ -909,8 +907,8 @@ case 2:
 			;}
     break;
 
-  case 111:
-#line 853 "perly.y"
+  case 110:
+#line 847 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   op_append_elem(OP_LIST, (ps[(4) - (5)].val.opval),
 				       newCVREF(0, scalar((ps[(1) - (5)].val.opval)))));
@@ -920,8 +918,8 @@ case 2:
 			;}
     break;
 
-  case 112:
-#line 862 "perly.y"
+  case 111:
+#line 856 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval),
 					       newCVREF(0, scalar((ps[(1) - (4)].val.opval)))));
@@ -930,8 +928,8 @@ case 2:
 			;}
     break;
 
-  case 113:
-#line 869 "perly.y"
+  case 112:
+#line 863 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar((ps[(1) - (3)].val.opval))));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
@@ -939,8 +937,8 @@ case 2:
 			;}
     break;
 
-  case 114:
-#line 875 "perly.y"
+  case 113:
+#line 869 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - (6)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),')');
@@ -949,16 +947,16 @@ case 2:
 			;}
     break;
 
-  case 115:
-#line 882 "perly.y"
+  case 114:
+#line 876 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
 			;}
     break;
 
-  case 116:
-#line 887 "perly.y"
+  case 115:
+#line 881 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL);
 			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),')');
@@ -967,22 +965,22 @@ case 2:
 			;}
     break;
 
-  case 117:
-#line 897 "perly.y"
+  case 116:
+#line 891 "perly.y"
     { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 118:
-#line 901 "perly.y"
+  case 117:
+#line 895 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 119:
-#line 905 "perly.y"
+  case 118:
+#line 899 "perly.y"
     {   if (IVAL((ps[(2) - (3)].val.i_tkval)) != OP_REPEAT)
 				scalar((ps[(1) - (3)].val.opval));
 			    (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), scalar((ps[(3) - (3)].val.opval)));
@@ -990,50 +988,50 @@ case 2:
 			;}
     break;
 
+  case 119:
+#line 905 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
+			;}
+    break;
+
   case 120:
-#line 911 "perly.y"
+#line 909 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 121:
-#line 915 "perly.y"
+#line 913 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 122:
-#line 919 "perly.y"
+#line 917 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 123:
-#line 923 "perly.y"
+#line 921 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 124:
-#line 927 "perly.y"
+#line 925 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 125:
-#line 931 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
-			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-			;}
-    break;
-
-  case 126:
-#line 935 "perly.y"
+#line 929 "perly.y"
     {
 			  (yyval.opval) = newRANGE(IVAL((ps[(2) - (3)].val.i_tkval)), scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
 			  DO_MAD({
@@ -1047,29 +1045,29 @@ case 2:
 			;}
     break;
 
-  case 127:
-#line 947 "perly.y"
+  case 126:
+#line 941 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 128:
-#line 951 "perly.y"
+  case 127:
+#line 945 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 129:
-#line 955 "perly.y"
+  case 128:
+#line 949 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 130:
-#line 959 "perly.y"
+  case 129:
+#line 953 "perly.y"
     { (yyval.opval) = bind_match(IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),
 				((yyval.opval)->op_type == OP_NOT
@@ -1078,15 +1076,15 @@ case 2:
 			;}
     break;
 
-  case 131:
-#line 969 "perly.y"
+  case 130:
+#line 963 "perly.y"
     { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 132:
-#line 973 "perly.y"
+  case 131:
+#line 967 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)),
 				    (ps[(2) - (2)].val.opval)
@@ -1095,70 +1093,70 @@ case 2:
 			;}
     break;
 
-  case 133:
-#line 980 "perly.y"
+  case 132:
+#line 974 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 134:
-#line 984 "perly.y"
+  case 133:
+#line 978 "perly.y"
     { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 135:
-#line 988 "perly.y"
+  case 134:
+#line 982 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
 					op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC));
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 136:
-#line 993 "perly.y"
+  case 135:
+#line 987 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
 					op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC));
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 137:
-#line 998 "perly.y"
+  case 136:
+#line 992 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
 					op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREINC));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 138:
-#line 1003 "perly.y"
+  case 137:
+#line 997 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
 					op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 139:
-#line 1012 "perly.y"
+  case 138:
+#line 1006 "perly.y"
     { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),']');
 			;}
     break;
 
-  case 140:
-#line 1017 "perly.y"
+  case 139:
+#line 1011 "perly.y"
     { (yyval.opval) = newANONLIST((OP*)NULL);
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'[');
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),']');
 			;}
     break;
 
-  case 141:
-#line 1022 "perly.y"
+  case 140:
+#line 1016 "perly.y"
     { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),';');
@@ -1166,8 +1164,8 @@ case 2:
 			;}
     break;
 
-  case 142:
-#line 1028 "perly.y"
+  case 141:
+#line 1022 "perly.y"
     { (yyval.opval) = newANONHASH((OP*)NULL);
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'{');
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),';');
@@ -1175,8 +1173,8 @@ case 2:
 			;}
     break;
 
-  case 143:
-#line 1034 "perly.y"
+  case 142:
+#line 1028 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 			  (yyval.opval) = newANONATTRSUB((ps[(2) - (5)].val.ival), (ps[(3) - (5)].val.opval), (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
@@ -1185,22 +1183,22 @@ case 2:
 			;}
     break;
 
-  case 144:
-#line 1045 "perly.y"
+  case 143:
+#line 1039 "perly.y"
     { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), IVAL((ps[(1) - (2)].val.i_tkval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 145:
-#line 1049 "perly.y"
+  case 144:
+#line 1043 "perly.y"
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D');
 			;}
     break;
 
-  case 146:
-#line 1053 "perly.y"
+  case 145:
+#line 1047 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    op_prepend_elem(OP_LIST,
@@ -1214,8 +1212,8 @@ case 2:
 			;}
     break;
 
-  case 147:
-#line 1065 "perly.y"
+  case 146:
+#line 1059 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    op_append_elem(OP_LIST,
@@ -1230,8 +1228,8 @@ case 2:
 			;}
     break;
 
-  case 148:
-#line 1078 "perly.y"
+  case 147:
+#line 1072 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    op_prepend_elem(OP_LIST,
 				scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep();
@@ -1241,8 +1239,8 @@ case 2:
 			;}
     break;
 
-  case 149:
-#line 1086 "perly.y"
+  case 148:
+#line 1080 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    op_prepend_elem(OP_LIST,
 				(ps[(4) - (5)].val.opval),
@@ -1253,86 +1251,86 @@ case 2:
 			;}
     break;
 
-  case 154:
-#line 1102 "perly.y"
+  case 153:
+#line 1096 "perly.y"
     { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval));
 			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'?');
 			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),':');
 			;}
     break;
 
-  case 155:
-#line 1107 "perly.y"
+  case 154:
+#line 1101 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, op_lvalue((ps[(2) - (2)].val.opval),OP_REFGEN));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 156:
-#line 1111 "perly.y"
+  case 155:
+#line 1105 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 157:
-#line 1113 "perly.y"
+  case 156:
+#line 1107 "perly.y"
     { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'k');
 			;}
     break;
 
-  case 158:
-#line 1117 "perly.y"
+  case 157:
+#line 1111 "perly.y"
     { (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(ps[(2) - (3)].val.opval)), (ps[(2) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
 			;}
     break;
 
-  case 159:
-#line 1122 "perly.y"
+  case 158:
+#line 1116 "perly.y"
     { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 160:
-#line 1124 "perly.y"
+  case 159:
+#line 1118 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST());
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')');
 			;}
     break;
 
+  case 160:
+#line 1123 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
   case 161:
-#line 1129 "perly.y"
+#line 1125 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 162:
-#line 1131 "perly.y"
+#line 1127 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 163:
-#line 1133 "perly.y"
+#line 1129 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 164:
-#line 1135 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
-    break;
-
-  case 165:
-#line 1137 "perly.y"
+#line 1131 "perly.y"
     { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
     break;
 
-  case 166:
-#line 1139 "perly.y"
+  case 165:
+#line 1133 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 167:
-#line 1141 "perly.y"
+  case 166:
+#line 1135 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_ASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_ASLICE, 0,
@@ -1343,8 +1341,8 @@ case 2:
 			;}
     break;
 
-  case 168:
-#line 1150 "perly.y"
+  case 167:
+#line 1144 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_HSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_HSLICE, 0,
@@ -1357,26 +1355,26 @@ case 2:
 			;}
     break;
 
-  case 169:
-#line 1161 "perly.y"
+  case 168:
+#line 1155 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 170:
-#line 1163 "perly.y"
+  case 169:
+#line 1157 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 171:
-#line 1165 "perly.y"
+  case 170:
+#line 1159 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval)));
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
 			;}
     break;
 
-  case 172:
-#line 1170 "perly.y"
+  case 171:
+#line 1164 "perly.y"
     {
 			  (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval))));
@@ -1391,91 +1389,91 @@ case 2:
 			;}
     break;
 
-  case 173:
-#line 1183 "perly.y"
+  case 172:
+#line 1177 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    op_append_elem(OP_LIST, (ps[(3) - (3)].val.opval), scalar((ps[(2) - (3)].val.opval))));
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 174:
-#line 1188 "perly.y"
+  case 173:
+#line 1182 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), OPf_SPECIAL);
 			    PL_hints |= HINT_BLOCK_SCOPE;
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 175:
-#line 1193 "perly.y"
+  case 174:
+#line 1187 "perly.y"
     { (yyval.opval) = newLOOPEX(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 176:
-#line 1197 "perly.y"
+  case 175:
+#line 1191 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 177:
-#line 1201 "perly.y"
+  case 176:
+#line 1195 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 178:
-#line 1205 "perly.y"
+  case 177:
+#line 1199 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 179:
-#line 1209 "perly.y"
+  case 178:
+#line 1203 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 180:
-#line 1213 "perly.y"
+  case 179:
+#line 1207 "perly.y"
     { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.i_tkval) ? OPf_SPECIAL : 0);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 181:
-#line 1217 "perly.y"
+  case 180:
+#line 1211 "perly.y"
     { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.i_tkval) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 182:
-#line 1221 "perly.y"
+  case 181:
+#line 1215 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 183:
-#line 1223 "perly.y"
+  case 182:
+#line 1217 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
     break;
 
-  case 184:
-#line 1226 "perly.y"
+  case 183:
+#line 1220 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
 			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
 			;}
     break;
 
-  case 185:
-#line 1230 "perly.y"
+  case 184:
+#line 1224 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0);
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
@@ -1483,14 +1481,14 @@ case 2:
 			;}
     break;
 
-  case 186:
-#line 1236 "perly.y"
+  case 185:
+#line 1230 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 187:
-#line 1239 "perly.y"
+  case 186:
+#line 1233 "perly.y"
     { (yyval.opval) = (IVAL((ps[(1) - (3)].val.i_tkval)) == OP_NOT)
 			    ? newUNOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0, newSVOP(OP_CONST, 0, newSViv(0)))
 			    : newOP(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_SPECIAL);
@@ -1501,8 +1499,8 @@ case 2:
 			;}
     break;
 
-  case 188:
-#line 1248 "perly.y"
+  case 187:
+#line 1242 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
@@ -1510,16 +1508,16 @@ case 2:
 			;}
     break;
 
-  case 189:
-#line 1254 "perly.y"
+  case 188:
+#line 1248 "perly.y"
     { (yyval.opval) = pmruntime((ps[(1) - (4)].val.opval), (ps[(3) - (4)].val.opval), 1);
 			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
 			;}
     break;
 
-  case 192:
-#line 1261 "perly.y"
+  case 191:
+#line 1255 "perly.y"
     {
 			  (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
 				newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
@@ -1527,8 +1525,8 @@ case 2:
 			;}
     break;
 
-  case 194:
-#line 1271 "perly.y"
+  case 193:
+#line 1265 "perly.y"
     { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval));
 			  DO_MAD(
 			      token_getmad((ps[(1) - (3)].val.i_tkval),(yyval.opval),'d');
@@ -1538,143 +1536,143 @@ case 2:
 			;}
     break;
 
-  case 195:
-#line 1279 "perly.y"
+  case 194:
+#line 1273 "perly.y"
     { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'d');
 			;}
     break;
 
-  case 196:
-#line 1286 "perly.y"
+  case 195:
+#line 1280 "perly.y"
     { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
 			;}
     break;
 
-  case 197:
-#line 1291 "perly.y"
+  case 196:
+#line 1285 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST());
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'(');
 			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')');
 			;}
     break;
 
+  case 197:
+#line 1290 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
   case 198:
-#line 1296 "perly.y"
+#line 1292 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 199:
-#line 1298 "perly.y"
+#line 1294 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 200:
-#line 1300 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1299 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 201:
-#line 1305 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 1301 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 202:
-#line 1307 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1305 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 203:
-#line 1311 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 1307 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 204:
-#line 1313 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1311 "perly.y"
+    { (yyval.i_tkval) = (ps[(1) - (1)].val.i_tkval); ;}
     break;
 
   case 205:
-#line 1317 "perly.y"
-    { (yyval.i_tkval) = (ps[(1) - (1)].val.i_tkval); ;}
+#line 1313 "perly.y"
+    { munge_qwlist_to_paren_list((ps[(1) - (1)].val.opval)); ;}
     break;
 
   case 206:
-#line 1319 "perly.y"
-    { munge_qwlist_to_paren_list((ps[(1) - (1)].val.opval)); ;}
+#line 1315 "perly.y"
+    { (yyval.i_tkval) = (ps[(3) - (3)].val.i_tkval); ;}
     break;
 
   case 207:
 #line 1321 "perly.y"
-    { (yyval.i_tkval) = (ps[(3) - (3)].val.i_tkval); ;}
-    break;
-
-  case 208:
-#line 1327 "perly.y"
     { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 209:
-#line 1331 "perly.y"
+  case 208:
+#line 1325 "perly.y"
     { (yyval.opval) = newCVREF(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'&');
 			;}
     break;
 
-  case 210:
-#line 1337 "perly.y"
+  case 209:
+#line 1331 "perly.y"
     { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$');
 			;}
     break;
 
-  case 211:
-#line 1343 "perly.y"
+  case 210:
+#line 1337 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@');
 			;}
     break;
 
-  case 212:
-#line 1349 "perly.y"
+  case 211:
+#line 1343 "perly.y"
     { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%');
 			;}
     break;
 
-  case 213:
-#line 1355 "perly.y"
+  case 212:
+#line 1349 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l');
 			;}
     break;
 
-  case 214:
-#line 1361 "perly.y"
+  case 213:
+#line 1355 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval));
 			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*');
 			;}
     break;
 
-  case 215:
-#line 1368 "perly.y"
+  case 214:
+#line 1362 "perly.y"
     { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 216:
-#line 1370 "perly.y"
+  case 215:
+#line 1364 "perly.y"
     { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 217:
-#line 1372 "perly.y"
+  case 216:
+#line 1366 "perly.y"
     { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 218:
-#line 1375 "perly.y"
+  case 217:
+#line 1369 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;