From: Dave Mitchell <davem@fdisolutions.com>
Date: Mon, 4 Dec 2006 18:08:31 +0000 (+0000)
Subject: fix some casting issues with perly.y / madly.y merger
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=123d08c9856c0c1cfafae2a631dd18e9539aaf13;p=p5sagit%2Fp5-mst-13.2.git

fix some casting issues with perly.y / madly.y merger

p4raw-id: //depot/perl@29461
---

diff --git a/perly.act b/perly.act
index 2746a6d..64c1922 100644
--- a/perly.act
+++ b/perly.act
@@ -1,62 +1,62 @@
 case 2:
-#line 129 "perly.y"
+#line 132 "perly.y"
     { (yyval.ival) = (yyvsp[(1) - (2)].ival); newPROG(block_end((yyvsp[(1) - (2)].ival),(yyvsp[(2) - (2)].opval))); ;}
     break;
 
   case 3:
-#line 134 "perly.y"
-    { if (PL_copline > (line_t)IVAL((yyvsp[(1) - (4)].tkval)))
-			      PL_copline = (line_t)IVAL((yyvsp[(1) - (4)].tkval));
+#line 137 "perly.y"
+    { if (PL_copline > (line_t)IVAL((yyvsp[(1) - (4)].i_tkval)))
+			      PL_copline = (line_t)IVAL((yyvsp[(1) - (4)].i_tkval));
 			  (yyval.opval) = block_end((yyvsp[(2) - (4)].ival), (yyvsp[(3) - (4)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (4)].tkval),(yyval.opval),'{');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),'}');
+			  TOKEN_GETMAD((yyvsp[(1) - (4)].i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),'}');
 			;}
     break;
 
   case 4:
-#line 143 "perly.y"
+#line 146 "perly.y"
     { (yyval.ival) = block_start(TRUE); ;}
     break;
 
   case 5:
-#line 147 "perly.y"
+#line 150 "perly.y"
     { (yyval.ival) = (I32) allocmy("$_"); ;}
     break;
 
   case 6:
-#line 151 "perly.y"
+#line 154 "perly.y"
     {
 		    PL_expect = XSTATE; (yyval.ival) = block_start(TRUE);
 		;}
     break;
 
   case 7:
-#line 158 "perly.y"
-    { if (PL_copline > (line_t)IVAL((yyvsp[(1) - (4)].tkval)))
-			      PL_copline = (line_t)IVAL((yyvsp[(1) - (4)].tkval));
+#line 161 "perly.y"
+    { if (PL_copline > (line_t)IVAL((yyvsp[(1) - (4)].i_tkval)))
+			      PL_copline = (line_t)IVAL((yyvsp[(1) - (4)].i_tkval));
 			  (yyval.opval) = block_end((yyvsp[(2) - (4)].ival), (yyvsp[(3) - (4)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (4)].tkval),(yyval.opval),'{');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),'}');
+			  TOKEN_GETMAD((yyvsp[(1) - (4)].i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),'}');
 			;}
     break;
 
   case 8:
-#line 167 "perly.y"
+#line 170 "perly.y"
     { (yyval.ival) = block_start(FALSE); ;}
     break;
 
   case 9:
-#line 171 "perly.y"
+#line 174 "perly.y"
     { (yyval.ival) = PL_savestack_ix; ;}
     break;
 
   case 10:
-#line 175 "perly.y"
+#line 178 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 11:
-#line 177 "perly.y"
+#line 180 "perly.y"
     {
 			(yyval.opval) = IF_MAD(
 				append_list(OP_LINESEQ,
@@ -66,7 +66,7 @@ case 2:
     break;
 
   case 12:
-#line 184 "perly.y"
+#line 187 "perly.y"
     {   LEAVE_SCOPE((yyvsp[(2) - (3)].ival));
 			    (yyval.opval) = append_list(OP_LINESEQ,
 				(LISTOP*)(yyvsp[(1) - (3)].opval), (LISTOP*)(yyvsp[(3) - (3)].opval));
@@ -75,28 +75,28 @@ case 2:
     break;
 
   case 13:
-#line 193 "perly.y"
+#line 196 "perly.y"
     { (yyval.opval) = newSTATEOP(0, PVAL((yyvsp[(1) - (2)].p_tkval)), (yyvsp[(2) - (2)].opval));
 			  TOKEN_GETMAD((yyvsp[(1) - (2)].p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;}
     break;
 
   case 15:
-#line 197 "perly.y"
+#line 200 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 16:
-#line 199 "perly.y"
+#line 202 "perly.y"
     { (yyval.opval) = newSTATEOP(0, PVAL((yyvsp[(1) - (2)].p_tkval)), (yyvsp[(2) - (2)].opval)); ;}
     break;
 
   case 17:
-#line 201 "perly.y"
+#line 204 "perly.y"
     {
 			  if (PVAL((yyvsp[(1) - (2)].p_tkval))) {
 			      (yyval.opval) = newSTATEOP(0, PVAL((yyvsp[(1) - (2)].p_tkval)), newOP(OP_NULL, 0));
 			      TOKEN_GETMAD((yyvsp[(1) - (2)].p_tkval),(yyval.opval),'L');
-			      TOKEN_GETMAD((yyvsp[(2) - (2)].tkval),((LISTOP*)(yyval.opval))->op_first,';');
+			      TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),((LISTOP*)(yyval.opval))->op_first,';');
 			  }
 			  else {
 			      (yyval.opval) = IF_MAD(
@@ -104,14 +104,14 @@ case 2:
 					Nullop);
                               PL_copline = NOLINE;
 			      TOKEN_FREE((yyvsp[(1) - (2)].p_tkval));
-			      TOKEN_GETMAD((yyvsp[(2) - (2)].tkval),(yyval.opval),';');
+			      TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),';');
 			  }
 			  PL_expect = XSTATE;
 			;}
     break;
 
   case 18:
-#line 218 "perly.y"
+#line 221 "perly.y"
     {
 			  (yyval.opval) = newSTATEOP(0, PVAL((yyvsp[(1) - (3)].p_tkval)), (yyvsp[(2) - (3)].opval));
 			  PL_expect = XSTATE;
@@ -123,203 +123,203 @@ case 2:
 				     op->op_sibling->op_type == OP_NEXTSTATE)
 					op = op->op_sibling;
 				  token_getmad((yyvsp[(1) - (3)].p_tkval),op,'L');
-				  token_getmad((yyvsp[(3) - (3)].tkval),op,';');
+				  token_getmad((yyvsp[(3) - (3)].i_tkval),op,';');
 			      }
 			  )
 			;}
     break;
 
   case 19:
-#line 237 "perly.y"
+#line 240 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 20:
-#line 239 "perly.y"
+#line 242 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 21:
-#line 241 "perly.y"
+#line 244 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[(3) - (3)].opval), (yyvsp[(1) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'i');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'i');
 			;}
     break;
 
   case 22:
-#line 245 "perly.y"
+#line 248 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[(3) - (3)].opval), (yyvsp[(1) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'i');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'i');
 			;}
     break;
 
   case 23:
-#line 249 "perly.y"
+#line 252 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((yyvsp[(3) - (3)].opval)), (yyvsp[(1) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'w');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'w');
 			;}
     break;
 
   case 24:
-#line 253 "perly.y"
+#line 256 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (yyvsp[(3) - (3)].opval), (yyvsp[(1) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'w');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'w');
 			;}
     break;
 
   case 25:
-#line 257 "perly.y"
-    { (yyval.opval) = newFOROP(0, Nullch, (line_t)IVAL((yyvsp[(2) - (3)].tkval)),
+#line 260 "perly.y"
+    { (yyval.opval) = newFOROP(0, Nullch, (line_t)IVAL((yyvsp[(2) - (3)].i_tkval)),
 					Nullop, (yyvsp[(3) - (3)].opval), (yyvsp[(1) - (3)].opval), Nullop);
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w');
 			;}
     break;
 
   case 26:
-#line 265 "perly.y"
+#line 268 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 27:
-#line 267 "perly.y"
+#line 270 "perly.y"
     { ((yyvsp[(2) - (2)].opval))->op_flags |= OPf_PARENS; (yyval.opval) = scope((yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 28:
-#line 271 "perly.y"
-    { PL_copline = (line_t)IVAL((yyvsp[(1) - (6)].tkval));
+#line 274 "perly.y"
+    { PL_copline = (line_t)IVAL((yyvsp[(1) - (6)].i_tkval));
 			    (yyval.opval) = newCONDOP(0, (yyvsp[(3) - (6)].opval), scope((yyvsp[(5) - (6)].opval)), (yyvsp[(6) - (6)].opval));
 			    PL_hints |= HINT_BLOCK_SCOPE;
-			  TOKEN_GETMAD((yyvsp[(1) - (6)].tkval),(yyval.opval),'I');
-			  TOKEN_GETMAD((yyvsp[(2) - (6)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(4) - (6)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (6)].i_tkval),(yyval.opval),'I');
+			  TOKEN_GETMAD((yyvsp[(2) - (6)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(4) - (6)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 29:
-#line 282 "perly.y"
-    { PL_copline = (line_t)IVAL((yyvsp[(1) - (7)].tkval));
+#line 285 "perly.y"
+    { PL_copline = (line_t)IVAL((yyvsp[(1) - (7)].i_tkval));
 			    (yyval.opval) = block_end((yyvsp[(3) - (7)].ival),
 				   newCONDOP(0, (yyvsp[(4) - (7)].opval), scope((yyvsp[(6) - (7)].opval)), (yyvsp[(7) - (7)].opval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (7)].tkval),(yyval.opval),'I');
-			  TOKEN_GETMAD((yyvsp[(2) - (7)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(5) - (7)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (7)].i_tkval),(yyval.opval),'I');
+			  TOKEN_GETMAD((yyvsp[(2) - (7)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(5) - (7)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 30:
-#line 290 "perly.y"
-    { PL_copline = (line_t)IVAL((yyvsp[(1) - (7)].tkval));
+#line 293 "perly.y"
+    { PL_copline = (line_t)IVAL((yyvsp[(1) - (7)].i_tkval));
 			    (yyval.opval) = block_end((yyvsp[(3) - (7)].ival),
 				   newCONDOP(0, (yyvsp[(4) - (7)].opval), scope((yyvsp[(6) - (7)].opval)), (yyvsp[(7) - (7)].opval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (7)].tkval),(yyval.opval),'I');
-			  TOKEN_GETMAD((yyvsp[(2) - (7)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(5) - (7)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (7)].i_tkval),(yyval.opval),'I');
+			  TOKEN_GETMAD((yyvsp[(2) - (7)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(5) - (7)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 31:
-#line 301 "perly.y"
+#line 304 "perly.y"
     { (yyval.opval) = block_end((yyvsp[(3) - (6)].ival),
 		newWHENOP((yyvsp[(4) - (6)].opval), scope((yyvsp[(6) - (6)].opval)))); ;}
     break;
 
   case 32:
-#line 304 "perly.y"
+#line 307 "perly.y"
     { (yyval.opval) = newWHENOP(0, scope((yyvsp[(2) - (2)].opval))); ;}
     break;
 
   case 33:
-#line 309 "perly.y"
+#line 312 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 34:
-#line 311 "perly.y"
+#line 314 "perly.y"
     { (yyval.opval) = scope((yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 35:
-#line 318 "perly.y"
+#line 321 "perly.y"
     { OP *innerop;
-			  PL_copline = (line_t)(yyvsp[(2) - (9)].tkval);
+			  PL_copline = (line_t)(yyvsp[(2) - (9)].i_tkval);
 			    (yyval.opval) = block_end((yyvsp[(4) - (9)].ival),
 				   newSTATEOP(0, PVAL((yyvsp[(1) - (9)].p_tkval)),
 				     innerop = newWHILEOP(0, 1, (LOOP*)Nullop,
-						IVAL((yyvsp[(2) - (9)].tkval)), (yyvsp[(5) - (9)].opval), (yyvsp[(8) - (9)].opval), (yyvsp[(9) - (9)].opval), (yyvsp[(7) - (9)].ival))));
+						IVAL((yyvsp[(2) - (9)].i_tkval)), (yyvsp[(5) - (9)].opval), (yyvsp[(8) - (9)].opval), (yyvsp[(9) - (9)].opval), (yyvsp[(7) - (9)].ival))));
 			  TOKEN_GETMAD((yyvsp[(1) - (9)].p_tkval),innerop,'L');
-			  TOKEN_GETMAD((yyvsp[(2) - (9)].tkval),innerop,'W');
-			  TOKEN_GETMAD((yyvsp[(3) - (9)].tkval),innerop,'(');
-			  TOKEN_GETMAD((yyvsp[(6) - (9)].tkval),innerop,')');
+			  TOKEN_GETMAD((yyvsp[(2) - (9)].i_tkval),innerop,'W');
+			  TOKEN_GETMAD((yyvsp[(3) - (9)].i_tkval),innerop,'(');
+			  TOKEN_GETMAD((yyvsp[(6) - (9)].i_tkval),innerop,')');
 			;}
     break;
 
   case 36:
-#line 331 "perly.y"
+#line 334 "perly.y"
     { OP *innerop;
-			  PL_copline = (line_t)(yyvsp[(2) - (9)].tkval);
+			  PL_copline = (line_t)(yyvsp[(2) - (9)].i_tkval);
 			    (yyval.opval) = block_end((yyvsp[(4) - (9)].ival),
 				   newSTATEOP(0, PVAL((yyvsp[(1) - (9)].p_tkval)),
 				     innerop = newWHILEOP(0, 1, (LOOP*)Nullop,
-						IVAL((yyvsp[(2) - (9)].tkval)), (yyvsp[(5) - (9)].opval), (yyvsp[(8) - (9)].opval), (yyvsp[(9) - (9)].opval), (yyvsp[(7) - (9)].ival))));
+						IVAL((yyvsp[(2) - (9)].i_tkval)), (yyvsp[(5) - (9)].opval), (yyvsp[(8) - (9)].opval), (yyvsp[(9) - (9)].opval), (yyvsp[(7) - (9)].ival))));
 			  TOKEN_GETMAD((yyvsp[(1) - (9)].p_tkval),innerop,'L');
-			  TOKEN_GETMAD((yyvsp[(2) - (9)].tkval),innerop,'W');
-			  TOKEN_GETMAD((yyvsp[(3) - (9)].tkval),innerop,'(');
-			  TOKEN_GETMAD((yyvsp[(6) - (9)].tkval),innerop,')');
+			  TOKEN_GETMAD((yyvsp[(2) - (9)].i_tkval),innerop,'W');
+			  TOKEN_GETMAD((yyvsp[(3) - (9)].i_tkval),innerop,'(');
+			  TOKEN_GETMAD((yyvsp[(6) - (9)].i_tkval),innerop,')');
 			;}
     break;
 
   case 37:
-#line 343 "perly.y"
+#line 346 "perly.y"
     { OP *innerop;
 			  (yyval.opval) = block_end((yyvsp[(4) - (10)].ival),
-			     innerop = newFOROP(0, PVAL((yyvsp[(1) - (10)].p_tkval)), (line_t)IVAL((yyvsp[(2) - (10)].tkval)),
+			     innerop = newFOROP(0, PVAL((yyvsp[(1) - (10)].p_tkval)), (line_t)IVAL((yyvsp[(2) - (10)].i_tkval)),
 					    (yyvsp[(5) - (10)].opval), (yyvsp[(7) - (10)].opval), (yyvsp[(9) - (10)].opval), (yyvsp[(10) - (10)].opval)));
 			  TOKEN_GETMAD((yyvsp[(1) - (10)].p_tkval),((LISTOP*)innerop)->op_first,'L');
-			  TOKEN_GETMAD((yyvsp[(2) - (10)].tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
-			  TOKEN_GETMAD((yyvsp[(3) - (10)].tkval),((LISTOP*)innerop)->op_first->op_sibling,'d');
-			  TOKEN_GETMAD((yyvsp[(6) - (10)].tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
-			  TOKEN_GETMAD((yyvsp[(8) - (10)].tkval),((LISTOP*)innerop)->op_first->op_sibling,')');
+			  TOKEN_GETMAD((yyvsp[(2) - (10)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
+			  TOKEN_GETMAD((yyvsp[(3) - (10)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'d');
+			  TOKEN_GETMAD((yyvsp[(6) - (10)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
+			  TOKEN_GETMAD((yyvsp[(8) - (10)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,')');
 			;}
     break;
 
   case 38:
-#line 354 "perly.y"
+#line 357 "perly.y"
     { OP *innerop;
 			  (yyval.opval) = block_end((yyvsp[(5) - (9)].ival),
-			     innerop = newFOROP(0, PVAL((yyvsp[(1) - (9)].p_tkval)), (line_t)IVAL((yyvsp[(2) - (9)].tkval)),
+			     innerop = newFOROP(0, PVAL((yyvsp[(1) - (9)].p_tkval)), (line_t)IVAL((yyvsp[(2) - (9)].i_tkval)),
 				    mod((yyvsp[(3) - (9)].opval), OP_ENTERLOOP), (yyvsp[(6) - (9)].opval), (yyvsp[(8) - (9)].opval), (yyvsp[(9) - (9)].opval)));
 			  TOKEN_GETMAD((yyvsp[(1) - (9)].p_tkval),((LISTOP*)innerop)->op_first,'L');
-			  TOKEN_GETMAD((yyvsp[(2) - (9)].tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
-			  TOKEN_GETMAD((yyvsp[(4) - (9)].tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
-			  TOKEN_GETMAD((yyvsp[(7) - (9)].tkval),((LISTOP*)innerop)->op_first->op_sibling,')');
+			  TOKEN_GETMAD((yyvsp[(2) - (9)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
+			  TOKEN_GETMAD((yyvsp[(4) - (9)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
+			  TOKEN_GETMAD((yyvsp[(7) - (9)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,')');
 			;}
     break;
 
   case 39:
-#line 364 "perly.y"
+#line 367 "perly.y"
     { OP *innerop;
 			  (yyval.opval) = block_end((yyvsp[(4) - (8)].ival),
-			     innerop = newFOROP(0, PVAL((yyvsp[(1) - (8)].p_tkval)), (line_t)IVAL((yyvsp[(2) - (8)].tkval)),
+			     innerop = newFOROP(0, PVAL((yyvsp[(1) - (8)].p_tkval)), (line_t)IVAL((yyvsp[(2) - (8)].i_tkval)),
 						    Nullop, (yyvsp[(5) - (8)].opval), (yyvsp[(7) - (8)].opval), (yyvsp[(8) - (8)].opval)));
 			  TOKEN_GETMAD((yyvsp[(1) - (8)].p_tkval),((LISTOP*)innerop)->op_first,'L');
-			  TOKEN_GETMAD((yyvsp[(2) - (8)].tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
-			  TOKEN_GETMAD((yyvsp[(3) - (8)].tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
-			  TOKEN_GETMAD((yyvsp[(6) - (8)].tkval),((LISTOP*)innerop)->op_first->op_sibling,')');
+			  TOKEN_GETMAD((yyvsp[(2) - (8)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'W');
+			  TOKEN_GETMAD((yyvsp[(3) - (8)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'(');
+			  TOKEN_GETMAD((yyvsp[(6) - (8)].i_tkval),((LISTOP*)innerop)->op_first->op_sibling,')');
 			;}
     break;
 
   case 40:
-#line 376 "perly.y"
+#line 379 "perly.y"
     { OP *forop;
-			  PL_copline = (line_t)IVAL((yyvsp[(2) - (12)].tkval));
+			  PL_copline = (line_t)IVAL((yyvsp[(2) - (12)].i_tkval));
 			  forop = newSTATEOP(0, PVAL((yyvsp[(1) - (12)].p_tkval)),
 					    newWHILEOP(0, 1, (LOOP*)Nullop,
-						IVAL((yyvsp[(2) - (12)].tkval)), scalar((yyvsp[(7) - (12)].opval)),
+						IVAL((yyvsp[(2) - (12)].i_tkval)), scalar((yyvsp[(7) - (12)].opval)),
 						(yyvsp[(12) - (12)].opval), (yyvsp[(10) - (12)].opval), (yyvsp[(9) - (12)].ival)));
 #ifdef MAD
 			  if (!(yyvsp[(5) - (12)].opval))
@@ -331,11 +331,11 @@ case 2:
 					   (yyvsp[(5) - (12)].opval)),
 				forop));
 
-			  token_getmad((yyvsp[(2) - (12)].tkval),forop,'3');
-			  token_getmad((yyvsp[(3) - (12)].tkval),forop,'(');
-			  token_getmad((yyvsp[(6) - (12)].tkval),forop,'1');
-			  token_getmad((yyvsp[(8) - (12)].tkval),forop,'2');
-			  token_getmad((yyvsp[(11) - (12)].tkval),forop,')');
+			  token_getmad((yyvsp[(2) - (12)].i_tkval),forop,'3');
+			  token_getmad((yyvsp[(3) - (12)].i_tkval),forop,'(');
+			  token_getmad((yyvsp[(6) - (12)].i_tkval),forop,'1');
+			  token_getmad((yyvsp[(8) - (12)].i_tkval),forop,'2');
+			  token_getmad((yyvsp[(11) - (12)].i_tkval),forop,')');
 			  token_getmad((yyvsp[(1) - (12)].p_tkval),forop,'L');
 #else
 			  if ((yyvsp[(5) - (12)].opval)) {
@@ -351,7 +351,7 @@ case 2:
     break;
 
   case 41:
-#line 410 "perly.y"
+#line 413 "perly.y"
     { (yyval.opval) = newSTATEOP(0, PVAL((yyvsp[(1) - (3)].p_tkval)),
 				 newWHILEOP(0, 1, (LOOP*)Nullop,
 					    NOLINE, Nullop, (yyvsp[(2) - (3)].opval), (yyvsp[(3) - (3)].opval), 0));
@@ -359,8 +359,8 @@ case 2:
     break;
 
   case 42:
-#line 418 "perly.y"
-    { PL_copline = (line_t) (yyvsp[(2) - (8)].tkval);
+#line 421 "perly.y"
+    { PL_copline = (line_t) (yyvsp[(2) - (8)].i_tkval);
 			    (yyval.opval) = block_end((yyvsp[(4) - (8)].ival),
 				newSTATEOP(0, PVAL((yyvsp[(1) - (8)].p_tkval)),
 				    newGIVENOP((yyvsp[(6) - (8)].opval), scope((yyvsp[(8) - (8)].opval)),
@@ -368,46 +368,46 @@ case 2:
     break;
 
   case 43:
-#line 427 "perly.y"
+#line 430 "perly.y"
     { (yyval.ival) = (PL_min_intro_pending &&
 			    PL_max_intro_pending >=  PL_min_intro_pending);
 			  intro_my(); ;}
     break;
 
   case 44:
-#line 433 "perly.y"
+#line 436 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 46:
-#line 439 "perly.y"
+#line 442 "perly.y"
     { YYSTYPE tmplval;
 			  (void)scan_num("1", &tmplval);
 			  (yyval.opval) = tmplval.opval; ;}
     break;
 
   case 48:
-#line 447 "perly.y"
+#line 450 "perly.y"
     { (yyval.opval) = invert(scalar((yyvsp[(1) - (1)].opval))); ;}
     break;
 
   case 49:
-#line 452 "perly.y"
+#line 455 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); intro_my(); ;}
     break;
 
   case 50:
-#line 456 "perly.y"
+#line 459 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); intro_my(); ;}
     break;
 
   case 51:
-#line 460 "perly.y"
+#line 463 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); intro_my(); ;}
     break;
 
   case 52:
-#line 465 "perly.y"
+#line 468 "perly.y"
     {
 #ifdef MAD
 			  YYSTYPE tmplval;
@@ -420,50 +420,50 @@ case 2:
     break;
 
   case 54:
-#line 479 "perly.y"
+#line 482 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 55:
-#line 481 "perly.y"
+#line 484 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 56:
-#line 483 "perly.y"
+#line 486 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 57:
-#line 485 "perly.y"
+#line 488 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 58:
-#line 487 "perly.y"
+#line 490 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 59:
-#line 492 "perly.y"
+#line 495 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 60:
-#line 496 "perly.y"
+#line 499 "perly.y"
     { (yyval.opval) = newOP(OP_NULL,0);
-			  TOKEN_GETMAD((yyvsp[(1) - (1)].tkval),(yyval.opval),'p');
+			  TOKEN_GETMAD((yyvsp[(1) - (1)].i_tkval),(yyval.opval),'p');
 			;}
     break;
 
   case 61:
-#line 502 "perly.y"
+#line 505 "perly.y"
     { SvREFCNT_inc(PL_compcv);
 #ifdef MAD
 			  (yyval.opval) = newFORM((yyvsp[(2) - (4)].ival), (yyvsp[(3) - (4)].opval), (yyvsp[(4) - (4)].opval));
-			  prepend_madprops((yyvsp[(1) - (4)].tkval)->tk_mad, (yyval.opval), 'F');
-			  (yyvsp[(1) - (4)].tkval)->tk_mad = 0;
-			  token_free((yyvsp[(1) - (4)].tkval));
+			  prepend_madprops((yyvsp[(1) - (4)].i_tkval)->tk_mad, (yyval.opval), 'F');
+			  (yyvsp[(1) - (4)].i_tkval)->tk_mad = 0;
+			  token_free((yyvsp[(1) - (4)].i_tkval));
 #else
 			  newFORM((yyvsp[(2) - (4)].ival), (yyvsp[(3) - (4)].opval), (yyvsp[(4) - (4)].opval));
 #endif
@@ -471,21 +471,21 @@ case 2:
     break;
 
   case 62:
-#line 514 "perly.y"
+#line 517 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 63:
-#line 515 "perly.y"
+#line 518 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 64:
-#line 520 "perly.y"
+#line 523 "perly.y"
     { SvREFCNT_inc(PL_compcv);
 #ifdef MAD
 			  (yyval.opval) = newMYSUB((yyvsp[(2) - (6)].ival), (yyvsp[(3) - (6)].opval), (yyvsp[(4) - (6)].opval), (yyvsp[(5) - (6)].opval), (yyvsp[(6) - (6)].opval));
-			  token_getmad((yyvsp[(1) - (6)].tkval),(yyval.opval),'d');
+			  token_getmad((yyvsp[(1) - (6)].i_tkval),(yyval.opval),'d');
 #else
 			  newMYSUB((yyvsp[(2) - (6)].ival), (yyvsp[(3) - (6)].opval), (yyvsp[(4) - (6)].opval), (yyvsp[(5) - (6)].opval), (yyvsp[(6) - (6)].opval));
 #endif
@@ -493,7 +493,7 @@ case 2:
     break;
 
   case 65:
-#line 532 "perly.y"
+#line 535 "perly.y"
     { SvREFCNT_inc(PL_compcv);
 #ifdef MAD
 			  OP* o = newSVOP(OP_ANONCODE, 0,
@@ -503,7 +503,7 @@ case 2:
 			  op_getmad((yyvsp[(3) - (6)].opval),(yyval.opval),'n');
 			  op_getmad((yyvsp[(4) - (6)].opval),(yyval.opval),'s');
 			  op_getmad((yyvsp[(5) - (6)].opval),(yyval.opval),'a');
-			  token_getmad((yyvsp[(1) - (6)].tkval),(yyval.opval),'d');
+			  token_getmad((yyvsp[(1) - (6)].i_tkval),(yyval.opval),'d');
 			  append_madprops((yyvsp[(6) - (6)].opval)->op_madprop, (yyval.opval), 0);
 			  (yyvsp[(6) - (6)].opval)->op_madprop = 0;
 #else
@@ -514,25 +514,25 @@ case 2:
     break;
 
   case 66:
-#line 552 "perly.y"
+#line 555 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, 0);
 			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 67:
-#line 558 "perly.y"
+#line 561 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
 			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 68:
-#line 563 "perly.y"
+#line 566 "perly.y"
     { (yyval.ival) = start_subparse(TRUE, 0);
 			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 69:
-#line 568 "perly.y"
+#line 571 "perly.y"
     { const char *const name = SvPV_nolen_const(((SVOP*)(yyvsp[(1) - (1)].opval))->op_sv);
 			  if (strEQ(name, "BEGIN") || strEQ(name, "END")
 			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
@@ -542,72 +542,72 @@ case 2:
     break;
 
   case 70:
-#line 578 "perly.y"
+#line 581 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 72:
-#line 584 "perly.y"
+#line 587 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 73:
-#line 586 "perly.y"
+#line 589 "perly.y"
     { (yyval.opval) = (yyvsp[(2) - (2)].opval);
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),':');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),':');
 			;}
     break;
 
   case 74:
-#line 590 "perly.y"
+#line 593 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newOP(OP_NULL, 0),
 				    Nullop
 				);
-			  TOKEN_GETMAD((yyvsp[(1) - (1)].tkval),(yyval.opval),':');
+			  TOKEN_GETMAD((yyvsp[(1) - (1)].i_tkval),(yyval.opval),':');
 			;}
     break;
 
   case 75:
-#line 600 "perly.y"
+#line 603 "perly.y"
     { (yyval.opval) = (yyvsp[(2) - (2)].opval);
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),':');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),':');
 			;}
     break;
 
   case 76:
-#line 604 "perly.y"
+#line 607 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newOP(OP_NULL, 0),
 				    Nullop
 				);
-			  TOKEN_GETMAD((yyvsp[(1) - (1)].tkval),(yyval.opval),':');
+			  TOKEN_GETMAD((yyvsp[(1) - (1)].i_tkval),(yyval.opval),':');
 			;}
     break;
 
   case 77:
-#line 613 "perly.y"
+#line 616 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 78:
-#line 614 "perly.y"
+#line 617 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newOP(OP_NULL,0),
 				    Nullop
 				);
 			  PL_expect = XSTATE;
-			  TOKEN_GETMAD((yyvsp[(1) - (1)].tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((yyvsp[(1) - (1)].i_tkval),(yyval.opval),';');
 			;}
     break;
 
   case 79:
-#line 624 "perly.y"
+#line 627 "perly.y"
     {
 #ifdef MAD
 			  (yyval.opval) = package((yyvsp[(2) - (3)].opval));
-			  token_getmad((yyvsp[(1) - (3)].tkval),(yyval.opval),'o');
-			  token_getmad((yyvsp[(3) - (3)].tkval),(yyval.opval),';');
+			  token_getmad((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'o');
+			  token_getmad((yyvsp[(3) - (3)].i_tkval),(yyval.opval),';');
 #else
 			  package((yyvsp[(2) - (3)].opval));
 #endif
@@ -615,52 +615,52 @@ case 2:
     break;
 
   case 80:
-#line 636 "perly.y"
+#line 639 "perly.y"
     { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
     break;
 
   case 81:
-#line 638 "perly.y"
+#line 641 "perly.y"
     { SvREFCNT_inc(PL_compcv);
 #ifdef MAD
-			  (yyval.opval) = utilize(IVAL((yyvsp[(1) - (7)].tkval)), (yyvsp[(2) - (7)].ival), (yyvsp[(4) - (7)].opval), (yyvsp[(5) - (7)].opval), (yyvsp[(6) - (7)].opval));
-			  token_getmad((yyvsp[(1) - (7)].tkval),(yyval.opval),'o');
-			  token_getmad((yyvsp[(7) - (7)].tkval),(yyval.opval),';');
+			  (yyval.opval) = utilize(IVAL((yyvsp[(1) - (7)].i_tkval)), (yyvsp[(2) - (7)].ival), (yyvsp[(4) - (7)].opval), (yyvsp[(5) - (7)].opval), (yyvsp[(6) - (7)].opval));
+			  token_getmad((yyvsp[(1) - (7)].i_tkval),(yyval.opval),'o');
+			  token_getmad((yyvsp[(7) - (7)].i_tkval),(yyval.opval),';');
 			  if (PL_rsfp_filters && AvFILLp(PL_rsfp_filters) >= 0)
 			      append_madprops(newMADPROP('!', MAD_PV, "", 0), (yyval.opval), 0);
 #else
-			  utilize(IVAL((yyvsp[(1) - (7)].tkval)), (yyvsp[(2) - (7)].ival), (yyvsp[(4) - (7)].opval), (yyvsp[(5) - (7)].opval), (yyvsp[(6) - (7)].opval));
+			  utilize(IVAL((yyvsp[(1) - (7)].i_tkval)), (yyvsp[(2) - (7)].ival), (yyvsp[(4) - (7)].opval), (yyvsp[(5) - (7)].opval), (yyvsp[(6) - (7)].opval));
 #endif
 			;}
     break;
 
   case 82:
-#line 653 "perly.y"
+#line 656 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 83:
-#line 657 "perly.y"
-    { (yyval.opval) = newLOGOP(IVAL((yyvsp[(2) - (3)].tkval)), 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+#line 660 "perly.y"
+    { (yyval.opval) = newLOGOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 84:
-#line 661 "perly.y"
+#line 664 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 86:
-#line 669 "perly.y"
+#line 672 "perly.y"
     {
 #ifdef MAD
 			  OP* op = newNULLLIST();
-			  token_getmad((yyvsp[(2) - (2)].tkval),op,',');
+			  token_getmad((yyvsp[(2) - (2)].i_tkval),op,',');
 			  (yyval.opval) = append_elem(OP_LIST, (yyvsp[(1) - (2)].opval), op);
 #else
 			  (yyval.opval) = (yyvsp[(1) - (2)].opval);
@@ -669,57 +669,57 @@ case 2:
     break;
 
   case 87:
-#line 679 "perly.y"
+#line 682 "perly.y"
     { 
 			  DO_MAD(
 			      (yyvsp[(3) - (3)].opval) = newUNOP(OP_NULL, 0, (yyvsp[(3) - (3)].opval));
-			      token_getmad((yyvsp[(2) - (3)].tkval),(yyvsp[(3) - (3)].opval),',');
+			      token_getmad((yyvsp[(2) - (3)].i_tkval),(yyvsp[(3) - (3)].opval),',');
 			  )
 			  (yyval.opval) = append_elem(OP_LIST, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
 			;}
     break;
 
   case 89:
-#line 691 "perly.y"
-    { (yyval.opval) = convert(IVAL((yyvsp[(1) - (3)].tkval)), OPf_STACKED,
-				prepend_elem(OP_LIST, newGVREF(IVAL((yyvsp[(1) - (3)].tkval)),(yyvsp[(2) - (3)].opval)), (yyvsp[(3) - (3)].opval)) );
-			  TOKEN_GETMAD((yyvsp[(1) - (3)].tkval),(yyval.opval),'o');
+#line 694 "perly.y"
+    { (yyval.opval) = convert(IVAL((yyvsp[(1) - (3)].i_tkval)), OPf_STACKED,
+				prepend_elem(OP_LIST, newGVREF(IVAL((yyvsp[(1) - (3)].i_tkval)),(yyvsp[(2) - (3)].opval)), (yyvsp[(3) - (3)].opval)) );
+			  TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 90:
-#line 696 "perly.y"
-    { (yyval.opval) = convert(IVAL((yyvsp[(1) - (5)].tkval)), OPf_STACKED,
-				prepend_elem(OP_LIST, newGVREF(IVAL((yyvsp[(1) - (5)].tkval)),(yyvsp[(3) - (5)].opval)), (yyvsp[(4) - (5)].opval)) );
-			  TOKEN_GETMAD((yyvsp[(1) - (5)].tkval),(yyval.opval),'o');
-			  TOKEN_GETMAD((yyvsp[(2) - (5)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),')');
+#line 699 "perly.y"
+    { (yyval.opval) = convert(IVAL((yyvsp[(1) - (5)].i_tkval)), OPf_STACKED,
+				prepend_elem(OP_LIST, newGVREF(IVAL((yyvsp[(1) - (5)].i_tkval)),(yyvsp[(3) - (5)].opval)), (yyvsp[(4) - (5)].opval)) );
+			  TOKEN_GETMAD((yyvsp[(1) - (5)].i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 91:
-#line 703 "perly.y"
+#line 706 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST,
 				    prepend_elem(OP_LIST, scalar((yyvsp[(1) - (6)].opval)), (yyvsp[(5) - (6)].opval)),
 				    newUNOP(OP_METHOD, 0, (yyvsp[(3) - (6)].opval))));
-			  TOKEN_GETMAD((yyvsp[(2) - (6)].tkval),(yyval.opval),'A');
-			  TOKEN_GETMAD((yyvsp[(4) - (6)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(6) - (6)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(2) - (6)].i_tkval),(yyval.opval),'A');
+			  TOKEN_GETMAD((yyvsp[(4) - (6)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(6) - (6)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 92:
-#line 712 "perly.y"
+#line 715 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST, scalar((yyvsp[(1) - (3)].opval)),
 				    newUNOP(OP_METHOD, 0, (yyvsp[(3) - (3)].opval))));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'A');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'A');
 			;}
     break;
 
   case 93:
-#line 718 "perly.y"
+#line 721 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST,
 				    prepend_elem(OP_LIST, (yyvsp[(2) - (3)].opval), (yyvsp[(3) - (3)].opval)),
@@ -728,40 +728,40 @@ case 2:
     break;
 
   case 94:
-#line 724 "perly.y"
+#line 727 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST,
 				    prepend_elem(OP_LIST, (yyvsp[(2) - (5)].opval), (yyvsp[(4) - (5)].opval)),
 				    newUNOP(OP_METHOD, 0, (yyvsp[(1) - (5)].opval))));
-			  TOKEN_GETMAD((yyvsp[(3) - (5)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(3) - (5)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 95:
-#line 732 "perly.y"
-    { (yyval.opval) = convert(IVAL((yyvsp[(1) - (2)].tkval)), 0, (yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+#line 735 "perly.y"
+    { (yyval.opval) = convert(IVAL((yyvsp[(1) - (2)].i_tkval)), 0, (yyvsp[(2) - (2)].opval));
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 96:
-#line 736 "perly.y"
-    { (yyval.opval) = convert(IVAL((yyvsp[(1) - (4)].tkval)), 0, (yyvsp[(3) - (4)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (4)].tkval),(yyval.opval),'o');
-			  TOKEN_GETMAD((yyvsp[(2) - (4)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),')');
+#line 739 "perly.y"
+    { (yyval.opval) = convert(IVAL((yyvsp[(1) - (4)].i_tkval)), 0, (yyvsp[(3) - (4)].opval));
+			  TOKEN_GETMAD((yyvsp[(1) - (4)].i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 97:
-#line 742 "perly.y"
+#line 745 "perly.y"
     { SvREFCNT_inc(PL_compcv);
 			  (yyvsp[(3) - (3)].opval) = newANONATTRSUB((yyvsp[(2) - (3)].ival), 0, Nullop, (yyvsp[(3) - (3)].opval)); ;}
     break;
 
   case 98:
-#line 745 "perly.y"
+#line 748 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				 append_elem(OP_LIST,
 				   prepend_elem(OP_LIST, (yyvsp[(3) - (5)].opval), (yyvsp[(5) - (5)].opval)), (yyvsp[(1) - (5)].opval)));
@@ -769,244 +769,244 @@ case 2:
     break;
 
   case 101:
-#line 760 "perly.y"
+#line 763 "perly.y"
     { (yyval.opval) = newBINOP(OP_GELEM, 0, (yyvsp[(1) - (5)].opval), scalar((yyvsp[(3) - (5)].opval)));
 			    PL_expect = XOPERATOR;
-			  TOKEN_GETMAD((yyvsp[(2) - (5)].tkval),(yyval.opval),'{');
-			  TOKEN_GETMAD((yyvsp[(4) - (5)].tkval),(yyval.opval),';');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),'}');
+			  TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((yyvsp[(4) - (5)].i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),'}');
 			;}
     break;
 
   case 102:
-#line 767 "perly.y"
+#line 770 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((yyvsp[(1) - (4)].opval)), scalar((yyvsp[(3) - (4)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (4)].tkval),(yyval.opval),'[');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),']');
+			  TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),']');
 			;}
     break;
 
   case 103:
-#line 772 "perly.y"
+#line 775 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((yyvsp[(1) - (5)].opval)),OP_RV2AV),
 					scalar((yyvsp[(4) - (5)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (5)].tkval),(yyval.opval),'a');
-			  TOKEN_GETMAD((yyvsp[(3) - (5)].tkval),(yyval.opval),'[');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),']');
+			  TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),'a');
+			  TOKEN_GETMAD((yyvsp[(3) - (5)].i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),']');
 			;}
     break;
 
   case 104:
-#line 780 "perly.y"
+#line 783 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
 					ref(newAVREF((yyvsp[(1) - (4)].opval)),OP_RV2AV),
 					scalar((yyvsp[(3) - (4)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (4)].tkval),(yyval.opval),'[');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),']');
+			  TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),']');
 			;}
     break;
 
   case 105:
-#line 787 "perly.y"
+#line 790 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((yyvsp[(1) - (5)].opval)), jmaybe((yyvsp[(3) - (5)].opval)));
 			    PL_expect = XOPERATOR;
-			  TOKEN_GETMAD((yyvsp[(2) - (5)].tkval),(yyval.opval),'{');
-			  TOKEN_GETMAD((yyvsp[(4) - (5)].tkval),(yyval.opval),';');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),'}');
+			  TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((yyvsp[(4) - (5)].i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),'}');
 			;}
     break;
 
   case 106:
-#line 794 "perly.y"
+#line 797 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((yyvsp[(1) - (6)].opval)),OP_RV2HV),
 					jmaybe((yyvsp[(4) - (6)].opval)));
 			    PL_expect = XOPERATOR;
-			  TOKEN_GETMAD((yyvsp[(2) - (6)].tkval),(yyval.opval),'a');
-			  TOKEN_GETMAD((yyvsp[(3) - (6)].tkval),(yyval.opval),'{');
-			  TOKEN_GETMAD((yyvsp[(5) - (6)].tkval),(yyval.opval),';');
-			  TOKEN_GETMAD((yyvsp[(6) - (6)].tkval),(yyval.opval),'}');
+			  TOKEN_GETMAD((yyvsp[(2) - (6)].i_tkval),(yyval.opval),'a');
+			  TOKEN_GETMAD((yyvsp[(3) - (6)].i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((yyvsp[(5) - (6)].i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((yyvsp[(6) - (6)].i_tkval),(yyval.opval),'}');
 			;}
     break;
 
   case 107:
-#line 804 "perly.y"
+#line 807 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
 					ref(newHVREF((yyvsp[(1) - (5)].opval)),OP_RV2HV),
 					jmaybe((yyvsp[(3) - (5)].opval)));
 			    PL_expect = XOPERATOR;
-			  TOKEN_GETMAD((yyvsp[(2) - (5)].tkval),(yyval.opval),'{');
-			  TOKEN_GETMAD((yyvsp[(4) - (5)].tkval),(yyval.opval),';');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),'}');
+			  TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((yyvsp[(4) - (5)].i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),'}');
 			;}
     break;
 
   case 108:
-#line 813 "perly.y"
+#line 816 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar((yyvsp[(1) - (4)].opval))));
-			  TOKEN_GETMAD((yyvsp[(2) - (4)].tkval),(yyval.opval),'a');
-			  TOKEN_GETMAD((yyvsp[(3) - (4)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'a');
+			  TOKEN_GETMAD((yyvsp[(3) - (4)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 109:
-#line 820 "perly.y"
+#line 823 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   append_elem(OP_LIST, (yyvsp[(4) - (5)].opval),
 				       newCVREF(0, scalar((yyvsp[(1) - (5)].opval)))));
-			  TOKEN_GETMAD((yyvsp[(2) - (5)].tkval),(yyval.opval),'a');
-			  TOKEN_GETMAD((yyvsp[(3) - (5)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),'a');
+			  TOKEN_GETMAD((yyvsp[(3) - (5)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 110:
-#line 829 "perly.y"
+#line 832 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   append_elem(OP_LIST, (yyvsp[(3) - (4)].opval),
 					       newCVREF(0, scalar((yyvsp[(1) - (4)].opval)))));
-			  TOKEN_GETMAD((yyvsp[(2) - (4)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 111:
-#line 836 "perly.y"
+#line 839 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				   newCVREF(0, scalar((yyvsp[(1) - (3)].opval))));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(3) - (3)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 112:
-#line 842 "perly.y"
+#line 845 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (yyvsp[(5) - (6)].opval), (yyvsp[(2) - (6)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (6)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(3) - (6)].tkval),(yyval.opval),')');
-			  TOKEN_GETMAD((yyvsp[(4) - (6)].tkval),(yyval.opval),'[');
-			  TOKEN_GETMAD((yyvsp[(6) - (6)].tkval),(yyval.opval),']');
+			  TOKEN_GETMAD((yyvsp[(1) - (6)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(3) - (6)].i_tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(4) - (6)].i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((yyvsp[(6) - (6)].i_tkval),(yyval.opval),']');
 			;}
     break;
 
   case 113:
-#line 849 "perly.y"
+#line 852 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (yyvsp[(4) - (5)].opval), Nullop);
-			  TOKEN_GETMAD((yyvsp[(1) - (5)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(2) - (5)].tkval),(yyval.opval),')');
-			  TOKEN_GETMAD((yyvsp[(3) - (5)].tkval),(yyval.opval),'[');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),']');
+			  TOKEN_GETMAD((yyvsp[(1) - (5)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(3) - (5)].i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),']');
 			;}
     break;
 
   case 114:
-#line 859 "perly.y"
-    { (yyval.opval) = newASSIGNOP(OPf_STACKED, (yyvsp[(1) - (3)].opval), IVAL((yyvsp[(2) - (3)].tkval)), (yyvsp[(3) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+#line 862 "perly.y"
+    { (yyval.opval) = newASSIGNOP(OPf_STACKED, (yyvsp[(1) - (3)].opval), IVAL((yyvsp[(2) - (3)].i_tkval)), (yyvsp[(3) - (3)].opval));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 115:
-#line 863 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+#line 866 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 116:
-#line 867 "perly.y"
-    {   if (IVAL((yyvsp[(2) - (3)].tkval)) != OP_REPEAT)
+#line 870 "perly.y"
+    {   if (IVAL((yyvsp[(2) - (3)].i_tkval)) != OP_REPEAT)
 				scalar((yyvsp[(1) - (3)].opval));
-			    (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].tkval)), 0, (yyvsp[(1) - (3)].opval), scalar((yyvsp[(3) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+			    (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, (yyvsp[(1) - (3)].opval), scalar((yyvsp[(3) - (3)].opval)));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 117:
-#line 873 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+#line 876 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 118:
-#line 877 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+#line 880 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 119:
-#line 881 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+#line 884 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 120:
-#line 885 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+#line 888 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 121:
-#line 889 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+#line 892 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 122:
-#line 893 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+#line 896 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 123:
-#line 897 "perly.y"
+#line 900 "perly.y"
     {
-			  (yyval.opval) = newRANGE(IVAL((yyvsp[(2) - (3)].tkval)), scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval)));
+			  (yyval.opval) = newRANGE(IVAL((yyvsp[(2) - (3)].i_tkval)), scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].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((yyvsp[(2) - (3)].tkval),(OP*)op,'o');
+			      token_getmad((yyvsp[(2) - (3)].i_tkval),(OP*)op,'o');
 			    )
 			;}
     break;
 
   case 124:
-#line 909 "perly.y"
+#line 912 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 125:
-#line 913 "perly.y"
+#line 916 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 126:
-#line 917 "perly.y"
+#line 920 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 127:
-#line 921 "perly.y"
-    { (yyval.opval) = bind_match(IVAL((yyvsp[(2) - (3)].tkval)), (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),
+#line 924 "perly.y"
+    { (yyval.opval) = bind_match(IVAL((yyvsp[(2) - (3)].i_tkval)), (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval));
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),
 				((yyval.opval)->op_type == OP_NOT
 				    ? ((UNOP*)(yyval.opval))->op_first : (yyval.opval)),
 				'~');
@@ -1014,128 +1014,128 @@ case 2:
     break;
 
   case 128:
-#line 931 "perly.y"
+#line 934 "perly.y"
     { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((yyvsp[(2) - (2)].opval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 129:
-#line 935 "perly.y"
+#line 938 "perly.y"
     { (yyval.opval) = IF_MAD(
 				    newUNOP(OP_NULL, 0, (yyvsp[(2) - (2)].opval)),
 				    (yyvsp[(2) - (2)].opval)
 				);
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'+');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'+');
 			;}
     break;
 
   case 130:
-#line 942 "perly.y"
+#line 945 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[(2) - (2)].opval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 131:
-#line 946 "perly.y"
+#line 949 "perly.y"
     { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((yyvsp[(2) - (2)].opval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 132:
-#line 950 "perly.y"
+#line 953 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
 					mod(scalar((yyvsp[(1) - (2)].opval)), OP_POSTINC));
-			  TOKEN_GETMAD((yyvsp[(2) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 133:
-#line 955 "perly.y"
+#line 958 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
 					mod(scalar((yyvsp[(1) - (2)].opval)), OP_POSTDEC));
-			  TOKEN_GETMAD((yyvsp[(2) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 134:
-#line 960 "perly.y"
+#line 963 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
 					mod(scalar((yyvsp[(2) - (2)].opval)), OP_PREINC));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 135:
-#line 965 "perly.y"
+#line 968 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
 					mod(scalar((yyvsp[(2) - (2)].opval)), OP_PREDEC));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 136:
-#line 974 "perly.y"
+#line 977 "perly.y"
     { (yyval.opval) = newANONLIST((yyvsp[(2) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (3)].tkval),(yyval.opval),'[');
-			  TOKEN_GETMAD((yyvsp[(3) - (3)].tkval),(yyval.opval),']');
+			  TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),']');
 			;}
     break;
 
   case 137:
-#line 979 "perly.y"
+#line 982 "perly.y"
     { (yyval.opval) = newANONLIST(Nullop);
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'[');
-			  TOKEN_GETMAD((yyvsp[(2) - (2)].tkval),(yyval.opval),']');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),']');
 			;}
     break;
 
   case 138:
-#line 984 "perly.y"
+#line 987 "perly.y"
     { (yyval.opval) = newANONHASH((yyvsp[(2) - (4)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (4)].tkval),(yyval.opval),'{');
-			  TOKEN_GETMAD((yyvsp[(3) - (4)].tkval),(yyval.opval),';');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),'}');
+			  TOKEN_GETMAD((yyvsp[(1) - (4)].i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((yyvsp[(3) - (4)].i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),'}');
 			;}
     break;
 
   case 139:
-#line 990 "perly.y"
+#line 993 "perly.y"
     { (yyval.opval) = newANONHASH(Nullop);
-			  TOKEN_GETMAD((yyvsp[(1) - (3)].tkval),(yyval.opval),'{');
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),';');
-			  TOKEN_GETMAD((yyvsp[(3) - (3)].tkval),(yyval.opval),'}');
+			  TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),'}');
 			;}
     break;
 
   case 140:
-#line 996 "perly.y"
+#line 999 "perly.y"
     { SvREFCNT_inc(PL_compcv);
 			  (yyval.opval) = newANONATTRSUB((yyvsp[(2) - (5)].ival), (yyvsp[(3) - (5)].opval), (yyvsp[(4) - (5)].opval), (yyvsp[(5) - (5)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (5)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (5)].i_tkval),(yyval.opval),'o');
 			  OP_GETMAD((yyvsp[(3) - (5)].opval),(yyval.opval),'s');
 			  OP_GETMAD((yyvsp[(4) - (5)].opval),(yyval.opval),'a');
 			;}
     break;
 
   case 141:
-#line 1007 "perly.y"
-    { (yyval.opval) = dofile((yyvsp[(2) - (2)].opval), (yyvsp[(1) - (2)].tkval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+#line 1010 "perly.y"
+    { (yyval.opval) = dofile((yyvsp[(2) - (2)].opval), IVAL((yyvsp[(1) - (2)].i_tkval)));
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 142:
-#line 1011 "perly.y"
+#line 1014 "perly.y"
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((yyvsp[(2) - (2)].opval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'D');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'D');
 			;}
     break;
 
   case 143:
-#line 1015 "perly.y"
+#line 1018 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
@@ -1143,14 +1143,14 @@ case 2:
 				    (OPpENTERSUB_AMPER<<8),
 				    scalar((yyvsp[(2) - (4)].opval))
 				)),Nullop)); dep();
-			  TOKEN_GETMAD((yyvsp[(1) - (4)].tkval),(yyval.opval),'o');
-			  TOKEN_GETMAD((yyvsp[(3) - (4)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (4)].i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(3) - (4)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 144:
-#line 1027 "perly.y"
+#line 1030 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
 			    OPf_SPECIAL|OPf_STACKED,
 			    append_elem(OP_LIST,
@@ -1159,154 +1159,154 @@ case 2:
 				    (OPpENTERSUB_AMPER<<8),
 				    scalar((yyvsp[(2) - (5)].opval))
 				)))); dep();
-			  TOKEN_GETMAD((yyvsp[(1) - (5)].tkval),(yyval.opval),'o');
-			  TOKEN_GETMAD((yyvsp[(3) - (5)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (5)].i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(3) - (5)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 145:
-#line 1040 "perly.y"
+#line 1043 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
 				scalar(newCVREF(0,scalar((yyvsp[(2) - (4)].opval)))), Nullop)); dep();
-			  TOKEN_GETMAD((yyvsp[(1) - (4)].tkval),(yyval.opval),'o');
-			  TOKEN_GETMAD((yyvsp[(3) - (4)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (4)].i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(3) - (4)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 146:
-#line 1048 "perly.y"
+#line 1051 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
 			    prepend_elem(OP_LIST,
 				(yyvsp[(4) - (5)].opval),
 				scalar(newCVREF(0,scalar((yyvsp[(2) - (5)].opval)))))); dep();
-			  TOKEN_GETMAD((yyvsp[(1) - (5)].tkval),(yyval.opval),'o');
-			  TOKEN_GETMAD((yyvsp[(3) - (5)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (5)].i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(3) - (5)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 151:
-#line 1064 "perly.y"
+#line 1067 "perly.y"
     { (yyval.opval) = newCONDOP(0, (yyvsp[(1) - (5)].opval), (yyvsp[(3) - (5)].opval), (yyvsp[(5) - (5)].opval));
-			  TOKEN_GETMAD((yyvsp[(2) - (5)].tkval),(yyval.opval),'?');
-			  TOKEN_GETMAD((yyvsp[(4) - (5)].tkval),(yyval.opval),':');
+			  TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),'?');
+			  TOKEN_GETMAD((yyvsp[(4) - (5)].i_tkval),(yyval.opval),':');
 			;}
     break;
 
   case 152:
-#line 1069 "perly.y"
+#line 1072 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((yyvsp[(2) - (2)].opval),OP_REFGEN));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 153:
-#line 1073 "perly.y"
+#line 1076 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 154:
-#line 1075 "perly.y"
-    { (yyval.opval) = localize((yyvsp[(2) - (2)].opval),IVAL((yyvsp[(1) - (2)].tkval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'d');
+#line 1078 "perly.y"
+    { (yyval.opval) = localize((yyvsp[(2) - (2)].opval),IVAL((yyvsp[(1) - (2)].i_tkval)));
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'d');
 			;}
     break;
 
   case 155:
-#line 1079 "perly.y"
+#line 1082 "perly.y"
     { (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(yyvsp[(2) - (3)].opval)), (yyvsp[(2) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (3)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(3) - (3)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 156:
-#line 1084 "perly.y"
+#line 1087 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST());
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(2) - (2)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 157:
-#line 1089 "perly.y"
+#line 1092 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 158:
-#line 1091 "perly.y"
+#line 1094 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 159:
-#line 1093 "perly.y"
+#line 1096 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 160:
-#line 1095 "perly.y"
+#line 1098 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 161:
-#line 1097 "perly.y"
+#line 1100 "perly.y"
     { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((yyvsp[(1) - (1)].opval), OP_AV2ARYLEN));;}
     break;
 
   case 162:
-#line 1099 "perly.y"
+#line 1102 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 163:
-#line 1101 "perly.y"
+#line 1104 "perly.y"
     { (yyval.opval) = prepend_elem(OP_ASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_ASLICE, 0,
 					list((yyvsp[(3) - (4)].opval)),
 					ref((yyvsp[(1) - (4)].opval), OP_ASLICE)));
-			  TOKEN_GETMAD((yyvsp[(2) - (4)].tkval),(yyval.opval),'[');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),']');
+			  TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'[');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),']');
 			;}
     break;
 
   case 164:
-#line 1110 "perly.y"
+#line 1113 "perly.y"
     { (yyval.opval) = prepend_elem(OP_HSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_HSLICE, 0,
 					list((yyvsp[(3) - (5)].opval)),
 					ref(oopsHV((yyvsp[(1) - (5)].opval)), OP_HSLICE)));
 			    PL_expect = XOPERATOR;
-			  TOKEN_GETMAD((yyvsp[(2) - (5)].tkval),(yyval.opval),'{');
-			  TOKEN_GETMAD((yyvsp[(4) - (5)].tkval),(yyval.opval),';');
-			  TOKEN_GETMAD((yyvsp[(5) - (5)].tkval),(yyval.opval),'}');
+			  TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),'{');
+			  TOKEN_GETMAD((yyvsp[(4) - (5)].i_tkval),(yyval.opval),';');
+			  TOKEN_GETMAD((yyvsp[(5) - (5)].i_tkval),(yyval.opval),'}');
 			;}
     break;
 
   case 165:
-#line 1121 "perly.y"
+#line 1124 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 166:
-#line 1123 "perly.y"
+#line 1126 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((yyvsp[(1) - (1)].opval))); ;}
     break;
 
   case 167:
-#line 1125 "perly.y"
+#line 1128 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((yyvsp[(1) - (3)].opval)));
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(3) - (3)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 168:
-#line 1130 "perly.y"
+#line 1133 "perly.y"
     {
 			  (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				append_elem(OP_LIST, (yyvsp[(3) - (4)].opval), scalar((yyvsp[(1) - (4)].opval))));
@@ -1315,140 +1315,140 @@ case 2:
 			      if (op->op_type == OP_CONST) { /* defeat const fold */
 				op = (OP*)op->op_madprop->mad_val;
 			      }
-			      token_getmad((yyvsp[(2) - (4)].tkval),op,'(');
-			      token_getmad((yyvsp[(4) - (4)].tkval),op,')');
+			      token_getmad((yyvsp[(2) - (4)].i_tkval),op,'(');
+			      token_getmad((yyvsp[(4) - (4)].i_tkval),op,')');
 			  )
 			;}
     break;
 
   case 169:
-#line 1143 "perly.y"
+#line 1146 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    append_elem(OP_LIST, (yyvsp[(3) - (3)].opval), scalar((yyvsp[(2) - (3)].opval))));
-			  TOKEN_GETMAD((yyvsp[(1) - (3)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 170:
-#line 1148 "perly.y"
-    { (yyval.opval) = newOP(IVAL((yyvsp[(1) - (1)].tkval)), OPf_SPECIAL);
+#line 1151 "perly.y"
+    { (yyval.opval) = newOP(IVAL((yyvsp[(1) - (1)].i_tkval)), OPf_SPECIAL);
 			    PL_hints |= HINT_BLOCK_SCOPE;
-			  TOKEN_GETMAD((yyvsp[(1) - (1)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (1)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 171:
-#line 1153 "perly.y"
-    { (yyval.opval) = newLOOPEX(IVAL((yyvsp[(1) - (2)].tkval)),(yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+#line 1156 "perly.y"
+    { (yyval.opval) = newLOOPEX(IVAL((yyvsp[(1) - (2)].i_tkval)),(yyvsp[(2) - (2)].opval));
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 172:
-#line 1157 "perly.y"
+#line 1160 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[(2) - (2)].opval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 173:
-#line 1161 "perly.y"
-    { (yyval.opval) = newOP(IVAL((yyvsp[(1) - (1)].tkval)), 0);
-			  TOKEN_GETMAD((yyvsp[(1) - (1)].tkval),(yyval.opval),'o');
+#line 1164 "perly.y"
+    { (yyval.opval) = newOP(IVAL((yyvsp[(1) - (1)].i_tkval)), 0);
+			  TOKEN_GETMAD((yyvsp[(1) - (1)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 174:
-#line 1165 "perly.y"
-    { (yyval.opval) = newUNOP(IVAL((yyvsp[(1) - (2)].tkval)), 0, (yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+#line 1168 "perly.y"
+    { (yyval.opval) = newUNOP(IVAL((yyvsp[(1) - (2)].i_tkval)), 0, (yyvsp[(2) - (2)].opval));
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 175:
-#line 1169 "perly.y"
-    { (yyval.opval) = newUNOP(IVAL((yyvsp[(1) - (2)].tkval)), 0, (yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'o');
+#line 1172 "perly.y"
+    { (yyval.opval) = newUNOP(IVAL((yyvsp[(1) - (2)].i_tkval)), 0, (yyvsp[(2) - (2)].opval));
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 176:
-#line 1173 "perly.y"
-    { (yyval.opval) = newOP(OP_REQUIRE, (yyvsp[(1) - (1)].tkval) ? OPf_SPECIAL : 0); ;}
+#line 1176 "perly.y"
+    { (yyval.opval) = newOP(OP_REQUIRE, (yyvsp[(1) - (1)].i_tkval) ? OPf_SPECIAL : 0); ;}
     break;
 
   case 177:
-#line 1175 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REQUIRE, (yyvsp[(1) - (2)].tkval) ? OPf_SPECIAL : 0, (yyvsp[(2) - (2)].opval)); ;}
+#line 1178 "perly.y"
+    { (yyval.opval) = newUNOP(OP_REQUIRE, (yyvsp[(1) - (2)].i_tkval) ? OPf_SPECIAL : 0, (yyvsp[(2) - (2)].opval)); ;}
     break;
 
   case 178:
-#line 1177 "perly.y"
+#line 1180 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((yyvsp[(1) - (1)].opval))); ;}
     break;
 
   case 179:
-#line 1179 "perly.y"
+#line 1182 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 			    append_elem(OP_LIST, (yyvsp[(2) - (2)].opval), scalar((yyvsp[(1) - (2)].opval)))); ;}
     break;
 
   case 180:
-#line 1182 "perly.y"
-    { (yyval.opval) = newOP(IVAL((yyvsp[(1) - (1)].tkval)), 0);
-			  TOKEN_GETMAD((yyvsp[(1) - (1)].tkval),(yyval.opval),'o');
+#line 1185 "perly.y"
+    { (yyval.opval) = newOP(IVAL((yyvsp[(1) - (1)].i_tkval)), 0);
+			  TOKEN_GETMAD((yyvsp[(1) - (1)].i_tkval),(yyval.opval),'o');
 			;}
     break;
 
   case 181:
-#line 1186 "perly.y"
-    { (yyval.opval) = newOP(IVAL((yyvsp[(1) - (3)].tkval)), 0);
-			  TOKEN_GETMAD((yyvsp[(1) - (3)].tkval),(yyval.opval),'o');
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(3) - (3)].tkval),(yyval.opval),')');
+#line 1189 "perly.y"
+    { (yyval.opval) = newOP(IVAL((yyvsp[(1) - (3)].i_tkval)), 0);
+			  TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 182:
-#line 1192 "perly.y"
+#line 1195 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				scalar((yyvsp[(1) - (1)].opval))); ;}
     break;
 
   case 183:
-#line 1195 "perly.y"
-    { (yyval.opval) = (IVAL((yyvsp[(1) - (3)].tkval)) == OP_NOT)
-			    ? newUNOP(IVAL((yyvsp[(1) - (3)].tkval)), 0, newSVOP(OP_CONST, 0, newSViv(0)))
-			    : newOP(IVAL((yyvsp[(1) - (3)].tkval)), OPf_SPECIAL);
+#line 1198 "perly.y"
+    { (yyval.opval) = (IVAL((yyvsp[(1) - (3)].i_tkval)) == OP_NOT)
+			    ? newUNOP(IVAL((yyvsp[(1) - (3)].i_tkval)), 0, newSVOP(OP_CONST, 0, newSViv(0)))
+			    : newOP(IVAL((yyvsp[(1) - (3)].i_tkval)), OPf_SPECIAL);
 
-			  TOKEN_GETMAD((yyvsp[(1) - (3)].tkval),(yyval.opval),'o');
-			  TOKEN_GETMAD((yyvsp[(2) - (3)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(3) - (3)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 184:
-#line 1204 "perly.y"
-    { (yyval.opval) = newUNOP(IVAL((yyvsp[(1) - (4)].tkval)), 0, (yyvsp[(3) - (4)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (4)].tkval),(yyval.opval),'o');
-			  TOKEN_GETMAD((yyvsp[(2) - (4)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),')');
+#line 1207 "perly.y"
+    { (yyval.opval) = newUNOP(IVAL((yyvsp[(1) - (4)].i_tkval)), 0, (yyvsp[(3) - (4)].opval));
+			  TOKEN_GETMAD((yyvsp[(1) - (4)].i_tkval),(yyval.opval),'o');
+			  TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 185:
-#line 1210 "perly.y"
+#line 1213 "perly.y"
     { (yyval.opval) = pmruntime((yyvsp[(1) - (4)].opval), (yyvsp[(3) - (4)].opval), 1);
-			  TOKEN_GETMAD((yyvsp[(2) - (4)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(4) - (4)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 188:
-#line 1220 "perly.y"
+#line 1223 "perly.y"
     { (yyval.opval) = my_attrs((yyvsp[(2) - (3)].opval),(yyvsp[(3) - (3)].opval));
 			  DO_MAD(
-			      token_getmad((yyvsp[(1) - (3)].tkval),(yyval.opval),'d');
+			      token_getmad((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'d');
 			      append_madprops((yyvsp[(3) - (3)].opval)->op_madprop, (yyval.opval), 'a');
 			      (yyvsp[(3) - (3)].opval)->op_madprop = 0;
 			  )
@@ -1456,69 +1456,69 @@ case 2:
     break;
 
   case 189:
-#line 1228 "perly.y"
-    { (yyval.opval) = localize((yyvsp[(2) - (2)].opval),IVAL((yyvsp[(1) - (2)].tkval)));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'d');
+#line 1231 "perly.y"
+    { (yyval.opval) = localize((yyvsp[(2) - (2)].opval),IVAL((yyvsp[(1) - (2)].i_tkval)));
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'d');
 			;}
     break;
 
   case 190:
-#line 1235 "perly.y"
+#line 1238 "perly.y"
     { (yyval.opval) = sawparens((yyvsp[(2) - (3)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (3)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(3) - (3)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 191:
-#line 1240 "perly.y"
+#line 1243 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST());
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'(');
-			  TOKEN_GETMAD((yyvsp[(2) - (2)].tkval),(yyval.opval),')');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'(');
+			  TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),')');
 			;}
     break;
 
   case 192:
-#line 1245 "perly.y"
+#line 1248 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 193:
-#line 1247 "perly.y"
+#line 1250 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 194:
-#line 1249 "perly.y"
+#line 1252 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 195:
-#line 1254 "perly.y"
+#line 1257 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 196:
-#line 1256 "perly.y"
+#line 1259 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 197:
-#line 1260 "perly.y"
+#line 1263 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
   case 198:
-#line 1262 "perly.y"
+#line 1265 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
   case 199:
-#line 1264 "perly.y"
+#line 1267 "perly.y"
     {
 #ifdef MAD
 			  OP* op = newNULLLIST();
-			  token_getmad((yyvsp[(2) - (2)].tkval),op,',');
+			  token_getmad((yyvsp[(2) - (2)].i_tkval),op,',');
 			  (yyval.opval) = append_elem(OP_LIST, (yyvsp[(1) - (2)].opval), op);
 #else
 			  (yyval.opval) = (yyvsp[(1) - (2)].opval);
@@ -1528,69 +1528,69 @@ case 2:
     break;
 
   case 200:
-#line 1279 "perly.y"
+#line 1282 "perly.y"
     { PL_in_my = 0; (yyval.opval) = my((yyvsp[(1) - (1)].opval)); ;}
     break;
 
   case 201:
-#line 1283 "perly.y"
-    { (yyval.opval) = newCVREF(IVAL((yyvsp[(1) - (2)].tkval)),(yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'&');
+#line 1286 "perly.y"
+    { (yyval.opval) = newCVREF(IVAL((yyvsp[(1) - (2)].i_tkval)),(yyvsp[(2) - (2)].opval));
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'&');
 			;}
     break;
 
   case 202:
-#line 1289 "perly.y"
+#line 1292 "perly.y"
     { (yyval.opval) = newSVREF((yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'$');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'$');
 			;}
     break;
 
   case 203:
-#line 1295 "perly.y"
+#line 1298 "perly.y"
     { (yyval.opval) = newAVREF((yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'@');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'@');
 			;}
     break;
 
   case 204:
-#line 1301 "perly.y"
+#line 1304 "perly.y"
     { (yyval.opval) = newHVREF((yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'%');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'%');
 			;}
     break;
 
   case 205:
-#line 1307 "perly.y"
+#line 1310 "perly.y"
     { (yyval.opval) = newAVREF((yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'l');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'l');
 			;}
     break;
 
   case 206:
-#line 1313 "perly.y"
+#line 1316 "perly.y"
     { (yyval.opval) = newGVREF(0,(yyvsp[(2) - (2)].opval));
-			  TOKEN_GETMAD((yyvsp[(1) - (2)].tkval),(yyval.opval),'*');
+			  TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'*');
 			;}
     break;
 
   case 207:
-#line 1320 "perly.y"
+#line 1323 "perly.y"
     { (yyval.opval) = scalar((yyvsp[(1) - (1)].opval)); ;}
     break;
 
   case 208:
-#line 1322 "perly.y"
+#line 1325 "perly.y"
     { (yyval.opval) = scalar((yyvsp[(1) - (1)].opval)); ;}
     break;
 
   case 209:
-#line 1324 "perly.y"
+#line 1327 "perly.y"
     { (yyval.opval) = scope((yyvsp[(1) - (1)].opval)); ;}
     break;
 
   case 210:
-#line 1327 "perly.y"
+#line 1330 "perly.y"
     { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;}
     break;
 
diff --git a/perly.h b/perly.h
index cadd593..0c19d29 100644
--- a/perly.h
+++ b/perly.h
@@ -193,10 +193,13 @@ typedef union YYSTYPE
     GV *gvval;
 #ifdef PERL_IN_MADLY_C
     TOKEN* p_tkval;
-    TOKEN* tkval;
+    TOKEN* i_tkval;
 #else
     char *p_tkval;
-    I32	tkval;
+    I32	i_tkval;
+#endif
+#ifdef PERL_MAD
+    TOKEN* tkval;
 #endif
 }
 /* Line 1529 of yacc.c.  */
diff --git a/perly.tab b/perly.tab
index 42f6147..599b4bc 100644
--- a/perly.tab
+++ b/perly.tab
@@ -167,28 +167,28 @@ static const yytype_int16 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   127,   127,   133,   143,   147,   151,   157,   167,   171,
-     175,   176,   183,   192,   195,   196,   198,   200,   217,   236,
-     238,   240,   244,   248,   252,   256,   265,   266,   270,   281,
-     289,   300,   303,   309,   310,   317,   330,   342,   353,   363,
-     373,   409,   417,   427,   433,   434,   439,   442,   446,   451,
-     455,   459,   465,   474,   478,   480,   482,   484,   486,   491,
-     495,   501,   514,   515,   519,   531,   552,   558,   563,   568,
-     578,   579,   584,   585,   589,   599,   603,   613,   614,   623,
-     636,   635,   652,   656,   660,   664,   668,   678,   686,   690,
-     695,   702,   711,   717,   723,   731,   735,   742,   741,   752,
-     753,   757,   766,   771,   779,   786,   793,   803,   812,   819,
-     828,   835,   841,   848,   858,   862,   866,   872,   876,   880,
-     884,   888,   892,   896,   908,   912,   916,   920,   930,   934,
-     941,   945,   949,   954,   959,   964,   973,   978,   983,   989,
-     995,  1006,  1010,  1014,  1026,  1039,  1047,  1059,  1060,  1061,
-    1062,  1063,  1068,  1072,  1074,  1078,  1083,  1088,  1090,  1092,
-    1094,  1096,  1098,  1100,  1109,  1120,  1122,  1124,  1129,  1142,
-    1147,  1152,  1156,  1160,  1164,  1168,  1172,  1174,  1176,  1178,
-    1181,  1185,  1191,  1194,  1203,  1209,  1214,  1215,  1219,  1227,
-    1234,  1239,  1244,  1246,  1248,  1253,  1255,  1260,  1261,  1263,
-    1278,  1282,  1288,  1294,  1300,  1306,  1312,  1319,  1321,  1323,
-    1326
+       0,   130,   130,   136,   146,   150,   154,   160,   170,   174,
+     178,   179,   186,   195,   198,   199,   201,   203,   220,   239,
+     241,   243,   247,   251,   255,   259,   268,   269,   273,   284,
+     292,   303,   306,   312,   313,   320,   333,   345,   356,   366,
+     376,   412,   420,   430,   436,   437,   442,   445,   449,   454,
+     458,   462,   468,   477,   481,   483,   485,   487,   489,   494,
+     498,   504,   517,   518,   522,   534,   555,   561,   566,   571,
+     581,   582,   587,   588,   592,   602,   606,   616,   617,   626,
+     639,   638,   655,   659,   663,   667,   671,   681,   689,   693,
+     698,   705,   714,   720,   726,   734,   738,   745,   744,   755,
+     756,   760,   769,   774,   782,   789,   796,   806,   815,   822,
+     831,   838,   844,   851,   861,   865,   869,   875,   879,   883,
+     887,   891,   895,   899,   911,   915,   919,   923,   933,   937,
+     944,   948,   952,   957,   962,   967,   976,   981,   986,   992,
+     998,  1009,  1013,  1017,  1029,  1042,  1050,  1062,  1063,  1064,
+    1065,  1066,  1071,  1075,  1077,  1081,  1086,  1091,  1093,  1095,
+    1097,  1099,  1101,  1103,  1112,  1123,  1125,  1127,  1132,  1145,
+    1150,  1155,  1159,  1163,  1167,  1171,  1175,  1177,  1179,  1181,
+    1184,  1188,  1194,  1197,  1206,  1212,  1217,  1218,  1222,  1230,
+    1237,  1242,  1247,  1249,  1251,  1256,  1258,  1263,  1264,  1266,
+    1281,  1285,  1291,  1297,  1303,  1309,  1315,  1322,  1324,  1326,
+    1329
 };
 #endif
 
diff --git a/perly.y b/perly.y
index f5b4203..231c22f 100644
--- a/perly.y
+++ b/perly.y
@@ -49,27 +49,30 @@
     GV *gvval;
 #ifdef PERL_IN_MADLY_C
     TOKEN* p_tkval;
-    TOKEN* tkval;
+    TOKEN* i_tkval;
 #else
     char *p_tkval;
-    I32	tkval;
+    I32	i_tkval;
+#endif
+#ifdef PERL_MAD
+    TOKEN* tkval;
 #endif
 }
 
-%token <tkval> '{' '}' '[' ']' '-' '+' '$' '@' '%' '*' '&' ';'
+%token <i_tkval> '{' '}' '[' ']' '-' '+' '$' '@' '%' '*' '&' ';'
 
 %token <opval> WORD METHOD FUNCMETH THING PMFUNC PRIVATEREF
 %token <opval> FUNC0SUB UNIOPSUB LSTOPSUB
 %token <p_tkval> LABEL
-%token <tkval> FORMAT SUB ANONSUB PACKAGE USE
-%token <tkval> WHILE UNTIL IF UNLESS ELSE ELSIF CONTINUE FOR
-%token <tkval> GIVEN WHEN DEFAULT
-%token <tkval> LOOPEX DOTDOT
-%token <tkval> FUNC0 FUNC1 FUNC UNIOP LSTOP
-%token <tkval> RELOP EQOP MULOP ADDOP
-%token <tkval> DOLSHARP DO HASHBRACK NOAMP
-%token <tkval> LOCAL MY MYSUB REQUIRE
-%token <tkval> COLONATTR
+%token <i_tkval> FORMAT SUB ANONSUB PACKAGE USE
+%token <i_tkval> WHILE UNTIL IF UNLESS ELSE ELSIF CONTINUE FOR
+%token <i_tkval> GIVEN WHEN DEFAULT
+%token <i_tkval> LOOPEX DOTDOT
+%token <i_tkval> FUNC0 FUNC1 FUNC UNIOP LSTOP
+%token <i_tkval> RELOP EQOP MULOP ADDOP
+%token <i_tkval> DOLSHARP DO HASHBRACK NOAMP
+%token <i_tkval> LOCAL MY MYSUB REQUIRE
+%token <i_tkval> COLONATTR
 
 %type <ival> prog progstart remember mremember savescope
 %type <ival>  startsub startanonsub startformsub
@@ -88,38 +91,38 @@
 %type <opval> switch case
 %type <p_tkval> label
 
-%nonassoc <tkval> PREC_LOW
+%nonassoc <i_tkval> PREC_LOW
 %nonassoc LOOPEX
 
-%left <tkval> OROP DOROP
-%left <tkval> ANDOP
-%right <tkval> NOTOP
+%left <i_tkval> OROP DOROP
+%left <i_tkval> ANDOP
+%right <i_tkval> NOTOP
 %nonassoc LSTOP LSTOPSUB
-%left <tkval> ','
-%right <tkval> ASSIGNOP
-%right <tkval> '?' ':'
+%left <i_tkval> ','
+%right <i_tkval> ASSIGNOP
+%right <i_tkval> '?' ':'
 %nonassoc DOTDOT
-%left <tkval> OROR DORDOR
-%left <tkval> ANDAND
-%left <tkval> BITOROP
-%left <tkval> BITANDOP
+%left <i_tkval> OROR DORDOR
+%left <i_tkval> ANDAND
+%left <i_tkval> BITOROP
+%left <i_tkval> BITANDOP
 %nonassoc EQOP
 %nonassoc RELOP
 %nonassoc UNIOP UNIOPSUB
 %nonassoc REQUIRE
-%left <tkval> SHIFTOP
+%left <i_tkval> SHIFTOP
 %left ADDOP
 %left MULOP
-%left <tkval> MATCHOP
-%right <tkval> '!' '~' UMINUS REFGEN
-%right <tkval> POWOP
-%nonassoc <tkval> PREINC PREDEC POSTINC POSTDEC
-%left <tkval> ARROW
-%nonassoc <tkval> ')'
-%left <tkval> '('
+%left <i_tkval> MATCHOP
+%right <i_tkval> '!' '~' UMINUS REFGEN
+%right <i_tkval> POWOP
+%nonassoc <i_tkval> PREINC PREDEC POSTINC POSTDEC
+%left <i_tkval> ARROW
+%nonassoc <i_tkval> ')'
+%left <i_tkval> '('
 %left '[' '{'
 
-%token <tkval> PEG
+%token <i_tkval> PEG
 
 %% /* RULES */
 
@@ -1004,7 +1007,7 @@ anonymous:	'[' expr ']'
 
 /* Things called with "do" */
 termdo	:       DO term	%prec UNIOP                     /* do $filename */
-			{ $$ = dofile($2, $1);
+			{ $$ = dofile($2, IVAL($1));
 			  TOKEN_GETMAD($1,$$,'o');
 			}
 	|	DO block	%prec '('               /* do { code */