X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/49fb862041f1f74fafbc91afa553624c43078261..635ff94cc77ff6728badc0e916ef0dc6cd568518:/perly.act

diff --git a/perly.act b/perly.act
index 56285e9..1237b50 100644
--- a/perly.act
+++ b/perly.act
@@ -5,15 +5,16 @@
  */
 
 case 2:
-#line 118 "perly.y" /* yacc.c:1646  */
+#line 120 "perly.y" /* yacc.c:1648  */
     {
 			  parser->expect = XSTATE;
+                          (yyval.ival) = 0;
 			}
 
     break;
 
   case 3:
-#line 122 "perly.y" /* yacc.c:1646  */
+#line 125 "perly.y" /* yacc.c:1648  */
     {
 			  newPROG(block_end((ps[-1].val.ival),(ps[0].val.opval)));
 			  PL_compiling.cop_seq = 0;
@@ -23,15 +24,16 @@ case 2:
     break;
 
   case 4:
-#line 128 "perly.y" /* yacc.c:1646  */
+#line 131 "perly.y" /* yacc.c:1648  */
     {
 			  parser->expect = XTERM;
+                          (yyval.ival) = 0;
 			}
 
     break;
 
   case 5:
-#line 132 "perly.y" /* yacc.c:1646  */
+#line 136 "perly.y" /* yacc.c:1648  */
     {
 			  PL_eval_root = (ps[0].val.opval);
 			  (yyval.ival) = 0;
@@ -40,75 +42,79 @@ case 2:
     break;
 
   case 6:
-#line 137 "perly.y" /* yacc.c:1646  */
+#line 141 "perly.y" /* yacc.c:1648  */
     {
 			  parser->expect = XBLOCK;
+                          (yyval.ival) = 0;
 			}
 
     break;
 
   case 7:
-#line 141 "perly.y" /* yacc.c:1646  */
+#line 146 "perly.y" /* yacc.c:1648  */
     {
 			  PL_pad_reset_pending = TRUE;
 			  PL_eval_root = (ps[0].val.opval);
 			  (yyval.ival) = 0;
 			  yyunlex();
-			  parser->yychar = YYEOF;
+			  parser->yychar = yytoken = YYEOF;
 			}
 
     break;
 
   case 8:
-#line 149 "perly.y" /* yacc.c:1646  */
+#line 154 "perly.y" /* yacc.c:1648  */
     {
 			  parser->expect = XSTATE;
+                          (yyval.ival) = 0;
 			}
 
     break;
 
   case 9:
-#line 153 "perly.y" /* yacc.c:1646  */
+#line 159 "perly.y" /* yacc.c:1648  */
     {
 			  PL_pad_reset_pending = TRUE;
 			  PL_eval_root = (ps[0].val.opval);
 			  (yyval.ival) = 0;
 			  yyunlex();
-			  parser->yychar = YYEOF;
+			  parser->yychar = yytoken = YYEOF;
 			}
 
     break;
 
   case 10:
-#line 161 "perly.y" /* yacc.c:1646  */
+#line 167 "perly.y" /* yacc.c:1648  */
     {
 			  parser->expect = XSTATE;
+                          (yyval.ival) = 0;
 			}
 
     break;
 
   case 11:
-#line 165 "perly.y" /* yacc.c:1646  */
+#line 172 "perly.y" /* yacc.c:1648  */
     {
 			  PL_pad_reset_pending = TRUE;
 			  PL_eval_root = (ps[0].val.opval);
 			  (yyval.ival) = 0;
 			  yyunlex();
-			  parser->yychar = YYEOF;
+			  parser->yychar = yytoken = YYEOF;
 			}
 
     break;
 
   case 12:
-#line 173 "perly.y" /* yacc.c:1646  */
+#line 180 "perly.y" /* yacc.c:1648  */
     {
 			  parser->expect = XSTATE;
+                          (yyval.ival) = 0;
 			}
 
     break;
 
   case 13:
-#line 177 "perly.y" /* yacc.c:1646  */
+#line 185 "perly.y" /* yacc.c:1648  */
     {
 			  PL_eval_root = (ps[0].val.opval);
 			  (yyval.ival) = 0;
@@ -117,7 +123,25 @@ case 2:
     break;
 
   case 14:
-#line 185 "perly.y" /* yacc.c:1646  */
+#line 190 "perly.y" /* yacc.c:1648  */
+    {
+			  parser->expect = XSTATE;
+			  (yyval.ival) = 0;
+			}
+
+    break;
+
+  case 15:
+#line 195 "perly.y" /* yacc.c:1648  */
+    {
+			  PL_eval_root = (ps[0].val.opval);
+			  (yyval.ival) = 0;
+			}
+
+    break;
+
+  case 16:
+#line 203 "perly.y" /* yacc.c:1648  */
     { if (parser->copline > (line_t)(ps[-3].val.ival))
 			      parser->copline = (line_t)(ps[-3].val.ival);
 			  (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval));
@@ -125,8 +149,8 @@ case 2:
 
     break;
 
-  case 15:
-#line 193 "perly.y" /* yacc.c:1646  */
+  case 17:
+#line 211 "perly.y" /* yacc.c:1648  */
     { if (parser->copline > (line_t)(ps[-6].val.ival))
 			      parser->copline = (line_t)(ps[-6].val.ival);
 			  (yyval.opval) = block_end((ps[-5].val.ival), (ps[-2].val.opval));
@@ -134,15 +158,15 @@ case 2:
 
     break;
 
-  case 16:
-#line 200 "perly.y" /* yacc.c:1646  */
+  case 18:
+#line 218 "perly.y" /* yacc.c:1648  */
     { (yyval.ival) = block_start(TRUE);
 			  parser->parsed_sub = 0; }
 
     break;
 
-  case 17:
-#line 205 "perly.y" /* yacc.c:1646  */
+  case 19:
+#line 223 "perly.y" /* yacc.c:1648  */
     { if (parser->copline > (line_t)(ps[-3].val.ival))
 			      parser->copline = (line_t)(ps[-3].val.ival);
 			  (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval));
@@ -150,21 +174,21 @@ case 2:
 
     break;
 
-  case 18:
-#line 212 "perly.y" /* yacc.c:1646  */
+  case 20:
+#line 230 "perly.y" /* yacc.c:1648  */
     { (yyval.ival) = block_start(FALSE);
 			  parser->parsed_sub = 0; }
 
     break;
 
-  case 19:
-#line 218 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 21:
+#line 236 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 20:
-#line 220 "perly.y" /* yacc.c:1646  */
+  case 22:
+#line 238 "perly.y" /* yacc.c:1648  */
     {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval));
 			    PL_pad_reset_pending = TRUE;
 			    if ((ps[-1].val.opval) && (ps[0].val.opval))
@@ -173,14 +197,14 @@ case 2:
 
     break;
 
-  case 21:
-#line 229 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 23:
+#line 247 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 22:
-#line 231 "perly.y" /* yacc.c:1646  */
+  case 24:
+#line 249 "perly.y" /* yacc.c:1648  */
     {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval));
 			    PL_pad_reset_pending = TRUE;
 			    if ((ps[-1].val.opval) && (ps[0].val.opval))
@@ -189,48 +213,54 @@ case 2:
 
     break;
 
-  case 23:
-#line 240 "perly.y" /* yacc.c:1646  */
+  case 25:
+#line 258 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = (ps[0].val.opval) ? newSTATEOP(0, NULL, (ps[0].val.opval)) : NULL;
 			}
 
     break;
 
-  case 24:
-#line 244 "perly.y" /* yacc.c:1646  */
+  case 26:
+#line 262 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 25:
-#line 248 "perly.y" /* yacc.c:1646  */
+  case 27:
+#line 266 "perly.y" /* yacc.c:1648  */
     {
-			  (yyval.opval) = newSTATEOP(SVf_UTF8 * (ps[-1].val.pval)[strlen((ps[-1].val.pval))+1], (ps[-1].val.pval), (ps[0].val.opval));
+                          SV *label = cSVOPx_sv((ps[-1].val.opval));
+			  (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8,
+                                            savepv(SvPVX_const(label)), (ps[0].val.opval));
+                          op_free((ps[-1].val.opval));
 			}
 
     break;
 
-  case 26:
-#line 252 "perly.y" /* yacc.c:1646  */
+  case 28:
+#line 273 "perly.y" /* yacc.c:1648  */
     {
-			  (yyval.opval) = newSTATEOP(SVf_UTF8 * (ps[-1].val.pval)[strlen((ps[-1].val.pval))+1], (ps[-1].val.pval), (ps[0].val.opval));
+                          SV *label = cSVOPx_sv((ps[-1].val.opval));
+			  (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8,
+                                            savepv(SvPVX_const(label)), (ps[0].val.opval));
+                          op_free((ps[-1].val.opval));
 			}
 
     break;
 
-  case 27:
-#line 259 "perly.y" /* yacc.c:1646  */
+  case 29:
+#line 283 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 28:
-#line 261 "perly.y" /* yacc.c:1646  */
+  case 30:
+#line 285 "perly.y" /* yacc.c:1648  */
     {
 			  CV *fmtcv = PL_compcv;
 			  newFORM((ps[-2].val.ival), (ps[-1].val.opval), (ps[0].val.opval));
-			  (yyval.opval) = (OP*)NULL;
+			  (yyval.opval) = NULL;
 			  if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
 			      pad_add_weakref(fmtcv);
 			  }
@@ -239,124 +269,86 @@ case 2:
 
     break;
 
-  case 29:
-#line 271 "perly.y" /* yacc.c:1646  */
+  case 31:
+#line 297 "perly.y" /* yacc.c:1648  */
     {
-			  if ((ps[-1].val.opval)->op_type == OP_CONST) {
-			    const char *const name =
-				SvPV_nolen_const(((SVOP*)(ps[-1].val.opval))->op_sv);
-			    if (strEQ(name, "BEGIN") || strEQ(name, "END")
-			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
-			      || strEQ(name, "UNITCHECK"))
-			      CvSPECIAL_on(PL_compcv);
-			  }
-			  else
-			  /* State subs inside anonymous subs need to be
-			     clonable themselves. */
-			  if (CvANON(CvOUTSIDE(PL_compcv))
-			   || CvCLONE(CvOUTSIDE(PL_compcv))
-			   || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST(
-						CvOUTSIDE(PL_compcv)
-					     ))[(ps[-1].val.opval)->op_targ]))
-			      CvCLONE_on(PL_compcv);
+                          init_named_cv(PL_compcv, (ps[-1].val.opval));
 			  parser->in_my = 0;
 			  parser->in_my_stash = NULL;
 			}
 
     break;
 
