X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.act;h=cb1d67db0e2aab15a9fbcfb8f1431696e9549c13;hb=ab45a0fa26b7a5ed9c49aa02ce422deee5e12a05;hp=877fa0716622bab751e1f548f60436cb5bc85af8;hpb=a034e688aeb372632feafc428b392a22393dec55;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perly.act b/perly.act
index 877fa07..cb1d67d 100644
--- a/perly.act
+++ b/perly.act
@@ -1,1047 +1,1615 @@
 case 2:
-#line 97 "perly.y"
-    { yyval.ival = yyvsp[-1].ival; newPROG(block_end(yyvsp[-1].ival,yyvsp[0].opval)); ;}
+#line 142 "perly.y"
+    { (yyval.ival) = (ps[(1) - (2)].val.ival); newPROG(block_end((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval))); ;}
     break;
 
   case 3:
-#line 102 "perly.y"
-    { if (PL_copline > (line_t)yyvsp[-3].ival)
-			      PL_copline = (line_t)yyvsp[-3].ival;
-			  yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); ;}
+#line 147 "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));
+			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}');
+			;}
     break;
 
   case 4:
-#line 108 "perly.y"
-    { yyval.ival = block_start(TRUE); ;}
+#line 156 "perly.y"
+    { (yyval.ival) = block_start(TRUE); ;}
     break;
 
   case 5:
-#line 112 "perly.y"
-    {
-		    PL_expect = XSTATE; yyval.ival = block_start(TRUE);
-		;}
+#line 160 "perly.y"
+    { (yyval.ival) = (I32) allocmy("$_"); ;}
     break;
 
   case 6:
-#line 119 "perly.y"
-    { if (PL_copline > (line_t)yyvsp[-3].ival)
-			      PL_copline = (line_t)yyvsp[-3].ival;
-			  yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); ;}
+#line 164 "perly.y"
+    {
+		    PL_parser->expect = XSTATE; (yyval.ival) = block_start(TRUE);
+		;}
     break;
 
   case 7:
-#line 125 "perly.y"
-    { yyval.ival = block_start(FALSE); ;}
+#line 171 "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));
+			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}');
+			;}
     break;
 
   case 8:
-#line 129 "perly.y"
-    { yyval.ival = PL_savestack_ix; ;}
+#line 180 "perly.y"
+    { (yyval.ival) = block_start(FALSE); ;}
     break;
 
   case 9:
-#line 133 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 185 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 10:
-#line 135 "perly.y"
-    { yyval.opval = yyvsp[-1].opval; ;}
+#line 187 "perly.y"
+    {
+			(yyval.opval) = IF_MAD(
+				append_list(OP_LINESEQ,
+			    	    (LISTOP*)(ps[(1) - (2)].val.opval), (LISTOP*)(ps[(2) - (2)].val.opval)),
+				(ps[(1) - (2)].val.opval));
+			;}
     break;
 
   case 11:
-#line 137 "perly.y"
-    {   LEAVE_SCOPE(yyvsp[-1].ival);
-			    yyval.opval = append_list(OP_LINESEQ,
-				(LISTOP*)yyvsp[-2].opval, (LISTOP*)yyvsp[0].opval);
+#line 194 "perly.y"
+    {   (yyval.opval) = append_list(OP_LINESEQ,
+				(LISTOP*)(ps[(1) - (2)].val.opval), (LISTOP*)(ps[(2) - (2)].val.opval));
 			    PL_pad_reset_pending = TRUE;
-			    if (yyvsp[-2].opval && yyvsp[0].opval) PL_hints |= HINT_BLOCK_SCOPE; ;}
+			    if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
+				PL_hints |= HINT_BLOCK_SCOPE;
+			;}
     break;
 
   case 12:
-#line 146 "perly.y"
-    { yyval.opval = newSTATEOP(0, yyvsp[-1].pval, yyvsp[0].opval); ;}
+#line 204 "perly.y"
+    { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;}
     break;
 
   case 14:
-#line 149 "perly.y"
-    { if (yyvsp[-1].pval != Nullch) {
-			      yyval.opval = newSTATEOP(0, yyvsp[-1].pval, newOP(OP_NULL, 0));
-			    }
-			    else {
-			      yyval.opval = Nullop;
-			      PL_copline = NOLINE;
-			    }
-			    PL_expect = XSTATE; ;}
+#line 208 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 15:
-#line 158 "perly.y"
-    { yyval.opval = newSTATEOP(0, yyvsp[-2].pval, yyvsp[-1].opval);
-			  PL_expect = XSTATE; ;}
+#line 210 "perly.y"
+    { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 16:
-#line 164 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 212 "perly.y"
+    {
+			  if (PVAL((ps[(1) - (2)].val.p_tkval))) {
+			      (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), newOP(OP_NULL, 0));
+			      TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval),(yyval.opval),'L');
+			      TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),((LISTOP*)(yyval.opval))->op_first,';');
+			  }
+			  else {
+			      (yyval.opval) = IF_MAD(
+					newOP(OP_NULL, 0),
+					(OP*)NULL);
+                              PL_parser->copline = NOLINE;
+			      TOKEN_FREE((ps[(1) - (2)].val.p_tkval));
+			      TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),';');
+			  }
+			  PL_parser->expect = XSTATE;
+			;}
     break;
 
   case 17:
-#line 166 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 229 "perly.y"
+    {
+			  (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)), (ps[(2) - (3)].val.opval));
+			  PL_parser->expect = XSTATE;
+			  DO_MAD({
+			      /* sideff might already have a nexstate */
+			      OP* op = ((LISTOP*)(yyval.opval))->op_first;
+			      if (op) {
+				  while (op->op_sibling &&
+				     op->op_sibling->op_type == OP_NEXTSTATE)
+					op = op->op_sibling;
+				  token_getmad((ps[(1) - (3)].val.p_tkval),op,'L');
+				  token_getmad((ps[(3) - (3)].val.i_tkval),op,';');
+			      }
+			  })
+			;}
     break;
 
   case 18:
-#line 168 "perly.y"
-    { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[0].opval, yyvsp[-2].opval); ;}
+#line 248 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 19:
-#line 170 "perly.y"
-    { yyval.opval = newLOGOP(OP_OR, 0, yyvsp[0].opval, yyvsp[-2].opval); ;}
+#line 250 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 20:
-#line 172 "perly.y"
-    { yyval.opval = newLOOPOP(OPf_PARENS, 1, scalar(yyvsp[0].opval), yyvsp[-2].opval); ;}
+#line 252 "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 21:
-#line 174 "perly.y"
-    { yyval.opval = newLOOPOP(OPf_PARENS, 1, yyvsp[0].opval, yyvsp[-2].opval);;}
+#line 256 "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 22:
-#line 176 "perly.y"
-    { yyval.opval = newFOROP(0, Nullch, (line_t)yyvsp[-1].ival,
-					Nullop, yyvsp[0].opval, yyvsp[-2].opval, Nullop); ;}
+#line 260 "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 23:
-#line 182 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 264 "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 24:
-#line 184 "perly.y"
-    { (yyvsp[0].opval)->op_flags |= OPf_PARENS; yyval.opval = scope(yyvsp[0].opval); ;}
+#line 268 "perly.y"
+    { (yyval.opval) = newFOROP(0, NULL, (line_t)IVAL((ps[(2) - (3)].val.i_tkval)),
+					(OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL);
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w');
+			;}
     break;
 
   case 25:
-#line 186 "perly.y"
-    { PL_copline = (line_t)yyvsp[-5].ival;
-			    yyval.opval = newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval);
-			    PL_hints |= HINT_BLOCK_SCOPE; ;}
+#line 273 "perly.y"
+    { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), scope((ps[(1) - (3)].val.opval))); ;}
     break;
 
   case 26:
