X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/5a63ceef8d48d5da8deade2d7122a0e51724cfed..d2898d73a1ac5ef072641f07c70d9334e368d58a:/perly.act diff --git a/perly.act b/perly.act index 32f9b82..fae0f13 100644 --- a/perly.act +++ b/perly.act @@ -5,14 +5,14 @@ */ case 2: -#line 142 "perly.y" +#line 141 "perly.y" { PL_parser->expect = XSTATE; ;} break; case 3: -#line 146 "perly.y" +#line 145 "perly.y" { newPROG(block_end((ps[(3) - (4)].val.ival),(ps[(4) - (4)].val.opval))); (yyval.ival) = 0; @@ -20,14 +20,14 @@ case 2: break; case 4: -#line 151 "perly.y" +#line 150 "perly.y" { parser->expect = XTERM; ;} break; case 5: -#line 155 "perly.y" +#line 154 "perly.y" { PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; @@ -35,14 +35,14 @@ case 2: break; case 6: -#line 160 "perly.y" +#line 159 "perly.y" { parser->expect = XBLOCK; ;} break; case 7: -#line 164 "perly.y" +#line 163 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); @@ -53,14 +53,14 @@ case 2: break; case 8: -#line 172 "perly.y" +#line 171 "perly.y" { parser->expect = XSTATE; ;} break; case 9: -#line 176 "perly.y" +#line 175 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); @@ -71,14 +71,14 @@ case 2: break; case 10: -#line 184 "perly.y" +#line 183 "perly.y" { parser->expect = XSTATE; ;} break; case 11: -#line 188 "perly.y" +#line 187 "perly.y" { PL_pad_reset_pending = TRUE; PL_eval_root = (ps[(3) - (3)].val.opval); @@ -89,14 +89,14 @@ case 2: break; case 12: -#line 196 "perly.y" +#line 195 "perly.y" { parser->expect = XSTATE; ;} break; case 13: -#line 200 "perly.y" +#line 199 "perly.y" { PL_eval_root = (ps[(3) - (3)].val.opval); (yyval.ival) = 0; @@ -104,7 +104,7 @@ case 2: break; case 14: -#line 208 "perly.y" +#line 207 "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)); @@ -115,16 +115,21 @@ case 2: case 15: #line 217 "perly.y" - { (yyval.ival) = block_start(TRUE); ;} + { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (7)].val.i_tkval))) + PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval)); + (yyval.opval) = block_end((ps[(2) - (7)].val.ival), (ps[(5) - (7)].val.opval)); + TOKEN_GETMAD((ps[(1) - (7)].val.i_tkval),(yyval.opval),'{'); + TOKEN_GETMAD((ps[(7) - (7)].val.i_tkval),(yyval.opval),'}'); + ;} break; case 16: -#line 221 "perly.y" - { (yyval.ival) = (I32) Perl_allocmy(aTHX_ STR_WITH_LEN("$_"), 0); ;} +#line 226 "perly.y" + { (yyval.ival) = block_start(TRUE); ;} break; case 17: -#line 225 "perly.y" +#line 230 "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)); @@ -134,17 +139,17 @@ case 2: break; case 18: -#line 234 "perly.y" +#line 239 "perly.y" { (yyval.ival) = block_start(FALSE); ;} break; case 19: -#line 239 "perly.y" +#line 244 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; case 20: -#line 241 "perly.y" +#line 246 "perly.y" { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval)); PL_pad_reset_pending = TRUE; if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval)) @@ -153,7 +158,21 @@ case 2: break; case 21: -#line 250 "perly.y" +#line 255 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} + break; + + case 22: +#line 257 "perly.y" + { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval)); + PL_pad_reset_pending = TRUE; + if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval)) + PL_hints |= HINT_BLOCK_SCOPE; + ;} + break; + + case 23: +#line 266 "perly.y" { if((ps[(1) - (1)].val.opval)) { (yyval.opval) = newSTATEOP(0, NULL, (ps[(1) - (1)].val.opval)); @@ -163,46 +182,49 @@ case 2: ;} break; - case 22: -#line 258 "perly.y" + case 24: +#line 274 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 23: -#line 262 "perly.y" + case 25: +#line 278 "perly.y" { - (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); + (yyval.opval) = newSTATEOP(SVf_UTF8 + * PVAL((ps[(1) - (2)].val.p_tkval))[strlen(PVAL((ps[(1) - (2)].val.p_tkval)))+1], + PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval), (ps[(2) - (2)].val.opval) ? cLISTOPx((yyval.opval))->op_first : (yyval.opval), 'L'); ;} break; - case 24: -#line 268 "perly.y" + case 26: +#line 286 "perly.y" { - (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); + (yyval.opval) = newSTATEOP(SVf_UTF8 + * PVAL((ps[(1) - (2)].val.p_tkval))[strlen(PVAL((ps[(1) - (2)].val.p_tkval)))+1], + PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval), cLISTOPx((yyval.opval))->op_first, 'L'); ;} break; - case 25: -#line 276 "perly.y" + case 27: +#line 296 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 26: -#line 278 "perly.y" + case 28: +#line 298 "perly.y" { (yyval.opval) = newOP(OP_NULL,0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p'); ;} break; - case 27: -#line 283 "perly.y" + case 29: +#line 303 "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'); @@ -212,54 +234,71 @@ case 2: newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval)); (yyval.opval) = (OP*)NULL; #endif - if (CvOUTSIDE(fmtcv) && !CvUNIQUE(CvOUTSIDE(fmtcv))) { + if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) { SvREFCNT_inc_simple_void(fmtcv); - pad_add_anon((SV*)fmtcv, OP_NULL); + pad_add_anon(fmtcv, OP_NULL); } ;} break; - case 28: -#line 301 "perly.y" + case 30: +#line 320 "perly.y" { - SvREFCNT_inc_simple_void(PL_compcv); -#ifdef MAD - { - OP* o = newSVOP(OP_ANONCODE, 0, - (SV*)newATTRSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval))); - (yyval.opval) = newOP(OP_NULL,0); - op_getmad(o,(yyval.opval),'&'); - op_getmad((ps[(3) - (6)].val.opval),(yyval.opval),'n'); - op_getmad((ps[(4) - (6)].val.opval),(yyval.opval),'s'); - op_getmad((ps[(5) - (6)].val.opval),(yyval.opval),'a'); - token_getmad((ps[(1) - (6)].val.i_tkval),(yyval.opval),'d'); - append_madprops((ps[(6) - (6)].val.opval)->op_madprop, (yyval.opval), 0); - (ps[(6) - (6)].val.opval)->op_madprop = 0; + if ((ps[(2) - (3)].val.opval)->op_type == OP_CONST) { + const char *const name = + SvPV_nolen_const(((SVOP*)(ps[(2) - (3)].val.opval))->op_sv); + if (strEQ(name, "BEGIN") || strEQ(name, "END") + || strEQ(name, "INIT") || strEQ(name, "CHECK") + || strEQ(name, "UNITCHECK")) + CvSPECIAL_on(PL_compcv); } -#else - newATTRSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval)); - (yyval.opval) = (OP*)NULL; -#endif + else + /* State subs inside anonymous subs need to be + clonable themselves. */ + if (CvANON(CvOUTSIDE(PL_compcv)) + || CvCLONE(CvOUTSIDE(PL_compcv)) + || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST( + CvOUTSIDE(PL_compcv) + ))[(ps[(2) - (3)].val.opval)->op_targ])) + CvCLONE_on(PL_compcv); + PL_parser->in_my = 0; + PL_parser->in_my_stash = NULL; ;} break; - case 29: -#line 322 "perly.y" + case 31: +#line 342 "perly.y" { - /* Unimplemented "my sub foo { }" */ 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'); + { + OP* o = newSVOP(OP_ANONCODE, 0, + (SV*)( +#endif + (ps[(2) - (7)].val.opval)->op_type == OP_CONST + ? newATTRSUB((ps[(3) - (7)].val.ival), (ps[(2) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval)) + : newMYSUB((ps[(3) - (7)].val.ival), (ps[(2) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval)) +#ifdef MAD + )); + (yyval.opval) = newOP(OP_NULL,0); + op_getmad(o,(yyval.opval),'&'); + op_getmad((ps[(2) - (7)].val.opval),(yyval.opval),'n'); + op_getmad((ps[(5) - (7)].val.opval),(yyval.opval),'s'); + op_getmad((ps[(6) - (7)].val.opval),(yyval.opval),'a'); + token_getmad((ps[(1) - (7)].val.i_tkval),(yyval.opval),'d'); + append_madprops((ps[(7) - (7)].val.opval)->op_madprop, (yyval.opval), 0); + (ps[(7) - (7)].val.opval)->op_madprop = 0; + } #else - newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval)); + ; (yyval.opval) = (OP*)NULL; #endif + intro_my(); ;} break; - case 30: -#line 334 "perly.y" + case 32: +#line 370 "perly.y" { #ifdef MAD (yyval.opval) = package((ps[(3) - (4)].val.opval)); @@ -276,13 +315,13 @@ case 2: ;} break; - case 31: -#line 349 "perly.y" + case 33: +#line 385 "perly.y" { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;} break; - case 32: -#line 351 "perly.y" + case 34: +#line 387 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD @@ -299,8 +338,8 @@ case 2: ;} break; - case 33: -#line 366 "perly.y" + case 35: +#line 402 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -311,8 +350,8 @@ case 2: ;} break; - case 34: -#line 375 "perly.y" + case 36: +#line 411 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval))); @@ -323,27 +362,32 @@ case 2: ;} break; - case 35: -#line 384 "perly.y" + case 37: +#line 420 "perly.y" { - (yyval.opval) = block_end((ps[(3) - (7)].val.ival), - newGIVENOP((ps[(5) - (7)].val.opval), op_scope((ps[(7) - (7)].val.opval)), (PADOFFSET)(ps[(4) - (7)].val.ival))); - PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval)); + const PADOFFSET offset = pad_findmy_pvs("$_", 0); + (yyval.opval) = block_end((ps[(3) - (6)].val.ival), + newGIVENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)), + offset == NOT_IN_PAD + || PAD_COMPNAME_FLAGS_isOUR(offset) + ? 0 + : offset)); + PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval)); ;} break; - case 36: -#line 390 "perly.y" + case 38: +#line 431 "perly.y" { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;} break; - case 37: -#line 392 "perly.y" + case 39: +#line 433 "perly.y" { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;} break; - case 38: -#line 394 "perly.y" + case 40: +#line 435 "perly.y" { (yyval.opval) = block_end((ps[(3) - (8)].val.ival), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -355,8 +399,8 @@ case 2: ;} break; - case 39: -#line 404 "perly.y" + case 41: +#line 445 "perly.y" { (yyval.opval) = block_end((ps[(3) - (8)].val.ival), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -368,8 +412,8 @@ case 2: ;} break; - case 40: -#line 415 "perly.y" + case 42: +#line 456 "perly.y" { OP *initop = IF_MAD((ps[(4) - (11)].val.opval) ? (ps[(4) - (11)].val.opval) : newOP(OP_NULL, 0), (ps[(4) - (11)].val.opval)); OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -391,8 +435,8 @@ case 2: ;} break; - case 41: -#line 435 "perly.y" + case 43: +#line 476 "perly.y" { (yyval.opval) = block_end((ps[(3) - (9)].val.ival), newFOROP(0, (ps[(4) - (9)].val.opval), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval))); TOKEN_GETMAD((ps[(1) - (9)].val.i_tkval),(yyval.opval),'W'); @@ -403,8 +447,8 @@ case 2: ;} break; - case 42: -#line 444 "perly.y" + case 44: +#line 485 "perly.y" { (yyval.opval) = block_end((ps[(4) - (8)].val.ival), newFOROP(0, op_lvalue((ps[(2) - (8)].val.opval), OP_ENTERLOOP), (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval))); @@ -415,8 +459,8 @@ case 2: ;} break; - case 43: -#line 453 "perly.y" + case 45: +#line 494 "perly.y" { (yyval.opval) = block_end((ps[(3) - (7)].val.ival), newFOROP(0, (OP*)NULL, (ps[(4) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval))); @@ -427,8 +471,8 @@ case 2: ;} break; - case 44: -#line 462 "perly.y" + case 46: +#line 503 "perly.y" { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, @@ -436,31 +480,22 @@ case 2: ;} break; - case 45: -#line 468 "perly.y" + case 47: +#line 509 "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 46: -#line 481 "perly.y" + case 48: +#line 516 "perly.y" { /* a block is a loop that happens once */ (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL, (OP*)NULL, block_end((ps[(5) - (8)].val.ival), (ps[(7) - (8)].val.opval)), (OP*)NULL, 0); - op_free((ps[(3) - (8)].val.opval)); - if ((ps[(2) - (8)].val.opval)) - op_free((ps[(2) - (8)].val.opval)); TOKEN_GETMAD((ps[(4) - (8)].val.i_tkval),(yyval.opval),'{'); TOKEN_GETMAD((ps[(8) - (8)].val.i_tkval),(yyval.opval),'}'); if (PL_parser->copline > (line_t)IVAL((ps[(4) - (8)].val.i_tkval))) @@ -468,8 +503,8 @@ case 2: ;} break; - case 47: -#line 494 "perly.y" + case 49: +#line 526 "perly.y" { PL_parser->expect = XSTATE; (yyval.opval) = (ps[(1) - (2)].val.opval); @@ -477,8 +512,8 @@ case 2: ;} break; - case 48: -#line 500 "perly.y" + case 50: +#line 532 "perly.y" { PL_parser->expect = XSTATE; (yyval.opval) = IF_MAD(newOP(OP_NULL, 0), (OP*)NULL); @@ -487,64 +522,98 @@ case 2: ;} break; - case 49: -#line 510 "perly.y" + case 51: +#line 542 "perly.y" + { OP *list; + if ((ps[(2) - (2)].val.opval)) { + OP *term = (ps[(2) - (2)].val.opval); + DO_MAD(term = newUNOP(OP_NULL, 0, term)); + list = op_append_elem(OP_LIST, (ps[(1) - (2)].val.opval), term); + } + else { +#ifdef MAD + OP *op = newNULLLIST(); + list = op_append_elem(OP_LIST, (ps[(1) - (2)].val.opval), op); +#else + list = (ps[(1) - (2)].val.opval); +#endif + } + if (PL_parser->copline == NOLINE) + PL_parser->copline = CopLINE(PL_curcop)-1; + else PL_parser->copline--; + (yyval.opval) = newSTATEOP(0, NULL, + convert(OP_FORMLINE, 0, list)); + ;} + break; + + case 52: +#line 565 "perly.y" + { (yyval.opval) = NULL; ;} + break; + + case 53: +#line 567 "perly.y" + { (yyval.opval) = op_unscope((ps[(2) - (3)].val.opval)); ;} + break; + + case 54: +#line 572 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 50: -#line 512 "perly.y" + case 55: +#line 574 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 51: -#line 514 "perly.y" + case 56: +#line 576 "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 52: -#line 518 "perly.y" + case 57: +#line 580 "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 53: -#line 522 "perly.y" + case 58: +#line 584 "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 54: -#line 526 "perly.y" + case 59: +#line 588 "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 55: -#line 530 "perly.y" + case 60: +#line 592 "perly.y" { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w'); PL_parser->copline = (line_t)IVAL((ps[(2) - (3)].val.i_tkval)); ;} break; - case 56: -#line 535 "perly.y" + case 61: +#line 597 "perly.y" { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); ;} break; - case 57: -#line 540 "perly.y" + case 62: +#line 602 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 58: -#line 542 "perly.y" + case 63: +#line 604 "perly.y" { ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); @@ -552,8 +621,8 @@ case 2: ;} break; - case 59: -#line 548 "perly.y" + case 64: +#line 610 "perly.y" { PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval)); (yyval.opval) = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)), @@ -565,115 +634,105 @@ case 2: ;} break; - case 60: -#line 561 "perly.y" + case 65: +#line 623 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 61: -#line 563 "perly.y" + case 66: +#line 625 "perly.y" { (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 62: -#line 571 "perly.y" + case 67: +#line 633 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); ;} break; - case 63: -#line 577 "perly.y" + case 68: +#line 639 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 65: -#line 583 "perly.y" + case 70: +#line 645 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; ;} break; - case 67: -#line 591 "perly.y" + case 72: +#line 653 "perly.y" { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;} break; - case 68: -#line 596 "perly.y" + case 73: +#line 658 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 69: -#line 600 "perly.y" + case 74: +#line 662 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 70: -#line 604 "perly.y" + case 75: +#line 666 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; - case 71: -#line 607 "perly.y" + case 76: +#line 669 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 72: -#line 608 "perly.y" + case 77: +#line 670 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 73: -#line 612 "perly.y" + case 78: +#line 674 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); ;} break; - case 74: -#line 618 "perly.y" + case 79: +#line 680 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); ;} break; - case 75: -#line 623 "perly.y" + case 80: +#line 685 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); ;} break; - case 76: -#line 628 "perly.y" - { const char *const name = SvPV_nolen_const(((SVOP*)(ps[(1) - (1)].val.opval))->op_sv); - if (strEQ(name, "BEGIN") || strEQ(name, "END") - || strEQ(name, "INIT") || strEQ(name, "CHECK") - || strEQ(name, "UNITCHECK")) - CvSPECIAL_on(PL_compcv); - (yyval.opval) = (ps[(1) - (1)].val.opval); ;} - break; - - case 77: -#line 638 "perly.y" + case 83: +#line 696 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 79: -#line 644 "perly.y" + case 85: +#line 702 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 80: -#line 646 "perly.y" + case 86: +#line 704 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 81: -#line 650 "perly.y" + case 87: +#line 708 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -682,15 +741,15 @@ case 2: ;} break; - case 82: -#line 660 "perly.y" + case 88: +#line 718 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 83: -#line 664 "perly.y" + case 89: +#line 722 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -699,13 +758,13 @@ case 2: ;} break; - case 84: -#line 673 "perly.y" + case 90: +#line 731 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 85: -#line 674 "perly.y" + case 91: +#line 732 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL,0), (OP*)NULL @@ -715,29 +774,29 @@ case 2: ;} break; - case 86: -#line 685 "perly.y" + case 92: +#line 743 "perly.y" { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 87: -#line 689 "perly.y" + case 93: +#line 747 "perly.y" { (yyval.opval) = newLOGOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 88: -#line 693 "perly.y" + case 94: +#line 751 "perly.y" { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 90: -#line 701 "perly.y" + case 96: +#line 759 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -749,8 +808,8 @@ case 2: ;} break; - case 91: -#line 711 "perly.y" + case 97: +#line 769 "perly.y" { OP* term = (ps[(3) - (3)].val.opval); DO_MAD( @@ -761,16 +820,16 @@ case 2: ;} break; - case 93: -#line 724 "perly.y" + case 99: +#line 782 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED, op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (3)].val.i_tkval)),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) ); TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 94: -#line 729 "perly.y" + case 100: +#line 787 "perly.y" { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED, op_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'); @@ -779,8 +838,8 @@ case 2: ;} break; - case 95: -#line 736 "perly.y" + case 101: +#line 794 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)), @@ -791,8 +850,8 @@ case 2: ;} break; - case 96: -#line 745 "perly.y" + case 102: +#line 803 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)), newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval)))); @@ -800,8 +859,8 @@ case 2: ;} break; - case 97: -#line 751 "perly.y" + case 103: +#line 809 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)), @@ -809,8 +868,8 @@ case 2: ;} break; - case 98: -#line 757 "perly.y" + case 104: +#line 815 "perly.y" { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)), @@ -820,15 +879,15 @@ case 2: ;} break; - case 99: -#line 765 "perly.y" + case 105: +#line 823 "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 100: -#line 769 "perly.y" + case 106: +#line 827 "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),'('); @@ -836,22 +895,22 @@ case 2: ;} break; - case 101: -#line 775 "perly.y" + case 107: +#line 833 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;} break; - case 102: -#line 778 "perly.y" + case 108: +#line 836 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval))); ;} break; - case 105: -#line 793 "perly.y" + case 111: +#line 851 "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),'{'); @@ -860,16 +919,16 @@ case 2: ;} break; - case 106: -#line 800 "perly.y" + case 112: +#line 858 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval))); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']'); ;} break; - case 107: -#line 805 "perly.y" + case 113: +#line 863 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV), scalar((ps[(4) - (5)].val.opval))); @@ -879,8 +938,8 @@ case 2: ;} break; - case 108: -#line 813 "perly.y" + case 114: +#line 871 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV), scalar((ps[(3) - (4)].val.opval))); @@ -889,8 +948,8 @@ case 2: ;} break; - case 109: -#line 820 "perly.y" + case 115: +#line 878 "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),'{'); @@ -899,8 +958,8 @@ case 2: ;} break; - case 110: -#line 827 "perly.y" + case 116: +#line 885 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV), jmaybe((ps[(4) - (6)].val.opval))); @@ -912,8 +971,8 @@ case 2: ;} break; - case 111: -#line 837 "perly.y" + case 117: +#line 895 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV), jmaybe((ps[(3) - (5)].val.opval))); @@ -924,8 +983,8 @@ case 2: ;} break; - case 112: -#line 846 "perly.y" + case 118: +#line 904 "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'); @@ -934,8 +993,8 @@ case 2: ;} break; - case 113: -#line 853 "perly.y" + case 119: +#line 911 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(4) - (5)].val.opval), newCVREF(0, scalar((ps[(1) - (5)].val.opval))))); @@ -945,8 +1004,8 @@ case 2: ;} break; - case 114: -#line 862 "perly.y" + case 120: +#line 920 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), newCVREF(0, scalar((ps[(1) - (4)].val.opval))))); @@ -955,8 +1014,8 @@ case 2: ;} break; - case 115: -#line 869 "perly.y" + case 121: +#line 927 "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),'('); @@ -964,8 +1023,8 @@ case 2: ;} break; - case 116: -#line 875 "perly.y" + case 122: +#line 933 "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),')'); @@ -974,16 +1033,16 @@ case 2: ;} break; - case 117: -#line 882 "perly.y" + case 123: +#line 940 "perly.y" { (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - (4)].val.opval)); TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'['); TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']'); ;} break; - case 118: -#line 887 "perly.y" + case 124: +#line 945 "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),')'); @@ -992,22 +1051,22 @@ case 2: ;} break; - case 119: -#line 897 "perly.y" + case 125: +#line 955 "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 120: -#line 901 "perly.y" + case 126: +#line 959 "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 905 "perly.y" + case 127: +#line 963 "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))); @@ -1015,50 +1074,50 @@ case 2: ;} break; - case 122: -#line 911 "perly.y" + case 128: +#line 969 "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 915 "perly.y" + case 129: +#line 973 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 124: -#line 919 "perly.y" + case 130: +#line 977 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 125: -#line 923 "perly.y" + case 131: +#line 981 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 126: -#line 927 "perly.y" + case 132: +#line 985 "perly.y" { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 127: -#line 931 "perly.y" + case 133: +#line 989 "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 128: -#line 935 "perly.y" + case 134: +#line 993 "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({ @@ -1068,33 +1127,33 @@ case 2: op = (UNOP*)op->op_first; /* get to flip */ op = (UNOP*)op->op_first; /* get to range */ token_getmad((ps[(2) - (3)].val.i_tkval),(OP*)op,'o'); - }) + }); ;} break; - case 129: -#line 947 "perly.y" + case 135: +#line 1005 "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 130: -#line 951 "perly.y" + case 136: +#line 1009 "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 131: -#line 955 "perly.y" + case 137: +#line 1013 "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 132: -#line 959 "perly.y" + case 138: +#line 1017 "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 @@ -1103,15 +1162,15 @@ case 2: ;} break; - case 133: -#line 969 "perly.y" + case 139: +#line 1027 "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 134: -#line 973 "perly.y" + case 140: +#line 1031 "perly.y" { (yyval.opval) = IF_MAD( newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)), (ps[(2) - (2)].val.opval) @@ -1120,70 +1179,70 @@ case 2: ;} break; - case 135: -#line 980 "perly.y" + case 141: +#line 1038 "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 136: -#line 984 "perly.y" + case 142: +#line 1042 "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 137: -#line 988 "perly.y" + case 143: +#line 1046 "perly.y" { (yyval.opval) = newUNOP(OP_POSTINC, 0, op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 138: -#line 993 "perly.y" + case 144: +#line 1051 "perly.y" { (yyval.opval) = newUNOP(OP_POSTDEC, 0, op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC)); TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 139: -#line 998 "perly.y" + case 145: +#line 1056 "perly.y" { (yyval.opval) = newUNOP(OP_PREINC, 0, op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREINC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 140: -#line 1003 "perly.y" + case 146: +#line 1061 "perly.y" { (yyval.opval) = newUNOP(OP_PREDEC, 0, op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 141: -#line 1012 "perly.y" + case 147: +#line 1070 "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 142: -#line 1017 "perly.y" + case 148: +#line 1075 "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 143: -#line 1022 "perly.y" + case 149: +#line 1080 "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),';'); @@ -1191,8 +1250,8 @@ case 2: ;} break; - case 144: -#line 1028 "perly.y" + case 150: +#line 1086 "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),';'); @@ -1200,8 +1259,8 @@ case 2: ;} break; - case 145: -#line 1034 "perly.y" + case 151: +#line 1092 "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'); @@ -1210,22 +1269,22 @@ case 2: ;} break; - case 146: -#line 1045 "perly.y" + case 152: +#line 1103 "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 147: -#line 1049 "perly.y" + case 153: +#line 1107 "perly.y" { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - (2)].val.opval))); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D'); ;} break; - case 148: -#line 1053 "perly.y" + case 154: +#line 1111 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, @@ -1239,8 +1298,8 @@ case 2: ;} break; - case 149: -#line 1065 "perly.y" + case 155: +#line 1123 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_append_elem(OP_LIST, @@ -1255,8 +1314,8 @@ case 2: ;} break; - case 150: -#line 1078 "perly.y" + case 156: +#line 1136 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep(); @@ -1266,8 +1325,8 @@ case 2: ;} break; - case 151: -#line 1086 "perly.y" + case 157: +#line 1144 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), @@ -1278,86 +1337,86 @@ case 2: ;} break; - case 156: -#line 1102 "perly.y" + case 162: +#line 1160 "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 157: -#line 1107 "perly.y" + case 163: +#line 1165 "perly.y" { (yyval.opval) = newUNOP(OP_REFGEN, 0, op_lvalue((ps[(2) - (2)].val.opval),OP_REFGEN)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 158: -#line 1111 "perly.y" + case 164: +#line 1169 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 159: -#line 1113 "perly.y" + case 165: +#line 1171 "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 160: -#line 1117 "perly.y" + case 166: +#line 1175 "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 161: -#line 1122 "perly.y" + case 167: +#line 1180 "perly.y" { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); ;} break; - case 162: -#line 1124 "perly.y" + case 168: +#line 1182 "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 163: -#line 1129 "perly.y" + case 169: +#line 1187 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 164: -#line 1131 "perly.y" + case 170: +#line 1189 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 165: -#line 1133 "perly.y" + case 171: +#line 1191 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 166: -#line 1135 "perly.y" + case 172: +#line 1193 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 167: -#line 1137 "perly.y" + case 173: +#line 1195 "perly.y" { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;} break; - case 168: -#line 1139 "perly.y" + case 174: +#line 1197 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 169: -#line 1141 "perly.y" + case 175: +#line 1199 "perly.y" { (yyval.opval) = op_prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1368,8 +1427,8 @@ case 2: ;} break; - case 170: -#line 1150 "perly.y" + case 176: +#line 1208 "perly.y" { (yyval.opval) = op_prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1382,26 +1441,26 @@ case 2: ;} break; - case 171: -#line 1161 "perly.y" + case 177: +#line 1219 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 172: -#line 1163 "perly.y" + case 178: +#line 1221 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 173: -#line 1165 "perly.y" + case 179: +#line 1223 "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 174: -#line 1170 "perly.y" + case 180: +#line 1228 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval)))); @@ -1412,95 +1471,95 @@ case 2: } token_getmad((ps[(2) - (4)].val.i_tkval),op,'('); token_getmad((ps[(4) - (4)].val.i_tkval),op,')'); - }) + }); ;} break; - case 175: -#line 1183 "perly.y" + case 181: +#line 1241 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_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 176: -#line 1188 "perly.y" + case 182: +#line 1246 "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 177: -#line 1193 "perly.y" + case 183: +#line 1251 "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 178: -#line 1197 "perly.y" + case 184: +#line 1255 "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 179: -#line 1201 "perly.y" + case 185: +#line 1259 "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 180: -#line 1205 "perly.y" + case 186: +#line 1263 "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 181: -#line 1209 "perly.y" + case 187: +#line 1267 "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 182: -#line 1213 "perly.y" + case 188: +#line 1271 "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 183: -#line 1217 "perly.y" + case 189: +#line 1275 "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 184: -#line 1221 "perly.y" + case 190: +#line 1279 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 185: -#line 1223 "perly.y" + case 191: +#line 1281 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;} break; - case 186: -#line 1226 "perly.y" + case 192: +#line 1284 "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 187: -#line 1230 "perly.y" + case 193: +#line 1288 "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),'('); @@ -1508,14 +1567,27 @@ case 2: ;} break; - case 188: -#line 1236 "perly.y" + case 194: +#line 1294 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + + case 195: +#line 1296 "perly.y" + { (yyval.opval) = (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 196: +#line 1301 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 189: -#line 1239 "perly.y" + case 197: +#line 1304 "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); @@ -1526,8 +1598,8 @@ case 2: ;} break; - case 190: -#line 1248 "perly.y" + case 198: +#line 1313 "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),'('); @@ -1535,16 +1607,30 @@ case 2: ;} break; - case 191: -#line 1254 "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),')'); + case 199: +#line 1319 "perly.y" + { + if ( (ps[(1) - (1)].val.opval)->op_type != OP_TRANS + && (ps[(1) - (1)].val.opval)->op_type != OP_TRANSR + && (((PMOP*)(ps[(1) - (1)].val.opval))->op_pmflags & PMf_HAS_CV)) + { + (yyval.ival) = start_subparse(FALSE, CVf_ANON); + SAVEFREESV(PL_compcv); + } else + (yyval.ival) = 0; ;} break; - case 194: -#line 1261 "perly.y" + case 200: +#line 1330 "perly.y" + { (yyval.opval) = pmruntime((ps[(1) - (5)].val.opval), (ps[(4) - (5)].val.opval), 1, (ps[(2) - (5)].val.ival)); + TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'('); + TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')'); + ;} + break; + + case 203: +#line 1337 "perly.y" { (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); @@ -1552,154 +1638,139 @@ case 2: ;} break; - case 196: -#line 1271 "perly.y" + case 205: +#line 1347 "perly.y" { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval)); DO_MAD( token_getmad((ps[(1) - (3)].val.i_tkval),(yyval.opval),'d'); append_madprops((ps[(3) - (3)].val.opval)->op_madprop, (yyval.opval), 'a'); (ps[(3) - (3)].val.opval)->op_madprop = 0; - ) + ); ;} break; - case 197: -#line 1279 "perly.y" + case 206: +#line 1355 "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 198: -#line 1286 "perly.y" + case 207: +#line 1362 "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 199: -#line 1291 "perly.y" + case 208: +#line 1367 "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 200: -#line 1296 "perly.y" + case 209: +#line 1372 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 201: -#line 1298 "perly.y" + case 210: +#line 1374 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 202: -#line 1300 "perly.y" + case 211: +#line 1376 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 203: -#line 1305 "perly.y" + case 212: +#line 1381 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 204: -#line 1307 "perly.y" + case 213: +#line 1383 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 205: -#line 1311 "perly.y" + case 214: +#line 1387 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 206: -#line 1313 "perly.y" + case 215: +#line 1389 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 207: -#line 1317 "perly.y" - { (yyval.i_tkval) = (ps[(1) - (1)].val.i_tkval); ;} - break; - - case 208: -#line 1319 "perly.y" - { munge_qwlist_to_paren_list((ps[(1) - (1)].val.opval)); ;} - break; - - case 209: -#line 1321 "perly.y" - { (yyval.i_tkval) = (ps[(3) - (3)].val.i_tkval); ;} - break; - - case 210: -#line 1327 "perly.y" + case 216: +#line 1395 "perly.y" { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;} break; - case 211: -#line 1331 "perly.y" + case 217: +#line 1399 "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 212: -#line 1337 "perly.y" + case 218: +#line 1405 "perly.y" { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$'); ;} break; - case 213: -#line 1343 "perly.y" + case 219: +#line 1411 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@'); ;} break; - case 214: -#line 1349 "perly.y" + case 220: +#line 1417 "perly.y" { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%'); ;} break; - case 215: -#line 1355 "perly.y" + case 221: +#line 1423 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l'); ;} break; - case 216: -#line 1361 "perly.y" + case 222: +#line 1429 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*'); ;} break; - case 217: -#line 1368 "perly.y" + case 223: +#line 1436 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 218: -#line 1370 "perly.y" + case 224: +#line 1438 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 219: -#line 1372 "perly.y" + case 225: +#line 1440 "perly.y" { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;} break; - case 220: -#line 1375 "perly.y" + case 226: +#line 1443 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; @@ -1710,6 +1781,6 @@ case 2: /* Generated from: - * dbb2439b7793bc662fb61a937ef279c1e367658eb7b8755c88b0e9c61116ed55 perly.y - * 738ca60a0b4cb075902435e976a2f393d438e8e6e32ba81e037dd773b75c87b5 regen_perly.pl + * 28c2c7738eefc00762e227af0363c729186c992e9127e0c935684cccbf3a3b4f perly.y + * 73288b53f1f6dc0183252a5a8e4f39cfe36e357e77233704fad3021fee88eb5b regen_perly.pl * ex: set ro: */