-  case 30:
-#line 293 "perly.y" /* yacc.c:1646  */
+  case 32:
+#line 303 "perly.y" /* yacc.c:1648  */
     {
 			  SvREFCNT_inc_simple_void(PL_compcv);
 			  (ps[-5].val.opval)->op_type == OP_CONST
 			      ? newATTRSUB((ps[-4].val.ival), (ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval))
 			      : newMYSUB((ps[-4].val.ival), (ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval))
 			  ;
-			  (yyval.opval) = (OP*)NULL;
+			  (yyval.opval) = NULL;
 			  intro_my();
 			  parser->parsed_sub = 1;
 			}
 
     break;
 
-  case 31:
-#line 304 "perly.y" /* yacc.c:1646  */
+  case 33:
+#line 318 "perly.y" /* yacc.c:1648  */
     {
-			  if ((ps[-1].val.opval)->op_type == OP_CONST) {
-			    const char *const name =
-				SvPV_nolen_const(((SVOP*)(ps[-1].val.opval))->op_sv);
-			    if (strEQ(name, "BEGIN") || strEQ(name, "END")
-			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
-			      || strEQ(name, "UNITCHECK"))
-			      CvSPECIAL_on(PL_compcv);
-			  }
-			  else
-			  /* State subs inside anonymous subs need to be
-			     clonable themselves. */
-			  if (CvANON(CvOUTSIDE(PL_compcv))
-			   || CvCLONE(CvOUTSIDE(PL_compcv))
-			   || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST(
-						CvOUTSIDE(PL_compcv)
-					     ))[(ps[-1].val.opval)->op_targ]))
-			      CvCLONE_on(PL_compcv);
+                          init_named_cv(PL_compcv, (ps[-1].val.opval));
 			  parser->in_my = 0;
 			  parser->in_my_stash = NULL;
 			}
 
     break;
 
-  case 32:
-#line 326 "perly.y" /* yacc.c:1646  */
+  case 34:
+#line 324 "perly.y" /* yacc.c:1648  */
     {
-			  OP *body;
-			  if (parser->copline > (line_t)(ps[-2].val.ival))
-			      parser->copline = (line_t)(ps[-2].val.ival);
-			  body = block_end((ps[-5].val.ival),
-				op_append_list(OP_LINESEQ, (ps[-4].val.opval), (ps[-1].val.opval)));
-
 			  SvREFCNT_inc_simple_void(PL_compcv);
-			  (ps[-8].val.opval)->op_type == OP_CONST
-			      ? newATTRSUB((ps[-7].val.ival), (ps[-8].val.opval), NULL, (ps[-3].val.opval), body)
-			      : newMYSUB((ps[-7].val.ival), (ps[-8].val.opval), NULL, (ps[-3].val.opval), body)
+			  (ps[-4].val.opval)->op_type == OP_CONST
+			      ? newATTRSUB((ps[-3].val.ival), (ps[-4].val.opval), NULL, (ps[-1].val.opval), (ps[0].val.opval))
+			      : newMYSUB(  (ps[-3].val.ival), (ps[-4].val.opval), NULL, (ps[-1].val.opval), (ps[0].val.opval))
 			  ;
-			  (yyval.opval) = (OP*)NULL;
+			  (yyval.opval) = NULL;
 			  intro_my();
 			  parser->parsed_sub = 1;
 			}
 
     break;
 
-  case 33:
-#line 343 "perly.y" /* yacc.c:1646  */
+  case 35:
+#line 335 "perly.y" /* yacc.c:1648  */
     {
 			  package((ps[-1].val.opval));
 			  if ((ps[-2].val.opval))
 			      package_version((ps[-2].val.opval));
-			  (yyval.opval) = (OP*)NULL;
+			  (yyval.opval) = NULL;
 			}
 
     break;
 
-  case 34:
-#line 350 "perly.y" /* yacc.c:1646  */
+  case 36:
+#line 342 "perly.y" /* yacc.c:1648  */
     { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
 
     break;
 
-  case 35:
-#line 352 "perly.y" /* yacc.c:1646  */
+  case 37:
+#line 344 "perly.y" /* yacc.c:1648  */
     {
 			  SvREFCNT_inc_simple_void(PL_compcv);
 			  utilize((ps[-6].val.ival), (ps[-5].val.ival), (ps[-3].val.opval), (ps[-2].val.opval), (ps[-1].val.opval));
 			  parser->parsed_sub = 1;
-			  (yyval.opval) = (OP*)NULL;
+			  (yyval.opval) = NULL;
 			}
 
     break;
 
-  case 36:
-#line 359 "perly.y" /* yacc.c:1646  */
+  case 38:
+#line 351 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end((ps[-4].val.ival),
 			      newCONDOP(0, (ps[-3].val.opval), op_scope((ps[-1].val.opval)), (ps[0].val.opval)));
@@ -365,8 +357,8 @@ case 2:
 
     break;
 