-#line 193 "perly.y"
-    { PL_copline = (line_t)yyvsp[-6].ival;
-			    yyval.opval = block_end(yyvsp[-4].ival,
-				   newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); ;}
+#line 278 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 27:
-#line 197 "perly.y"
-    { PL_copline = (line_t)yyvsp[-6].ival;
-			    yyval.opval = block_end(yyvsp[-4].ival,
-				   newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); ;}
+#line 280 "perly.y"
+    { ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = scope((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 28:
-#line 204 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 284 "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)), scope((ps[(5) - (6)].val.opval)), (ps[(6) - (6)].val.opval));
+			    PL_hints |= HINT_BLOCK_SCOPE;
+			  TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'I');
+			  TOKEN_GETMAD((ps[(2) - (6)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(4) - (6)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 29:
-#line 206 "perly.y"
-    { yyval.opval = scope(yyvsp[0].opval); ;}
+#line 295 "perly.y"
+    { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
+			    (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
+				   newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
+			  TOKEN_GETMAD((ps[(1) - (7)].val.i_tkval),(yyval.opval),'I');
+			  TOKEN_GETMAD((ps[(2) - (7)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(5) - (7)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 30:
-#line 211 "perly.y"
-    { PL_copline = (line_t)yyvsp[-7].ival;
-			    yyval.opval = block_end(yyvsp[-5].ival,
-				   newSTATEOP(0, yyvsp[-8].pval,
-				     newWHILEOP(0, 1, (LOOP*)Nullop,
-						yyvsp[-7].ival, yyvsp[-4].opval, yyvsp[-1].opval, yyvsp[0].opval, yyvsp[-2].ival))); ;}
+#line 303 "perly.y"
+    { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
+			    (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
+				   newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
+			  TOKEN_GETMAD((ps[(1) - (7)].val.i_tkval),(yyval.opval),'I');
+			  TOKEN_GETMAD((ps[(2) - (7)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(5) - (7)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 31:
-#line 217 "perly.y"
-    { PL_copline = (line_t)yyvsp[-7].ival;
-			    yyval.opval = block_end(yyvsp[-5].ival,
-				   newSTATEOP(0, yyvsp[-8].pval,
-				     newWHILEOP(0, 1, (LOOP*)Nullop,
-						yyvsp[-7].ival, yyvsp[-4].opval, yyvsp[-1].opval, yyvsp[0].opval, yyvsp[-2].ival))); ;}
+#line 314 "perly.y"
+    { (yyval.opval) = block_end((ps[(3) - (6)].val.ival),
+		newWHENOP((ps[(4) - (6)].val.opval), scope((ps[(6) - (6)].val.opval)))); ;}
     break;
 
   case 32:
-#line 223 "perly.y"
-    { yyval.opval = block_end(yyvsp[-6].ival,
-				 newFOROP(0, yyvsp[-9].pval, (line_t)yyvsp[-8].ival, yyvsp[-5].opval, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); ;}
+#line 317 "perly.y"
+    { (yyval.opval) = newWHENOP(0, scope((ps[(2) - (2)].val.opval))); ;}
     break;
 
   case 33:
-#line 226 "perly.y"
-    { yyval.opval = block_end(yyvsp[-4].ival,
-				 newFOROP(0, yyvsp[-8].pval, (line_t)yyvsp[-7].ival, mod(yyvsp[-6].opval, OP_ENTERLOOP),
-					  yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); ;}
+#line 322 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 34:
-#line 230 "perly.y"
-    { yyval.opval = block_end(yyvsp[-4].ival,
-				 newFOROP(0, yyvsp[-7].pval, (line_t)yyvsp[-6].ival, Nullop, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); ;}
+#line 324 "perly.y"
+    { (yyval.opval) = scope((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 35:
-#line 235 "perly.y"
-    { OP *forop;
-			  PL_copline = (line_t)yyvsp[-10].ival;
-			  forop = newSTATEOP(0, yyvsp[-11].pval,
-					    newWHILEOP(0, 1, (LOOP*)Nullop,
-						yyvsp[-10].ival, scalar(yyvsp[-5].opval),
-						yyvsp[0].opval, yyvsp[-2].opval, yyvsp[-3].ival));
-			  if (yyvsp[-7].opval) {
-				forop = append_elem(OP_LINESEQ,
-                                        newSTATEOP(0, (yyvsp[-11].pval?savepv(yyvsp[-11].pval):Nullch),
-						   yyvsp[-7].opval),
-					forop);
-			  }
-
-			  yyval.opval = block_end(yyvsp[-8].ival, forop); ;}
+#line 331 "perly.y"
+    { OP *innerop;
+			  PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval);
+			    (yyval.opval) = block_end((ps[(4) - (9)].val.ival),
+				   newSTATEOP(0, PVAL((ps[(1) - (9)].val.p_tkval)),
+				     innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+						IVAL((ps[(2) - (9)].val.i_tkval)), (ps[(5) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval), (ps[(7) - (9)].val.ival))));
+			  TOKEN_GETMAD((ps[(1) - (9)].val.p_tkval),innerop,'L');
+			  TOKEN_GETMAD((ps[(2) - (9)].val.i_tkval),innerop,'W');
+			  TOKEN_GETMAD((ps[(3) - (9)].val.i_tkval),innerop,'(');
+			  TOKEN_GETMAD((ps[(6) - (9)].val.i_tkval),innerop,')');
+			;}
     break;
 
   case 36:
-#line 250 "perly.y"
-    { yyval.opval = newSTATEOP(0, yyvsp[-2].pval,
-				 newWHILEOP(0, 1, (LOOP*)Nullop,
-					    NOLINE, Nullop, yyvsp[-1].opval, yyvsp[0].opval, 0)); ;}
+#line 344 "perly.y"
+    { OP *innerop;
+			  PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval);
+			    (yyval.opval) = block_end((ps[(4) - (9)].val.ival),
+				   newSTATEOP(0, PVAL((ps[(1) - (9)].val.p_tkval)),
+				     innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+						IVAL((ps[(2) - (9)].val.i_tkval)), (ps[(5) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval), (ps[(7) - (9)].val.ival))));
+			  TOKEN_GETMAD((ps[(1) - (9)].val.p_tkval),innerop,'L');
+			  TOKEN_GETMAD((ps[(2) - (9)].val.i_tkval),innerop,'W');
+			  TOKEN_GETMAD((ps[(3) - (9)].val.i_tkval),innerop,'(');
+			  TOKEN_GETMAD((ps[(6) - (9)].val.i_tkval),innerop,')');
+			;}
     break;
 
   case 37:
-#line 257 "perly.y"
-    { yyval.ival = (PL_min_intro_pending &&
-			    PL_max_intro_pending >=  PL_min_intro_pending);
-			  intro_my(); ;}
+#line 356 "perly.y"
+    { OP *innerop;
+			  (yyval.opval) = block_end((ps[(4) - (10)].val.ival),
+			     innerop = newFOROP(0, PVAL((ps[(1) - (10)].val.p_tkval)), (line_t)IVAL((ps[(2) - (10)].val.i_tkval)),
+					    (ps[(5) - (10)].val.opval), (ps[(7) - (10)].val.opval), (ps[(9) - (10)].val.opval), (ps[(10) - (10)].val.opval)));
+			  TOKEN_GETMAD((ps[(1) - (10)].val.p_tkval),((LISTOP*)innerop)->op_first,'L');
+			  TOKEN_GETMAD((ps[(2) - (10)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
+			  TOKEN_GETMAD((ps[(3) - (10)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'d');
+			  TOKEN_GETMAD((ps[(6) - (10)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
+			  TOKEN_GETMAD((ps[(8) - (10)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,')');
+			;}
     break;
 
   case 38:
-#line 263 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 367 "perly.y"
+    { OP *innerop;
+			  (yyval.opval) = block_end((ps[(5) - (9)].val.ival),
+			     innerop = newFOROP(0, PVAL((ps[(1) - (9)].val.p_tkval)), (line_t)IVAL((ps[(2) - (9)].val.i_tkval)),
+				    mod((ps[(3) - (9)].val.opval), OP_ENTERLOOP), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval)));
+			  TOKEN_GETMAD((ps[(1) - (9)].val.p_tkval),((LISTOP*)innerop)->op_first,'L');
+			  TOKEN_GETMAD((ps[(2) - (9)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
+			  TOKEN_GETMAD((ps[(4) - (9)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
+			  TOKEN_GETMAD((ps[(7) - (9)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,')');
+			;}
+    break;
+
+  case 39:
+#line 377 "perly.y"
+    { OP *innerop;
+			  (yyval.opval) = block_end((ps[(4) - (8)].val.ival),
+			     innerop = newFOROP(0, PVAL((ps[(1) - (8)].val.p_tkval)), (line_t)IVAL((ps[(2) - (8)].val.i_tkval)),
+						    (OP*)NULL, (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval)));
+			  TOKEN_GETMAD((ps[(1) - (8)].val.p_tkval),((LISTOP*)innerop)->op_first,'L');
+			  TOKEN_GETMAD((ps[(2) - (8)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
+			  TOKEN_GETMAD((ps[(3) - (8)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
+			  TOKEN_GETMAD((ps[(6) - (8)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,')');
+			;}
     break;
 
   case 40:
-#line 269 "perly.y"
-    { (void)scan_num("1", &yylval); yyval.opval = yylval.opval; ;}
+#line 389 "perly.y"
+    { OP *forop;
+			  PL_parser->copline = (line_t)IVAL((ps[(2) - (12)].val.i_tkval));
+			  forop = newSTATEOP(0, PVAL((ps[(1) - (12)].val.p_tkval)),
+					    newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+						IVAL((ps[(2) - (12)].val.i_tkval)), scalar((ps[(7) - (12)].val.opval)),
+						(ps[(12) - (12)].val.opval), (ps[(10) - (12)].val.opval), (ps[(9) - (12)].val.ival)));
+#ifdef MAD
+			  forop = newUNOP(OP_NULL, 0, append_elem(OP_LINESEQ,
+				newSTATEOP(0,
+					   CopLABEL_alloc(((ps[(1) - (12)].val.p_tkval))->tk_lval.pval),
+					   ((ps[(5) - (12)].val.opval) ? (ps[(5) - (12)].val.opval) : newOP(OP_NULL, 0)) ),
+				forop));
+
+			  token_getmad((ps[(2) - (12)].val.i_tkval),forop,'3');
+			  token_getmad((ps[(3) - (12)].val.i_tkval),forop,'(');
+			  token_getmad((ps[(6) - (12)].val.i_tkval),forop,'1');
+			  token_getmad((ps[(8) - (12)].val.i_tkval),forop,'2');
+			  token_getmad((ps[(11) - (12)].val.i_tkval),forop,')');
+			  token_getmad((ps[(1) - (12)].val.p_tkval),forop,'L');
+#else
+			  if ((ps[(5) - (12)].val.opval)) {
+				forop = append_elem(OP_LINESEQ,
+                                        newSTATEOP(0, CopLABEL_alloc((ps[(1) - (12)].val.p_tkval)), (ps[(5) - (12)].val.opval)),
+					forop);
+			  }
+
+
+#endif
+			  (yyval.opval) = block_end((ps[(4) - (12)].val.ival), forop); ;}
+    break;
+
+  case 41:
+#line 419 "perly.y"
+    { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)),
+				 newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+					    NOLINE, (OP*)NULL, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval), 0));
+			  TOKEN_GETMAD((ps[(1) - (3)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;}
     break;
 
   case 42:
-#line 275 "perly.y"
-    { yyval.opval = invert(scalar(yyvsp[0].opval)); ;}
+#line 427 "perly.y"
+    { PL_parser->copline = (line_t) (ps[(2) - (8)].val.i_tkval);
+			    (yyval.opval) = block_end((ps[(4) - (8)].val.ival),
+				newSTATEOP(0, PVAL((ps[(1) - (8)].val.p_tkval)),
+				    newGIVENOP((ps[(6) - (8)].val.opval), scope((ps[(8) - (8)].val.opval)),
+					(PADOFFSET) (ps[(5) - (8)].val.ival)) )); ;}
     break;
 
   case 43:
-#line 280 "perly.y"
-    { yyval.opval = yyvsp[0].opval; intro_my(); ;}
+#line 436 "perly.y"
+    { (yyval.ival) = (PL_min_intro_pending &&
+			    PL_max_intro_pending >=  PL_min_intro_pending);
+			  intro_my(); ;}
     break;
 
   case 44:
-#line 284 "perly.y"
-    { yyval.opval = yyvsp[0].opval; intro_my(); ;}
-    break;
-
-  case 45:
-#line 288 "perly.y"
-    { yyval.opval = yyvsp[0].opval; intro_my(); ;}
+#line 442 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 46:
-#line 293 "perly.y"
-    { yyval.pval = Nullch; ;}
+#line 448 "perly.y"
+    { YYSTYPE tmplval;
+			  (void)scan_num("1", &tmplval);
+			  (yyval.opval) = tmplval.opval; ;}
     break;
 
   case 48:
-#line 299 "perly.y"
-    { yyval.ival = 0; ;}
+#line 456 "perly.y"
+    { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 49:
-#line 301 "perly.y"
-    { yyval.ival = 0; ;}
+#line 461 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
   case 50:
-#line 303 "perly.y"
-    { yyval.ival = 0; ;}
+#line 465 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
   case 51:
-#line 305 "perly.y"
-    { yyval.ival = 0; ;}
+#line 469 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
   case 52:
-#line 307 "perly.y"
-    { yyval.ival = 0; ;}
-    break;
-
-  case 53:
-#line 311 "perly.y"
-    { newFORM(yyvsp[-2].ival, yyvsp[-1].opval, yyvsp[0].opval); ;}
+#line 474 "perly.y"
+    {
+#ifdef MAD
+			  YYSTYPE tmplval;
+			  tmplval.pval = NULL;
+			  (yyval.p_tkval) = newTOKEN(OP_NULL, tmplval, 0);
+#else
+			  (yyval.p_tkval) = NULL;
+#endif
+			;}
     break;
 
   case 54:
-#line 314 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 488 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 55:
-#line 315 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 490 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 56:
-#line 320 "perly.y"
-    { newMYSUB(yyvsp[-4].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); ;}
+#line 492 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 57:
-#line 325 "perly.y"
-    { newATTRSUB(yyvsp[-4].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); ;}
+#line 494 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 58:
-#line 329 "perly.y"
-    { yyval.ival = start_subparse(FALSE, 0); ;}
+#line 496 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 59:
-#line 333 "perly.y"
-    { yyval.ival = start_subparse(FALSE, CVf_ANON); ;}
+#line 501 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 60:
-#line 337 "perly.y"
-    { yyval.ival = start_subparse(TRUE, 0); ;}
+#line 505 "perly.y"
+    { (yyval.opval) = newOP(OP_NULL,0);
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p');
+			;}
     break;
 
   case 61:
-#line 341 "perly.y"
-    { STRLEN n_a; char *name = SvPV(((SVOP*)yyvsp[0].opval)->op_sv,n_a);
-			  if (strEQ(name, "BEGIN") || strEQ(name, "END")
-			      || strEQ(name, "INIT") || strEQ(name, "CHECK"))
-			      CvSPECIAL_on(PL_compcv);
-			  yyval.opval = yyvsp[0].opval; ;}
+#line 511 "perly.y"
+    { SvREFCNT_inc_simple_void(PL_compcv);
+#ifdef MAD
+			  (yyval.opval) = newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval));
+			  prepend_madprops((ps[(1) - (4)].val.i_tkval)->tk_mad, (yyval.opval), 'F');
+			  (ps[(1) - (4)].val.i_tkval)->tk_mad = 0;
+			  token_free((ps[(1) - (4)].val.i_tkval));
+#else
+			  newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval));
+			  (yyval.opval) = (OP*)NULL;
+#endif
+			;}
     break;
 
   case 62:
-#line 350 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 524 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
+  case 63:
+#line 525 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 64:
-#line 356 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 530 "perly.y"
+    { SvREFCNT_inc_simple_void(PL_compcv);
+#ifdef MAD
+			  (yyval.opval) = newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
+			  token_getmad((ps[(1) - (6)].val.i_tkval),(yyval.opval),'d');
+#else
+			  newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
+			  (yyval.opval) = (OP*)NULL;
+#endif
+			;}
     break;
 
   case 65:
-#line 358 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 543 "perly.y"
+    { SvREFCNT_inc_simple_void(PL_compcv);
+#ifdef MAD
+			  {
+			      OP* o = newSVOP(OP_ANONCODE, 0,
+				(SV*)newATTRSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval)));
+			      (yyval.opval) = newOP(OP_NULL,0);
+			      op_getmad(o,(yyval.opval),'&');
+			      op_getmad((ps[(3) - (6)].val.opval),(yyval.opval),'n');
+			      op_getmad((ps[(4) - (6)].val.opval),(yyval.opval),'s');
+			      op_getmad((ps[(5) - (6)].val.opval),(yyval.opval),'a');
+			      token_getmad((ps[(1) - (6)].val.i_tkval),(yyval.opval),'d');
+			      append_madprops((ps[(6) - (6)].val.opval)->op_madprop, (yyval.opval), 0);
+			      (ps[(6) - (6)].val.opval)->op_madprop = 0;
+			    }
+#else
+			  newATTRSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
+			  (yyval.opval) = (OP*)NULL;
+#endif
+			;}
     break;
 
   case 66:
-#line 360 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 565 "perly.y"
+    { (yyval.ival) = start_subparse(FALSE, 0);
+			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 67:
-#line 365 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 571 "perly.y"
+    { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
+			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 68:
-#line 367 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 576 "perly.y"
+    { (yyval.ival) = start_subparse(TRUE, 0);
+			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 69:
-#line 371 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 581 "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")
+			      || strEQ(name, "UNITCHECK"))
+			      CvSPECIAL_on(PL_compcv);
+			  (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 70:
-#line 372 "perly.y"
-    { yyval.opval = Nullop; PL_expect = XSTATE; ;}
-    break;
-
-  case 71:
-#line 376 "perly.y"
-    { package(yyvsp[-1].opval); ;}
+#line 591 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 72:
-#line 380 "perly.y"
-    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
+#line 597 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 73:
-#line 382 "perly.y"
-    { utilize(yyvsp[-6].ival, yyvsp[-5].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval); ;}
+#line 599 "perly.y"
+    { (yyval.opval) = (ps[(2) - (2)].val.opval);
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
+			;}
     break;
 
   case 74:
-#line 387 "perly.y"
-    { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
+#line 603 "perly.y"
+    { (yyval.opval) = IF_MAD(
+				    newOP(OP_NULL, 0),
+				    (OP*)NULL
+				);
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':');
+			;}
     break;
 
   case 75:
-#line 389 "perly.y"
-    { yyval.opval = newLOGOP(yyvsp[-1].ival, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
+#line 613 "perly.y"
+    { (yyval.opval) = (ps[(2) - (2)].val.opval);
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
+			;}
     break;
 
   case 76:
-#line 391 "perly.y"
-    { yyval.opval = newLOGOP(OP_DOR, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
+#line 617 "perly.y"
+    { (yyval.opval) = IF_MAD(
+				    newOP(OP_NULL, 0),
+				    (OP*)NULL
+				);
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':');
+			;}
+    break;
+
+  case 77:
+#line 626 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 78:
-#line 397 "perly.y"
-    { yyval.opval = yyvsp[-1].opval; ;}
+#line 627 "perly.y"
+    { (yyval.opval) = IF_MAD(
+				    newOP(OP_NULL,0),
+				    (OP*)NULL
+				);
+			  PL_parser->expect = XSTATE;
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),';');
+			;}
     break;
 
   case 79:
-#line 399 "perly.y"
-    { yyval.opval = append_elem(OP_LIST, yyvsp[-2].opval, yyvsp[0].opval); ;}
+#line 637 "perly.y"
+    {
+#ifdef MAD
+			  (yyval.opval) = package((ps[(2) - (3)].val.opval));
+			  token_getmad((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
+			  token_getmad((ps[(3) - (3)].val.i_tkval),(yyval.opval),';');
+#else
+			  package((ps[(2) - (3)].val.opval));
+			  (yyval.opval) = (OP*)NULL;
+#endif
+			;}
+    break;
+
+  case 80:
+#line 650 "perly.y"
+    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
     break;
 
   case 81:
-#line 405 "perly.y"
-    { yyval.opval = convert(yyvsp[-2].ival, OPf_STACKED,
-				prepend_elem(OP_LIST, newGVREF(yyvsp[-2].ival,yyvsp[-1].opval), yyvsp[0].opval) ); ;}
+#line 652 "perly.y"
+    { SvREFCNT_inc_simple_void(PL_compcv);
+#ifdef MAD
+			  (yyval.opval) = utilize(IVAL((ps[(1) - (7)].val.i_tkval)), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval));
+			  token_getmad((ps[(1) - (7)].val.i_tkval),(yyval.opval),'o');
+			  token_getmad((ps[(7) - (7)].val.i_tkval),(yyval.opval),';');
+			  if (PL_parser->rsfp_filters &&
+				      AvFILLp(PL_parser->rsfp_filters) >= 0)
+			      append_madprops(newMADPROP('!', MAD_PV, "", 0), (yyval.opval), 0);
+#else
+			  utilize(IVAL((ps[(1) - (7)].val.i_tkval)), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval));
+			  (yyval.opval) = (OP*)NULL;
+#endif
+			;}
     break;
 
   case 82:
-#line 408 "perly.y"
-    { yyval.opval = convert(yyvsp[-4].ival, OPf_STACKED,
-				prepend_elem(OP_LIST, newGVREF(yyvsp[-4].ival,yyvsp[-2].opval), yyvsp[-1].opval) ); ;}
+#line 669 "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 83:
-#line 411 "perly.y"
-    { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
-				append_elem(OP_LIST,
-				    prepend_elem(OP_LIST, scalar(yyvsp[-5].opval), yyvsp[-1].opval),
-				    newUNOP(OP_METHOD, 0, yyvsp[-3].opval))); ;}
+#line 673 "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 84:
-#line 416 "perly.y"
-    { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
-				append_elem(OP_LIST, scalar(yyvsp[-2].opval),
-				    newUNOP(OP_METHOD, 0, yyvsp[0].opval))); ;}
-    break;
-
-  case 85:
-#line 420 "perly.y"
-    { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
-				append_elem(OP_LIST,
-				    prepend_elem(OP_LIST, yyvsp[-1].opval, yyvsp[0].opval),
-				    newUNOP(OP_METHOD, 0, yyvsp[-2].opval))); ;}
+#line 677 "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 86:
-#line 425 "perly.y"
-    { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
-				append_elem(OP_LIST,
-				    prepend_elem(OP_LIST, yyvsp[-3].opval, yyvsp[-1].opval),
-				    newUNOP(OP_METHOD, 0, yyvsp[-4].opval))); ;}
+#line 685 "perly.y"
+    {
+#ifdef MAD
+			  OP* op = newNULLLIST();
+			  token_getmad((ps[(2) - (2)].val.i_tkval),op,',');
+			  (yyval.opval) = append_elem(OP_LIST, (ps[(1) - (2)].val.opval), op);
+#else
+			  (yyval.opval) = (ps[(1) - (2)].val.opval);
+#endif
+			;}
     break;
 
   case 87:
-#line 430 "perly.y"
-    { yyval.opval = convert(yyvsp[-1].ival, 0, yyvsp[0].opval); ;}
-    break;
-
-  case 88:
-#line 432 "perly.y"
-    { yyval.opval = convert(yyvsp[-3].ival, 0, yyvsp[-1].opval); ;}
+#line 695 "perly.y"
+    { 
+			  OP* term = (ps[(3) - (3)].val.opval);
+			  DO_MAD(
+			      term = newUNOP(OP_NULL, 0, term);
+			      token_getmad((ps[(2) - (3)].val.i_tkval),term,',');
+			  )
+			  (yyval.opval) = append_elem(OP_LIST, (ps[(1) - (3)].val.opval), term);
+			;}
     break;
 
   case 89:
-#line 434 "perly.y"
-    { yyvsp[0].opval = newANONATTRSUB(yyvsp[-1].ival, 0, Nullop, yyvsp[0].opval); ;}
+#line 708 "perly.y"
+    { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED,
+				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 90:
-#line 436 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				 append_elem(OP_LIST,
-				   prepend_elem(OP_LIST, yyvsp[-2].opval, yyvsp[0].opval), yyvsp[-4].opval)); ;}
+#line 713 "perly.y"
+    { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED,
+				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');
+			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
+			;}
+    break;
+
+  case 91:
+#line 720 "perly.y"
+    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+				append_elem(OP_LIST,
+				    prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)),
+				    newUNOP(OP_METHOD, 0, (ps[(3) - (6)].val.opval))));
+			  TOKEN_GETMAD((ps[(2) - (6)].val.i_tkval),(yyval.opval),'A');
+			  TOKEN_GETMAD((ps[(4) - (6)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(6) - (6)].val.i_tkval),(yyval.opval),')');
+			;}
+    break;
+
+  case 92:
+#line 729 "perly.y"
+    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+				append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)),
+				    newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval))));
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'A');
+			;}
     break;
 
   case 93:
-#line 450 "perly.y"
-    { yyval.opval = newBINOP(OP_GELEM, 0, yyvsp[-4].opval, scalar(yyvsp[-2].opval));
-			    PL_expect = XOPERATOR; ;}
+#line 735 "perly.y"
+    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+				append_elem(OP_LIST,
+				    prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)),
+				    newUNOP(OP_METHOD, 0, (ps[(1) - (3)].val.opval))));
+			;}
     break;
 
   case 94:
-#line 453 "perly.y"
-    { yyval.opval = newBINOP(OP_AELEM, 0, oopsAV(yyvsp[-3].opval), scalar(yyvsp[-1].opval)); ;}
+#line 741 "perly.y"
+    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+				append_elem(OP_LIST,
+				    prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)),
+				    newUNOP(OP_METHOD, 0, (ps[(1) - (5)].val.opval))));
+			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 95:
-#line 455 "perly.y"
-    { yyval.opval = newBINOP(OP_AELEM, 0,
-					ref(newAVREF(yyvsp[-4].opval),OP_RV2AV),
-					scalar(yyvsp[-1].opval));;}
+#line 749 "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 96:
-#line 459 "perly.y"
-    { yyval.opval = newBINOP(OP_AELEM, 0,
-					ref(newAVREF(yyvsp[-3].opval),OP_RV2AV),
-					scalar(yyvsp[-1].opval));;}
+#line 753 "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),'(');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 97:
-#line 463 "perly.y"
-    { yyval.opval = newBINOP(OP_HELEM, 0, oopsHV(yyvsp[-4].opval), jmaybe(yyvsp[-2].opval));
-			    PL_expect = XOPERATOR; ;}
+#line 759 "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 98:
-#line 466 "perly.y"
-    { yyval.opval = newBINOP(OP_HELEM, 0,
-					ref(newHVREF(yyvsp[-5].opval),OP_RV2HV),
-					jmaybe(yyvsp[-2].opval));
-			    PL_expect = XOPERATOR; ;}
-    break;
-
-  case 99:
-#line 471 "perly.y"
-    { yyval.opval = newBINOP(OP_HELEM, 0,
-					ref(newHVREF(yyvsp[-4].opval),OP_RV2HV),
-					jmaybe(yyvsp[-2].opval));
-			    PL_expect = XOPERATOR; ;}
-    break;
-
-  case 100:
-#line 476 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   newCVREF(0, scalar(yyvsp[-3].opval))); ;}
+#line 762 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+				 append_elem(OP_LIST,
+				   prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval)));
+			;}
     break;
 
   case 101:
-#line 479 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   append_elem(OP_LIST, yyvsp[-1].opval,
-				       newCVREF(0, scalar(yyvsp[-4].opval)))); ;}
+#line 777 "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),'{');
+			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}');
+			;}
     break;
 
   case 102:
-#line 484 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   append_elem(OP_LIST, yyvsp[-1].opval,
-					       newCVREF(0, scalar(yyvsp[-3].opval)))); ;}
+#line 784 "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 103:
-#line 488 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   newCVREF(0, scalar(yyvsp[-2].opval))); ;}
+#line 789 "perly.y"
+    { (yyval.opval) = newBINOP(OP_AELEM, 0,
+					ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV),
+					scalar((ps[(4) - (5)].val.opval)));
+			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'a');
+			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),']');
+			;}
     break;
 
   case 104:
