From d5c6462ec54f07680e7532435b71727ae3075024 Mon Sep 17 00:00:00 2001 From: Dave Mitchell Date: Sun, 10 Dec 2006 17:18:00 +0000 Subject: [PATCH] parser: expand yy_is_opval[] to include all value types and rename to yy_type_tab[]. Then use this table to improve stack dumping with -Dpv p4raw-id: //depot/perl@29500 --- perly.act | 388 ++++++++++++++++++++++++++++----------------------------- perly.c | 25 +++- perly.h | 3 +- perly.tab | 99 ++++++++------- perly.y | 3 +- regen_perly.pl | 81 +++++++++--- 6 files changed, 331 insertions(+), 268 deletions(-) diff --git a/perly.act b/perly.act index 64c1922..6e35f50 100644 --- a/perly.act +++ b/perly.act @@ -1,10 +1,10 @@ case 2: -#line 132 "perly.y" +#line 133 "perly.y" { (yyval.ival) = (yyvsp[(1) - (2)].ival); newPROG(block_end((yyvsp[(1) - (2)].ival),(yyvsp[(2) - (2)].opval))); ;} break; case 3: -#line 137 "perly.y" +#line 138 "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)); @@ -14,24 +14,24 @@ case 2: break; case 4: -#line 146 "perly.y" +#line 147 "perly.y" { (yyval.ival) = block_start(TRUE); ;} break; case 5: -#line 150 "perly.y" +#line 151 "perly.y" { (yyval.ival) = (I32) allocmy("$_"); ;} break; case 6: -#line 154 "perly.y" +#line 155 "perly.y" { PL_expect = XSTATE; (yyval.ival) = block_start(TRUE); ;} break; case 7: -#line 161 "perly.y" +#line 162 "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)); @@ -41,22 +41,22 @@ case 2: break; case 8: -#line 170 "perly.y" +#line 171 "perly.y" { (yyval.ival) = block_start(FALSE); ;} break; case 9: -#line 174 "perly.y" +#line 175 "perly.y" { (yyval.ival) = PL_savestack_ix; ;} break; case 10: -#line 178 "perly.y" +#line 179 "perly.y" { (yyval.opval) = Nullop; ;} break; case 11: -#line 180 "perly.y" +#line 181 "perly.y" { (yyval.opval) = IF_MAD( append_list(OP_LINESEQ, @@ -66,7 +66,7 @@ case 2: break; case 12: -#line 187 "perly.y" +#line 188 "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,23 +75,23 @@ case 2: break; case 13: -#line 196 "perly.y" +#line 197 "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 200 "perly.y" +#line 201 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 16: -#line 202 "perly.y" +#line 203 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((yyvsp[(1) - (2)].p_tkval)), (yyvsp[(2) - (2)].opval)); ;} break; case 17: -#line 204 "perly.y" +#line 205 "perly.y" { if (PVAL((yyvsp[(1) - (2)].p_tkval))) { (yyval.opval) = newSTATEOP(0, PVAL((yyvsp[(1) - (2)].p_tkval)), newOP(OP_NULL, 0)); @@ -111,7 +111,7 @@ case 2: break; case 18: -#line 221 "perly.y" +#line 222 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((yyvsp[(1) - (3)].p_tkval)), (yyvsp[(2) - (3)].opval)); PL_expect = XSTATE; @@ -130,45 +130,45 @@ case 2: break; case 19: -#line 240 "perly.y" +#line 241 "perly.y" { (yyval.opval) = Nullop; ;} break; case 20: -#line 242 "perly.y" +#line 243 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 21: -#line 244 "perly.y" +#line 245 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[(3) - (3)].opval), (yyvsp[(1) - (3)].opval)); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'i'); ;} break; case 22: -#line 248 "perly.y" +#line 249 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[(3) - (3)].opval), (yyvsp[(1) - (3)].opval)); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'i'); ;} break; case 23: -#line 252 "perly.y" +#line 253 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((yyvsp[(3) - (3)].opval)), (yyvsp[(1) - (3)].opval)); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'w'); ;} break; case 24: -#line 256 "perly.y" +#line 257 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (yyvsp[(3) - (3)].opval), (yyvsp[(1) - (3)].opval)); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'w'); ;} break; case 25: -#line 260 "perly.y" +#line 261 "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)].i_tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w'); @@ -176,19 +176,19 @@ case 2: break; case 26: -#line 268 "perly.y" +#line 269 "perly.y" { (yyval.opval) = Nullop; ;} break; case 27: -#line 270 "perly.y" +#line 271 "perly.y" { ((yyvsp[(2) - (2)].opval))->op_flags |= OPf_PARENS; (yyval.opval) = scope((yyvsp[(2) - (2)].opval)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o'); ;} break; case 28: -#line 274 "perly.y" +#line 275 "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; @@ -199,7 +199,7 @@ case 2: break; case 29: -#line 285 "perly.y" +#line 286 "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))); @@ -210,7 +210,7 @@ case 2: break; case 30: -#line 293 "perly.y" +#line 294 "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))); @@ -221,30 +221,30 @@ case 2: break; case 31: -#line 304 "perly.y" +#line 305 "perly.y" { (yyval.opval) = block_end((yyvsp[(3) - (6)].ival), newWHENOP((yyvsp[(4) - (6)].opval), scope((yyvsp[(6) - (6)].opval)))); ;} break; case 32: -#line 307 "perly.y" +#line 308 "perly.y" { (yyval.opval) = newWHENOP(0, scope((yyvsp[(2) - (2)].opval))); ;} break; case 33: -#line 312 "perly.y" +#line 313 "perly.y" { (yyval.opval) = Nullop; ;} break; case 34: -#line 314 "perly.y" +#line 315 "perly.y" { (yyval.opval) = scope((yyvsp[(2) - (2)].opval)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o'); ;} break; case 35: -#line 321 "perly.y" +#line 322 "perly.y" { OP *innerop; PL_copline = (line_t)(yyvsp[(2) - (9)].i_tkval); (yyval.opval) = block_end((yyvsp[(4) - (9)].ival), @@ -259,7 +259,7 @@ case 2: break; case 36: -#line 334 "perly.y" +#line 335 "perly.y" { OP *innerop; PL_copline = (line_t)(yyvsp[(2) - (9)].i_tkval); (yyval.opval) = block_end((yyvsp[(4) - (9)].ival), @@ -274,7 +274,7 @@ case 2: break; case 37: -#line 346 "perly.y" +#line 347 "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)].i_tkval)), @@ -288,7 +288,7 @@ case 2: break; case 38: -#line 357 "perly.y" +#line 358 "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)].i_tkval)), @@ -301,7 +301,7 @@ case 2: break; case 39: -#line 367 "perly.y" +#line 368 "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)].i_tkval)), @@ -314,7 +314,7 @@ case 2: break; case 40: -#line 379 "perly.y" +#line 380 "perly.y" { OP *forop; PL_copline = (line_t)IVAL((yyvsp[(2) - (12)].i_tkval)); forop = newSTATEOP(0, PVAL((yyvsp[(1) - (12)].p_tkval)), @@ -351,7 +351,7 @@ case 2: break; case 41: -#line 413 "perly.y" +#line 414 "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,7 +359,7 @@ case 2: break; case 42: -#line 421 "perly.y" +#line 422 "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)), @@ -368,46 +368,46 @@ case 2: break; case 43: -#line 430 "perly.y" +#line 431 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); ;} break; case 44: -#line 436 "perly.y" +#line 437 "perly.y" { (yyval.opval) = Nullop; ;} break; case 46: -#line 442 "perly.y" +#line 443 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; ;} break; case 48: -#line 450 "perly.y" +#line 451 "perly.y" { (yyval.opval) = invert(scalar((yyvsp[(1) - (1)].opval))); ;} break; case 49: -#line 455 "perly.y" +#line 456 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); intro_my(); ;} break; case 50: -#line 459 "perly.y" +#line 460 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); intro_my(); ;} break; case 51: -#line 463 "perly.y" +#line 464 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); intro_my(); ;} break; case 52: -#line 468 "perly.y" +#line 469 "perly.y" { #ifdef MAD YYSTYPE tmplval; @@ -420,44 +420,44 @@ case 2: break; case 54: -#line 482 "perly.y" +#line 483 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 55: -#line 484 "perly.y" +#line 485 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 56: -#line 486 "perly.y" +#line 487 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 57: -#line 488 "perly.y" +#line 489 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 58: -#line 490 "perly.y" +#line 491 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 59: -#line 495 "perly.y" +#line 496 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 60: -#line 499 "perly.y" +#line 500 "perly.y" { (yyval.opval) = newOP(OP_NULL,0); TOKEN_GETMAD((yyvsp[(1) - (1)].i_tkval),(yyval.opval),'p'); ;} break; case 61: -#line 505 "perly.y" +#line 506 "perly.y" { SvREFCNT_inc(PL_compcv); #ifdef MAD (yyval.opval) = newFORM((yyvsp[(2) - (4)].ival), (yyvsp[(3) - (4)].opval), (yyvsp[(4) - (4)].opval)); @@ -471,17 +471,17 @@ case 2: break; case 62: -#line 517 "perly.y" +#line 518 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 63: -#line 518 "perly.y" +#line 519 "perly.y" { (yyval.opval) = Nullop; ;} break; case 64: -#line 523 "perly.y" +#line 524 "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)); @@ -493,7 +493,7 @@ case 2: break; case 65: -#line 535 "perly.y" +#line 536 "perly.y" { SvREFCNT_inc(PL_compcv); #ifdef MAD OP* o = newSVOP(OP_ANONCODE, 0, @@ -514,25 +514,25 @@ case 2: break; case 66: -#line 555 "perly.y" +#line 556 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); ;} break; case 67: -#line 561 "perly.y" +#line 562 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); ;} break; case 68: -#line 566 "perly.y" +#line 567 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); ;} break; case 69: -#line 571 "perly.y" +#line 572 "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,24 +542,24 @@ case 2: break; case 70: -#line 581 "perly.y" +#line 582 "perly.y" { (yyval.opval) = Nullop; ;} break; case 72: -#line 587 "perly.y" +#line 588 "perly.y" { (yyval.opval) = Nullop; ;} break; case 73: -#line 589 "perly.y" +#line 590 "perly.y" { (yyval.opval) = (yyvsp[(2) - (2)].opval); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),':'); ;} break; case 74: -#line 593 "perly.y" +#line 594 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), Nullop @@ -569,14 +569,14 @@ case 2: break; case 75: -#line 603 "perly.y" +#line 604 "perly.y" { (yyval.opval) = (yyvsp[(2) - (2)].opval); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),':'); ;} break; case 76: -#line 607 "perly.y" +#line 608 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), Nullop @@ -586,12 +586,12 @@ case 2: break; case 77: -#line 616 "perly.y" +#line 617 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 78: -#line 617 "perly.y" +#line 618 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL,0), Nullop @@ -602,7 +602,7 @@ case 2: break; case 79: -#line 627 "perly.y" +#line 628 "perly.y" { #ifdef MAD (yyval.opval) = package((yyvsp[(2) - (3)].opval)); @@ -615,12 +615,12 @@ case 2: break; case 80: -#line 639 "perly.y" +#line 640 "perly.y" { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;} break; case 81: -#line 641 "perly.y" +#line 642 "perly.y" { SvREFCNT_inc(PL_compcv); #ifdef MAD (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)); @@ -635,28 +635,28 @@ case 2: break; case 82: -#line 656 "perly.y" +#line 657 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval)); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o'); ;} break; case 83: -#line 660 "perly.y" +#line 661 "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 664 "perly.y" +#line 665 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval)); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o'); ;} break; case 86: -#line 672 "perly.y" +#line 673 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -669,7 +669,7 @@ case 2: break; case 87: -#line 682 "perly.y" +#line 683 "perly.y" { DO_MAD( (yyvsp[(3) - (3)].opval) = newUNOP(OP_NULL, 0, (yyvsp[(3) - (3)].opval)); @@ -680,7 +680,7 @@ case 2: break; case 89: -#line 694 "perly.y" +#line 695 "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'); @@ -688,7 +688,7 @@ case 2: break; case 90: -#line 699 "perly.y" +#line 700 "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'); @@ -698,7 +698,7 @@ case 2: break; case 91: -#line 706 "perly.y" +#line 707 "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)), @@ -710,7 +710,7 @@ case 2: break; case 92: -#line 715 "perly.y" +#line 716 "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)))); @@ -719,7 +719,7 @@ case 2: break; case 93: -#line 721 "perly.y" +#line 722 "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,7 +728,7 @@ case 2: break; case 94: -#line 727 "perly.y" +#line 728 "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)), @@ -739,14 +739,14 @@ case 2: break; case 95: -#line 735 "perly.y" +#line 736 "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 739 "perly.y" +#line 740 "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),'('); @@ -755,13 +755,13 @@ case 2: break; case 97: -#line 745 "perly.y" +#line 746 "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 748 "perly.y" +#line 749 "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,7 +769,7 @@ case 2: break; case 101: -#line 763 "perly.y" +#line 764 "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)].i_tkval),(yyval.opval),'{'); @@ -779,7 +779,7 @@ case 2: break; case 102: -#line 770 "perly.y" +#line 771 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((yyvsp[(1) - (4)].opval)), scalar((yyvsp[(3) - (4)].opval))); TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'['); TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),']'); @@ -787,7 +787,7 @@ case 2: break; case 103: -#line 775 "perly.y" +#line 776 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((yyvsp[(1) - (5)].opval)),OP_RV2AV), scalar((yyvsp[(4) - (5)].opval))); @@ -798,7 +798,7 @@ case 2: break; case 104: -#line 783 "perly.y" +#line 784 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((yyvsp[(1) - (4)].opval)),OP_RV2AV), scalar((yyvsp[(3) - (4)].opval))); @@ -808,7 +808,7 @@ case 2: break; case 105: -#line 790 "perly.y" +#line 791 "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)].i_tkval),(yyval.opval),'{'); @@ -818,7 +818,7 @@ case 2: break; case 106: -#line 797 "perly.y" +#line 798 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((yyvsp[(1) - (6)].opval)),OP_RV2HV), jmaybe((yyvsp[(4) - (6)].opval))); @@ -831,7 +831,7 @@ case 2: break; case 107: -#line 807 "perly.y" +#line 808 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((yyvsp[(1) - (5)].opval)),OP_RV2HV), jmaybe((yyvsp[(3) - (5)].opval))); @@ -843,7 +843,7 @@ case 2: break; case 108: -#line 816 "perly.y" +#line 817 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((yyvsp[(1) - (4)].opval)))); TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'a'); @@ -853,7 +853,7 @@ case 2: break; case 109: -#line 823 "perly.y" +#line 824 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, (yyvsp[(4) - (5)].opval), newCVREF(0, scalar((yyvsp[(1) - (5)].opval))))); @@ -864,7 +864,7 @@ case 2: break; case 110: -#line 832 "perly.y" +#line 833 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, (yyvsp[(3) - (4)].opval), newCVREF(0, scalar((yyvsp[(1) - (4)].opval))))); @@ -874,7 +874,7 @@ case 2: break; case 111: -#line 839 "perly.y" +#line 840 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((yyvsp[(1) - (3)].opval)))); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'('); @@ -883,7 +883,7 @@ case 2: break; case 112: -#line 845 "perly.y" +#line 846 "perly.y" { (yyval.opval) = newSLICEOP(0, (yyvsp[(5) - (6)].opval), (yyvsp[(2) - (6)].opval)); TOKEN_GETMAD((yyvsp[(1) - (6)].i_tkval),(yyval.opval),'('); TOKEN_GETMAD((yyvsp[(3) - (6)].i_tkval),(yyval.opval),')'); @@ -893,7 +893,7 @@ case 2: break; case 113: -#line 852 "perly.y" +#line 853 "perly.y" { (yyval.opval) = newSLICEOP(0, (yyvsp[(4) - (5)].opval), Nullop); TOKEN_GETMAD((yyvsp[(1) - (5)].i_tkval),(yyval.opval),'('); TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),')'); @@ -903,21 +903,21 @@ case 2: break; case 114: -#line 862 "perly.y" +#line 863 "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 866 "perly.y" +#line 867 "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 870 "perly.y" +#line 871 "perly.y" { if (IVAL((yyvsp[(2) - (3)].i_tkval)) != OP_REPEAT) scalar((yyvsp[(1) - (3)].opval)); (yyval.opval) = newBINOP(IVAL((yyvsp[(2) - (3)].i_tkval)), 0, (yyvsp[(1) - (3)].opval), scalar((yyvsp[(3) - (3)].opval))); @@ -926,49 +926,49 @@ case 2: break; case 117: -#line 876 "perly.y" +#line 877 "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 880 "perly.y" +#line 881 "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 884 "perly.y" +#line 885 "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 888 "perly.y" +#line 889 "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 892 "perly.y" +#line 893 "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 896 "perly.y" +#line 897 "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 900 "perly.y" +#line 901 "perly.y" { (yyval.opval) = newRANGE(IVAL((yyvsp[(2) - (3)].i_tkval)), scalar((yyvsp[(1) - (3)].opval)), scalar((yyvsp[(3) - (3)].opval))); DO_MAD( @@ -983,28 +983,28 @@ case 2: break; case 124: -#line 912 "perly.y" +#line 913 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval)); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o'); ;} break; case 125: -#line 916 "perly.y" +#line 917 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval)); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o'); ;} break; case 126: -#line 920 "perly.y" +#line 921 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[(1) - (3)].opval), (yyvsp[(3) - (3)].opval)); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'o'); ;} break; case 127: -#line 924 "perly.y" +#line 925 "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 @@ -1014,14 +1014,14 @@ case 2: break; case 128: -#line 934 "perly.y" +#line 935 "perly.y" { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((yyvsp[(2) - (2)].opval))); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o'); ;} break; case 129: -#line 938 "perly.y" +#line 939 "perly.y" { (yyval.opval) = IF_MAD( newUNOP(OP_NULL, 0, (yyvsp[(2) - (2)].opval)), (yyvsp[(2) - (2)].opval) @@ -1031,21 +1031,21 @@ case 2: break; case 130: -#line 945 "perly.y" +#line 946 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[(2) - (2)].opval))); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o'); ;} break; case 131: -#line 949 "perly.y" +#line 950 "perly.y" { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((yyvsp[(2) - (2)].opval))); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o'); ;} break; case 132: -#line 953 "perly.y" +#line 954 "perly.y" { (yyval.opval) = newUNOP(OP_POSTINC, 0, mod(scalar((yyvsp[(1) - (2)].opval)), OP_POSTINC)); TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),'o'); @@ -1053,7 +1053,7 @@ case 2: break; case 133: -#line 958 "perly.y" +#line 959 "perly.y" { (yyval.opval) = newUNOP(OP_POSTDEC, 0, mod(scalar((yyvsp[(1) - (2)].opval)), OP_POSTDEC)); TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),'o'); @@ -1061,7 +1061,7 @@ case 2: break; case 134: -#line 963 "perly.y" +#line 964 "perly.y" { (yyval.opval) = newUNOP(OP_PREINC, 0, mod(scalar((yyvsp[(2) - (2)].opval)), OP_PREINC)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o'); @@ -1069,7 +1069,7 @@ case 2: break; case 135: -#line 968 "perly.y" +#line 969 "perly.y" { (yyval.opval) = newUNOP(OP_PREDEC, 0, mod(scalar((yyvsp[(2) - (2)].opval)), OP_PREDEC)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o'); @@ -1077,7 +1077,7 @@ case 2: break; case 136: -#line 977 "perly.y" +#line 978 "perly.y" { (yyval.opval) = newANONLIST((yyvsp[(2) - (3)].opval)); TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'['); TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),']'); @@ -1085,7 +1085,7 @@ case 2: break; case 137: -#line 982 "perly.y" +#line 983 "perly.y" { (yyval.opval) = newANONLIST(Nullop); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'['); TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),']'); @@ -1093,7 +1093,7 @@ case 2: break; case 138: -#line 987 "perly.y" +#line 988 "perly.y" { (yyval.opval) = newANONHASH((yyvsp[(2) - (4)].opval)); TOKEN_GETMAD((yyvsp[(1) - (4)].i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((yyvsp[(3) - (4)].i_tkval),(yyval.opval),';'); @@ -1102,7 +1102,7 @@ case 2: break; case 139: -#line 993 "perly.y" +#line 994 "perly.y" { (yyval.opval) = newANONHASH(Nullop); TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),';'); @@ -1111,7 +1111,7 @@ case 2: break; case 140: -#line 999 "perly.y" +#line 1000 "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)].i_tkval),(yyval.opval),'o'); @@ -1121,21 +1121,21 @@ case 2: break; case 141: -#line 1010 "perly.y" +#line 1011 "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 1014 "perly.y" +#line 1015 "perly.y" { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((yyvsp[(2) - (2)].opval))); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'D'); ;} break; case 143: -#line 1018 "perly.y" +#line 1019 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, prepend_elem(OP_LIST, @@ -1150,7 +1150,7 @@ case 2: break; case 144: -#line 1030 "perly.y" +#line 1031 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, append_elem(OP_LIST, @@ -1166,7 +1166,7 @@ case 2: break; case 145: -#line 1043 "perly.y" +#line 1044 "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(); @@ -1177,7 +1177,7 @@ case 2: break; case 146: -#line 1051 "perly.y" +#line 1052 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, prepend_elem(OP_LIST, (yyvsp[(4) - (5)].opval), @@ -1189,7 +1189,7 @@ case 2: break; case 151: -#line 1067 "perly.y" +#line 1068 "perly.y" { (yyval.opval) = newCONDOP(0, (yyvsp[(1) - (5)].opval), (yyvsp[(3) - (5)].opval), (yyvsp[(5) - (5)].opval)); TOKEN_GETMAD((yyvsp[(2) - (5)].i_tkval),(yyval.opval),'?'); TOKEN_GETMAD((yyvsp[(4) - (5)].i_tkval),(yyval.opval),':'); @@ -1197,26 +1197,26 @@ case 2: break; case 152: -#line 1072 "perly.y" +#line 1073 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((yyvsp[(2) - (2)].opval),OP_REFGEN)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o'); ;} break; case 153: -#line 1076 "perly.y" +#line 1077 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 154: -#line 1078 "perly.y" +#line 1079 "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 1082 "perly.y" +#line 1083 "perly.y" { (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(yyvsp[(2) - (3)].opval)), (yyvsp[(2) - (3)].opval))); TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'('); TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),')'); @@ -1224,7 +1224,7 @@ case 2: break; case 156: -#line 1087 "perly.y" +#line 1088 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'('); TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),')'); @@ -1232,37 +1232,37 @@ case 2: break; case 157: -#line 1092 "perly.y" +#line 1093 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 158: -#line 1094 "perly.y" +#line 1095 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 159: -#line 1096 "perly.y" +#line 1097 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 160: -#line 1098 "perly.y" +#line 1099 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 161: -#line 1100 "perly.y" +#line 1101 "perly.y" { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((yyvsp[(1) - (1)].opval), OP_AV2ARYLEN));;} break; case 162: -#line 1102 "perly.y" +#line 1103 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 163: -#line 1104 "perly.y" +#line 1105 "perly.y" { (yyval.opval) = prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1274,7 +1274,7 @@ case 2: break; case 164: -#line 1113 "perly.y" +#line 1114 "perly.y" { (yyval.opval) = prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1288,17 +1288,17 @@ case 2: break; case 165: -#line 1124 "perly.y" +#line 1125 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 166: -#line 1126 "perly.y" +#line 1127 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((yyvsp[(1) - (1)].opval))); ;} break; case 167: -#line 1128 "perly.y" +#line 1129 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((yyvsp[(1) - (3)].opval))); TOKEN_GETMAD((yyvsp[(2) - (3)].i_tkval),(yyval.opval),'('); TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),')'); @@ -1306,7 +1306,7 @@ case 2: break; case 168: -#line 1133 "perly.y" +#line 1134 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, (yyvsp[(3) - (4)].opval), scalar((yyvsp[(1) - (4)].opval)))); @@ -1322,7 +1322,7 @@ case 2: break; case 169: -#line 1146 "perly.y" +#line 1147 "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)].i_tkval),(yyval.opval),'o'); @@ -1330,7 +1330,7 @@ case 2: break; case 170: -#line 1151 "perly.y" +#line 1152 "perly.y" { (yyval.opval) = newOP(IVAL((yyvsp[(1) - (1)].i_tkval)), OPf_SPECIAL); PL_hints |= HINT_BLOCK_SCOPE; TOKEN_GETMAD((yyvsp[(1) - (1)].i_tkval),(yyval.opval),'o'); @@ -1338,70 +1338,70 @@ case 2: break; case 171: -#line 1156 "perly.y" +#line 1157 "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 1160 "perly.y" +#line 1161 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[(2) - (2)].opval))); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'o'); ;} break; case 173: -#line 1164 "perly.y" +#line 1165 "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 1168 "perly.y" +#line 1169 "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 1172 "perly.y" +#line 1173 "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 1176 "perly.y" +#line 1177 "perly.y" { (yyval.opval) = newOP(OP_REQUIRE, (yyvsp[(1) - (1)].i_tkval) ? OPf_SPECIAL : 0); ;} break; case 177: -#line 1178 "perly.y" +#line 1179 "perly.y" { (yyval.opval) = newUNOP(OP_REQUIRE, (yyvsp[(1) - (2)].i_tkval) ? OPf_SPECIAL : 0, (yyvsp[(2) - (2)].opval)); ;} break; case 178: -#line 1180 "perly.y" +#line 1181 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((yyvsp[(1) - (1)].opval))); ;} break; case 179: -#line 1182 "perly.y" +#line 1183 "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 1185 "perly.y" +#line 1186 "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 1189 "perly.y" +#line 1190 "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),'('); @@ -1410,13 +1410,13 @@ case 2: break; case 182: -#line 1195 "perly.y" +#line 1196 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((yyvsp[(1) - (1)].opval))); ;} break; case 183: -#line 1198 "perly.y" +#line 1199 "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); @@ -1428,7 +1428,7 @@ case 2: break; case 184: -#line 1207 "perly.y" +#line 1208 "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),'('); @@ -1437,7 +1437,7 @@ case 2: break; case 185: -#line 1213 "perly.y" +#line 1214 "perly.y" { (yyval.opval) = pmruntime((yyvsp[(1) - (4)].opval), (yyvsp[(3) - (4)].opval), 1); TOKEN_GETMAD((yyvsp[(2) - (4)].i_tkval),(yyval.opval),'('); TOKEN_GETMAD((yyvsp[(4) - (4)].i_tkval),(yyval.opval),')'); @@ -1445,7 +1445,7 @@ case 2: break; case 188: -#line 1223 "perly.y" +#line 1224 "perly.y" { (yyval.opval) = my_attrs((yyvsp[(2) - (3)].opval),(yyvsp[(3) - (3)].opval)); DO_MAD( token_getmad((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'d'); @@ -1456,14 +1456,14 @@ case 2: break; case 189: -#line 1231 "perly.y" +#line 1232 "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 1238 "perly.y" +#line 1239 "perly.y" { (yyval.opval) = sawparens((yyvsp[(2) - (3)].opval)); TOKEN_GETMAD((yyvsp[(1) - (3)].i_tkval),(yyval.opval),'('); TOKEN_GETMAD((yyvsp[(3) - (3)].i_tkval),(yyval.opval),')'); @@ -1471,7 +1471,7 @@ case 2: break; case 191: -#line 1243 "perly.y" +#line 1244 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'('); TOKEN_GETMAD((yyvsp[(2) - (2)].i_tkval),(yyval.opval),')'); @@ -1479,42 +1479,42 @@ case 2: break; case 192: -#line 1248 "perly.y" +#line 1249 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 193: -#line 1250 "perly.y" +#line 1251 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 194: -#line 1252 "perly.y" +#line 1253 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 195: -#line 1257 "perly.y" +#line 1258 "perly.y" { (yyval.opval) = Nullop; ;} break; case 196: -#line 1259 "perly.y" +#line 1260 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 197: -#line 1263 "perly.y" +#line 1264 "perly.y" { (yyval.opval) = Nullop; ;} break; case 198: -#line 1265 "perly.y" +#line 1266 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; case 199: -#line 1267 "perly.y" +#line 1268 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -1528,69 +1528,69 @@ case 2: break; case 200: -#line 1282 "perly.y" +#line 1283 "perly.y" { PL_in_my = 0; (yyval.opval) = my((yyvsp[(1) - (1)].opval)); ;} break; case 201: -#line 1286 "perly.y" +#line 1287 "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 1292 "perly.y" +#line 1293 "perly.y" { (yyval.opval) = newSVREF((yyvsp[(2) - (2)].opval)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'$'); ;} break; case 203: -#line 1298 "perly.y" +#line 1299 "perly.y" { (yyval.opval) = newAVREF((yyvsp[(2) - (2)].opval)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'@'); ;} break; case 204: -#line 1304 "perly.y" +#line 1305 "perly.y" { (yyval.opval) = newHVREF((yyvsp[(2) - (2)].opval)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'%'); ;} break; case 205: -#line 1310 "perly.y" +#line 1311 "perly.y" { (yyval.opval) = newAVREF((yyvsp[(2) - (2)].opval)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'l'); ;} break; case 206: -#line 1316 "perly.y" +#line 1317 "perly.y" { (yyval.opval) = newGVREF(0,(yyvsp[(2) - (2)].opval)); TOKEN_GETMAD((yyvsp[(1) - (2)].i_tkval),(yyval.opval),'*'); ;} break; case 207: -#line 1323 "perly.y" +#line 1324 "perly.y" { (yyval.opval) = scalar((yyvsp[(1) - (1)].opval)); ;} break; case 208: -#line 1325 "perly.y" +#line 1326 "perly.y" { (yyval.opval) = scalar((yyvsp[(1) - (1)].opval)); ;} break; case 209: -#line 1327 "perly.y" +#line 1328 "perly.y" { (yyval.opval) = scope((yyvsp[(1) - (1)].opval)); ;} break; case 210: -#line 1330 "perly.y" +#line 1331 "perly.y" { (yyval.opval) = (yyvsp[(1) - (1)].opval); ;} break; diff --git a/perly.c b/perly.c index 031e947..b8b582f 100644 --- a/perly.c +++ b/perly.c @@ -157,15 +157,28 @@ yy_stack_print (pTHX_ const short *yyss, const short *yyssp, const YYSTYPE *yyvs PerlIO_printf(Perl_debug_log, " %8.8s", yyns[start+i]); PerlIO_printf(Perl_debug_log, "\nvalue:"); for (i=0; i < count; i++) { - if (yy_is_opval[yystos[yyss[start+i]]]) { + switch (yy_type_tab[yystos[yyss[start+i]]]) { + case toketype_opval: PerlIO_printf(Perl_debug_log, " %8.8s", yyvs[start+i].opval ? PL_op_name[yyvs[start+i].opval->op_type] - : "NULL" + : "(NULL)" ); - } - else + break; +#ifndef PERL_IN_MADLY_C + case toketype_p_tkval: + PerlIO_printf(Perl_debug_log, " %8.8s", + yyvs[start+i].pval ? yyvs[start+i].pval : "(NULL)"); + break; + + case toketype_i_tkval: +#endif + case toketype_ival: + PerlIO_printf(Perl_debug_log, " %8"IVdf, yyvs[start+i].ival); + break; + default: PerlIO_printf(Perl_debug_log, " %8"UVxf, (UV)yyvs[start+i].ival); + } } PerlIO_printf(Perl_debug_log, "\n\n"); } @@ -658,7 +671,7 @@ Perl_yyparse (pTHX) /* Pop the rest of the stack. */ while (yyss < yyssp) { YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp); - if (yy_is_opval[yystos[*yyssp]]) { + if (yy_type_tab[yystos[*yyssp]] == toketype_opval) { YYDPRINTF ((Perl_debug_log, "(freeing op)\n")); op_free(yyvsp->opval); } @@ -699,7 +712,7 @@ Perl_yyparse (pTHX) YYABORT; YYDSYMPRINTF ("Error: popping", yystos[*yyssp], yyvsp); - if (yy_is_opval[yystos[*yyssp]]) { + if (yy_type_tab[yystos[*yyssp]] == toketype_opval) { YYDPRINTF ((Perl_debug_log, "(freeing op)\n")); op_free(yyvsp->opval); } diff --git a/perly.h b/perly.h index 0c19d29..73dc4b8 100644 --- a/perly.h +++ b/perly.h @@ -187,7 +187,8 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { - I32 ival; + I32 ival; /* __DEFAULT__ (marker for regen_perly.pl; + must always be 1st union member) */ char *pval; OP *opval; GV *gvval; diff --git a/perly.tab b/perly.tab index 599b4bc..e20aef9 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, 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 + 0, 131, 131, 137, 147, 151, 155, 161, 171, 175, + 179, 180, 187, 196, 199, 200, 202, 204, 221, 240, + 242, 244, 248, 252, 256, 260, 269, 270, 274, 285, + 293, 304, 307, 313, 314, 321, 334, 346, 357, 367, + 377, 413, 421, 431, 437, 438, 443, 446, 450, 455, + 459, 463, 469, 478, 482, 484, 486, 488, 490, 495, + 499, 505, 518, 519, 523, 535, 556, 562, 567, 572, + 582, 583, 588, 589, 593, 603, 607, 617, 618, 627, + 640, 639, 656, 660, 664, 668, 672, 682, 690, 694, + 699, 706, 715, 721, 727, 735, 739, 746, 745, 756, + 757, 761, 770, 775, 783, 790, 797, 807, 816, 823, + 832, 839, 845, 852, 862, 866, 870, 876, 880, 884, + 888, 892, 896, 900, 912, 916, 920, 924, 934, 938, + 945, 949, 953, 958, 963, 968, 977, 982, 987, 993, + 999, 1010, 1014, 1018, 1030, 1043, 1051, 1063, 1064, 1065, + 1066, 1067, 1072, 1076, 1078, 1082, 1087, 1092, 1094, 1096, + 1098, 1100, 1102, 1104, 1113, 1124, 1126, 1128, 1133, 1146, + 1151, 1156, 1160, 1164, 1168, 1172, 1176, 1178, 1180, 1182, + 1185, 1189, 1195, 1198, 1207, 1213, 1218, 1219, 1223, 1231, + 1238, 1243, 1248, 1250, 1252, 1257, 1259, 1264, 1265, 1267, + 1282, 1286, 1292, 1298, 1304, 1310, 1316, 1323, 1325, 1327, + 1330 }; #endif @@ -889,30 +889,35 @@ static const yytype_uint8 yystos[] = 14, 96, 96, 105, 105, 99, 96, 88, 96, 108, 105, 4, 112, 105, 113, 87, 87, 96, 96, 102 }; -/* which symbols are of type opval */ -static const int yy_is_opval[] = -{ - 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 1, 1, 1, - 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 1, - 0, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 0, 1, 1, 1, - 1, 1, 1, 0, 1, 1, 1, - 1, 1, 1, 0, 0, - 0, 1, 1, 1, 1, - 1, 1, 1, 0, 1, 1, 1, 0, - 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0 +typedef enum { + toketype_i_tkval, toketype_ival, toketype_opval, toketype_p_tkval +} toketypes; + +/* type of each token/terminal */ +static const toketypes XXX; +static const toketypes yy_type_tab[] = +{ + toketype_ival, toketype_ival, toketype_ival, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, + toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_p_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, + toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, + toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, + toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, + toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, + toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_i_tkval, toketype_ival, + toketype_ival, toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_opval, + toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_p_tkval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_ival, + toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_ival, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval }; diff --git a/perly.y b/perly.y index 231c22f..af62341 100644 --- a/perly.y +++ b/perly.y @@ -43,7 +43,8 @@ %start prog %union { - I32 ival; + I32 ival; /* __DEFAULT__ (marker for regen_perly.pl; + must always be 1st union member) */ char *pval; OP *opval; GV *gvval; diff --git a/regen_perly.pl b/regen_perly.pl index d34a8ad..674aa78 100644 --- a/regen_perly.pl +++ b/regen_perly.pl @@ -88,7 +88,7 @@ close CTMPFILE; my ($actlines, $tablines) = extract($clines); -$tablines .= make_opval_tab($y_file, $tablines); +$tablines .= make_type_tab($y_file, $tablines); chmod 0644, $act_file; open ACTFILE, ">$act_file" or die "can't open $act_file: $!\n"; @@ -178,30 +178,61 @@ sub extract { return $actlines. "\n", $tablines. "\n"; } -# read a .y file and extract a list of all the token names and -# non-terminal names that are declared to be of type opval -# then scan the string $tablines for the table yytname which gives -# the token index of each token/non-terminal, then use this to -# create a new table, indexed by token number, which indicates -# whether that token is of type opval. +# Generate a table, yy_type_tab[], that specifies for each token, what +# type of value it holds. # -# ie given -# %token A B -# %type C D +# Read the .y file and extract a list of all the token names and +# non-terminal names; then scan the string $tablines for the table yytname, +# which gives the token index of each token/non-terminal; then use this to +# create yy_type_tab. # -# and yytname[] = { "A" "B", "C", "D", "E", "F" }; +# ie given (in perly.y), +# +# %token A +# %token B +# %type C +# %type D +# +# and (in $tablines), +# +# yytname[] = { "A" "B", "C", "D", "E" }; # # then return -# static const int yy_is_opval[] = { 1, 1, 1, 1, 0, 0 } +# +# typedef enum { toketype_ival, toketype_opval, toketype_pval } toketypes; +# +# static const toketypes yy_type_tab[] +# = { toketype_opval, toketype_ival, toketype_pval, +# toketype_opval, toketype_ival } +# +# where "E" has the default type. The default type is determined +# by the __DEFAULT__ comment next to the appropriate union member in +# perly.y -sub make_opval_tab { +sub make_type_tab { my ($y_file, $tablines) = @_; my %tokens; + my %types; + my $default_token; open my $fh, '<', $y_file or die "Can't open $y_file: $!\n"; while (<$fh>) { - next unless s/^%(token|type)\s+\s+//; - $tokens{$_} =1 for (split ' ', $_); + if (/__DEFAULT__/) { + m{(\w+) \s* ; \s* /\* \s* __DEFAULT__}x + or die "$y_file: can't parse __DEFAULT__ line: $_"; + die "$y_file: duplicate __DEFAULT__ line: $_" + if defined $default_token; + $default_token = $1; + next; + } + + next unless /^%(token|type)/; + s/^%(token|type)\s+<(\w+)>\s+// + or die "$y_file: unparseable token/type line: $_"; + $tokens{$_} = $2 for (split ' ', $_); + $types{$2} = 1; } + die "$y_file: no __DEFAULT__ token defined\n" unless $default_token; + $types{$default_token} = 1; $tablines =~ /^\Qstatic const char *const yytname[] =\E\n {\n @@ -210,17 +241,29 @@ sub make_opval_tab { /xsm or die "Can't extract yytname[] from table string\n"; my $fields = $1; - $fields =~ s/"([^"]+)"/$tokens{$1}||0/ge; + $fields =~ s{"([^"]+)"} + { "toketype_" . + (defined $tokens{$1} ? $tokens{$1} : $default_token) + }ge; + $fields =~ s/, \s* 0 \s* $//x + or die "make_type_tab: couldn't delete trailing ',0'\n"; + return - "/* which symbols are of type opval */\n" . - "static const int yy_is_opval[] =\n{\n" . $fields . "\n};\n"; + "\ntypedef enum {\n\t" + . join(", ", map "toketype_$_", sort keys %types) + . "\n} toketypes;\n\n" + . "/* type of each token/terminal */\n" + . "static const toketypes XXX;\n" + . "static const toketypes yy_type_tab[] =\n{\n" + . $fields + . "\n};\n"; } sub my_system { system(@_); if ($? == -1) { - die "failed to execute comamnd '@_': $!\n"; + die "failed to execute command '@_': $!\n"; } elsif ($? & 127) { die sprintf "command '@_' died with signal %d\n", -- 2.7.4