-  case 37:
-#line 365 "perly.y" /* yacc.c:1646  */
+  case 39:
+#line 357 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end((ps[-4].val.ival),
                               newCONDOP(0, (ps[-3].val.opval), (ps[0].val.opval), op_scope((ps[-1].val.opval))));
@@ -375,8 +367,8 @@ case 2:
 
     break;
 
-  case 38:
-#line 371 "perly.y" /* yacc.c:1646  */
+  case 40:
+#line 363 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end((ps[-3].val.ival), newGIVENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)), 0));
 			  parser->copline = (line_t)(ps[-5].val.ival);
@@ -384,57 +376,57 @@ case 2:
 
     break;
 
-  case 39:
-#line 376 "perly.y" /* yacc.c:1646  */
+  case 41:
+#line 368 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = block_end((ps[-3].val.ival), newWHENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)))); }
 
     break;
 
-  case 40:
-#line 378 "perly.y" /* yacc.c:1646  */
+  case 42:
+#line 370 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newWHENOP(0, op_scope((ps[0].val.opval))); }
 
     break;
 
-  case 41:
-#line 380 "perly.y" /* yacc.c:1646  */
+  case 43:
+#line 372 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end((ps[-5].val.ival),
-				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+				  newWHILEOP(0, 1, NULL,
 				      (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival)));
 			  parser->copline = (line_t)(ps[-7].val.ival);
 			}
 
     break;
 
-  case 42:
-#line 387 "perly.y" /* yacc.c:1646  */
+  case 44:
+#line 379 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end((ps[-5].val.ival),
-				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+				  newWHILEOP(0, 1, NULL,
 				      (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival)));
 			  parser->copline = (line_t)(ps[-7].val.ival);
 			}
 
     break;
 
-  case 43:
-#line 394 "perly.y" /* yacc.c:1646  */
+  case 45:
+#line 386 "perly.y" /* yacc.c:1648  */
     { parser->expect = XTERM; }
 
     break;
 
-  case 44:
-#line 396 "perly.y" /* yacc.c:1646  */
+  case 46:
+#line 388 "perly.y" /* yacc.c:1648  */
     { parser->expect = XTERM; }
 
     break;
 