-#line 494 "perly.y"
-    { yyval.opval = newASSIGNOP(OPf_STACKED, yyvsp[-2].opval, yyvsp[-1].ival, yyvsp[0].opval); ;}
+#line 797 "perly.y"
+    { (yyval.opval) = newBINOP(OP_AELEM, 0,
+					ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV),
+					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 496 "perly.y"
-    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
+#line 804 "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),'{');
+			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}');
+			;}
     break;
 
   case 106:
-#line 498 "perly.y"
-    {   if (yyvsp[-1].ival != OP_REPEAT)
-				scalar(yyvsp[-2].opval);
-			    yyval.opval = newBINOP(yyvsp[-1].ival, 0, yyvsp[-2].opval, scalar(yyvsp[0].opval)); ;}
+#line 811 "perly.y"
+    { (yyval.opval) = newBINOP(OP_HELEM, 0,
+					ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV),
+					jmaybe((ps[(4) - (6)].val.opval)));
+			    PL_parser->expect = XOPERATOR;
+			  TOKEN_GETMAD((ps[(2) - (6)].val.i_tkval),(yyval.opval),'a');
+			  TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((ps[(5) - (6)].val.i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((ps[(6) - (6)].val.i_tkval),(yyval.opval),'}');
+			;}
     break;
 
   case 107:
-#line 502 "perly.y"
-    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
+#line 821 "perly.y"
+    { (yyval.opval) = newBINOP(OP_HELEM, 0,
+					ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV),
+					jmaybe((ps[(3) - (5)].val.opval)));
+			    PL_parser->expect = XOPERATOR;
+			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}');
+			;}
     break;
 
   case 108:
-#line 504 "perly.y"
-    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
+#line 830 "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');
+			  TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 109:
-#line 506 "perly.y"
-    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
+#line 837 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+				   append_elem(OP_LIST, (ps[(4) - (5)].val.opval),
+				       newCVREF(0, scalar((ps[(1) - (5)].val.opval)))));
+			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'a');
+			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 110:
-#line 508 "perly.y"
-    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
+#line 846 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+				   append_elem(OP_LIST, (ps[(3) - (4)].val.opval),
+					       newCVREF(0, scalar((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 111:
-#line 510 "perly.y"
-    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
+#line 853 "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),'(');
+			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 112:
-#line 512 "perly.y"
-    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
+#line 859 "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),')');
+			  TOKEN_GETMAD((ps[(4) - (6)].val.i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((ps[(6) - (6)].val.i_tkval),(yyval.opval),']');
+			;}
     break;
 
   case 113:
-#line 514 "perly.y"
-    { yyval.opval = newRANGE(yyvsp[-1].ival, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval));;}
+#line 866 "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),')');
+			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),']');
+			;}
     break;
 
   case 114:
-#line 516 "perly.y"
-    { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
+#line 876 "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 115:
-#line 518 "perly.y"
-    { yyval.opval = newLOGOP(OP_OR, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
+#line 880 "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 116:
-#line 520 "perly.y"
-    { yyval.opval = newLOGOP(OP_DOR, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
+#line 884 "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)));
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 117:
-#line 522 "perly.y"
-    { yyval.opval = bind_match(yyvsp[-1].ival, yyvsp[-2].opval, yyvsp[0].opval); ;}
+#line 890 "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 118:
-#line 527 "perly.y"
-    { yyval.opval = newUNOP(OP_NEGATE, 0, scalar(yyvsp[0].opval)); ;}
+#line 894 "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 529 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 898 "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 531 "perly.y"
-    { yyval.opval = newUNOP(OP_NOT, 0, scalar(yyvsp[0].opval)); ;}
+#line 902 "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 533 "perly.y"
-    { yyval.opval = newUNOP(OP_COMPLEMENT, 0, scalar(yyvsp[0].opval));;}
+#line 906 "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 535 "perly.y"
-    { yyval.opval = newUNOP(OP_POSTINC, 0,
-					mod(scalar(yyvsp[-1].opval), OP_POSTINC)); ;}
+#line 910 "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 538 "perly.y"
-    { yyval.opval = newUNOP(OP_POSTDEC, 0,
-					mod(scalar(yyvsp[-1].opval), OP_POSTDEC)); ;}
+#line 914 "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({
+			      UNOP *op;
+			      op = (UNOP*)(yyval.opval);
+			      op = (UNOP*)op->op_first;	/* get to flop */
+			      op = (UNOP*)op->op_first;	/* get to flip */
+			      op = (UNOP*)op->op_first;	/* get to range */
+			      token_getmad((ps[(2) - (3)].val.i_tkval),(OP*)op,'o');
+			    })
+			;}
     break;
 
   case 124:
-#line 541 "perly.y"
-    { yyval.opval = newUNOP(OP_PREINC, 0,
-					mod(scalar(yyvsp[0].opval), OP_PREINC)); ;}
+#line 926 "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 125:
-#line 544 "perly.y"
-    { yyval.opval = newUNOP(OP_PREDEC, 0,
-					mod(scalar(yyvsp[0].opval), OP_PREDEC)); ;}
+#line 930 "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 126:
-#line 551 "perly.y"
-    { yyval.opval = newANONLIST(yyvsp[-1].opval); ;}
+#line 934 "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 127:
-#line 553 "perly.y"
-    { yyval.opval = newANONLIST(Nullop); ;}
+#line 938 "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
+				    ? ((UNOP*)(yyval.opval))->op_first : (yyval.opval)),
+				'~');
+			;}
     break;
 
   case 128:
-#line 555 "perly.y"
-    { yyval.opval = newANONHASH(yyvsp[-2].opval); ;}
+#line 948 "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 129:
-#line 557 "perly.y"
-    { yyval.opval = newANONHASH(Nullop); ;}
+#line 952 "perly.y"
+    { (yyval.opval) = IF_MAD(
+				    newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)),
+				    (ps[(2) - (2)].val.opval)
+				);
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'+');
+			;}
     break;
 
   case 130:
-#line 559 "perly.y"
-    { yyval.opval = newANONATTRSUB(yyvsp[-3].ival, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); ;}
+#line 959 "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 131:
-#line 565 "perly.y"
-    { yyval.opval = dofile(yyvsp[0].opval); ;}
+#line 963 "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 132:
-#line 567 "perly.y"
-    { yyval.opval = newUNOP(OP_NULL, OPf_SPECIAL, scope(yyvsp[0].opval)); ;}
+#line 967 "perly.y"
+    { (yyval.opval) = newUNOP(OP_POSTINC, 0,
+					mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC));
+			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 133:
-#line 569 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB,
-			    OPf_SPECIAL|OPf_STACKED,
-			    prepend_elem(OP_LIST,
-				scalar(newCVREF(
-				    (OPpENTERSUB_AMPER<<8),
-				    scalar(yyvsp[-2].opval)
-				)),Nullop)); dep();;}
+#line 972 "perly.y"
+    { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
+					mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC));
+			  TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 134:
-#line 577 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB,
-			    OPf_SPECIAL|OPf_STACKED,
-			    append_elem(OP_LIST,
-				yyvsp[-1].opval,
-				scalar(newCVREF(
-				    (OPpENTERSUB_AMPER<<8),
-				    scalar(yyvsp[-3].opval)
-				)))); dep();;}
+#line 977 "perly.y"
+    { (yyval.opval) = newUNOP(OP_PREINC, 0,
+					mod(scalar((ps[(2) - (2)].val.opval)), OP_PREINC));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 135:
-#line 586 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
-			    prepend_elem(OP_LIST,
-				scalar(newCVREF(0,scalar(yyvsp[-2].opval))), Nullop)); dep();;}
+#line 982 "perly.y"
+    { (yyval.opval) = newUNOP(OP_PREDEC, 0,
+					mod(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 136:
-#line 590 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
-			    prepend_elem(OP_LIST,
-				yyvsp[-1].opval,
-				scalar(newCVREF(0,scalar(yyvsp[-3].opval))))); dep();;}
+#line 991 "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 141:
-#line 602 "perly.y"
-    { yyval.opval = newCONDOP(0, yyvsp[-4].opval, yyvsp[-2].opval, yyvsp[0].opval); ;}
+  case 137:
+#line 996 "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 142:
-#line 604 "perly.y"
-    { yyval.opval = newUNOP(OP_REFGEN, 0, mod(yyvsp[0].opval,OP_REFGEN)); ;}
+  case 138:
+#line 1001 "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),';');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}');
+			;}
     break;
 
