X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perly.act;h=7cf5da3e78f83351edcdf059479fbd657f9278b0;hb=c2dc4c7d5e51c6211637044820c7a560da7e6268;hp=997c96cf17b9c9baa0f2402bc4feba8cafba29a9;hpb=035e2bcc0535c60f40214acc38bb076a74774dd2;p=p5sagit%2Fp5-mst-13.2.git diff --git a/perly.act b/perly.act index 997c96c..7cf5da3 100644 --- a/perly.act +++ b/perly.act @@ -1,10 +1,10 @@ case 2: -#line 137 "perly.y" +#line 143 "perly.y" { (yyval.ival) = (ps[(1) - (2)].val.ival); newPROG(block_end((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval))); ;} break; case 3: -#line 142 "perly.y" +#line 148 "perly.y" { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval))) PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval)); (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval)); @@ -14,24 +14,24 @@ case 2: break; case 4: -#line 151 "perly.y" +#line 157 "perly.y" { (yyval.ival) = block_start(TRUE); ;} break; case 5: -#line 155 "perly.y" - { (yyval.ival) = (I32) allocmy("$_"); ;} +#line 161 "perly.y" + { (yyval.ival) = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); ;} break; case 6: -#line 159 "perly.y" +#line 165 "perly.y" { PL_parser->expect = XSTATE; (yyval.ival) = block_start(TRUE); ;} break; case 7: -#line 166 "perly.y" +#line 172 "perly.y" { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval))) PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval)); (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval)); @@ -41,22 +41,17 @@ case 2: break; case 8: -#line 175 "perly.y" +#line 181 "perly.y" { (yyval.ival) = block_start(FALSE); ;} break; case 9: -#line 179 "perly.y" - { (yyval.ival) = PL_savestack_ix; ;} +#line 186 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; case 10: -#line 183 "perly.y" - { (yyval.opval) = Nullop; ;} - break; - - case 11: -#line 185 "perly.y" +#line 188 "perly.y" { (yyval.opval) = IF_MAD( append_list(OP_LINESEQ, @@ -65,33 +60,34 @@ case 2: ;} break; - case 12: -#line 192 "perly.y" - { LEAVE_SCOPE((ps[(2) - (3)].val.ival)); - (yyval.opval) = append_list(OP_LINESEQ, - (LISTOP*)(ps[(1) - (3)].val.opval), (LISTOP*)(ps[(3) - (3)].val.opval)); + case 11: +#line 195 "perly.y" + { (yyval.opval) = append_list(OP_LINESEQ, + (LISTOP*)(ps[(1) - (2)].val.opval), (LISTOP*)(ps[(2) - (2)].val.opval)); PL_pad_reset_pending = TRUE; - if ((ps[(1) - (3)].val.opval) && (ps[(3) - (3)].val.opval)) PL_hints |= HINT_BLOCK_SCOPE; ;} + if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval)) + PL_hints |= HINT_BLOCK_SCOPE; + ;} break; - case 13: -#line 201 "perly.y" + case 12: +#line 205 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;} break; - case 15: -#line 205 "perly.y" + case 14: +#line 209 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 16: -#line 207 "perly.y" + case 15: +#line 211 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;} break; - case 17: -#line 209 "perly.y" + case 16: +#line 213 "perly.y" { if (PVAL((ps[(1) - (2)].val.p_tkval))) { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), newOP(OP_NULL, 0)); @@ -101,7 +97,7 @@ case 2: else { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), - Nullop); + (OP*)NULL); PL_parser->copline = NOLINE; TOKEN_FREE((ps[(1) - (2)].val.p_tkval)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),';'); @@ -110,8 +106,8 @@ case 2: ;} break; - case 18: -#line 226 "perly.y" + case 17: +#line 230 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)), (ps[(2) - (3)].val.opval)); PL_parser->expect = XSTATE; @@ -129,68 +125,86 @@ case 2: ;} break; + case 18: +#line 246 "perly.y" + { (yyval.opval) = newSTATEOP(0, NULL, + newWHILEOP(0, 1, (LOOP*)(OP*)NULL, + NOLINE, (OP*)NULL, (ps[(1) - (1)].val.opval), + (OP*)NULL, 0)); ;} + break; + case 19: -#line 245 "perly.y" - { (yyval.opval) = Nullop; ;} +#line 251 "perly.y" + { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;} break; case 20: -#line 247 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} +#line 256 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; case 21: -#line 249 "perly.y" +#line 258 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + + case 22: +#line 260 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i'); ;} break; - case 22: -#line 253 "perly.y" + case 23: +#line 264 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i'); ;} break; - case 23: -#line 257 "perly.y" + case 24: +#line 268 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w'); ;} break; - case 24: -#line 261 "perly.y" + case 25: +#line 272 "perly.y" { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w'); ;} break; - case 25: -#line 265 "perly.y" - { (yyval.opval) = newFOROP(0, Nullch, (line_t)IVAL((ps[(2) - (3)].val.i_tkval)), - Nullop, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), Nullop); + case 26: +#line 276 "perly.y" + { (yyval.opval) = newFOROP(0, NULL, (line_t)IVAL((ps[(2) - (3)].val.i_tkval)), + (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w'); ;} break; - case 26: -#line 273 "perly.y" - { (yyval.opval) = Nullop; ;} + case 27: +#line 281 "perly.y" + { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), scope((ps[(1) - (3)].val.opval))); ;} break; - case 27: -#line 275 "perly.y" + case 28: +#line 286 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} + break; + + case 29: +#line 288 "perly.y" { ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 28: -#line 279 "perly.y" + case 30: +#line 292 "perly.y" { PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval)); - (yyval.opval) = newCONDOP(0, (ps[(3) - (6)].val.opval), scope((ps[(5) - (6)].val.opval)), (ps[(6) - (6)].val.opval)); + (yyval.opval) = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)), scope((ps[(5) - (6)].val.opval)), (ps[(6) - (6)].val.opval)); PL_hints |= HINT_BLOCK_SCOPE; TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'I'); TOKEN_GETMAD((ps[(2) - (6)].val.i_tkval),(yyval.opval),'('); @@ -198,8 +212,8 @@ case 2: ;} break; - case 29: -#line 290 "perly.y" + case 31: +#line 303 "perly.y" { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval)); (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -209,8 +223,8 @@ case 2: ;} break; - case 30: -#line 298 "perly.y" + case 32: +#line 311 "perly.y" { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval)); (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -220,36 +234,36 @@ case 2: ;} break; - case 31: -#line 309 "perly.y" + case 33: +#line 322 "perly.y" { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), scope((ps[(6) - (6)].val.opval)))); ;} break; - case 32: -#line 312 "perly.y" + case 34: +#line 325 "perly.y" { (yyval.opval) = newWHENOP(0, scope((ps[(2) - (2)].val.opval))); ;} break; - case 33: -#line 317 "perly.y" - { (yyval.opval) = Nullop; ;} + case 35: +#line 330 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; - case 34: -#line 319 "perly.y" + case 36: +#line 332 "perly.y" { (yyval.opval) = scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 35: -#line 326 "perly.y" + case 37: +#line 339 "perly.y" { OP *innerop; - PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval); + PL_parser->copline = (line_t)IVAL((ps[(2) - (9)].val.i_tkval)); (yyval.opval) = block_end((ps[(4) - (9)].val.ival), newSTATEOP(0, PVAL((ps[(1) - (9)].val.p_tkval)), - innerop = newWHILEOP(0, 1, (LOOP*)Nullop, + innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, IVAL((ps[(2) - (9)].val.i_tkval)), (ps[(5) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval), (ps[(7) - (9)].val.ival)))); TOKEN_GETMAD((ps[(1) - (9)].val.p_tkval),innerop,'L'); TOKEN_GETMAD((ps[(2) - (9)].val.i_tkval),innerop,'W'); @@ -258,13 +272,13 @@ case 2: ;} break; - case 36: -#line 339 "perly.y" + case 38: +#line 352 "perly.y" { OP *innerop; - PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval); + PL_parser->copline = (line_t)IVAL((ps[(2) - (9)].val.i_tkval)); (yyval.opval) = block_end((ps[(4) - (9)].val.ival), newSTATEOP(0, PVAL((ps[(1) - (9)].val.p_tkval)), - innerop = newWHILEOP(0, 1, (LOOP*)Nullop, + innerop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, IVAL((ps[(2) - (9)].val.i_tkval)), (ps[(5) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval), (ps[(7) - (9)].val.ival)))); TOKEN_GETMAD((ps[(1) - (9)].val.p_tkval),innerop,'L'); TOKEN_GETMAD((ps[(2) - (9)].val.i_tkval),innerop,'W'); @@ -273,8 +287,8 @@ case 2: ;} break; - case 37: -#line 351 "perly.y" + case 39: +#line 364 "perly.y" { OP *innerop; (yyval.opval) = block_end((ps[(4) - (10)].val.ival), innerop = newFOROP(0, PVAL((ps[(1) - (10)].val.p_tkval)), (line_t)IVAL((ps[(2) - (10)].val.i_tkval)), @@ -287,8 +301,8 @@ case 2: ;} break; - case 38: -#line 362 "perly.y" + case 40: +#line 375 "perly.y" { OP *innerop; (yyval.opval) = block_end((ps[(5) - (9)].val.ival), innerop = newFOROP(0, PVAL((ps[(1) - (9)].val.p_tkval)), (line_t)IVAL((ps[(2) - (9)].val.i_tkval)), @@ -300,12 +314,12 @@ case 2: ;} break; - case 39: -#line 372 "perly.y" + case 41: +#line 385 "perly.y" { OP *innerop; (yyval.opval) = block_end((ps[(4) - (8)].val.ival), innerop = newFOROP(0, PVAL((ps[(1) - (8)].val.p_tkval)), (line_t)IVAL((ps[(2) - (8)].val.i_tkval)), - Nullop, (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval))); + (OP*)NULL, (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval))); TOKEN_GETMAD((ps[(1) - (8)].val.p_tkval),((LISTOP*)innerop)->op_first,'L'); TOKEN_GETMAD((ps[(2) - (8)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'W'); TOKEN_GETMAD((ps[(3) - (8)].val.i_tkval),((LISTOP*)innerop)->op_first->op_sibling,'('); @@ -313,12 +327,12 @@ case 2: ;} break; - case 40: -#line 384 "perly.y" + case 42: +#line 397 "perly.y" { OP *forop; PL_parser->copline = (line_t)IVAL((ps[(2) - (12)].val.i_tkval)); forop = newSTATEOP(0, PVAL((ps[(1) - (12)].val.p_tkval)), - newWHILEOP(0, 1, (LOOP*)Nullop, + newWHILEOP(0, 1, (LOOP*)(OP*)NULL, IVAL((ps[(2) - (12)].val.i_tkval)), scalar((ps[(7) - (12)].val.opval)), (ps[(12) - (12)].val.opval), (ps[(10) - (12)].val.opval), (ps[(9) - (12)].val.ival))); #ifdef MAD @@ -346,115 +360,117 @@ case 2: (yyval.opval) = block_end((ps[(4) - (12)].val.ival), forop); ;} break; - case 41: -#line 414 "perly.y" + case 43: +#line 427 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)), - newWHILEOP(0, 1, (LOOP*)Nullop, - NOLINE, Nullop, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval), 0)); + newWHILEOP(0, 1, (LOOP*)(OP*)NULL, + NOLINE, (OP*)NULL, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval), 0)); TOKEN_GETMAD((ps[(1) - (3)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;} break; - case 42: -#line 422 "perly.y" - { PL_parser->copline = (line_t) (ps[(2) - (8)].val.i_tkval); + case 44: +#line 435 "perly.y" + { PL_parser->copline = (line_t) IVAL((ps[(2) - (8)].val.i_tkval)); (yyval.opval) = block_end((ps[(4) - (8)].val.ival), newSTATEOP(0, PVAL((ps[(1) - (8)].val.p_tkval)), newGIVENOP((ps[(6) - (8)].val.opval), scope((ps[(8) - (8)].val.opval)), (PADOFFSET) (ps[(5) - (8)].val.ival)) )); ;} break; - case 43: -#line 431 "perly.y" + case 45: +#line 444 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); ;} break; - case 44: -#line 437 "perly.y" - { (yyval.opval) = Nullop; ;} + case 46: +#line 450 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; - case 46: -#line 443 "perly.y" + case 48: +#line 456 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; ;} break; - case 48: -#line 451 "perly.y" + case 50: +#line 464 "perly.y" { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;} break; - case 49: -#line 456 "perly.y" + case 51: +#line 469 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 50: -#line 460 "perly.y" + case 52: +#line 473 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 51: -#line 464 "perly.y" + case 53: +#line 477 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 52: -#line 469 "perly.y" + case 54: +#line 482 "perly.y" { #ifdef MAD YYSTYPE tmplval; - tmplval.pval = Nullch; + tmplval.pval = NULL; (yyval.p_tkval) = newTOKEN(OP_NULL, tmplval, 0); #else - (yyval.p_tkval) = Nullch; + (yyval.p_tkval) = NULL; #endif ;} break; - case 54: -#line 483 "perly.y" + case 56: +#line 496 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 55: -#line 485 "perly.y" + case 57: +#line 498 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 56: -#line 487 "perly.y" + case 58: +#line 500 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 57: -#line 489 "perly.y" + case 59: +#line 502 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 58: -#line 491 "perly.y" + case 60: +#line 504 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 59: -#line 496 "perly.y" + case 61: +#line 509 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 60: -#line 500 "perly.y" + case 62: +#line 513 "perly.y" { (yyval.opval) = newOP(OP_NULL,0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p'); ;} break; - case 61: -#line 506 "perly.y" - { SvREFCNT_inc_simple_void(PL_compcv); + case 63: +#line 519 "perly.y" + { + CV *fmtcv = PL_compcv; + SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD (yyval.opval) = newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval)); prepend_madprops((ps[(1) - (4)].val.i_tkval)->tk_mad, (yyval.opval), 'F'); @@ -462,36 +478,40 @@ case 2: token_free((ps[(1) - (4)].val.i_tkval)); #else newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval)); - (yyval.opval) = Nullop; + (yyval.opval) = (OP*)NULL; #endif + if (CvOUTSIDE(fmtcv) && !CvUNIQUE(CvOUTSIDE(fmtcv))) { + SvREFCNT_inc_simple_void(fmtcv); + pad_add_anon((SV*)fmtcv, OP_NULL); + } ;} break; - case 62: -#line 519 "perly.y" + case 64: +#line 538 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 63: -#line 520 "perly.y" - { (yyval.opval) = Nullop; ;} + case 65: +#line 539 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; - case 64: -#line 525 "perly.y" + case 66: +#line 544 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD (yyval.opval) = newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval)); token_getmad((ps[(1) - (6)].val.i_tkval),(yyval.opval),'d'); #else newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval)); - (yyval.opval) = Nullop; + (yyval.opval) = (OP*)NULL; #endif ;} break; - case 65: -#line 538 "perly.y" + case 67: +#line 557 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD { @@ -508,31 +528,31 @@ case 2: } #else newATTRSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval)); - (yyval.opval) = Nullop; + (yyval.opval) = (OP*)NULL; #endif ;} break; - case 66: -#line 560 "perly.y" + case 68: +#line 579 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); ;} break; - case 67: -#line 566 "perly.y" + case 69: +#line 585 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); ;} break; - case 68: -#line 571 "perly.y" + case 70: +#line 590 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); ;} break; - case 69: -#line 576 "perly.y" + case 71: +#line 595 "perly.y" { const char *const name = SvPV_nolen_const(((SVOP*)(ps[(1) - (1)].val.opval))->op_sv); if (strEQ(name, "BEGIN") || strEQ(name, "END") || strEQ(name, "INIT") || strEQ(name, "CHECK") @@ -541,87 +561,120 @@ case 2: (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 70: -#line 586 "perly.y" - { (yyval.opval) = Nullop; ;} + case 72: +#line 605 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; - case 72: -#line 592 "perly.y" - { (yyval.opval) = Nullop; ;} + case 74: +#line 611 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; - case 73: -#line 594 "perly.y" + case 75: +#line 613 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 74: -#line 598 "perly.y" + case 76: +#line 617 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), - Nullop + (OP*)NULL ); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':'); ;} break; - case 75: -#line 608 "perly.y" + case 77: +#line 627 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 76: -#line 612 "perly.y" + case 78: +#line 631 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), - Nullop + (OP*)NULL ); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),':'); ;} break; - case 77: -#line 621 "perly.y" + case 79: +#line 640 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 78: -#line 622 "perly.y" + case 80: +#line 641 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL,0), - Nullop + (OP*)NULL ); PL_parser->expect = XSTATE; TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),';'); ;} break; - case 79: -#line 632 "perly.y" + case 81: +#line 651 "perly.y" { #ifdef MAD - (yyval.opval) = package((ps[(2) - (3)].val.opval)); - token_getmad((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); - token_getmad((ps[(3) - (3)].val.i_tkval),(yyval.opval),';'); + (yyval.opval) = package((ps[(3) - (4)].val.opval)); + token_getmad((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); + if ((ps[(2) - (4)].val.opval)) + package_version((ps[(2) - (4)].val.opval)); + token_getmad((ps[(4) - (4)].val.i_tkval),(yyval.opval),';'); #else - package((ps[(2) - (3)].val.opval)); - (yyval.opval) = Nullop; + package((ps[(3) - (4)].val.opval)); + if ((ps[(2) - (4)].val.opval)) + package_version((ps[(2) - (4)].val.opval)); + (yyval.opval) = (OP*)NULL; #endif ;} break; - case 80: -#line 645 "perly.y" + case 82: +#line 668 "perly.y" + { + int save_3_latefree = (ps[(3) - (5)].val.opval)->op_latefree; + (ps[(3) - (5)].val.opval)->op_latefree = 1; + package((ps[(3) - (5)].val.opval)); + (ps[(3) - (5)].val.opval)->op_latefree = save_3_latefree; + if ((ps[(2) - (5)].val.opval)) { + int save_2_latefree = (ps[(2) - (5)].val.opval)->op_latefree; + (ps[(2) - (5)].val.opval)->op_latefree = 1; + package_version((ps[(2) - (5)].val.opval)); + (ps[(2) - (5)].val.opval)->op_latefree = save_2_latefree; + } + ;} + break; + + case 83: +#line 681 "perly.y" + { if (PL_parser->copline > (line_t)IVAL((ps[(4) - (8)].val.i_tkval))) + PL_parser->copline = (line_t)IVAL((ps[(4) - (8)].val.i_tkval)); + (yyval.opval) = block_end((ps[(5) - (8)].val.ival), (ps[(7) - (8)].val.opval)); + TOKEN_GETMAD((ps[(4) - (8)].val.i_tkval),(yyval.opval),'{'); + TOKEN_GETMAD((ps[(8) - (8)].val.i_tkval),(yyval.opval),'}'); + op_free((ps[(3) - (8)].val.opval)); + if ((ps[(2) - (8)].val.opval)) + op_free((ps[(2) - (8)].val.opval)); + ;} + break; + + case 84: +#line 693 "perly.y" { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;} break; - case 81: -#line 647 "perly.y" + case 85: +#line 695 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD (yyval.opval) = utilize(IVAL((ps[(1) - (7)].val.i_tkval)), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval)); @@ -629,37 +682,37 @@ case 2: token_getmad((ps[(7) - (7)].val.i_tkval),(yyval.opval),';'); if (PL_parser->rsfp_filters && AvFILLp(PL_parser->rsfp_filters) >= 0) - append_madprops(newMADPROP('!', MAD_PV, "", 0), (yyval.opval), 0); + append_madprops(newMADPROP('!', MAD_NULL, NULL, 0), (yyval.opval), 0); #else utilize(IVAL((ps[(1) - (7)].val.i_tkval)), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval)); - (yyval.opval) = Nullop; + (yyval.opval) = (OP*)NULL; #endif ;} break; - case 82: -#line 664 "perly.y" + case 86: +#line 712 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 83: -#line 668 "perly.y" + case 87: +#line 716 "perly.y" { (yyval.opval) = newLOGOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 84: -#line 672 "perly.y" + case 88: +#line 720 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 86: -#line 680 "perly.y" + case 90: +#line 728 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -671,8 +724,8 @@ case 2: ;} break; - case 87: -#line 690 "perly.y" + case 91: +#line 738 "perly.y" { OP* term = (ps[(3) - (3)].val.opval); DO_MAD( @@ -683,16 +736,16 @@ case 2: ;} break; - case 89: -#line 703 "perly.y" + case 93: +#line 751 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED, prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (3)].val.i_tkval)),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) ); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 90: -#line 708 "perly.y" + case 94: +#line 756 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED, prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (5)].val.i_tkval)),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) ); TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); @@ -701,8 +754,8 @@ case 2: ;} break; - case 91: -#line 715 "perly.y" + case 95: +#line 763 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)), @@ -713,8 +766,8 @@ case 2: ;} break; - case 92: -#line 724 "perly.y" + case 96: +#line 772 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)), newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval)))); @@ -722,8 +775,8 @@ case 2: ;} break; - case 93: -#line 730 "perly.y" + case 97: +#line 778 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)), @@ -731,8 +784,8 @@ case 2: ;} break; - case 94: -#line 736 "perly.y" + case 98: +#line 784 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)), @@ -742,15 +795,15 @@ case 2: ;} break; - case 95: -#line 744 "perly.y" + case 99: +#line 792 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 96: -#line 748 "perly.y" + case 100: +#line 796 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'('); @@ -758,22 +811,22 @@ case 2: ;} break; - case 97: -#line 754 "perly.y" + case 101: +#line 802 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); - (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, Nullop, (ps[(3) - (3)].val.opval)); ;} + (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;} break; - case 98: -#line 757 "perly.y" + case 102: +#line 805 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval))); ;} break; - case 101: -#line 772 "perly.y" + case 105: +#line 820 "perly.y" { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), scalar((ps[(3) - (5)].val.opval))); PL_parser->expect = XOPERATOR; TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); @@ -782,16 +835,16 @@ case 2: ;} break; - case 102: -#line 779 "perly.y" + case 106: +#line 827 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval))); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']'); ;} break; - case 103: -#line 784 "perly.y" + case 107: +#line 832 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV), scalar((ps[(4) - (5)].val.opval))); @@ -801,8 +854,8 @@ case 2: ;} break; - case 104: -#line 792 "perly.y" + case 108: +#line 840 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV), scalar((ps[(3) - (4)].val.opval))); @@ -811,8 +864,8 @@ case 2: ;} break; - case 105: -#line 799 "perly.y" + case 109: +#line 847 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), jmaybe((ps[(3) - (5)].val.opval))); PL_parser->expect = XOPERATOR; TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{'); @@ -821,8 +874,8 @@ case 2: ;} break; - case 106: -#line 806 "perly.y" + case 110: +#line 854 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV), jmaybe((ps[(4) - (6)].val.opval))); @@ -834,8 +887,8 @@ case 2: ;} break; - case 107: -#line 816 "perly.y" + case 111: +#line 864 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV), jmaybe((ps[(3) - (5)].val.opval))); @@ -846,8 +899,8 @@ case 2: ;} break; - case 108: -#line 825 "perly.y" + case 112: +#line 873 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[(1) - (4)].val.opval)))); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'a'); @@ -856,8 +909,8 @@ case 2: ;} break; - case 109: -#line 832 "perly.y" + case 113: +#line 880 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, (ps[(4) - (5)].val.opval), newCVREF(0, scalar((ps[(1) - (5)].val.opval))))); @@ -867,8 +920,8 @@ case 2: ;} break; - case 110: -#line 841 "perly.y" + case 114: +#line 889 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, (ps[(3) - (4)].val.opval), newCVREF(0, scalar((ps[(1) - (4)].val.opval))))); @@ -877,8 +930,8 @@ case 2: ;} break; - case 111: -#line 848 "perly.y" + case 115: +#line 896 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, newCVREF(0, scalar((ps[(1) - (3)].val.opval)))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'('); @@ -886,8 +939,8 @@ case 2: ;} break; - case 112: -#line 854 "perly.y" + case 116: +#line 902 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - (6)].val.opval)); TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),')'); @@ -896,9 +949,9 @@ case 2: ;} break; - case 113: -#line 861 "perly.y" - { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), Nullop); + case 117: +#line 909 "perly.y" + { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL); TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),')'); TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'['); @@ -906,22 +959,22 @@ case 2: ;} break; - case 114: -#line 871 "perly.y" + case 118: +#line 919 "perly.y" { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 115: -#line 875 "perly.y" + case 119: +#line 923 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 116: -#line 879 "perly.y" + case 120: +#line 927 "perly.y" { if (IVAL((ps[(2) - (3)].val.i_tkval)) != OP_REPEAT) scalar((ps[(1) - (3)].val.opval)); (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), scalar((ps[(3) - (3)].val.opval))); @@ -929,50 +982,50 @@ case 2: ;} break; - case 117: -#line 885 "perly.y" + case 121: +#line 933 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 118: -#line 889 "perly.y" + case 122: +#line 937 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 119: -#line 893 "perly.y" + case 123: +#line 941 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 120: -#line 897 "perly.y" + case 124: +#line 945 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 121: -#line 901 "perly.y" + case 125: +#line 949 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 122: -#line 905 "perly.y" + case 126: +#line 953 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 123: -#line 909 "perly.y" + case 127: +#line 957 "perly.y" { (yyval.opval) = newRANGE(IVAL((ps[(2) - (3)].val.i_tkval)), scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); DO_MAD({ @@ -986,29 +1039,29 @@ case 2: ;} break; - case 124: -#line 921 "perly.y" + case 128: +#line 969 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 125: -#line 925 "perly.y" + case 129: +#line 973 "perly.y" { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 126: -#line 929 "perly.y" + case 130: +#line 977 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 127: -#line 933 "perly.y" + case 131: +#line 981 "perly.y" { (yyval.opval) = bind_match(IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval), ((yyval.opval)->op_type == OP_NOT @@ -1017,15 +1070,15 @@ case 2: ;} break; - case 128: -#line 943 "perly.y" + case 132: +#line 991 "perly.y" { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 129: -#line 947 "perly.y" + case 133: +#line 995 "perly.y" { (yyval.opval) = IF_MAD( newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)), (ps[(2) - (2)].val.opval) @@ -1034,70 +1087,70 @@ case 2: ;} break; - case 130: -#line 954 "perly.y" + case 134: +#line 1002 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 131: -#line 958 "perly.y" + case 135: +#line 1006 "perly.y" { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 132: -#line 962 "perly.y" + case 136: +#line 1010 "perly.y" { (yyval.opval) = newUNOP(OP_POSTINC, 0, mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 133: -#line 967 "perly.y" + case 137: +#line 1015 "perly.y" { (yyval.opval) = newUNOP(OP_POSTDEC, 0, mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 134: -#line 972 "perly.y" + case 138: +#line 1020 "perly.y" { (yyval.opval) = newUNOP(OP_PREINC, 0, mod(scalar((ps[(2) - (2)].val.opval)), OP_PREINC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 135: -#line 977 "perly.y" + case 139: +#line 1025 "perly.y" { (yyval.opval) = newUNOP(OP_PREDEC, 0, mod(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 136: -#line 986 "perly.y" + case 140: +#line 1034 "perly.y" { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval)); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),']'); ;} break; - case 137: -#line 991 "perly.y" - { (yyval.opval) = newANONLIST(Nullop); + case 141: +#line 1039 "perly.y" + { (yyval.opval) = newANONLIST((OP*)NULL); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),']'); ;} break; - case 138: -#line 996 "perly.y" + case 142: +#line 1044 "perly.y" { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),';'); @@ -1105,17 +1158,17 @@ case 2: ;} break; - case 139: -#line 1002 "perly.y" - { (yyval.opval) = newANONHASH(Nullop); + case 143: +#line 1050 "perly.y" + { (yyval.opval) = newANONHASH((OP*)NULL); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),';'); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),'}'); ;} break; - case 140: -#line 1008 "perly.y" + case 144: +#line 1056 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[(2) - (5)].val.ival), (ps[(3) - (5)].val.opval), (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)); TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o'); @@ -1124,37 +1177,37 @@ case 2: ;} break; - case 141: -#line 1019 "perly.y" + case 145: +#line 1067 "perly.y" { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), IVAL((ps[(1) - (2)].val.i_tkval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 142: -#line 1023 "perly.y" + case 146: +#line 1071 "perly.y" { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D'); ;} break; - case 143: -#line 1027 "perly.y" + case 147: +#line 1075 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, prepend_elem(OP_LIST, scalar(newCVREF( (OPpENTERSUB_AMPER<<8), scalar((ps[(2) - (4)].val.opval)) - )),Nullop)); dep(); + )),(OP*)NULL)); dep(); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')'); ;} break; - case 144: -#line 1039 "perly.y" + case 148: +#line 1087 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, append_elem(OP_LIST, @@ -1169,19 +1222,19 @@ case 2: ;} break; - case 145: -#line 1052 "perly.y" + case 149: +#line 1100 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, prepend_elem(OP_LIST, - scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), Nullop)); dep(); + scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep(); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')'); ;} break; - case 146: -#line 1060 "perly.y" + case 150: +#line 1108 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), @@ -1192,81 +1245,81 @@ case 2: ;} break; - case 151: -#line 1076 "perly.y" + case 155: +#line 1124 "perly.y" { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval)); TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'?'); TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),':'); ;} break; - case 152: -#line 1081 "perly.y" + case 156: +#line 1129 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((ps[(2) - (2)].val.opval),OP_REFGEN)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 153: -#line 1085 "perly.y" + case 157: +#line 1133 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 154: -#line 1087 "perly.y" + case 158: +#line 1135 "perly.y" { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'k'); ;} break; - case 155: -#line 1091 "perly.y" + case 159: +#line 1139 "perly.y" { (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(ps[(2) - (3)].val.opval)), (ps[(2) - (3)].val.opval))); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')'); ;} break; - case 156: -#line 1096 "perly.y" + case 160: +#line 1144 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')'); ;} break; - case 157: -#line 1101 "perly.y" + case 161: +#line 1149 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 158: -#line 1103 "perly.y" + case 162: +#line 1151 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 159: -#line 1105 "perly.y" + case 163: +#line 1153 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 160: -#line 1107 "perly.y" + case 164: +#line 1155 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 161: -#line 1109 "perly.y" + case 165: +#line 1157 "perly.y" { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;} break; - case 162: -#line 1111 "perly.y" + case 166: +#line 1159 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 163: -#line 1113 "perly.y" + case 167: +#line 1161 "perly.y" { (yyval.opval) = prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1277,8 +1330,8 @@ case 2: ;} break; - case 164: -#line 1122 "perly.y" + case 168: +#line 1170 "perly.y" { (yyval.opval) = prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1291,26 +1344,26 @@ case 2: ;} break; - case 165: -#line 1133 "perly.y" + case 169: +#line 1181 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 166: -#line 1135 "perly.y" + case 170: +#line 1183 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 167: -#line 1137 "perly.y" + case 171: +#line 1185 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')'); ;} break; - case 168: -#line 1142 "perly.y" + case 172: +#line 1190 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval)))); @@ -1325,91 +1378,91 @@ case 2: ;} break; - case 169: -#line 1155 "perly.y" + case 173: +#line 1203 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, (ps[(3) - (3)].val.opval), scalar((ps[(2) - (3)].val.opval)))); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 170: -#line 1160 "perly.y" + case 174: +#line 1208 "perly.y" { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), OPf_SPECIAL); PL_hints |= HINT_BLOCK_SCOPE; TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 171: -#line 1165 "perly.y" + case 175: +#line 1213 "perly.y" { (yyval.opval) = newLOOPEX(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 172: -#line 1169 "perly.y" + case 176: +#line 1217 "perly.y" { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 173: -#line 1173 "perly.y" + case 177: +#line 1221 "perly.y" { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 174: -#line 1177 "perly.y" + case 178: +#line 1225 "perly.y" { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 175: -#line 1181 "perly.y" + case 179: +#line 1229 "perly.y" { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 176: -#line 1185 "perly.y" + case 180: +#line 1233 "perly.y" { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.i_tkval) ? OPf_SPECIAL : 0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 177: -#line 1189 "perly.y" + case 181: +#line 1237 "perly.y" { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.i_tkval) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 178: -#line 1193 "perly.y" + case 182: +#line 1241 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 179: -#line 1195 "perly.y" + case 183: +#line 1243 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;} break; - case 180: -#line 1198 "perly.y" + case 184: +#line 1246 "perly.y" { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 181: -#line 1202 "perly.y" + case 185: +#line 1250 "perly.y" { (yyval.opval) = newOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'('); @@ -1417,14 +1470,14 @@ case 2: ;} break; - case 182: -#line 1208 "perly.y" + case 186: +#line 1256 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 183: -#line 1211 "perly.y" + case 187: +#line 1259 "perly.y" { (yyval.opval) = (IVAL((ps[(1) - (3)].val.i_tkval)) == OP_NOT) ? newUNOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0, newSVOP(OP_CONST, 0, newSViv(0))) : newOP(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_SPECIAL); @@ -1435,8 +1488,8 @@ case 2: ;} break; - case 184: -#line 1220 "perly.y" + case 188: +#line 1268 "perly.y" { (yyval.opval) = newUNOP(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval)); TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o'); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'('); @@ -1444,16 +1497,25 @@ case 2: ;} break; - case 185: -#line 1226 "perly.y" + case 189: +#line 1274 "perly.y" { (yyval.opval) = pmruntime((ps[(1) - (4)].val.opval), (ps[(3) - (4)].val.opval), 1); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')'); ;} break; - case 188: -#line 1236 "perly.y" + case 192: +#line 1281 "perly.y" + { + (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), + newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); + TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'X'); + ;} + break; + + case 194: +#line 1291 "perly.y" { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval)); DO_MAD( token_getmad((ps[(1) - (3)].val.i_tkval),(yyval.opval),'d'); @@ -1463,66 +1525,66 @@ case 2: ;} break; - case 189: -#line 1244 "perly.y" + case 195: +#line 1299 "perly.y" { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'d'); ;} break; - case 190: -#line 1251 "perly.y" + case 196: +#line 1306 "perly.y" { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')'); ;} break; - case 191: -#line 1256 "perly.y" + case 197: +#line 1311 "perly.y" { (yyval.opval) = sawparens(newNULLLIST()); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'('); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')'); ;} break; - case 192: -#line 1261 "perly.y" + case 198: +#line 1316 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 193: -#line 1263 "perly.y" + case 199: +#line 1318 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 194: -#line 1265 "perly.y" + case 200: +#line 1320 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 195: -#line 1270 "perly.y" - { (yyval.opval) = Nullop; ;} + case 201: +#line 1325 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; - case 196: -#line 1272 "perly.y" + case 202: +#line 1327 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 197: -#line 1276 "perly.y" - { (yyval.opval) = Nullop; ;} + case 203: +#line 1331 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; - case 198: -#line 1278 "perly.y" + case 204: +#line 1333 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 199: -#line 1280 "perly.y" + case 205: +#line 1335 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -1535,70 +1597,70 @@ case 2: ;} break; - case 200: -#line 1295 "perly.y" + case 206: +#line 1350 "perly.y" { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;} break; - case 201: -#line 1299 "perly.y" + case 207: +#line 1354 "perly.y" { (yyval.opval) = newCVREF(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'&'); ;} break; - case 202: -#line 1305 "perly.y" + case 208: +#line 1360 "perly.y" { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$'); ;} break; - case 203: -#line 1311 "perly.y" + case 209: +#line 1366 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@'); ;} break; - case 204: -#line 1317 "perly.y" + case 210: +#line 1372 "perly.y" { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%'); ;} break; - case 205: -#line 1323 "perly.y" + case 211: +#line 1378 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l'); ;} break; - case 206: -#line 1329 "perly.y" + case 212: +#line 1384 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*'); ;} break; - case 207: -#line 1336 "perly.y" + case 213: +#line 1391 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 208: -#line 1338 "perly.y" + case 214: +#line 1393 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 209: -#line 1340 "perly.y" + case 215: +#line 1395 "perly.y" { (yyval.opval) = scope((ps[(1) - (1)].val.opval)); ;} break; - case 210: -#line 1343 "perly.y" + case 216: +#line 1398 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break;