-  case 45:
-#line 399 "perly.y" /* yacc.c:1646  */
+  case 47:
+#line 391 "perly.y" /* yacc.c:1648  */
     {
 			  OP *initop = (ps[-9].val.opval);
-			  OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+			  OP *forop = newWHILEOP(0, 1, NULL,
 				      scalar((ps[-6].val.opval)), (ps[0].val.opval), (ps[-2].val.opval), (ps[-3].val.ival));
 			  if (initop) {
 			      forop = op_prepend_elem(OP_LINESEQ, initop,
@@ -449,8 +441,8 @@ case 2:
 
     break;
 
-  case 46:
-#line 414 "perly.y" /* yacc.c:1646  */
+  case 48:
+#line 406 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end((ps[-6].val.ival), newFOROP(0, (ps[-5].val.opval), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
 			  parser->copline = (line_t)(ps[-8].val.ival);
@@ -458,8 +450,8 @@ case 2:
 
     break;
 
-  case 47:
-#line 419 "perly.y" /* yacc.c:1646  */
+  case 49:
+#line 411 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(0,
 				      op_lvalue((ps[-6].val.opval), OP_ENTERLOOP), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
@@ -468,14 +460,14 @@ case 2:
 
     break;
 
-  case 48:
-#line 425 "perly.y" /* yacc.c:1646  */
+  case 50:
+#line 417 "perly.y" /* yacc.c:1648  */
     { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
 
     break;
 
-  case 49:
-#line 427 "perly.y" /* yacc.c:1646  */
+  case 51:
+#line 419 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end(
 				(ps[-7].val.ival),
@@ -491,8 +483,8 @@ case 2:
 
     break;
 
-  case 50:
-#line 440 "perly.y" /* yacc.c:1646  */
+  case 52:
+#line 432 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(
 				0, op_lvalue(newUNOP(OP_REFGEN, 0,
@@ -503,28 +495,28 @@ case 2:
 
     break;
 
-  case 51:
-#line 448 "perly.y" /* yacc.c:1646  */
+  case 53:
+#line 440 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = block_end((ps[-4].val.ival),
-				  newFOROP(0, (OP*)NULL, (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
+				  newFOROP(0, NULL, (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
 			  parser->copline = (line_t)(ps[-6].val.ival);
 			}
 
     break;
 
-  case 52:
-#line 454 "perly.y" /* yacc.c:1646  */
+  case 54:
+#line 446 "perly.y" /* yacc.c:1648  */
     {
 			  /* a block is a loop that happens once */
-			  (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-				  (OP*)NULL, (ps[-1].val.opval), (ps[0].val.opval), 0);
+			  (yyval.opval) = newWHILEOP(0, 1, NULL,
+				  NULL, (ps[-1].val.opval), (ps[0].val.opval), 0);
 			}
 
     break;
 
-  case 53:
-#line 460 "perly.y" /* yacc.c:1646  */
+  case 55:
+#line 452 "perly.y" /* yacc.c:1648  */
     {
 			  package((ps[-2].val.opval));
 			  if ((ps[-3].val.opval)) {
@@ -534,37 +526,46 @@ case 2:
 
     break;
 
-  case 54:
-#line 467 "perly.y" /* yacc.c:1646  */
+  case 56:
+#line 459 "perly.y" /* yacc.c:1648  */
     {
 			  /* a block is a loop that happens once */
-			  (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-				  (OP*)NULL, block_end((ps[-3].val.ival), (ps[-1].val.opval)), (OP*)NULL, 0);
+			  (yyval.opval) = newWHILEOP(0, 1, NULL,
+				  NULL, block_end((ps[-3].val.ival), (ps[-1].val.opval)), NULL, 0);
 			  if (parser->copline > (line_t)(ps[-4].val.ival))
 			      parser->copline = (line_t)(ps[-4].val.ival);
 			}
 
     break;
 
-  case 55:
-#line 475 "perly.y" /* yacc.c:1646  */
+  case 57:
+#line 467 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = (ps[-1].val.opval);
 			}
 
     break;
 
-  case 56:
-#line 479 "perly.y" /* yacc.c:1646  */
+  case 58:
+#line 471 "perly.y" /* yacc.c:1648  */
     {
-			  (yyval.opval) = (OP*)NULL;
+			  (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
+				newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
+			}
+
+    break;
+
+  case 59:
+#line 476 "perly.y" /* yacc.c:1648  */
+    {
+			  (yyval.opval) = NULL;
 			  parser->copline = NOLINE;
 			}
 
     break;
 
-  case 57:
-#line 487 "perly.y" /* yacc.c:1646  */
+  case 60:
+#line 484 "perly.y" /* yacc.c:1648  */
     { OP *list;
 			  if ((ps[0].val.opval)) {
 			      OP *term = (ps[0].val.opval);
@@ -582,75 +583,75 @@ case 2:
 
     break;
 
-  case 58:
-#line 504 "perly.y" /* yacc.c:1646  */
+  case 61:
+#line 501 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = NULL; }
 
     break;
 
-  case 59:
-#line 506 "perly.y" /* yacc.c:1646  */
+  case 62:
+#line 503 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_unscope((ps[-1].val.opval)); }
 
     break;
 
-  case 60:
-#line 511 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 63:
+#line 508 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 61:
-#line 513 "perly.y" /* yacc.c:1646  */
+  case 64:
+#line 510 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 62:
-#line 515 "perly.y" /* yacc.c:1646  */
+  case 65:
+#line 512 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
 
     break;
 
-  case 63:
-#line 517 "perly.y" /* yacc.c:1646  */
+  case 66:
+#line 514 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
 
     break;
 
-  case 64:
-#line 519 "perly.y" /* yacc.c:1646  */
+  case 67:
+#line 516 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[0].val.opval)), (ps[-2].val.opval)); }
 
     break;
 
-  case 65:
-#line 521 "perly.y" /* yacc.c:1646  */
+  case 68:
+#line 518 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[0].val.opval), (ps[-2].val.opval)); }
 
     break;
 
-  case 66:
-#line 523 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[0].val.opval), (ps[-2].val.opval), (OP*)NULL);
+  case 69:
+#line 520 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = newFOROP(0, NULL, (ps[0].val.opval), (ps[-2].val.opval), NULL);
 			  parser->copline = (line_t)(ps[-1].val.ival); }
 
     break;
 
-  case 67:
-#line 526 "perly.y" /* yacc.c:1646  */
+  case 70:
+#line 523 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newWHENOP((ps[0].val.opval), op_scope((ps[-2].val.opval))); }
 
     break;
 
-  case 68:
-#line 531 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 71:
+#line 528 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 69:
-#line 533 "perly.y" /* yacc.c:1646  */
+  case 72:
+#line 530 "perly.y" /* yacc.c:1648  */
     {
 			  ((ps[0].val.opval))->op_flags |= OPf_PARENS;
 			  (yyval.opval) = op_scope((ps[0].val.opval));
@@ -658,8 +659,8 @@ case 2:
 
     break;
 
-  case 70:
-#line 538 "perly.y" /* yacc.c:1646  */
+  case 73:
+#line 535 "perly.y" /* yacc.c:1648  */
     { parser->copline = (line_t)(ps[-5].val.ival);
 			    (yyval.opval) = newCONDOP(0,
 				newSTATEOP(OPf_SPECIAL,NULL,(ps[-3].val.opval)),
@@ -669,153 +670,153 @@ case 2:
 
     break;
 
-  case 71:
-#line 548 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 74:
+#line 545 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 72:
-#line 550 "perly.y" /* yacc.c:1646  */
+  case 75:
+#line 547 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_scope((ps[0].val.opval)); }
 
     break;
 
-  case 73:
-#line 555 "perly.y" /* yacc.c:1646  */
+  case 76:
+#line 552 "perly.y" /* yacc.c:1648  */
     { (yyval.ival) = (PL_min_intro_pending &&
 			    PL_max_intro_pending >=  PL_min_intro_pending);
 			  intro_my(); }
 
     break;
 
-  case 74:
-#line 561 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 77:
+#line 558 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 76:
-#line 567 "perly.y" /* yacc.c:1646  */
+  case 79:
+#line 564 "perly.y" /* yacc.c:1648  */
     { YYSTYPE tmplval;
 			  (void)scan_num("1", &tmplval);
 			  (yyval.opval) = tmplval.opval; }
 
     break;
 
-  case 78:
-#line 575 "perly.y" /* yacc.c:1646  */
+  case 81:
+#line 572 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = invert(scalar((ps[0].val.opval))); }
 
     break;
 
-  case 79:
-#line 580 "perly.y" /* yacc.c:1646  */
+  case 82:
+#line 577 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); intro_my(); }
 
     break;
 
-  case 80:
-#line 584 "perly.y" /* yacc.c:1646  */
+  case 83:
+#line 581 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); intro_my(); }
 
     break;
 
-  case 81:
-#line 587 "perly.y" /* yacc.c:1646  */
+  case 84:
+#line 584 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 82:
-#line 588 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 85:
+#line 585 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 83:
-#line 592 "perly.y" /* yacc.c:1646  */
+  case 86:
+#line 589 "perly.y" /* yacc.c:1648  */
     { (yyval.ival) = start_subparse(FALSE, 0);
 			    SAVEFREESV(PL_compcv); }
 
     break;
 
-  case 84:
-#line 598 "perly.y" /* yacc.c:1646  */
+  case 87:
+#line 595 "perly.y" /* yacc.c:1648  */
     { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
 			    SAVEFREESV(PL_compcv); }
 
     break;
 
-  case 85:
-#line 603 "perly.y" /* yacc.c:1646  */
+  case 88:
+#line 600 "perly.y" /* yacc.c:1648  */
     { (yyval.ival) = start_subparse(TRUE, 0);
 			    SAVEFREESV(PL_compcv); }
 
     break;
 
-  case 88:
-#line 614 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 91:
+#line 611 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 90:
-#line 620 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 93:
+#line 617 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 91:
-#line 622 "perly.y" /* yacc.c:1646  */
+  case 94:
+#line 619 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 92:
-#line 624 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 95:
+#line 621 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 93:
-#line 629 "perly.y" /* yacc.c:1646  */
+  case 96:
+#line 626 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 94:
-#line 631 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 97:
+#line 628 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 95:
-#line 642 "perly.y" /* yacc.c:1646  */
-    { parser->in_my = 0; (yyval.opval) = (OP*)NULL; }
+  case 98:
+#line 639 "perly.y" /* yacc.c:1648  */
+    { parser->in_my = 0; (yyval.opval) = NULL; }
 
     break;
 
-  case 96:
-#line 644 "perly.y" /* yacc.c:1646  */
+  case 99:
+#line 641 "perly.y" /* yacc.c:1648  */
     { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 97:
-#line 649 "perly.y" /* yacc.c:1646  */
+  case 100:
+#line 646 "perly.y" /* yacc.c:1648  */
     { (yyval.ival) = '@'; }
 
     break;
 
-  case 98:
-#line 651 "perly.y" /* yacc.c:1646  */
+  case 101:
+#line 648 "perly.y" /* yacc.c:1648  */
     { (yyval.ival) = '%'; }
 
     break;
 
-  case 99:
-#line 655 "perly.y" /* yacc.c:1646  */
+  case 102:
+#line 652 "perly.y" /* yacc.c:1648  */
     {
                             I32 sigil   = (ps[-2].val.ival);
                             OP *var     = (ps[-1].val.opval);
@@ -829,31 +830,31 @@ case 2:
                                 yyerror("A slurpy parameter may not have "
                                         "a default value");
 
-                            (yyval.opval) = var ? newSTATEOP(0, NULL, var) : (OP*)NULL;
+                            (yyval.opval) = var ? newSTATEOP(0, NULL, var) : NULL;
                         }
 
     break;
 
-  case 100:
-#line 674 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 103:
+#line 671 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 101:
-#line 676 "perly.y" /* yacc.c:1646  */
+  case 104:
+#line 673 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP(OP_NULL, 0); }
 
     break;
 
-  case 102:
-#line 678 "perly.y" /* yacc.c:1646  */
+  case 105:
+#line 675 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 103:
-#line 684 "perly.y" /* yacc.c:1646  */
+  case 106:
+#line 681 "perly.y" /* yacc.c:1648  */
     {
                             OP *var     = (ps[-1].val.opval);
                             OP *defexpr = (ps[0].val.opval);
@@ -912,57 +913,75 @@ case 2:
                                             "follows optional parameter");
                             }
 
-                            (yyval.opval) = var ? newSTATEOP(0, NULL, var) : (OP*)NULL;
+                            (yyval.opval) = var ? newSTATEOP(0, NULL, var) : NULL;
                         }
 
     break;
 
-  case 104:
-#line 749 "perly.y" /* yacc.c:1646  */
+  case 107:
+#line 746 "perly.y" /* yacc.c:1648  */
     { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 105:
-#line 751 "perly.y" /* yacc.c:1646  */
+  case 108:
+#line 748 "perly.y" /* yacc.c:1648  */
     { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 106:
-#line 757 "perly.y" /* yacc.c:1646  */
+  case 109:
+#line 754 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[-1].val.opval); }
 
     break;
 
-  case 107:
-#line 759 "perly.y" /* yacc.c:1646  */
+  case 110:
+#line 756 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-2].val.opval), (ps[0].val.opval));
 			}
 
     break;
 
-  case 108:
-#line 763 "perly.y" /* yacc.c:1646  */
+  case 111:
+#line 760 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 109:
-#line 768 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 112:
+#line 765 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 110:
-#line 770 "perly.y" /* yacc.c:1646  */
+  case 113:
+#line 767 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 111:
-#line 774 "perly.y" /* yacc.c:1646  */
+  case 114:
+#line 771 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
+
+    break;
+
+  case 115:
+#line 773 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
+    break;
+
+  case 116:
+#line 777 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = (ps[-1].val.opval); }
+
+    break;
+
+  case 117:
+#line 780 "perly.y" /* yacc.c:1648  */
     {
                             ENTER;
                             SAVEIV(parser->sig_elems);
@@ -976,75 +995,136 @@ case 2:
 
     break;
 
-  case 112:
-#line 786 "perly.y" /* yacc.c:1646  */
+  case 118:
+#line 791 "perly.y" /* yacc.c:1648  */
     {
-                            OP            *sigops = (ps[-1].val.opval);
-                            UNOP_AUX_item *aux;
+                            OP            *sigops = (ps[0].val.opval);
+                            struct op_argcheck_aux *aux;
                             OP            *check;
 
-                            assert(FEATURE_SIGNATURES_IS_ENABLED);
+			    if (!FEATURE_SIGNATURES_IS_ENABLED)
+			        Perl_croak(aTHX_ "Experimental "
+                                    "subroutine signatures not enabled");
 
                             /* We shouldn't get here otherwise */
                             Perl_ck_warner_d(aTHX_
                                 packWARN(WARN_EXPERIMENTAL__SIGNATURES),
                                 "The signatures feature is experimental");
 
-                            aux = (UNOP_AUX_item*)PerlMemShared_malloc(
-                                sizeof(UNOP_AUX_item) * 3);
-                            aux[0].iv = parser->sig_elems;
-                            aux[1].iv = parser->sig_optelems;
-                            aux[2].iv = parser->sig_slurpy;
-                            check = newUNOP_AUX(OP_ARGCHECK, 0, NULL, aux);
+                            aux = (struct op_argcheck_aux*)
+                                    PerlMemShared_malloc(
+                                        sizeof(struct op_argcheck_aux));
+                            aux->params     = parser->sig_elems;
+                            aux->opt_params = parser->sig_optelems;
+                            aux->slurpy     = parser->sig_slurpy;
+                            check = newUNOP_AUX(OP_ARGCHECK, 0, NULL,
+                                            (UNOP_AUX_item *)aux);
                             sigops = op_prepend_elem(OP_LINESEQ, check, sigops);
                             sigops = op_prepend_elem(OP_LINESEQ,
                                                 newSTATEOP(0, NULL, NULL),
                                                 sigops);
                             /* a nextstate at the end handles context
                              * correctly for an empty sub body */
-                            (yyval.opval) = op_append_elem(OP_LINESEQ,
+                            sigops = op_append_elem(OP_LINESEQ,
                                                 sigops,
                                                 newSTATEOP(0, NULL, NULL));
+                            /* wrap the list of arg ops in a NULL aux op.
+                              This serves two purposes. First, it makes
+                              the arg list a separate subtree from the
+                              body of the sub, and secondly the null op
+                              may in future be upgraded to an OP_SIGNATURE
+                              when implemented. For now leave it as
+                              ex-argcheck */
+                            (yyval.opval) = newUNOP_AUX(OP_ARGCHECK, 0, sigops, NULL);
+                            op_null((yyval.opval));
 
                             parser->in_my = 0;
+                            /* tell the toker that attrributes can follow
+                             * this sig, but only so that the toker
+                             * can skip through any (illegal) trailing
+                             * attribute text then give a useful error
+                             * message about "attributes before sig",
+                             * rather than falling over ina mess at
+                             * unrecognised syntax.
+                             */
                             parser->expect = XATTRBLOCK;
+                            parser->sig_seen = TRUE;
                             LEAVE;
 			}
 
     break;
 
-  case 114:
-#line 824 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 119:
+#line 848 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 115:
-#line 829 "perly.y" /* yacc.c:1646  */
+  case 120:
+#line 849 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
+
+    break;
+
+  case 121:
+#line 855 "perly.y" /* yacc.c:1648  */
+    {
+			  if (parser->copline > (line_t)(ps[-2].val.ival))
+			      parser->copline = (line_t)(ps[-2].val.ival);
+			  (yyval.opval) = block_end((ps[-3].val.ival), (ps[-1].val.opval));
+			}
+
+    break;
+
+  case 122:
+#line 865 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = (ps[0].val.opval); }
+
+    break;
+
+  case 123:
+#line 866 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
+
+    break;
+
+  case 124:
+#line 870 "perly.y" /* yacc.c:1648  */
+    {
+			  if (parser->copline > (line_t)(ps[-2].val.ival))
+			      parser->copline = (line_t)(ps[-2].val.ival);
+			  (yyval.opval) = block_end((ps[-4].val.ival),
+				op_append_list(OP_LINESEQ, (ps[-3].val.opval), (ps[-1].val.opval)));
+ 			}
+
+    break;
+
+  case 125:
+#line 881 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 116:
-#line 831 "perly.y" /* yacc.c:1646  */
+  case 126:
+#line 883 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 117:
-#line 833 "perly.y" /* yacc.c:1646  */
+  case 127:
+#line 885 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 119:
-#line 839 "perly.y" /* yacc.c:1646  */
+  case 129:
+#line 891 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[-1].val.opval); }
 
     break;
 
-  case 120:
-#line 841 "perly.y" /* yacc.c:1646  */
+  case 130:
+#line 893 "perly.y" /* yacc.c:1648  */
     {
 			  OP* term = (ps[0].val.opval);
 			  (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term);
@@ -1052,24 +1132,24 @@ case 2:
 
     break;
 
-  case 122:
-#line 850 "perly.y" /* yacc.c:1646  */
+  case 132:
+#line 902 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list((ps[-2].val.ival), OPf_STACKED,
 				op_prepend_elem(OP_LIST, newGVREF((ps[-2].val.ival),(ps[-1].val.opval)), (ps[0].val.opval)) );
 			}
 
     break;
 
-  case 123:
-#line 854 "perly.y" /* yacc.c:1646  */
+  case 133:
+#line 906 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list((ps[-4].val.ival), OPf_STACKED,
 				op_prepend_elem(OP_LIST, newGVREF((ps[-4].val.ival),(ps[-2].val.opval)), (ps[-1].val.opval)) );
 			}
 
     break;
 
-  case 124:
-#line 858 "perly.y" /* yacc.c:1646  */
+  case 134:
+#line 910 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, scalar((ps[-5].val.opval)), (ps[-1].val.opval)),
@@ -1078,8 +1158,8 @@ case 2:
 
     break;
 
-  case 125:
-#line 864 "perly.y" /* yacc.c:1646  */
+  case 135:
+#line 916 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST, scalar((ps[-2].val.opval)),
 				    newMETHOP(OP_METHOD, 0, (ps[0].val.opval))));
@@ -1087,8 +1167,8 @@ case 2:
 
     break;
 
-  case 126:
-#line 869 "perly.y" /* yacc.c:1646  */
+  case 136:
+#line 921 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)),
@@ -1097,8 +1177,8 @@ case 2:
 
     break;
 
-  case 127:
-#line 875 "perly.y" /* yacc.c:1646  */
+  case 137:
+#line 927 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
 				    op_prepend_elem(OP_LIST, (ps[-3].val.opval), (ps[-1].val.opval)),
@@ -1107,27 +1187,33 @@ case 2:
 
     break;
 
-  case 128:
-#line 881 "perly.y" /* yacc.c:1646  */
+  case 138:
+#line 933 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
-  case 129:
-#line 883 "perly.y" /* yacc.c:1646  */
+  case 139:
+#line 935 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
 
     break;
 
-  case 130:
-#line 885 "perly.y" /* yacc.c:1646  */
+  case 140:
+#line 937 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
+
+    break;
+
+  case 141:
+#line 939 "perly.y" /* yacc.c:1648  */
     { SvREFCNT_inc_simple_void(PL_compcv);
-			  (yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, (OP*)NULL, (ps[0].val.opval)); }
+			  (yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, NULL, (ps[0].val.opval)); }
 
     break;
 
-  case 131:
-#line 888 "perly.y" /* yacc.c:1646  */
+  case 142:
+#line 942 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				 op_append_elem(OP_LIST,
 				   op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)), (ps[-4].val.opval)));
@@ -1135,21 +1221,21 @@ case 2:
 
     break;
 
-  case 134:
-#line 903 "perly.y" /* yacc.c:1646  */
+  case 145:
+#line 957 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); }
 
     break;
 
-  case 135:
-#line 905 "perly.y" /* yacc.c:1646  */
+  case 146:
+#line 959 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval)));
 			}
 
     break;
 
-  case 136:
-#line 908 "perly.y" /* yacc.c:1646  */
+  case 147:
+#line 962 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((ps[-4].val.opval)),OP_RV2AV),
 					scalar((ps[-1].val.opval)));
@@ -1157,8 +1243,8 @@ case 2:
 
     break;
 
-  case 137:
-#line 913 "perly.y" /* yacc.c:1646  */
+  case 148:
+#line 967 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((ps[-3].val.opval)),OP_RV2AV),
 					scalar((ps[-1].val.opval)));
@@ -1166,91 +1252,103 @@ case 2:
 
     break;
 
-  case 138:
-#line 918 "perly.y" /* yacc.c:1646  */
+  case 149:
+#line 972 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval)));
 			}
 
     break;
 
-  case 139:
-#line 921 "perly.y" /* yacc.c:1646  */
+  case 150:
+#line 975 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((ps[-5].val.opval)),OP_RV2HV),
 					jmaybe((ps[-2].val.opval))); }
 
     break;
 
-  case 140:
-#line 925 "perly.y" /* yacc.c:1646  */
+  case 151:
+#line 979 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((ps[-4].val.opval)),OP_RV2HV),
 					jmaybe((ps[-2].val.opval))); }
 
     break;
 