-  case 143:
-#line 606 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+  case 139:
+#line 1007 "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),';');
+			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),'}');
+			;}
     break;
 
-  case 144:
-#line 608 "perly.y"
-    { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); ;}
+  case 140:
+#line 1013 "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');
+			  OP_GETMAD((ps[(3) - (5)].val.opval),(yyval.opval),'s');
+			  OP_GETMAD((ps[(4) - (5)].val.opval),(yyval.opval),'a');
+			;}
     break;
 
-  case 145:
-#line 610 "perly.y"
-    { yyval.opval = sawparens(yyvsp[-1].opval); ;}
+  case 141:
+#line 1024 "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 146:
-#line 612 "perly.y"
-    { yyval.opval = sawparens(newNULLLIST()); ;}
+  case 142:
+#line 1028 "perly.y"
+    { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((ps[(2) - (2)].val.opval)));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D');
+			;}
     break;
 
-  case 147:
-#line 614 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+  case 143:
+#line 1032 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB,
+			    OPf_SPECIAL|OPf_STACKED,
+			    prepend_elem(OP_LIST,
+				scalar(newCVREF(
+				    (OPpENTERSUB_AMPER<<8),
+				    scalar((ps[(2) - (4)].val.opval))
+				)),(OP*)NULL)); dep();
+			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
-  case 148:
-#line 616 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+  case 144:
+#line 1044 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB,
+			    OPf_SPECIAL|OPf_STACKED,
+			    append_elem(OP_LIST,
+				(ps[(4) - (5)].val.opval),
+				scalar(newCVREF(
+				    (OPpENTERSUB_AMPER<<8),
+				    scalar((ps[(2) - (5)].val.opval))
+				)))); dep();
+			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
-  case 149:
-#line 618 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+  case 145:
+#line 1057 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
+			    prepend_elem(OP_LIST,
+				scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep();
+			  TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
-  case 150:
-#line 620 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+  case 146:
+#line 1065 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
+			    prepend_elem(OP_LIST,
+				(ps[(4) - (5)].val.opval),
+				scalar(newCVREF(0,scalar((ps[(2) - (5)].val.opval)))))); dep();
+			  TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 151:
-#line 622 "perly.y"
-    { yyval.opval = newUNOP(OP_AV2ARYLEN, 0, ref(yyvsp[0].opval, OP_AV2ARYLEN));;}
+#line 1081 "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 152:
-#line 624 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 1086 "perly.y"
+    { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((ps[(2) - (2)].val.opval),OP_REFGEN));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 153:
-#line 626 "perly.y"
-    { yyval.opval = newSLICEOP(0, yyvsp[-1].opval, yyvsp[-4].opval); ;}
+#line 1090 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 154:
-#line 628 "perly.y"
-    { yyval.opval = newSLICEOP(0, yyvsp[-1].opval, Nullop); ;}
+#line 1092 "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 155:
-#line 630 "perly.y"
-    { yyval.opval = prepend_elem(OP_ASLICE,
-				newOP(OP_PUSHMARK, 0),
-				    newLISTOP(OP_ASLICE, 0,
-					list(yyvsp[-1].opval),
-					ref(yyvsp[-3].opval, OP_ASLICE))); ;}
+#line 1096 "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 156:
-#line 636 "perly.y"
-    { yyval.opval = prepend_elem(OP_HSLICE,
-				newOP(OP_PUSHMARK, 0),
-				    newLISTOP(OP_HSLICE, 0,
-					list(yyvsp[-2].opval),
-					ref(oopsHV(yyvsp[-4].opval), OP_HSLICE)));
-			    PL_expect = XOPERATOR; ;}
+#line 1101 "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 157:
-#line 643 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 1106 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 158:
-#line 645 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, 0, scalar(yyvsp[0].opval)); ;}
+#line 1108 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 159:
-#line 647 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar(yyvsp[-2].opval)); ;}
+#line 1110 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 160:
-#line 649 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
-			    append_elem(OP_LIST, yyvsp[-1].opval, scalar(yyvsp[-3].opval))); ;}
+#line 1112 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 161:
-#line 652 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
-			    append_elem(OP_LIST, yyvsp[0].opval, scalar(yyvsp[-1].opval))); ;}
+#line 1114 "perly.y"
+    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
     break;
 
   case 162:
-#line 655 "perly.y"
-    { yyval.opval = newOP(yyvsp[0].ival, OPf_SPECIAL);
-			    PL_hints |= HINT_BLOCK_SCOPE; ;}
+#line 1116 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 163:
-#line 658 "perly.y"
-    { yyval.opval = newLOOPEX(yyvsp[-1].ival,yyvsp[0].opval); ;}
+#line 1118 "perly.y"
+    { (yyval.opval) = prepend_elem(OP_ASLICE,
+				newOP(OP_PUSHMARK, 0),
+				    newLISTOP(OP_ASLICE, 0,
+					list((ps[(3) - (4)].val.opval)),
+					ref((ps[(1) - (4)].val.opval), OP_ASLICE)));
+			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
+			;}
     break;
 
   case 164:
-#line 660 "perly.y"
-    { yyval.opval = newUNOP(OP_NOT, 0, scalar(yyvsp[0].opval)); ;}
+#line 1127 "perly.y"
+    { (yyval.opval) = prepend_elem(OP_HSLICE,
+				newOP(OP_PUSHMARK, 0),
+				    newLISTOP(OP_HSLICE, 0,
+					list((ps[(3) - (5)].val.opval)),
+					ref(oopsHV((ps[(1) - (5)].val.opval)), OP_HSLICE)));
+			    PL_parser->expect = XOPERATOR;
+			  TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),'}');
+			;}
     break;
 
   case 165:
-#line 662 "perly.y"
-    { yyval.opval = newOP(yyvsp[0].ival, 0); ;}
+#line 1138 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 166:
-#line 664 "perly.y"
-    { yyval.opval = newUNOP(yyvsp[-1].ival, 0, yyvsp[0].opval); ;}
+#line 1140 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 167:
-#line 666 "perly.y"
-    { yyval.opval = newUNOP(yyvsp[-1].ival, 0, yyvsp[0].opval); ;}
+#line 1142 "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 168:
-#line 668 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
-			    append_elem(OP_LIST, yyvsp[0].opval, scalar(yyvsp[-1].opval))); ;}
+#line 1147 "perly.y"
+    {
+			  (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+				append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval))));
+			  DO_MAD({
+			      OP* op = (yyval.opval);
+			      if (op->op_type == OP_CONST) { /* defeat const fold */
+				op = (OP*)op->op_madprop->mad_val;
+			      }
+			      token_getmad((ps[(2) - (4)].val.i_tkval),op,'(');
+			      token_getmad((ps[(4) - (4)].val.i_tkval),op,')');
+			  })
+			;}
     break;
 
   case 169:
-#line 671 "perly.y"
-    { yyval.opval = newOP(yyvsp[0].ival, 0); ;}
+#line 1160 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+			    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 170:
-#line 673 "perly.y"
-    { yyval.opval = newOP(yyvsp[-2].ival, 0); ;}
+#line 1165 "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 171:
-#line 675 "perly.y"
-    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				scalar(yyvsp[0].opval)); ;}
+#line 1170 "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 172:
-#line 678 "perly.y"
-    { yyval.opval = yyvsp[-2].ival == OP_NOT ? newUNOP(yyvsp[-2].ival, 0, newSVOP(OP_CONST, 0, newSViv(0)))
-					    : newOP(yyvsp[-2].ival, OPf_SPECIAL); ;}
+#line 1174 "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 173:
-#line 681 "perly.y"
-    { yyval.opval = newUNOP(yyvsp[-3].ival, 0, yyvsp[-1].opval); ;}
+#line 1178 "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 174:
-#line 683 "perly.y"
-    { yyval.opval = pmruntime(yyvsp[-3].opval, yyvsp[-1].opval, 1); ;}
+#line 1182 "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 175:
+#line 1186 "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 176:
+#line 1190 "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 177:
-#line 690 "perly.y"
-    { yyval.opval = my_attrs(yyvsp[-1].opval,yyvsp[0].opval); ;}
+#line 1194 "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 178:
-#line 692 "perly.y"
-    { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); ;}
+#line 1198 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 179:
-#line 697 "perly.y"
-    { yyval.opval = sawparens(yyvsp[-1].opval); ;}
+#line 1200 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+			    append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
     break;
 
   case 180:
-#line 699 "perly.y"
-    { yyval.opval = sawparens(newNULLLIST()); ;}
+#line 1203 "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 181:
-#line 701 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 1207 "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),'(');
+			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 182:
-#line 703 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 1213 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+				scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 183:
-#line 705 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 1216 "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);
+
+			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 184:
-#line 710 "perly.y"
-    { yyval.opval = Nullop; ;}
+#line 1225 "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),'(');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 185:
-#line 712 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
-    break;
-
-  case 186:
-#line 716 "perly.y"
-    { yyval.opval = Nullop; ;}
-    break;
-
-  case 187:
-#line 718 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 1231 "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 188:
-#line 720 "perly.y"
-    { yyval.opval = yyvsp[-1].opval; ;}
+#line 1238 "perly.y"
+    {
+			  (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
+				newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
+			;}
     break;
 
   case 189:
-#line 726 "perly.y"
-    { PL_in_my = 0; yyval.opval = my(yyvsp[0].opval); ;}
+#line 1246 "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');
+			      append_madprops((ps[(3) - (3)].val.opval)->op_madprop, (yyval.opval), 'a');
+			      (ps[(3) - (3)].val.opval)->op_madprop = 0;
+			  )
+			;}
     break;
 
   case 190:
-#line 730 "perly.y"
-    { yyval.opval = newCVREF(yyvsp[-1].ival,yyvsp[0].opval); ;}
+#line 1254 "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 191:
-#line 734 "perly.y"
-    { yyval.opval = newSVREF(yyvsp[0].opval); ;}
+#line 1261 "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 192:
-#line 738 "perly.y"
-    { yyval.opval = newAVREF(yyvsp[0].opval); ;}
+#line 1266 "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 193:
-#line 742 "perly.y"
-    { yyval.opval = newHVREF(yyvsp[0].opval); ;}
+#line 1271 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 194:
-#line 746 "perly.y"
-    { yyval.opval = newAVREF(yyvsp[0].opval); ;}
+#line 1273 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 195:
-#line 750 "perly.y"
-    { yyval.opval = newGVREF(0,yyvsp[0].opval); ;}
+#line 1275 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 196:
-#line 755 "perly.y"
-    { yyval.opval = scalar(yyvsp[0].opval); ;}
+#line 1280 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 197:
-#line 757 "perly.y"
-    { yyval.opval = scalar(yyvsp[0].opval);  ;}
+#line 1282 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 198:
-#line 759 "perly.y"
-    { yyval.opval = scope(yyvsp[0].opval); ;}
+#line 1286 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 199:
-#line 762 "perly.y"
-    { yyval.opval = yyvsp[0].opval; ;}
+#line 1288 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
+  case 200:
+#line 1290 "perly.y"
+    {
+#ifdef MAD
+			  OP* op = newNULLLIST();
+			  token_getmad((ps[(2) - (2)].val.i_tkval),op,',');
+			  (yyval.opval) = append_elem(OP_LIST, (ps[(1) - (2)].val.opval), op);
+#else
+			  (yyval.opval) = (ps[(1) - (2)].val.opval);
+#endif
+
+			;}
+    break;
+
+  case 201:
+#line 1305 "perly.y"
+    { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
+    break;
+
+  case 202:
+#line 1309 "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 203:
+#line 1315 "perly.y"
+    { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$');
+			;}
+    break;
+
+  case 204:
+#line 1321 "perly.y"
+    { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@');
+			;}
+    break;
+
+  case 205:
+#line 1327 "perly.y"
+    { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%');
+			;}
     break;
 
+  case 206:
+#line 1333 "perly.y"
+    { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l');
+			;}
+    break;
+
+  case 207:
+#line 1339 "perly.y"
+    { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*');
+			;}
+    break;
+
+  case 208:
+#line 1346 "perly.y"
+    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
+    break;
+
+  case 209:
+#line 1348 "perly.y"
+    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
+    break;
+
+  case 210:
+#line 1350 "perly.y"
+    { (yyval.opval) = scope((ps[(1) - (1)].val.opval)); ;}
+    break;
+
+  case 211:
+#line 1353 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
 
+      default: break;