X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.act;h=7cf5da3e78f83351edcdf059479fbd657f9278b0;hb=1a1a5af7b042b1599e52170095e55b02673d4c53;hp=817bde9e18730d085fc59ad2a7144221cc492a23;hpb=0d863452f5cac86322a90184dc68dbf446006ed7;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perly.act b/perly.act
index 817bde9..7cf5da3 100644
--- a/perly.act
+++ b/perly.act
@@ -1,1093 +1,1671 @@
 case 2:
-#line 100 "perly.y"
-    { (yyval.ival) = (yyvsp[-1].ival); newPROG(block_end((yyvsp[-1].ival),(yyvsp[0].opval))); ;}
+#line 143 "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 105 "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 148 "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 111 "perly.y"
+#line 157 "perly.y"
     { (yyval.ival) = block_start(TRUE); ;}
     break;
 
   case 5:
-#line 115 "perly.y"
-    { (yyval.ival) = (I32) allocmy("$_"); ;}
+#line 161 "perly.y"
+    { (yyval.ival) = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); ;}
     break;
 
   case 6:
-#line 119 "perly.y"
+#line 165 "perly.y"
     {
-		    PL_expect = XSTATE; (yyval.ival) = block_start(TRUE);
+		    PL_parser->expect = XSTATE; (yyval.ival) = block_start(TRUE);
 		;}
     break;
 
   case 7:
-#line 126 "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 172 "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 132 "perly.y"
+#line 181 "perly.y"
     { (yyval.ival) = block_start(FALSE); ;}
     break;
 
   case 9:
-#line 136 "perly.y"
-    { (yyval.ival) = PL_savestack_ix; ;}
+#line 186 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 10:
-#line 140 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 188 "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 142 "perly.y"
-    { (yyval.opval) = (yyvsp[-1].opval); ;}
+#line 195 "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 ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
+				PL_hints |= HINT_BLOCK_SCOPE;
+			;}
     break;
 
   case 12:
-#line 144 "perly.y"
-    {   LEAVE_SCOPE((yyvsp[-1].ival));
-			    (yyval.opval) = append_list(OP_LINESEQ,
-				(LISTOP*)(yyvsp[-2].opval), (LISTOP*)(yyvsp[0].opval));
-			    PL_pad_reset_pending = TRUE;
-			    if ((yyvsp[-2].opval) && (yyvsp[0].opval)) PL_hints |= HINT_BLOCK_SCOPE; ;}
+#line 205 "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 13:
-#line 153 "perly.y"
-    { (yyval.opval) = newSTATEOP(0, (yyvsp[-1].pval), (yyvsp[0].opval)); ;}
+  case 14:
+#line 209 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 15:
-#line 156 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 211 "perly.y"
+    { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 16:
-#line 158 "perly.y"
-    { (yyval.opval) = newSTATEOP(0, (yyvsp[-1].pval), (yyvsp[0].opval)); ;}
+#line 213 "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 160 "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 230 "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 169 "perly.y"
-    { (yyval.opval) = newSTATEOP(0, (yyvsp[-2].pval), (yyvsp[-1].opval));
-			  PL_expect = XSTATE; ;}
+#line 246 "perly.y"
+    { (yyval.opval) = newSTATEOP(0, NULL,
+				 newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
+					    NOLINE, (OP*)NULL, (ps[(1) - (1)].val.opval),
+					    (OP*)NULL, 0)); ;}
     break;
 
   case 19:
-#line 175 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 251 "perly.y"
+    { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 20:
-#line 177 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 256 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 21:
-#line 179 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[0].opval), (yyvsp[-2].opval)); ;}
+#line 258 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 22:
-#line 181 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[0].opval), (yyvsp[-2].opval)); ;}
+#line 260 "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 23:
-#line 183 "perly.y"
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((yyvsp[0].opval)), (yyvsp[-2].opval)); ;}
+#line 264 "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 24:
-#line 185 "perly.y"
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (yyvsp[0].opval), (yyvsp[-2].opval));;}
+#line 268 "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 25:
-#line 187 "perly.y"
-    { (yyval.opval) = newFOROP(0, Nullch, (line_t)(yyvsp[-1].ival),
-					Nullop, (yyvsp[0].opval), (yyvsp[-2].opval), Nullop); ;}
+#line 272 "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 26:
-#line 193 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 276 "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 27:
-#line 195 "perly.y"
-    { ((yyvsp[0].opval))->op_flags |= OPf_PARENS; (yyval.opval) = scope((yyvsp[0].opval)); ;}
+#line 281 "perly.y"
+    { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), scope((ps[(1) - (3)].val.opval))); ;}
     break;
 
   case 28:
-#line 197 "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 286 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 29:
-#line 204 "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 288 "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 30:
-#line 208 "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 292 "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 31:
-#line 215 "perly.y"
-    { (yyval.opval) = block_end((yyvsp[-3].ival),
-		newWHENOP((yyvsp[-2].opval), scope((yyvsp[0].opval)))); ;}
+#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 32:
-#line 218 "perly.y"
-    { (yyval.opval) = newWHENOP(0, scope((yyvsp[0].opval))); ;}
+#line 311 "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 33:
-#line 223 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 322 "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 34:
-#line 225 "perly.y"
-    { (yyval.opval) = scope((yyvsp[0].opval)); ;}
+#line 325 "perly.y"
+    { (yyval.opval) = newWHENOP(0, scope((ps[(2) - (2)].val.opval))); ;}
     break;
 
   case 35:
-#line 230 "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 330 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 36:
-#line 236 "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 332 "perly.y"
+    { (yyval.opval) = scope((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 37:
-#line 242 "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 339 "perly.y"
+    { OP *innerop;
+			  PL_parser->copline = (line_t)IVAL((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 38:
-#line 245 "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 352 "perly.y"
+    { OP *innerop;
+			  PL_parser->copline = (line_t)IVAL((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 39:
-#line 249 "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 364 "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 40:
-#line 254 "perly.y"
+#line 375 "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 41:
+#line 385 "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 42:
+#line 397 "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)) {
+			  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, ((yyvsp[-11].pval)?savepv((yyvsp[-11].pval)):Nullch),
-						   (yyvsp[-7].opval)),
+                                        newSTATEOP(0, CopLABEL_alloc((ps[(1) - (12)].val.p_tkval)), (ps[(5) - (12)].val.opval)),
 					forop);
 			  }
 
-			  (yyval.opval) = block_end((yyvsp[-8].ival), forop); ;}
+
+#endif
+			  (yyval.opval) = block_end((ps[(4) - (12)].val.ival), forop); ;}
     break;
 
-  case 41:
-#line 269 "perly.y"
-    { (yyval.opval) = newSTATEOP(0, (yyvsp[-2].pval),
-				 newWHILEOP(0, 1, (LOOP*)Nullop,
-					    NOLINE, Nullop, (yyvsp[-1].opval), (yyvsp[0].opval), 0)); ;}
+  case 43:
+#line 427 "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 276 "perly.y"
-    { PL_copline = (line_t) (yyvsp[-6].ival);
-			    (yyval.opval) = block_end((yyvsp[-4].ival),
-				newSTATEOP(0, (yyvsp[-7].pval),
-				    newGIVENOP((yyvsp[-2].opval), scope((yyvsp[0].opval)),
-					(PADOFFSET) (yyvsp[-3].ival)) )); ;}
+  case 44:
+#line 435 "perly.y"
+    { PL_parser->copline = (line_t) IVAL((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 285 "perly.y"
+  case 45:
+#line 444 "perly.y"
     { (yyval.ival) = (PL_min_intro_pending &&
 			    PL_max_intro_pending >=  PL_min_intro_pending);
 			  intro_my(); ;}
     break;
 
-  case 44:
-#line 291 "perly.y"
-    { (yyval.opval) = Nullop; ;}
-    break;
-
   case 46:
-#line 297 "perly.y"
-    { (void)scan_num("1", &yylval); (yyval.opval) = yylval.opval; ;}
+#line 450 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 48:
-#line 303 "perly.y"
-    { (yyval.opval) = invert(scalar((yyvsp[0].opval))); ;}
-    break;
-
-  case 49:
-#line 308 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+#line 456 "perly.y"
+    { YYSTYPE tmplval;
+			  (void)scan_num("1", &tmplval);
+			  (yyval.opval) = tmplval.opval; ;}
     break;
 
   case 50:
-#line 312 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+#line 464 "perly.y"
+    { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 51:
-#line 316 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+#line 469 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
   case 52:
-#line 321 "perly.y"
-    { (yyval.pval) = Nullch; ;}
+#line 473 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
-  case 54:
-#line 327 "perly.y"
-    { (yyval.ival) = 0; ;}
+  case 53:
+#line 477 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
-  case 55:
-#line 329 "perly.y"
-    { (yyval.ival) = 0; ;}
+  case 54:
+#line 482 "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 56:
-#line 331 "perly.y"
-    { (yyval.ival) = 0; ;}
+#line 496 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 57:
-#line 333 "perly.y"
-    { (yyval.ival) = 0; ;}
+#line 498 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 58:
-#line 335 "perly.y"
-    { (yyval.ival) = 0; ;}
+#line 500 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 59:
-#line 339 "perly.y"
-    { newFORM((yyvsp[-2].ival), (yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+#line 502 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 60:
-#line 342 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 504 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 61:
-#line 343 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 509 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 62:
-#line 348 "perly.y"
-    { newMYSUB((yyvsp[-4].ival), (yyvsp[-3].opval), (yyvsp[-2].opval), (yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+#line 513 "perly.y"
+    { (yyval.opval) = newOP(OP_NULL,0);
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p');
+			;}
     break;
 
   case 63:
-#line 353 "perly.y"
-    { newATTRSUB((yyvsp[-4].ival), (yyvsp[-3].opval), (yyvsp[-2].opval), (yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+#line 519 "perly.y"
+    {
+			  CV *fmtcv = PL_compcv;
+			  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
+			  if (CvOUTSIDE(fmtcv) && !CvUNIQUE(CvOUTSIDE(fmtcv))) {
+			    SvREFCNT_inc_simple_void(fmtcv);
+			    pad_add_anon((SV*)fmtcv, OP_NULL);
+			  }
+			;}
     break;
 
   case 64:
-#line 357 "perly.y"
-    { (yyval.ival) = start_subparse(FALSE, 0); ;}
+#line 538 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 65:
-#line 361 "perly.y"
-    { (yyval.ival) = start_subparse(FALSE, CVf_ANON); ;}
+#line 539 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 66:
-#line 365 "perly.y"
-    { (yyval.ival) = start_subparse(TRUE, 0); ;}
+#line 544 "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 67:
-#line 369 "perly.y"
-    { const char *const name = SvPV_nolen_const(((SVOP*)(yyvsp[0].opval))->op_sv);
-			  if (strEQ(name, "BEGIN") || strEQ(name, "END")
-			      || strEQ(name, "INIT") || strEQ(name, "CHECK"))
-			      CvSPECIAL_on(PL_compcv);
-			  (yyval.opval) = (yyvsp[0].opval); ;}
+#line 557 "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 68:
-#line 378 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 579 "perly.y"
+    { (yyval.ival) = start_subparse(FALSE, 0);
+			    SAVEFREESV(PL_compcv); ;}
+    break;
+
+  case 69:
+#line 585 "perly.y"
+    { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
+			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 70:
-#line 384 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 590 "perly.y"
+    { (yyval.ival) = start_subparse(TRUE, 0);
+			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 71:
-#line 386 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 595 "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 72:
-#line 388 "perly.y"
-    { (yyval.opval) = Nullop; ;}
-    break;
-
-  case 73:
-#line 393 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 605 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 74:
-#line 395 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 611 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 75:
-#line 399 "perly.y"
-    { (yyval.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 400 "perly.y"
-    { (yyval.opval) = Nullop; PL_expect = XSTATE; ;}
+#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 404 "perly.y"
-    { package((yyvsp[-1].opval)); ;}
+#line 627 "perly.y"
+    { (yyval.opval) = (ps[(2) - (2)].val.opval);
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
+			;}
     break;
 
   case 78:
-#line 408 "perly.y"
-    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
+#line 631 "perly.y"
+    { (yyval.opval) = IF_MAD(
+				    newOP(OP_NULL, 0),
+				    (OP*)NULL
+				);
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':');
+			;}
     break;
 
   case 79:
-#line 410 "perly.y"
-    { utilize((yyvsp[-6].ival), (yyvsp[-5].ival), (yyvsp[-3].opval), (yyvsp[-2].opval), (yyvsp[-1].opval)); ;}
+#line 640 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 80:
-#line 415 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 641 "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 81:
-#line 417 "perly.y"
-    { (yyval.opval) = newLOGOP((yyvsp[-1].ival), 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 651 "perly.y"
+    {
+#ifdef MAD
+			  (yyval.opval) = package((ps[(3) - (4)].val.opval));
+			  token_getmad((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
+			  if ((ps[(2) - (4)].val.opval))
+			      package_version((ps[(2) - (4)].val.opval));
+			  token_getmad((ps[(4) - (4)].val.i_tkval),(yyval.opval),';');
+#else
+			  package((ps[(3) - (4)].val.opval));
+			  if ((ps[(2) - (4)].val.opval))
+			      package_version((ps[(2) - (4)].val.opval));
+			  (yyval.opval) = (OP*)NULL;
+#endif
+			;}
     break;
 
   case 82:
-#line 419 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 668 "perly.y"
+    {
+			  int save_3_latefree = (ps[(3) - (5)].val.opval)->op_latefree;
+			  (ps[(3) - (5)].val.opval)->op_latefree = 1;
+			  package((ps[(3) - (5)].val.opval));
+			  (ps[(3) - (5)].val.opval)->op_latefree = save_3_latefree;
+			  if ((ps[(2) - (5)].val.opval)) {
+			      int save_2_latefree = (ps[(2) - (5)].val.opval)->op_latefree;
+			      (ps[(2) - (5)].val.opval)->op_latefree = 1;
+			      package_version((ps[(2) - (5)].val.opval));
+			      (ps[(2) - (5)].val.opval)->op_latefree = save_2_latefree;
+			  }
+			;}
+    break;
+
+  case 83:
+#line 681 "perly.y"
+    { if (PL_parser->copline > (line_t)IVAL((ps[(4) - (8)].val.i_tkval)))
+			      PL_parser->copline = (line_t)IVAL((ps[(4) - (8)].val.i_tkval));
+			  (yyval.opval) = block_end((ps[(5) - (8)].val.ival), (ps[(7) - (8)].val.opval));
+			  TOKEN_GETMAD((ps[(4) - (8)].val.i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((ps[(8) - (8)].val.i_tkval),(yyval.opval),'}');
+			  op_free((ps[(3) - (8)].val.opval));
+			  if ((ps[(2) - (8)].val.opval))
+			      op_free((ps[(2) - (8)].val.opval));
+			;}
     break;
 
   case 84:
-#line 425 "perly.y"
-    { (yyval.opval) = (yyvsp[-1].opval); ;}
+#line 693 "perly.y"
+    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
     break;
 
   case 85:
-#line 427 "perly.y"
-    { (yyval.opval) = append_elem(OP_LIST, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 695 "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_NULL, NULL, 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 86:
+#line 712 "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 87:
-#line 433 "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 716 "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 88:
-#line 436 "perly.y"
-    { (yyval.opval) = convert((yyvsp[-4].ival), OPf_STACKED,
-				prepend_elem(OP_LIST, newGVREF((yyvsp[-4].ival),(yyvsp[-2].opval)), (yyvsp[-1].opval)) ); ;}
-    break;
-
-  case 89:
-#line 439 "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 720 "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 90:
-#line 444 "perly.y"
-    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
-				append_elem(OP_LIST, scalar((yyvsp[-2].opval)),
-				    newUNOP(OP_METHOD, 0, (yyvsp[0].opval)))); ;}
+#line 728 "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 91:
-#line 448 "perly.y"
-    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
-				append_elem(OP_LIST,
-				    prepend_elem(OP_LIST, (yyvsp[-1].opval), (yyvsp[0].opval)),
-				    newUNOP(OP_METHOD, 0, (yyvsp[-2].opval)))); ;}
-    break;
-
-  case 92:
-#line 453 "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 738 "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 93:
-#line 458 "perly.y"
-    { (yyval.opval) = convert((yyvsp[-1].ival), 0, (yyvsp[0].opval)); ;}
+#line 751 "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 94:
-#line 460 "perly.y"
-    { (yyval.opval) = convert((yyvsp[-3].ival), 0, (yyvsp[-1].opval)); ;}
+#line 756 "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 95:
-#line 462 "perly.y"
-    { (yyvsp[0].opval) = newANONATTRSUB((yyvsp[-1].ival), 0, Nullop, (yyvsp[0].opval)); ;}
+#line 763 "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 96:
-#line 464 "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 772 "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 99:
-#line 478 "perly.y"
-    { (yyval.opval) = newBINOP(OP_GELEM, 0, (yyvsp[-4].opval), scalar((yyvsp[-2].opval)));
-			    PL_expect = XOPERATOR; ;}
+  case 97:
+#line 778 "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 100:
-#line 481 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((yyvsp[-3].opval)), scalar((yyvsp[-1].opval))); ;}
+  case 98:
+#line 784 "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 101:
-#line 483 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0,
-					ref(newAVREF((yyvsp[-4].opval)),OP_RV2AV),
-					scalar((yyvsp[-1].opval)));;}
+  case 99:
+#line 792 "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 102:
-#line 487 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0,
-					ref(newAVREF((yyvsp[-3].opval)),OP_RV2AV),
-					scalar((yyvsp[-1].opval)));;}
+  case 100:
+#line 796 "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 103:
-#line 491 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((yyvsp[-4].opval)), jmaybe((yyvsp[-2].opval)));
-			    PL_expect = XOPERATOR; ;}
+  case 101:
+#line 802 "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 104:
-#line 494 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0,
-					ref(newHVREF((yyvsp[-5].opval)),OP_RV2HV),
-					jmaybe((yyvsp[-2].opval)));
-			    PL_expect = XOPERATOR; ;}
+  case 102:
+#line 805 "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 105:
-#line 499 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0,
-					ref(newHVREF((yyvsp[-4].opval)),OP_RV2HV),
-					jmaybe((yyvsp[-2].opval)));
-			    PL_expect = XOPERATOR; ;}
+#line 820 "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 106:
-#line 504 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   newCVREF(0, scalar((yyvsp[-3].opval)))); ;}
+#line 827 "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 107:
-#line 507 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   append_elem(OP_LIST, (yyvsp[-1].opval),
-				       newCVREF(0, scalar((yyvsp[-4].opval))))); ;}
+#line 832 "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 108:
-#line 512 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   append_elem(OP_LIST, (yyvsp[-1].opval),
-					       newCVREF(0, scalar((yyvsp[-3].opval))))); ;}
+#line 840 "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 109:
-#line 516 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   newCVREF(0, scalar((yyvsp[-2].opval)))); ;}
+#line 847 "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 110:
-#line 519 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (yyvsp[-1].opval), (yyvsp[-4].opval)); ;}
+#line 854 "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 111:
-#line 521 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (yyvsp[-1].opval), Nullop); ;}
+#line 864 "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 112:
-#line 526 "perly.y"
-    { (yyval.opval) = newASSIGNOP(OPf_STACKED, (yyvsp[-2].opval), (yyvsp[-1].ival), (yyvsp[0].opval)); ;}
+#line 873 "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 113:
-#line 528 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 880 "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 114:
-#line 530 "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 889 "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 115:
-#line 534 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 896 "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 116:
-#line 536 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 902 "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 117:
-#line 538 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 909 "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 118:
-#line 540 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 919 "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 119:
-#line 542 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 923 "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 544 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 927 "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 121:
-#line 546 "perly.y"
-    { (yyval.opval) = newRANGE((yyvsp[-1].ival), scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval)));;}
+#line 933 "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 548 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 937 "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 550 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 941 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 124:
-#line 552 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 945 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 125:
-#line 554 "perly.y"
-    { (yyval.opval) = bind_match((yyvsp[-1].ival), (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 949 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 126:
-#line 559 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((yyvsp[0].opval))); ;}
+#line 953 "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 127:
-#line 561 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 957 "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 128:
-#line 563 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[0].opval))); ;}
+#line 969 "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 129:
-#line 565 "perly.y"
-    { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((yyvsp[0].opval)));;}
+#line 973 "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 130:
-#line 567 "perly.y"
-    { (yyval.opval) = newUNOP(OP_POSTINC, 0,
-					mod(scalar((yyvsp[-1].opval)), OP_POSTINC)); ;}
+#line 977 "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 131:
-#line 570 "perly.y"
-    { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
-					mod(scalar((yyvsp[-1].opval)), OP_POSTDEC)); ;}
+#line 981 "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 132:
-#line 573 "perly.y"
-    { (yyval.opval) = newUNOP(OP_PREINC, 0,
-					mod(scalar((yyvsp[0].opval)), OP_PREINC)); ;}
+#line 991 "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 133:
-#line 576 "perly.y"
-    { (yyval.opval) = newUNOP(OP_PREDEC, 0,
-					mod(scalar((yyvsp[0].opval)), OP_PREDEC)); ;}
+#line 995 "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 134:
-#line 583 "perly.y"
-    { (yyval.opval) = newANONLIST((yyvsp[-1].opval)); ;}
+#line 1002 "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 135:
-#line 585 "perly.y"
-    { (yyval.opval) = newANONLIST(Nullop); ;}
+#line 1006 "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 136:
-#line 587 "perly.y"
-    { (yyval.opval) = newANONHASH((yyvsp[-2].opval)); ;}
+#line 1010 "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 137:
-#line 589 "perly.y"
-    { (yyval.opval) = newANONHASH(Nullop); ;}
+#line 1015 "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 138:
-#line 591 "perly.y"
-    { (yyval.opval) = newANONATTRSUB((yyvsp[-3].ival), (yyvsp[-2].opval), (yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+#line 1020 "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 139:
-#line 597 "perly.y"
-    { (yyval.opval) = dofile((yyvsp[0].opval), (yyvsp[-1].ival)); ;}
+#line 1025 "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 140:
-#line 599 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((yyvsp[0].opval))); ;}
+#line 1034 "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 601 "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 1039 "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 609 "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 1044 "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 618 "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 1050 "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 622 "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 1056 "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 149:
-#line 634 "perly.y"
-    { (yyval.opval) = newCONDOP(0, (yyvsp[-4].opval), (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+  case 145:
+#line 1067 "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 150:
-#line 636 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((yyvsp[0].opval),OP_REFGEN)); ;}
+  case 146:
+#line 1071 "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 151:
-#line 638 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+  case 147:
+#line 1075 "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 152:
-#line 640 "perly.y"
-    { (yyval.opval) = localize((yyvsp[0].opval),(yyvsp[-1].ival)); ;}
+  case 148:
+#line 1087 "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 153:
-#line 642 "perly.y"
-    { (yyval.opval) = sawparens((yyvsp[-1].opval)); ;}
+  case 149:
+#line 1100 "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 154:
-#line 644 "perly.y"
-    { (yyval.opval) = sawparens(newNULLLIST()); ;}
+  case 150:
+#line 1108 "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 155:
-#line 646 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1124 "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 156:
-#line 648 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1129 "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 157:
-#line 650 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1133 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 158:
-#line 652 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1135 "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 159:
-#line 654 "perly.y"
-    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((yyvsp[0].opval), OP_AV2ARYLEN));;}
+#line 1139 "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 160:
-#line 656 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1144 "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 161:
-#line 658 "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 1149 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 162:
-#line 664 "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 1151 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 163:
-#line 671 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1153 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 164:
-#line 673 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((yyvsp[0].opval))); ;}
+#line 1155 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 165:
-#line 675 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((yyvsp[-2].opval))); ;}
+#line 1157 "perly.y"
+    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
     break;
 
   case 166:
-#line 677 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-			    append_elem(OP_LIST, (yyvsp[-1].opval), scalar((yyvsp[-3].opval)))); ;}
+#line 1159 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 167:
-#line 680 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-			    append_elem(OP_LIST, (yyvsp[0].opval), scalar((yyvsp[-1].opval)))); ;}
+#line 1161 "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 168:
-#line 683 "perly.y"
-    { (yyval.opval) = newOP((yyvsp[0].ival), OPf_SPECIAL);
-			    PL_hints |= HINT_BLOCK_SCOPE; ;}
+#line 1170 "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 169:
-#line 686 "perly.y"
-    { (yyval.opval) = newLOOPEX((yyvsp[-1].ival),(yyvsp[0].opval)); ;}
+#line 1181 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 170:
-#line 688 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[0].opval))); ;}
+#line 1183 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 171:
-#line 690 "perly.y"
-    { (yyval.opval) = newOP((yyvsp[0].ival), 0); ;}
+#line 1185 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval)));
+			  TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 172:
-#line 692 "perly.y"
-    { (yyval.opval) = newUNOP((yyvsp[-1].ival), 0, (yyvsp[0].opval)); ;}
+#line 1190 "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 173:
-#line 694 "perly.y"
-    { (yyval.opval) = newUNOP((yyvsp[-1].ival), 0, (yyvsp[0].opval)); ;}
+#line 1203 "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 174:
-#line 696 "perly.y"
-    { (yyval.opval) = newOP(OP_REQUIRE, (yyvsp[0].ival) ? OPf_SPECIAL : 0); ;}
+#line 1208 "perly.y"
+    { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), OPf_SPECIAL);
+			    PL_hints |= HINT_BLOCK_SCOPE;
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 175:
-#line 698 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REQUIRE, (yyvsp[-1].ival) ? OPf_SPECIAL : 0, (yyvsp[0].opval)); ;}
+#line 1213 "perly.y"
+    { (yyval.opval) = newLOOPEX(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 176:
-#line 700 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-			    append_elem(OP_LIST, (yyvsp[0].opval), scalar((yyvsp[-1].opval)))); ;}
+#line 1217 "perly.y"
+    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 177:
-#line 703 "perly.y"
-    { (yyval.opval) = newOP((yyvsp[0].ival), 0); ;}
+#line 1221 "perly.y"
+    { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 178:
-#line 705 "perly.y"
-    { (yyval.opval) = newOP((yyvsp[-2].ival), 0); ;}
+#line 1225 "perly.y"
+    { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 179:
-#line 707 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				scalar((yyvsp[0].opval))); ;}
+#line 1229 "perly.y"
+    { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 180:
-#line 710 "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 1233 "perly.y"
+    { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.i_tkval) ? OPf_SPECIAL : 0);
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 181:
-#line 713 "perly.y"
-    { (yyval.opval) = newUNOP((yyvsp[-3].ival), 0, (yyvsp[-1].opval)); ;}
+#line 1237 "perly.y"
+    { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.i_tkval) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 182:
-#line 715 "perly.y"
-    { (yyval.opval) = pmruntime((yyvsp[-3].opval), (yyvsp[-1].opval), 1); ;}
+#line 1241 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
+    break;
+
+  case 183:
+#line 1243 "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 184:
+#line 1246 "perly.y"
+    { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
+			;}
     break;
 
   case 185:
-#line 722 "perly.y"
-    { (yyval.opval) = my_attrs((yyvsp[-1].opval),(yyvsp[0].opval)); ;}
+#line 1250 "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 186:
-#line 724 "perly.y"
-    { (yyval.opval) = localize((yyvsp[0].opval),(yyvsp[-1].ival)); ;}
+#line 1256 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+				scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 187:
-#line 729 "perly.y"
-    { (yyval.opval) = sawparens((yyvsp[-1].opval)); ;}
+#line 1259 "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 188:
-#line 731 "perly.y"
-    { (yyval.opval) = sawparens(newNULLLIST()); ;}
+#line 1268 "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 189:
-#line 733 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
-    break;
-
-  case 190:
-#line 735 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
-    break;
-
-  case 191:
-#line 737 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1274 "perly.y"
+    { (yyval.opval) = pmruntime((ps[(1) - (4)].val.opval), (ps[(3) - (4)].val.opval), 1);
+			  TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 192:
-#line 742 "perly.y"
-    { (yyval.opval) = Nullop; ;}
-    break;
-
-  case 193:
-#line 744 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1281 "perly.y"
+    {
+			  (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
+				newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
+			  TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'X');
+			;}
     break;
 
   case 194:
-#line 748 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 1291 "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 195:
-#line 750 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1299 "perly.y"
+    { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'d');
+			;}
     break;
 
   case 196:
-#line 752 "perly.y"
-    { (yyval.opval) = (yyvsp[-1].opval); ;}
+#line 1306 "perly.y"
+    { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
+			;}
     break;
 
   case 197:
-#line 758 "perly.y"
-    { PL_in_my = 0; (yyval.opval) = my((yyvsp[0].opval)); ;}
+#line 1311 "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 198:
-#line 762 "perly.y"
-    { (yyval.opval) = newCVREF((yyvsp[-1].ival),(yyvsp[0].opval)); ;}
+#line 1316 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 199:
-#line 766 "perly.y"
-    { (yyval.opval) = newSVREF((yyvsp[0].opval)); ;}
+#line 1318 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 200:
-#line 770 "perly.y"
-    { (yyval.opval) = newAVREF((yyvsp[0].opval)); ;}
+#line 1320 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 201:
-#line 774 "perly.y"
-    { (yyval.opval) = newHVREF((yyvsp[0].opval)); ;}
+#line 1325 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 202:
-#line 778 "perly.y"
-    { (yyval.opval) = newAVREF((yyvsp[0].opval)); ;}
+#line 1327 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 203:
-#line 782 "perly.y"
-    { (yyval.opval) = newGVREF(0,(yyvsp[0].opval)); ;}
+#line 1331 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 204:
-#line 787 "perly.y"
-    { (yyval.opval) = scalar((yyvsp[0].opval)); ;}
+#line 1333 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 205:
-#line 789 "perly.y"
-    { (yyval.opval) = scalar((yyvsp[0].opval));  ;}
+#line 1335 "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 206:
-#line 791 "perly.y"
-    { (yyval.opval) = scope((yyvsp[0].opval)); ;}
+#line 1350 "perly.y"
+    { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
     break;
 
   case 207:
-#line 794 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 1354 "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 208:
+#line 1360 "perly.y"
+    { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$');
+			;}
+    break;
+
+  case 209:
+#line 1366 "perly.y"
+    { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@');
+			;}
+    break;
+
+  case 210:
+#line 1372 "perly.y"
+    { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%');
+			;}
     break;
 
+  case 211:
+#line 1378 "perly.y"
+    { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l');
+			;}
+    break;
+
+  case 212:
+#line 1384 "perly.y"
+    { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval));
+			  TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*');
+			;}
+    break;
+
+  case 213:
+#line 1391 "perly.y"
+    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
+    break;
+
+  case 214:
+#line 1393 "perly.y"
+    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
+    break;
+
+  case 215:
+#line 1395 "perly.y"
+    { (yyval.opval) = scope((ps[(1) - (1)].val.opval)); ;}
+    break;
+
+  case 216:
+#line 1398 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
+
+/* Line 1267 of yacc.c.  */
 
       default: break;