-  case 141:
-#line 929 "perly.y" /* yacc.c:1646  */
+  case 152:
+#line 983 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   newCVREF(0, scalar((ps[-3].val.opval)))); }
+				   newCVREF(0, scalar((ps[-3].val.opval))));
+			  if (parser->expect == XBLOCK)
+			      parser->expect = XOPERATOR;
+			}
 
     break;
 
-  case 142:
-#line 932 "perly.y" /* yacc.c:1646  */
+  case 153:
+#line 989 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   op_append_elem(OP_LIST, (ps[-1].val.opval),
-				       newCVREF(0, scalar((ps[-4].val.opval))))); }
+				       newCVREF(0, scalar((ps[-4].val.opval)))));
+			  if (parser->expect == XBLOCK)
+			      parser->expect = XOPERATOR;
+			}
 
     break;
 
-  case 143:
-#line 937 "perly.y" /* yacc.c:1646  */
+  case 154:
+#line 997 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   op_append_elem(OP_LIST, (ps[-1].val.opval),
-					       newCVREF(0, scalar((ps[-3].val.opval))))); }
+					       newCVREF(0, scalar((ps[-3].val.opval)))));
+			  if (parser->expect == XBLOCK)
+			      parser->expect = XOPERATOR;
+			}
 
     break;
 
-  case 144:
-#line 941 "perly.y" /* yacc.c:1646  */
+  case 155:
+#line 1004 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   newCVREF(0, scalar((ps[-2].val.opval)))); }
+				   newCVREF(0, scalar((ps[-2].val.opval))));
+			  if (parser->expect == XBLOCK)
+			      parser->expect = XOPERATOR;
+			}
 
     break;
 
-  case 145:
-#line 944 "perly.y" /* yacc.c:1646  */
+  case 156:
+#line 1010 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); }
 
     break;
 
-  case 146:
-#line 946 "perly.y" /* yacc.c:1646  */
+  case 157:
+#line 1012 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); }
 
     break;
 
-  case 147:
-#line 948 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (OP*)NULL); }
+  case 158:
+#line 1014 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), NULL); }
 
     break;
 
-  case 148:
-#line 953 "perly.y" /* yacc.c:1646  */
+  case 159:
+#line 1019 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); }
 
     break;
 
-  case 149:
-#line 955 "perly.y" /* yacc.c:1646  */
+  case 160:
+#line 1021 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
-  case 150:
-#line 957 "perly.y" /* yacc.c:1646  */
+  case 161:
+#line 1023 "perly.y" /* yacc.c:1648  */
     {   if ((ps[-1].val.ival) != OP_REPEAT)
 				scalar((ps[-2].val.opval));
 			    (yyval.opval) = newBINOP((ps[-1].val.ival), 0, (ps[-2].val.opval), scalar((ps[0].val.opval)));
@@ -1258,112 +1356,112 @@ case 2:
 
     break;
 
-  case 151:
-#line 962 "perly.y" /* yacc.c:1646  */
+  case 162:
+#line 1028 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
-  case 152:
-#line 964 "perly.y" /* yacc.c:1646  */
+  case 163:
+#line 1030 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
-  case 153:
-#line 966 "perly.y" /* yacc.c:1646  */
+  case 164:
+#line 1032 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
-  case 154:
-#line 968 "perly.y" /* yacc.c:1646  */
+  case 165:
+#line 1034 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
-  case 155:
-#line 970 "perly.y" /* yacc.c:1646  */
+  case 166:
+#line 1036 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
-  case 156:
-#line 972 "perly.y" /* yacc.c:1646  */
+  case 167:
+#line 1038 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
-  case 157:
-#line 974 "perly.y" /* yacc.c:1646  */
+  case 168:
+#line 1040 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
 
     break;
 
-  case 158:
-#line 976 "perly.y" /* yacc.c:1646  */
+  case 169:
+#line 1042 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 159:
-#line 978 "perly.y" /* yacc.c:1646  */
+  case 170:
+#line 1044 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 160:
-#line 980 "perly.y" /* yacc.c:1646  */
+  case 171:
+#line 1046 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 161:
-#line 982 "perly.y" /* yacc.c:1646  */
+  case 172:
+#line 1048 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 162:
-#line 987 "perly.y" /* yacc.c:1646  */
+  case 173:
+#line 1053 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 163:
-#line 989 "perly.y" /* yacc.c:1646  */
+  case 174:
+#line 1055 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 164:
-#line 992 "perly.y" /* yacc.c:1646  */
+  case 175:
+#line 1058 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 165:
-#line 994 "perly.y" /* yacc.c:1646  */
+  case 176:
+#line 1060 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 166:
-#line 996 "perly.y" /* yacc.c:1646  */
+  case 177:
+#line 1062 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
 					op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); }
 
     break;
 
-  case 167:
-#line 999 "perly.y" /* yacc.c:1646  */
+  case 178:
+#line 1065 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
 					op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));}
 
     break;
 
-  case 168:
-#line 1002 "perly.y" /* yacc.c:1646  */
+  case 179:
+#line 1068 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_convert_list(OP_JOIN, 0,
 				       op_append_elem(
 					OP_LIST,
@@ -1377,163 +1475,156 @@ case 2:
 
     break;
 
-  case 169:
-#line 1013 "perly.y" /* yacc.c:1646  */
+  case 180:
+#line 1079 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
 					op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); }
 
     break;
 
-  case 170:
-#line 1016 "perly.y" /* yacc.c:1646  */
+  case 181:
+#line 1082 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
 					op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); }
 
     break;
 
-  case 171:
-#line 1023 "perly.y" /* yacc.c:1646  */
+  case 182:
+#line 1089 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newANONLIST((ps[-1].val.opval)); }
 
     break;
 
-  case 172:
-#line 1025 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newANONLIST((OP*)NULL);}
+  case 183:
+#line 1091 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = newANONLIST(NULL);}
 
     break;
 
-  case 173:
-#line 1027 "perly.y" /* yacc.c:1646  */
+  case 184:
+#line 1093 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newANONHASH((ps[-2].val.opval)); }
 
     break;
 
-  case 174:
-#line 1029 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newANONHASH((OP*)NULL); }
+  case 185:
+#line 1095 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = newANONHASH(NULL); }
 
     break;
 
-  case 175:
-#line 1031 "perly.y" /* yacc.c:1646  */
+  case 186:
+#line 1097 "perly.y" /* yacc.c:1648  */
     { SvREFCNT_inc_simple_void(PL_compcv);
 			  (yyval.opval) = newANONATTRSUB((ps[-3].val.ival), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 176:
-#line 1034 "perly.y" /* yacc.c:1646  */
-    {
-			  OP *body;
-			  if (parser->copline > (line_t)(ps[-2].val.ival))
-			      parser->copline = (line_t)(ps[-2].val.ival);
-			  body = block_end((ps[-5].val.ival),
-				op_append_list(OP_LINESEQ, (ps[-4].val.opval), (ps[-1].val.opval)));
-			  SvREFCNT_inc_simple_void(PL_compcv);
-			  (yyval.opval) = newANONATTRSUB((ps[-6].val.ival), NULL, (ps[-3].val.opval), body);
-			}
+  case 187:
+#line 1100 "perly.y" /* yacc.c:1648  */
+    { SvREFCNT_inc_simple_void(PL_compcv);
+			  (yyval.opval) = newANONATTRSUB((ps[-2].val.ival), NULL, (ps[-1].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 177:
-#line 1048 "perly.y" /* yacc.c:1646  */
+  case 188:
+#line 1106 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}
 
     break;
 
-  case 178:
-#line 1050 "perly.y" /* yacc.c:1646  */
+  case 189:
+#line 1108 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));}
 
     break;
 
-  case 183:
-#line 1058 "perly.y" /* yacc.c:1646  */
+  case 194:
+#line 1116 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); }
 
     break;
 
-  case 184:
-#line 1060 "perly.y" /* yacc.c:1646  */
+  case 195:
+#line 1118 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }
 
     break;
 
-  case 185:
-#line 1062 "perly.y" /* yacc.c:1646  */
+  case 196:
+#line 1120 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }
 
     break;
 
-  case 186:
-#line 1064 "perly.y" /* yacc.c:1646  */
+  case 197:
+#line 1122 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 187:
-#line 1066 "perly.y" /* yacc.c:1646  */
+  case 198:
+#line 1124 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = localize((ps[0].val.opval),0); }
 
     break;
 
-  case 188:
-#line 1068 "perly.y" /* yacc.c:1646  */
+  case 199:
+#line 1126 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = sawparens((ps[-1].val.opval)); }
 
     break;
 
-  case 189:
-#line 1070 "perly.y" /* yacc.c:1646  */
+  case 200:
+#line 1128 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 190:
-#line 1072 "perly.y" /* yacc.c:1646  */
+  case 201:
+#line 1130 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = sawparens(newNULLLIST()); }
 
     break;
 
-  case 191:
-#line 1074 "perly.y" /* yacc.c:1646  */
+  case 202:
+#line 1132 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 192:
-#line 1076 "perly.y" /* yacc.c:1646  */
+  case 203:
+#line 1134 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 193:
-#line 1078 "perly.y" /* yacc.c:1646  */
+  case 204:
+#line 1136 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 194:
-#line 1080 "perly.y" /* yacc.c:1646  */
+  case 205:
+#line 1138 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 195:
-#line 1082 "perly.y" /* yacc.c:1646  */
+  case 206:
+#line 1140 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));}
 
     break;
 
-  case 196:
-#line 1084 "perly.y" /* yacc.c:1646  */
+  case 207:
+#line 1142 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 197:
-#line 1086 "perly.y" /* yacc.c:1646  */
+  case 208:
+#line 1144 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_prepend_elem(OP_ASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_ASLICE, 0,
@@ -1546,8 +1637,8 @@ case 2:
 
     break;
 
-  case 198:
-#line 1096 "perly.y" /* yacc.c:1646  */
+  case 209:
+#line 1154 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_prepend_elem(OP_KVASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_KVASLICE, 0,
@@ -1560,8 +1651,8 @@ case 2:
 
     break;
 
-  case 199:
-#line 1106 "perly.y" /* yacc.c:1646  */
+  case 210:
+#line 1164 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_prepend_elem(OP_HSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_HSLICE, 0,
@@ -1574,8 +1665,8 @@ case 2:
 
     break;
 
-  case 200:
-#line 1116 "perly.y" /* yacc.c:1646  */
+  case 211:
+#line 1174 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_prepend_elem(OP_KVHSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_KVHSLICE, 0,
@@ -1588,27 +1679,27 @@ case 2:
 
     break;
 
-  case 201:
-#line 1126 "perly.y" /* yacc.c:1646  */
+  case 212:
+#line 1184 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 202:
-#line 1128 "perly.y" /* yacc.c:1646  */
+  case 213:
+#line 1186 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 203:
-#line 1130 "perly.y" /* yacc.c:1646  */
+  case 214:
+#line 1188 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval)));
 			}
 
     break;
 
-  case 204:
-#line 1133 "perly.y" /* yacc.c:1646  */
+  case 215:
+#line 1191 "perly.y" /* yacc.c:1648  */
     {
 			  (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval))));
@@ -1616,153 +1707,153 @@ case 2:
 
     break;
 
-  case 205:
-#line 1138 "perly.y" /* yacc.c:1646  */
+  case 216:
+#line 1196 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval))));
 			}
 
     break;
 
-  case 206:
-#line 1142 "perly.y" /* yacc.c:1646  */
+  case 217:
+#line 1200 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newSVREF((ps[-3].val.opval)); }
 
     break;
 
-  case 207:
-#line 1144 "perly.y" /* yacc.c:1646  */
+  case 218:
+#line 1202 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
 
     break;
 
-  case 208:
-#line 1146 "perly.y" /* yacc.c:1646  */
+  case 219:
+#line 1204 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newHVREF((ps[-3].val.opval)); }
 
     break;
 
-  case 209:
-#line 1148 "perly.y" /* yacc.c:1646  */
+  case 220:
+#line 1206 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
 				       scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); }
 
     break;
 
-  case 210:
-#line 1151 "perly.y" /* yacc.c:1646  */
+  case 221:
+#line 1209 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); }
 
     break;
 
-  case 211:
-#line 1153 "perly.y" /* yacc.c:1646  */
+  case 222:
+#line 1211 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL);
 			    PL_hints |= HINT_BLOCK_SCOPE; }
 
     break;
 
-  case 212:
-#line 1156 "perly.y" /* yacc.c:1646  */
+  case 223:
+#line 1214 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); }
 
     break;
 
-  case 213:
-#line 1158 "perly.y" /* yacc.c:1646  */
+  case 224:
+#line 1216 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 214:
-#line 1160 "perly.y" /* yacc.c:1646  */
+  case 225:
+#line 1218 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP((ps[0].val.ival), 0); }
 
     break;
 
-  case 215:
-#line 1162 "perly.y" /* yacc.c:1646  */
+  case 226:
+#line 1220 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
-  case 216:
-#line 1164 "perly.y" /* yacc.c:1646  */
+  case 227:
+#line 1222 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
 
     break;
 
-  case 217:
-#line 1166 "perly.y" /* yacc.c:1646  */
+  case 228:
+#line 1224 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); }
 
     break;
 
-  case 218:
-#line 1168 "perly.y" /* yacc.c:1646  */
+  case 229:
+#line 1226 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); }
 
     break;
 
-  case 219:
-#line 1170 "perly.y" /* yacc.c:1646  */
+  case 230:
+#line 1228 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 220:
-#line 1172 "perly.y" /* yacc.c:1646  */
+  case 231:
+#line 1230 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); }
 
     break;
 
-  case 221:
-#line 1175 "perly.y" /* yacc.c:1646  */
+  case 232:
+#line 1233 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP((ps[0].val.ival), 0); }
 
     break;
 
-  case 222:
-#line 1177 "perly.y" /* yacc.c:1646  */
+  case 233:
+#line 1235 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newOP((ps[-2].val.ival), 0);}
 
     break;
 
-  case 223:
-#line 1179 "perly.y" /* yacc.c:1646  */
+  case 234:
+#line 1237 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 224:
-#line 1181 "perly.y" /* yacc.c:1646  */
+  case 235:
+#line 1239 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[-2].val.opval); }
 
     break;
 
-  case 225:
-#line 1183 "perly.y" /* yacc.c:1646  */
+  case 236:
+#line 1241 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
 
     break;
 
-  case 226:
-#line 1185 "perly.y" /* yacc.c:1646  */
+  case 237:
+#line 1243 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = ((ps[-2].val.ival) == OP_NOT)
                           ? newUNOP((ps[-2].val.ival), 0, newSVOP(OP_CONST, 0, newSViv(0)))
                           : newOP((ps[-2].val.ival), OPf_SPECIAL); }
 
     break;
 
-  case 227:
-#line 1189 "perly.y" /* yacc.c:1646  */
+  case 238:
+#line 1247 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
 
     break;
 
-  case 228:
-#line 1191 "perly.y" /* yacc.c:1646  */
+  case 239:
+#line 1249 "perly.y" /* yacc.c:1648  */
     {
 			    if (   (ps[0].val.opval)->op_type != OP_TRANS
 			        && (ps[0].val.opval)->op_type != OP_TRANSR
@@ -1776,195 +1867,186 @@ case 2:
 
     break;
 
-  case 229:
-#line 1202 "perly.y" /* yacc.c:1646  */
+  case 240:
+#line 1260 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); }
 
     break;
 
-  case 232:
-#line 1206 "perly.y" /* yacc.c:1646  */
-    {
-			  (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
-				newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
-			}
-
-    break;
-
-  case 234:
-#line 1215 "perly.y" /* yacc.c:1646  */
+  case 244:
+#line 1268 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); }
 
     break;
 
-  case 235:
-#line 1217 "perly.y" /* yacc.c:1646  */
+  case 245:
+#line 1270 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = localize((ps[0].val.opval),1); }
 
     break;
 
-  case 236:
-#line 1219 "perly.y" /* yacc.c:1646  */
+  case 246:
+#line 1272 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); }
 
     break;
 
-  case 237:
-#line 1224 "perly.y" /* yacc.c:1646  */
+  case 247:
+#line 1277 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = sawparens((ps[-1].val.opval)); }
 
     break;
 
-  case 238:
-#line 1226 "perly.y" /* yacc.c:1646  */
+  case 248:
+#line 1279 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = sawparens(newNULLLIST()); }
 
     break;
 
-  case 239:
-#line 1229 "perly.y" /* yacc.c:1646  */
+  case 249:
+#line 1282 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 240:
-#line 1231 "perly.y" /* yacc.c:1646  */
+  case 250:
+#line 1284 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 241:
-#line 1233 "perly.y" /* yacc.c:1646  */
+  case 251:
+#line 1286 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 242:
-#line 1238 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 252:
+#line 1291 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 243:
-#line 1240 "perly.y" /* yacc.c:1646  */
+  case 253:
+#line 1293 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 244:
-#line 1244 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 254:
+#line 1297 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 245:
-#line 1246 "perly.y" /* yacc.c:1646  */
+  case 255:
+#line 1299 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 246:
-#line 1250 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
+  case 256:
+#line 1303 "perly.y" /* yacc.c:1648  */
+    { (yyval.opval) = NULL; }
 
     break;
 
-  case 247:
-#line 1252 "perly.y" /* yacc.c:1646  */
+  case 257:
+#line 1305 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
 
-  case 248:
-#line 1258 "perly.y" /* yacc.c:1646  */
+  case 258:
+#line 1311 "perly.y" /* yacc.c:1648  */
     { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
 
     break;
 
-  case 256:
-#line 1275 "perly.y" /* yacc.c:1646  */
+  case 266:
+#line 1328 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); }
 
     break;
 
-  case 257:
-#line 1279 "perly.y" /* yacc.c:1646  */
+  case 267:
+#line 1332 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newSVREF((ps[0].val.opval)); }
 
     break;
 
-  case 258:
-#line 1283 "perly.y" /* yacc.c:1646  */
+  case 268:
+#line 1336 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[0].val.opval));
 			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
 			}
 
     break;
 
-  case 259:
-#line 1289 "perly.y" /* yacc.c:1646  */
+  case 269:
+#line 1342 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newHVREF((ps[0].val.opval));
 			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
 			}
 
     break;
 
-  case 260:
-#line 1295 "perly.y" /* yacc.c:1646  */
+  case 270:
+#line 1348 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[0].val.opval)); }
 
     break;
 
-  case 261:
-#line 1297 "perly.y" /* yacc.c:1646  */
+  case 271:
+#line 1350 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
 
     break;
 
-  case 262:
-#line 1301 "perly.y" /* yacc.c:1646  */
+  case 272:
+#line 1354 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); }
 
     break;
 
-  case 264:
-#line 1306 "perly.y" /* yacc.c:1646  */
+  case 274:
+#line 1359 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newAVREF((ps[-2].val.opval)); }
 
     break;
 
-  case 266:
-#line 1311 "perly.y" /* yacc.c:1646  */
+  case 276:
+#line 1364 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newHVREF((ps[-2].val.opval)); }
 
     break;
 
-  case 268:
-#line 1316 "perly.y" /* yacc.c:1646  */
+  case 278:
+#line 1369 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); }
 
     break;
 
-  case 269:
-#line 1321 "perly.y" /* yacc.c:1646  */
+  case 279:
+#line 1374 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = scalar((ps[0].val.opval)); }
 
     break;
 
-  case 270:
-#line 1323 "perly.y" /* yacc.c:1646  */
+  case 280:
+#line 1376 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = scalar((ps[0].val.opval)); }
 
     break;
 
-  case 271:
-#line 1325 "perly.y" /* yacc.c:1646  */
+  case 281:
+#line 1378 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = op_scope((ps[0].val.opval)); }
 
     break;
 
-  case 272:
-#line 1328 "perly.y" /* yacc.c:1646  */
+  case 282:
+#line 1381 "perly.y" /* yacc.c:1648  */
     { (yyval.opval) = (ps[0].val.opval); }
 
     break;
@@ -1975,6 +2057,6 @@ case 2:
     
 
 /* Generated from:
- * 1a8fc0f841dee6e563463a6b91bf9c410b47437c760f485a16d87ade3d66bf1d perly.y
- * 3e1dff60f26df8933d7aed0c0e87177a0f022c14800c0707eb62a7db4196ac98 regen_perly.pl
+ * c522864236e07231c0a218cecf8cdcd82b74ce082b72f10199de4deeff580100 perly.y
+ * 0947213b55d0ed11693554bea04987e886cf285f5c14cf9075fa1e7acc3f4061 regen_perly.pl
  * ex: set ro: */