diff options
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | perly.act | 745 | ||||
| -rw-r--r-- | perly.h | 42 | ||||
| -rw-r--r-- | perly.tab | 1338 | ||||
| -rw-r--r-- | perly.y | 23 | ||||
| -rw-r--r-- | pod/perlfunc.pod | 17 | ||||
| -rw-r--r-- | t/comp/package_block.t | 37 | ||||
| -rw-r--r-- | toke.c | 7 | ||||
| -rw-r--r-- | util.c | 6 |
9 files changed, 1162 insertions, 1054 deletions
@@ -4207,6 +4207,7 @@ t/comp/line_debug.t See if @{"_<$file"} works t/comp/multiline.t See if multiline strings work t/comp/opsubs.t See if q() etc. are not parsed as functions t/comp/our.t Tests for our declaration +t/comp/package_block.t See if package block syntax works t/comp/package.t See if packages work t/comp/parser.t See if the parser works in edge cases t/comp/proto.t See if function prototypes work @@ -127,74 +127,83 @@ case 2: case 18: #line 246 "perly.y" - { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;} + { (yyval.opval) = newSTATEOP(0, NULL, + newWHILEOP(0, 1, (LOOP*)(OP*)NULL, + NOLINE, (OP*)NULL, (ps[(1) - (1)].val.opval), + (OP*)NULL, 0)); + TOKEN_GETMAD((ps[(1) - (1)].val.opval),((LISTOP*)(yyval.opval))->op_first,'L'); ;} break; case 19: -#line 251 "perly.y" - { (yyval.opval) = (OP*)NULL; ;} +#line 252 "perly.y" + { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;} break; case 20: -#line 253 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} +#line 257 "perly.y" + { (yyval.opval) = (OP*)NULL; ;} break; case 21: -#line 255 "perly.y" +#line 259 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + + case 22: +#line 261 "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 259 "perly.y" + case 23: +#line 265 "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 263 "perly.y" + case 24: +#line 269 "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 267 "perly.y" + case 25: +#line 273 "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 271 "perly.y" + case 26: +#line 277 "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 276 "perly.y" + case 27: +#line 282 "perly.y" { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), scope((ps[(1) - (3)].val.opval))); ;} break; - case 27: -#line 281 "perly.y" + case 28: +#line 287 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 28: -#line 283 "perly.y" + case 29: +#line 289 "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 29: -#line 287 "perly.y" + case 30: +#line 293 "perly.y" { PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval)); (yyval.opval) = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)), scope((ps[(5) - (6)].val.opval)), (ps[(6) - (6)].val.opval)); PL_hints |= HINT_BLOCK_SCOPE; @@ -204,8 +213,8 @@ case 2: ;} break; - case 30: -#line 298 "perly.y" + case 31: +#line 304 "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))); @@ -215,8 +224,8 @@ case 2: ;} break; - case 31: -#line 306 "perly.y" + case 32: +#line 312 "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))); @@ -226,31 +235,31 @@ case 2: ;} break; - case 32: -#line 317 "perly.y" + case 33: +#line 323 "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 33: -#line 320 "perly.y" + case 34: +#line 326 "perly.y" { (yyval.opval) = newWHENOP(0, scope((ps[(2) - (2)].val.opval))); ;} break; - case 34: -#line 325 "perly.y" + case 35: +#line 331 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 35: -#line 327 "perly.y" + case 36: +#line 333 "perly.y" { (yyval.opval) = scope((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o'); ;} break; - case 36: -#line 334 "perly.y" + case 37: +#line 340 "perly.y" { OP *innerop; PL_parser->copline = (line_t)IVAL((ps[(2) - (9)].val.i_tkval)); (yyval.opval) = block_end((ps[(4) - (9)].val.ival), @@ -264,8 +273,8 @@ case 2: ;} break; - case 37: -#line 347 "perly.y" + case 38: +#line 353 "perly.y" { OP *innerop; PL_parser->copline = (line_t)IVAL((ps[(2) - (9)].val.i_tkval)); (yyval.opval) = block_end((ps[(4) - (9)].val.ival), @@ -279,8 +288,8 @@ case 2: ;} break; - case 38: -#line 359 "perly.y" + case 39: +#line 365 "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)), @@ -293,8 +302,8 @@ case 2: ;} break; - case 39: -#line 370 "perly.y" + case 40: +#line 376 "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)), @@ -306,8 +315,8 @@ case 2: ;} break; - case 40: -#line 380 "perly.y" + case 41: +#line 386 "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)), @@ -319,8 +328,8 @@ case 2: ;} break; - case 41: -#line 392 "perly.y" + case 42: +#line 398 "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)), @@ -352,16 +361,16 @@ case 2: (yyval.opval) = block_end((ps[(4) - (12)].val.ival), forop); ;} break; - case 42: -#line 422 "perly.y" + case 43: +#line 428 "perly.y" { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)), newWHILEOP(0, 1, (LOOP*)(OP*)NULL, NOLINE, (OP*)NULL, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval), 0)); TOKEN_GETMAD((ps[(1) - (3)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;} break; - case 43: -#line 430 "perly.y" + case 44: +#line 436 "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)), @@ -369,47 +378,47 @@ case 2: (PADOFFSET) (ps[(5) - (8)].val.ival)) )); ;} break; - case 44: -#line 439 "perly.y" + case 45: +#line 445 "perly.y" { (yyval.ival) = (PL_min_intro_pending && PL_max_intro_pending >= PL_min_intro_pending); intro_my(); ;} break; - case 45: -#line 445 "perly.y" + case 46: +#line 451 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 47: -#line 451 "perly.y" + case 48: +#line 457 "perly.y" { YYSTYPE tmplval; (void)scan_num("1", &tmplval); (yyval.opval) = tmplval.opval; ;} break; - case 49: -#line 459 "perly.y" - { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;} - break; - case 50: -#line 464 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} +#line 465 "perly.y" + { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;} break; case 51: -#line 468 "perly.y" +#line 470 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; case 52: -#line 472 "perly.y" +#line 474 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} break; case 53: -#line 477 "perly.y" +#line 478 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;} + break; + + case 54: +#line 483 "perly.y" { #ifdef MAD YYSTYPE tmplval; @@ -421,45 +430,45 @@ case 2: ;} break; - case 55: -#line 491 "perly.y" - { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} - break; - case 56: -#line 493 "perly.y" +#line 497 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 57: -#line 495 "perly.y" +#line 499 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 58: -#line 497 "perly.y" +#line 501 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 59: -#line 499 "perly.y" +#line 503 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 60: -#line 504 "perly.y" +#line 505 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; case 61: -#line 508 "perly.y" +#line 510 "perly.y" + { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} + break; + + case 62: +#line 514 "perly.y" { (yyval.opval) = newOP(OP_NULL,0); TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p'); ;} break; - case 62: -#line 514 "perly.y" + case 63: +#line 520 "perly.y" { CV *fmtcv = PL_compcv; SvREFCNT_inc_simple_void(PL_compcv); @@ -479,18 +488,18 @@ case 2: ;} break; - case 63: -#line 533 "perly.y" + case 64: +#line 539 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 64: -#line 534 "perly.y" + case 65: +#line 540 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 65: -#line 539 "perly.y" + case 66: +#line 545 "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)); @@ -502,8 +511,8 @@ case 2: ;} break; - case 66: -#line 552 "perly.y" + case 67: +#line 558 "perly.y" { SvREFCNT_inc_simple_void(PL_compcv); #ifdef MAD { @@ -525,26 +534,26 @@ case 2: ;} break; - case 67: -#line 574 "perly.y" + case 68: +#line 580 "perly.y" { (yyval.ival) = start_subparse(FALSE, 0); SAVEFREESV(PL_compcv); ;} break; - case 68: -#line 580 "perly.y" + case 69: +#line 586 "perly.y" { (yyval.ival) = start_subparse(FALSE, CVf_ANON); SAVEFREESV(PL_compcv); ;} break; - case 69: -#line 585 "perly.y" + case 70: +#line 591 "perly.y" { (yyval.ival) = start_subparse(TRUE, 0); SAVEFREESV(PL_compcv); ;} break; - case 70: -#line 590 "perly.y" + case 71: +#line 596 "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") @@ -553,25 +562,25 @@ case 2: (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 71: -#line 600 "perly.y" + case 72: +#line 606 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 73: -#line 606 "perly.y" + case 74: +#line 612 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 74: -#line 608 "perly.y" + case 75: +#line 614 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 75: -#line 612 "perly.y" + case 76: +#line 618 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -580,15 +589,15 @@ case 2: ;} break; - case 76: -#line 622 "perly.y" + case 77: +#line 628 "perly.y" { (yyval.opval) = (ps[(2) - (2)].val.opval); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':'); ;} break; - case 77: -#line 626 "perly.y" + case 78: +#line 632 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL, 0), (OP*)NULL @@ -597,13 +606,13 @@ case 2: ;} break; - case 78: -#line 635 "perly.y" + case 79: +#line 641 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 79: -#line 636 "perly.y" + case 80: +#line 642 "perly.y" { (yyval.opval) = IF_MAD( newOP(OP_NULL,0), (OP*)NULL @@ -613,8 +622,8 @@ case 2: ;} break; - case 80: -#line 646 "perly.y" + case 81: +#line 652 "perly.y" { #ifdef MAD (yyval.opval) = package((ps[(3) - (4)].val.opval)); @@ -631,13 +640,32 @@ case 2: ;} break; - case 81: -#line 663 "perly.y" + case 82: +#line 669 "perly.y" + { + package((ps[(3) - (5)].val.opval)); + if ((ps[(2) - (5)].val.opval)) + package_version((ps[(2) - (5)].val.opval)); + ;} + break; + + case 83: +#line 675 "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),'}'); + ;} + break; + + case 84: +#line 684 "perly.y" { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;} break; - case 82: -#line 665 "perly.y" + case 85: +#line 686 "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)); @@ -653,29 +681,29 @@ case 2: ;} break; - case 83: -#line 682 "perly.y" + case 86: +#line 703 "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 84: -#line 686 "perly.y" + case 87: +#line 707 "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 85: -#line 690 "perly.y" + case 88: +#line 711 "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 87: -#line 698 "perly.y" + case 90: +#line 719 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -687,8 +715,8 @@ case 2: ;} break; - case 88: -#line 708 "perly.y" + case 91: +#line 729 "perly.y" { OP* term = (ps[(3) - (3)].val.opval); DO_MAD( @@ -699,16 +727,16 @@ case 2: ;} break; - case 90: -#line 721 "perly.y" + case 93: +#line 742 "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 91: -#line 726 "perly.y" + case 94: +#line 747 "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'); @@ -717,8 +745,8 @@ case 2: ;} break; - case 92: -#line 733 "perly.y" + case 95: +#line 754 "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)), @@ -729,8 +757,8 @@ case 2: ;} break; - case 93: -#line 742 "perly.y" + case 96: +#line 763 "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)))); @@ -738,8 +766,8 @@ case 2: ;} break; - case 94: -#line 748 "perly.y" + case 97: +#line 769 "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)), @@ -747,8 +775,8 @@ case 2: ;} break; - case 95: -#line 754 "perly.y" + case 98: +#line 775 "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)), @@ -758,15 +786,15 @@ case 2: ;} break; - case 96: -#line 762 "perly.y" + case 99: +#line 783 "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 97: -#line 766 "perly.y" + case 100: +#line 787 "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),'('); @@ -774,22 +802,22 @@ case 2: ;} break; - case 98: -#line 772 "perly.y" + case 101: +#line 793 "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 99: -#line 775 "perly.y" + case 102: +#line 796 "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 102: -#line 790 "perly.y" + case 105: +#line 811 "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),'{'); @@ -798,16 +826,16 @@ case 2: ;} break; - case 103: -#line 797 "perly.y" + case 106: +#line 818 "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 104: -#line 802 "perly.y" + case 107: +#line 823 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV), scalar((ps[(4) - (5)].val.opval))); @@ -817,8 +845,8 @@ case 2: ;} break; - case 105: -#line 810 "perly.y" + case 108: +#line 831 "perly.y" { (yyval.opval) = newBINOP(OP_AELEM, 0, ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV), scalar((ps[(3) - (4)].val.opval))); @@ -827,8 +855,8 @@ case 2: ;} break; - case 106: -#line 817 "perly.y" + case 109: +#line 838 "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),'{'); @@ -837,8 +865,8 @@ case 2: ;} break; - case 107: -#line 824 "perly.y" + case 110: +#line 845 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV), jmaybe((ps[(4) - (6)].val.opval))); @@ -850,8 +878,8 @@ case 2: ;} break; - case 108: -#line 834 "perly.y" + case 111: +#line 855 "perly.y" { (yyval.opval) = newBINOP(OP_HELEM, 0, ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV), jmaybe((ps[(3) - (5)].val.opval))); @@ -862,8 +890,8 @@ case 2: ;} break; - case 109: -#line 843 "perly.y" + case 112: +#line 864 "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'); @@ -872,8 +900,8 @@ case 2: ;} break; - case 110: -#line 850 "perly.y" + case 113: +#line 871 "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))))); @@ -883,8 +911,8 @@ case 2: ;} break; - case 111: -#line 859 "perly.y" + case 114: +#line 880 "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))))); @@ -893,8 +921,8 @@ case 2: ;} break; - case 112: -#line 866 "perly.y" + case 115: +#line 887 "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),'('); @@ -902,8 +930,8 @@ case 2: ;} break; - case 113: -#line 872 "perly.y" + case 116: +#line 893 "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),')'); @@ -912,8 +940,8 @@ case 2: ;} break; - case 114: -#line 879 "perly.y" + case 117: +#line 900 "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),')'); @@ -922,22 +950,22 @@ case 2: ;} break; - case 115: -#line 889 "perly.y" + case 118: +#line 910 "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 116: -#line 893 "perly.y" + case 119: +#line 914 "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 117: -#line 897 "perly.y" + case 120: +#line 918 "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))); @@ -945,50 +973,50 @@ case 2: ;} break; - case 118: -#line 903 "perly.y" + case 121: +#line 924 "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 907 "perly.y" + case 122: +#line 928 "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 911 "perly.y" + case 123: +#line 932 "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 915 "perly.y" + case 124: +#line 936 "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 919 "perly.y" + case 125: +#line 940 "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 923 "perly.y" + case 126: +#line 944 "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 927 "perly.y" + case 127: +#line 948 "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({ @@ -1002,29 +1030,29 @@ case 2: ;} break; - case 125: -#line 939 "perly.y" + case 128: +#line 960 "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 126: -#line 943 "perly.y" + case 129: +#line 964 "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 127: -#line 947 "perly.y" + case 130: +#line 968 "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 128: -#line 951 "perly.y" + case 131: +#line 972 "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 @@ -1033,15 +1061,15 @@ case 2: ;} break; - case 129: -#line 961 "perly.y" + case 132: +#line 982 "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 130: -#line 965 "perly.y" + case 133: +#line 986 "perly.y" { (yyval.opval) = IF_MAD( newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)), (ps[(2) - (2)].val.opval) @@ -1050,70 +1078,70 @@ case 2: ;} break; - case 131: -#line 972 "perly.y" + case 134: +#line 993 "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 132: -#line 976 "perly.y" + case 135: +#line 997 "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 133: -#line 980 "perly.y" + case 136: +#line 1001 "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 134: -#line 985 "perly.y" + case 137: +#line 1006 "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 135: -#line 990 "perly.y" + case 138: +#line 1011 "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 136: -#line 995 "perly.y" + case 139: +#line 1016 "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 137: -#line 1004 "perly.y" + case 140: +#line 1025 "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 138: -#line 1009 "perly.y" + case 141: +#line 1030 "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 139: -#line 1014 "perly.y" + case 142: +#line 1035 "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),';'); @@ -1121,8 +1149,8 @@ case 2: ;} break; - case 140: -#line 1020 "perly.y" + case 143: +#line 1041 "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),';'); @@ -1130,8 +1158,8 @@ case 2: ;} break; - case 141: -#line 1026 "perly.y" + case 144: +#line 1047 "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'); @@ -1140,22 +1168,22 @@ case 2: ;} break; - case 142: -#line 1037 "perly.y" + case 145: +#line 1058 "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 143: -#line 1041 "perly.y" + case 146: +#line 1062 "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 144: -#line 1045 "perly.y" + case 147: +#line 1066 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, prepend_elem(OP_LIST, @@ -1169,8 +1197,8 @@ case 2: ;} break; - case 145: -#line 1057 "perly.y" + case 148: +#line 1078 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, append_elem(OP_LIST, @@ -1185,8 +1213,8 @@ case 2: ;} break; - case 146: -#line 1070 "perly.y" + case 149: +#line 1091 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, prepend_elem(OP_LIST, scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep(); @@ -1196,8 +1224,8 @@ case 2: ;} break; - case 147: -#line 1078 "perly.y" + case 150: +#line 1099 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED, prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), @@ -1208,81 +1236,81 @@ case 2: ;} break; - case 152: -#line 1094 "perly.y" + case 155: +#line 1115 "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 153: -#line 1099 "perly.y" + case 156: +#line 1120 "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 154: -#line 1103 "perly.y" + case 157: +#line 1124 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 155: -#line 1105 "perly.y" + case 158: +#line 1126 "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 156: -#line 1109 "perly.y" + case 159: +#line 1130 "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 157: -#line 1114 "perly.y" + case 160: +#line 1135 "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 158: -#line 1119 "perly.y" + case 161: +#line 1140 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 159: -#line 1121 "perly.y" + case 162: +#line 1142 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 160: -#line 1123 "perly.y" + case 163: +#line 1144 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 161: -#line 1125 "perly.y" + case 164: +#line 1146 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 162: -#line 1127 "perly.y" + case 165: +#line 1148 "perly.y" { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;} break; - case 163: -#line 1129 "perly.y" + case 166: +#line 1150 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 164: -#line 1131 "perly.y" + case 167: +#line 1152 "perly.y" { (yyval.opval) = prepend_elem(OP_ASLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_ASLICE, 0, @@ -1293,8 +1321,8 @@ case 2: ;} break; - case 165: -#line 1140 "perly.y" + case 168: +#line 1161 "perly.y" { (yyval.opval) = prepend_elem(OP_HSLICE, newOP(OP_PUSHMARK, 0), newLISTOP(OP_HSLICE, 0, @@ -1307,26 +1335,26 @@ case 2: ;} break; - case 166: -#line 1151 "perly.y" + case 169: +#line 1172 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 167: -#line 1153 "perly.y" + case 170: +#line 1174 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 168: -#line 1155 "perly.y" + case 171: +#line 1176 "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 169: -#line 1160 "perly.y" + case 172: +#line 1181 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval)))); @@ -1341,91 +1369,91 @@ case 2: ;} break; - case 170: -#line 1173 "perly.y" + case 173: +#line 1194 "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 171: -#line 1178 "perly.y" + case 174: +#line 1199 "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 172: -#line 1183 "perly.y" + case 175: +#line 1204 "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 173: -#line 1187 "perly.y" + case 176: +#line 1208 "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 174: -#line 1191 "perly.y" + case 177: +#line 1212 "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 175: -#line 1195 "perly.y" + case 178: +#line 1216 "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 1199 "perly.y" + case 179: +#line 1220 "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 177: -#line 1203 "perly.y" + case 180: +#line 1224 "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 178: -#line 1207 "perly.y" + case 181: +#line 1228 "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 179: -#line 1211 "perly.y" + case 182: +#line 1232 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 180: -#line 1213 "perly.y" + case 183: +#line 1234 "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 181: -#line 1216 "perly.y" + case 184: +#line 1237 "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 182: -#line 1220 "perly.y" + case 185: +#line 1241 "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),'('); @@ -1433,14 +1461,14 @@ case 2: ;} break; - case 183: -#line 1226 "perly.y" + case 186: +#line 1247 "perly.y" { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;} break; - case 184: -#line 1229 "perly.y" + case 187: +#line 1250 "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); @@ -1451,8 +1479,8 @@ case 2: ;} break; - case 185: -#line 1238 "perly.y" + case 188: +#line 1259 "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),'('); @@ -1460,16 +1488,16 @@ case 2: ;} break; - case 186: -#line 1244 "perly.y" + case 189: +#line 1265 "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 189: -#line 1251 "perly.y" + case 192: +#line 1272 "perly.y" { (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0), newSVOP(OP_CONST, 0, newSVpvs("Unimplemented"))); @@ -1477,8 +1505,8 @@ case 2: ;} break; - case 191: -#line 1261 "perly.y" + case 194: +#line 1282 "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'); @@ -1488,66 +1516,66 @@ case 2: ;} break; - case 192: -#line 1269 "perly.y" + case 195: +#line 1290 "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 193: -#line 1276 "perly.y" + case 196: +#line 1297 "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 194: -#line 1281 "perly.y" + case 197: +#line 1302 "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 195: -#line 1286 "perly.y" + case 198: +#line 1307 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 196: -#line 1288 "perly.y" + case 199: +#line 1309 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 197: -#line 1290 "perly.y" + case 200: +#line 1311 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 198: -#line 1295 "perly.y" + case 201: +#line 1316 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 199: -#line 1297 "perly.y" + case 202: +#line 1318 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 200: -#line 1301 "perly.y" + case 203: +#line 1322 "perly.y" { (yyval.opval) = (OP*)NULL; ;} break; - case 201: -#line 1303 "perly.y" + case 204: +#line 1324 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; - case 202: -#line 1305 "perly.y" + case 205: +#line 1326 "perly.y" { #ifdef MAD OP* op = newNULLLIST(); @@ -1560,72 +1588,75 @@ case 2: ;} break; - case 203: -#line 1320 "perly.y" + case 206: +#line 1341 "perly.y" { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;} break; - case 204: -#line 1324 "perly.y" + case 207: +#line 1345 "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 205: -#line 1330 "perly.y" + case 208: +#line 1351 "perly.y" { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$'); ;} break; - case 206: -#line 1336 "perly.y" + case 209: +#line 1357 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@'); ;} break; - case 207: -#line 1342 "perly.y" + case 210: +#line 1363 "perly.y" { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%'); ;} break; - case 208: -#line 1348 "perly.y" + case 211: +#line 1369 "perly.y" { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l'); ;} break; - case 209: -#line 1354 "perly.y" + case 212: +#line 1375 "perly.y" { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval)); TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*'); ;} break; - case 210: -#line 1361 "perly.y" + case 213: +#line 1382 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 211: -#line 1363 "perly.y" + case 214: +#line 1384 "perly.y" { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;} break; - case 212: -#line 1365 "perly.y" + case 215: +#line 1386 "perly.y" { (yyval.opval) = scope((ps[(1) - (1)].val.opval)); ;} break; - case 213: -#line 1368 "perly.y" + case 216: +#line 1389 "perly.y" { (yyval.opval) = (ps[(1) - (1)].val.opval); ;} break; + +/* Line 1267 of yacc.c. */ + default: break; @@ -1,24 +1,25 @@ #ifdef PERL_CORE - -/* A Bison parser, made by GNU Bison 2.4.1. */ +/* A Bison parser, made by GNU Bison 2.3. */ /* Skeleton interface for Bison's Yacc-like parsers in C - - Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 + + Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - - This program is free software: you can redistribute it and/or modify + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - + the Free Software Foundation; either version 2, or (at your option) + any later version. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work @@ -29,11 +30,10 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ - /* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -113,7 +113,6 @@ PEG = 328 }; #endif - /* Tokens. */ #define WORD 258 #define METHOD 259 @@ -189,13 +188,11 @@ + #endif /* PERL_CORE */ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE { - -/* Line 1676 of yacc.c */ - I32 ival; /* __DEFAULT__ (marker for regen_perly.pl; must always be 1st union member) */ char *pval; @@ -211,16 +208,13 @@ typedef union YYSTYPE #ifdef PERL_MAD TOKEN* tkval; #endif - - - -/* Line 1676 of yacc.c */ -} YYSTYPE; -# define YYSTYPE_IS_TRIVIAL 1 +} +/* Line 1489 of yacc.c. */ + YYSTYPE; # define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define YYSTYPE_IS_DECLARED 1 +# define YYSTYPE_IS_TRIVIAL 1 #endif - @@ -1,15 +1,15 @@ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2074 +#define YYLAST 2106 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 93 /* YYNNTS -- Number of nonterminals. */ -#define YYNNTS 65 +#define YYNNTS 67 /* YYNRULES -- Number of rules. */ -#define YYNRULES 213 +#define YYNRULES 216 /* YYNRULES -- Number of states. */ -#define YYNSTATES 425 +#define YYNSTATES 431 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -62,27 +62,27 @@ static const yytype_uint8 yytranslate[] = static const yytype_uint16 yyprhs[] = { 0, 0, 3, 6, 11, 12, 13, 14, 19, 20, - 21, 24, 27, 30, 32, 34, 37, 40, 44, 47, - 49, 51, 55, 59, 63, 67, 71, 75, 76, 79, - 86, 94, 102, 109, 112, 113, 116, 126, 136, 147, - 157, 166, 179, 183, 192, 193, 194, 196, 197, 199, - 201, 203, 205, 207, 208, 210, 212, 214, 216, 218, - 220, 222, 224, 229, 231, 232, 239, 246, 247, 248, - 249, 251, 252, 254, 255, 258, 260, 263, 265, 267, - 269, 274, 275, 283, 287, 291, 295, 297, 300, 304, - 306, 310, 316, 323, 327, 331, 337, 340, 345, 346, - 352, 354, 356, 362, 367, 373, 378, 384, 391, 397, - 402, 408, 413, 417, 424, 430, 434, 438, 442, 446, + 21, 24, 27, 30, 32, 34, 37, 40, 44, 46, + 49, 51, 53, 57, 61, 65, 69, 73, 77, 78, + 81, 88, 96, 104, 111, 114, 115, 118, 128, 138, + 149, 159, 168, 181, 185, 194, 195, 196, 198, 199, + 201, 203, 205, 207, 209, 210, 212, 214, 216, 218, + 220, 222, 224, 226, 231, 233, 234, 241, 248, 249, + 250, 251, 253, 254, 256, 257, 260, 262, 265, 267, + 269, 271, 276, 277, 286, 287, 295, 299, 303, 307, + 309, 312, 316, 318, 322, 328, 335, 339, 343, 349, + 352, 357, 358, 364, 366, 368, 374, 379, 385, 390, + 396, 403, 409, 414, 420, 425, 429, 436, 442, 446, 450, 454, 458, 462, 466, 470, 474, 478, 482, 486, - 489, 492, 495, 498, 501, 504, 507, 510, 514, 517, - 522, 526, 532, 535, 538, 543, 549, 554, 560, 562, - 564, 566, 568, 574, 577, 579, 582, 586, 589, 591, - 593, 595, 597, 599, 601, 606, 612, 614, 616, 620, - 625, 629, 631, 634, 637, 639, 642, 645, 647, 650, - 652, 655, 657, 661, 663, 667, 672, 677, 679, 681, - 683, 685, 689, 692, 696, 699, 701, 703, 705, 706, - 708, 709, 711, 714, 716, 719, 722, 725, 728, 731, - 734, 736, 738, 740 + 490, 494, 498, 501, 504, 507, 510, 513, 516, 519, + 522, 526, 529, 534, 538, 544, 547, 550, 555, 561, + 566, 572, 574, 576, 578, 580, 586, 589, 591, 594, + 598, 601, 603, 605, 607, 609, 611, 613, 618, 624, + 626, 628, 632, 637, 641, 643, 646, 649, 651, 654, + 657, 659, 662, 664, 667, 669, 673, 675, 679, 684, + 689, 691, 693, 695, 697, 701, 704, 708, 711, 713, + 715, 717, 718, 720, 721, 723, 726, 728, 731, 734, + 737, 740, 743, 746, 748, 750, 752 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -92,104 +92,105 @@ static const yytype_int16 yyrhs[] = -1, -1, -1, -1, 3, 100, 101, 4, -1, -1, -1, 101, 118, -1, 101, 102, -1, 117, 105, -1, 108, -1, 109, -1, 117, 106, -1, 117, 14, -1, - 117, 103, 14, -1, 117, 25, -1, 1, -1, 135, - -1, 135, 34, 135, -1, 135, 35, 135, -1, 135, - 32, 135, -1, 135, 33, 113, -1, 135, 39, 135, - -1, 135, 41, 135, -1, -1, 36, 99, -1, 37, - 91, 114, 90, 99, 104, -1, 34, 91, 96, 114, - 90, 99, 104, -1, 35, 91, 96, 116, 90, 99, - 104, -1, 41, 91, 96, 114, 90, 99, -1, 42, - 95, -1, -1, 38, 95, -1, 117, 32, 91, 96, - 112, 90, 110, 99, 107, -1, 117, 33, 91, 96, - 113, 90, 110, 99, 107, -1, 117, 39, 60, 96, - 150, 91, 114, 90, 99, 107, -1, 117, 39, 152, - 91, 96, 114, 90, 99, 107, -1, 117, 39, 91, - 96, 114, 90, 99, 107, -1, 117, 39, 91, 96, - 115, 14, 112, 14, 110, 115, 90, 99, -1, 117, - 95, 107, -1, 117, 40, 91, 96, 97, 114, 90, - 99, -1, -1, -1, 103, -1, -1, 135, -1, 135, - -1, 135, -1, 111, -1, 113, -1, -1, 26, -1, - 120, -1, 123, -1, 122, -1, 132, -1, 133, -1, - 119, -1, 92, -1, 27, 126, 121, 95, -1, 15, - -1, -1, 61, 124, 127, 128, 129, 131, -1, 28, - 124, 127, 128, 129, 131, -1, -1, -1, -1, 15, - -1, -1, 18, -1, -1, 63, 18, -1, 63, -1, - 63, 18, -1, 63, -1, 95, -1, 14, -1, 30, - 15, 15, 14, -1, -1, 31, 124, 134, 15, 15, - 148, 14, -1, 135, 67, 135, -1, 135, 66, 135, - -1, 135, 65, 135, -1, 136, -1, 136, 69, -1, - 136, 69, 145, -1, 145, -1, 50, 157, 136, -1, - 48, 91, 157, 135, 90, -1, 145, 89, 139, 91, - 149, 90, -1, 145, 89, 139, -1, 16, 157, 148, - -1, 17, 157, 91, 149, 90, -1, 50, 148, -1, - 48, 91, 149, 90, -1, -1, 23, 125, 95, 138, - 148, -1, 16, -1, 152, -1, 156, 3, 135, 14, - 4, -1, 152, 5, 135, 6, -1, 145, 89, 5, - 135, 6, -1, 140, 5, 135, 6, -1, 152, 3, - 135, 14, 4, -1, 145, 89, 3, 135, 14, 4, - -1, 140, 3, 135, 14, 4, -1, 145, 89, 91, - 90, -1, 145, 89, 91, 135, 90, -1, 140, 91, - 135, 90, -1, 140, 91, 90, -1, 91, 135, 90, - 5, 135, 6, -1, 91, 90, 5, 135, 6, -1, - 145, 70, 145, -1, 145, 84, 145, -1, 145, 53, - 145, -1, 145, 54, 145, -1, 145, 78, 145, -1, - 145, 51, 145, -1, 145, 52, 145, -1, 145, 77, - 145, -1, 145, 76, 145, -1, 145, 44, 145, -1, - 145, 75, 145, -1, 145, 74, 145, -1, 145, 73, - 145, -1, 145, 79, 145, -1, 7, 145, -1, 8, - 145, -1, 80, 145, -1, 81, 145, -1, 145, 86, - -1, 145, 85, -1, 88, 145, -1, 87, 145, -1, - 5, 135, 6, -1, 5, 6, -1, 57, 135, 14, - 4, -1, 57, 14, 4, -1, 29, 125, 128, 129, - 95, -1, 56, 145, -1, 56, 95, -1, 56, 15, - 91, 90, -1, 56, 15, 91, 135, 90, -1, 56, - 152, 91, 90, -1, 56, 152, 91, 135, 90, -1, - 141, -1, 142, -1, 143, -1, 144, -1, 145, 71, - 145, 72, 145, -1, 82, 145, -1, 146, -1, 59, - 145, -1, 91, 135, 90, -1, 91, 90, -1, 152, - -1, 156, -1, 154, -1, 153, -1, 155, -1, 140, - -1, 153, 5, 135, 6, -1, 153, 3, 135, 14, - 4, -1, 18, -1, 151, -1, 151, 91, 90, -1, - 151, 91, 135, 90, -1, 58, 15, 148, -1, 43, - -1, 43, 145, -1, 68, 136, -1, 49, -1, 49, - 95, -1, 49, 145, -1, 62, -1, 62, 145, -1, - 22, -1, 22, 145, -1, 46, -1, 46, 91, 90, - -1, 21, -1, 47, 91, 90, -1, 47, 91, 135, - 90, -1, 19, 91, 136, 90, -1, 15, -1, 137, - -1, 45, -1, 24, -1, 60, 147, 130, -1, 60, - 147, -1, 91, 135, 90, -1, 91, 90, -1, 152, - -1, 154, -1, 153, -1, -1, 136, -1, -1, 135, - -1, 135, 69, -1, 152, -1, 13, 157, -1, 9, - 157, -1, 10, 157, -1, 11, 157, -1, 55, 157, - -1, 12, 157, -1, 15, -1, 152, -1, 95, -1, - 20, -1 + 117, 103, 14, -1, 133, -1, 117, 25, -1, 1, + -1, 137, -1, 137, 34, 137, -1, 137, 35, 137, + -1, 137, 32, 137, -1, 137, 33, 113, -1, 137, + 39, 137, -1, 137, 41, 137, -1, -1, 36, 99, + -1, 37, 91, 114, 90, 99, 104, -1, 34, 91, + 96, 114, 90, 99, 104, -1, 35, 91, 96, 116, + 90, 99, 104, -1, 41, 91, 96, 114, 90, 99, + -1, 42, 95, -1, -1, 38, 95, -1, 117, 32, + 91, 96, 112, 90, 110, 99, 107, -1, 117, 33, + 91, 96, 113, 90, 110, 99, 107, -1, 117, 39, + 60, 96, 152, 91, 114, 90, 99, 107, -1, 117, + 39, 154, 91, 96, 114, 90, 99, 107, -1, 117, + 39, 91, 96, 114, 90, 99, 107, -1, 117, 39, + 91, 96, 115, 14, 112, 14, 110, 115, 90, 99, + -1, 117, 95, 107, -1, 117, 40, 91, 96, 97, + 114, 90, 99, -1, -1, -1, 103, -1, -1, 137, + -1, 137, -1, 137, -1, 111, -1, 113, -1, -1, + 26, -1, 120, -1, 123, -1, 122, -1, 132, -1, + 135, -1, 119, -1, 92, -1, 27, 126, 121, 95, + -1, 15, -1, -1, 61, 124, 127, 128, 129, 131, + -1, 28, 124, 127, 128, 129, 131, -1, -1, -1, + -1, 15, -1, -1, 18, -1, -1, 63, 18, -1, + 63, -1, 63, 18, -1, 63, -1, 95, -1, 14, + -1, 30, 15, 15, 14, -1, -1, 30, 15, 15, + 3, 96, 134, 101, 4, -1, -1, 31, 124, 136, + 15, 15, 150, 14, -1, 137, 67, 137, -1, 137, + 66, 137, -1, 137, 65, 137, -1, 138, -1, 138, + 69, -1, 138, 69, 147, -1, 147, -1, 50, 159, + 138, -1, 48, 91, 159, 137, 90, -1, 147, 89, + 141, 91, 151, 90, -1, 147, 89, 141, -1, 16, + 159, 150, -1, 17, 159, 91, 151, 90, -1, 50, + 150, -1, 48, 91, 151, 90, -1, -1, 23, 125, + 95, 140, 150, -1, 16, -1, 154, -1, 158, 3, + 137, 14, 4, -1, 154, 5, 137, 6, -1, 147, + 89, 5, 137, 6, -1, 142, 5, 137, 6, -1, + 154, 3, 137, 14, 4, -1, 147, 89, 3, 137, + 14, 4, -1, 142, 3, 137, 14, 4, -1, 147, + 89, 91, 90, -1, 147, 89, 91, 137, 90, -1, + 142, 91, 137, 90, -1, 142, 91, 90, -1, 91, + 137, 90, 5, 137, 6, -1, 91, 90, 5, 137, + 6, -1, 147, 70, 147, -1, 147, 84, 147, -1, + 147, 53, 147, -1, 147, 54, 147, -1, 147, 78, + 147, -1, 147, 51, 147, -1, 147, 52, 147, -1, + 147, 77, 147, -1, 147, 76, 147, -1, 147, 44, + 147, -1, 147, 75, 147, -1, 147, 74, 147, -1, + 147, 73, 147, -1, 147, 79, 147, -1, 7, 147, + -1, 8, 147, -1, 80, 147, -1, 81, 147, -1, + 147, 86, -1, 147, 85, -1, 88, 147, -1, 87, + 147, -1, 5, 137, 6, -1, 5, 6, -1, 57, + 137, 14, 4, -1, 57, 14, 4, -1, 29, 125, + 128, 129, 95, -1, 56, 147, -1, 56, 95, -1, + 56, 15, 91, 90, -1, 56, 15, 91, 137, 90, + -1, 56, 154, 91, 90, -1, 56, 154, 91, 137, + 90, -1, 143, -1, 144, -1, 145, -1, 146, -1, + 147, 71, 147, 72, 147, -1, 82, 147, -1, 148, + -1, 59, 147, -1, 91, 137, 90, -1, 91, 90, + -1, 154, -1, 158, -1, 156, -1, 155, -1, 157, + -1, 142, -1, 155, 5, 137, 6, -1, 155, 3, + 137, 14, 4, -1, 18, -1, 153, -1, 153, 91, + 90, -1, 153, 91, 137, 90, -1, 58, 15, 150, + -1, 43, -1, 43, 147, -1, 68, 138, -1, 49, + -1, 49, 95, -1, 49, 147, -1, 62, -1, 62, + 147, -1, 22, -1, 22, 147, -1, 46, -1, 46, + 91, 90, -1, 21, -1, 47, 91, 90, -1, 47, + 91, 137, 90, -1, 19, 91, 138, 90, -1, 15, + -1, 139, -1, 45, -1, 24, -1, 60, 149, 130, + -1, 60, 149, -1, 91, 137, 90, -1, 91, 90, + -1, 154, -1, 156, -1, 155, -1, -1, 138, -1, + -1, 137, -1, 137, 69, -1, 154, -1, 13, 159, + -1, 9, 159, -1, 10, 159, -1, 11, 159, -1, + 55, 159, -1, 12, 159, -1, 15, -1, 154, -1, + 95, -1, 20, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { 0, 141, 141, 147, 157, 161, 165, 171, 181, 186, - 187, 194, 204, 207, 208, 210, 212, 229, 245, 250, - 252, 254, 258, 262, 266, 270, 275, 281, 282, 286, - 297, 305, 316, 319, 325, 326, 333, 346, 358, 369, - 379, 389, 421, 429, 439, 445, 446, 451, 454, 458, - 463, 467, 471, 477, 486, 490, 492, 494, 496, 498, - 503, 507, 513, 533, 534, 538, 551, 574, 580, 585, - 590, 600, 601, 606, 607, 611, 621, 625, 635, 636, - 645, 663, 662, 681, 685, 689, 693, 697, 707, 716, - 720, 725, 732, 741, 747, 753, 761, 765, 772, 771, - 782, 783, 787, 796, 801, 809, 816, 823, 833, 842, - 849, 858, 865, 871, 878, 888, 892, 896, 902, 906, - 910, 914, 918, 922, 926, 938, 942, 946, 950, 960, - 964, 971, 975, 979, 984, 989, 994, 1003, 1008, 1013, - 1019, 1025, 1036, 1040, 1044, 1056, 1069, 1077, 1089, 1090, - 1091, 1092, 1093, 1098, 1102, 1104, 1108, 1113, 1118, 1120, - 1122, 1124, 1126, 1128, 1130, 1139, 1150, 1152, 1154, 1159, - 1172, 1177, 1182, 1186, 1190, 1194, 1198, 1202, 1206, 1210, - 1212, 1215, 1219, 1225, 1228, 1237, 1243, 1248, 1249, 1250, - 1256, 1260, 1268, 1275, 1280, 1285, 1287, 1289, 1294, 1296, - 1301, 1302, 1304, 1319, 1323, 1329, 1335, 1341, 1347, 1353, - 1360, 1362, 1364, 1367 + 187, 194, 204, 207, 208, 210, 212, 229, 245, 251, + 256, 258, 260, 264, 268, 272, 276, 281, 287, 288, + 292, 303, 311, 322, 325, 331, 332, 339, 352, 364, + 375, 385, 395, 427, 435, 445, 451, 452, 457, 460, + 464, 469, 473, 477, 483, 492, 496, 498, 500, 502, + 504, 509, 513, 519, 539, 540, 544, 557, 580, 586, + 591, 596, 606, 607, 612, 613, 617, 627, 631, 641, + 642, 651, 669, 668, 684, 683, 702, 706, 710, 714, + 718, 728, 737, 741, 746, 753, 762, 768, 774, 782, + 786, 793, 792, 803, 804, 808, 817, 822, 830, 837, + 844, 854, 863, 870, 879, 886, 892, 899, 909, 913, + 917, 923, 927, 931, 935, 939, 943, 947, 959, 963, + 967, 971, 981, 985, 992, 996, 1000, 1005, 1010, 1015, + 1024, 1029, 1034, 1040, 1046, 1057, 1061, 1065, 1077, 1090, + 1098, 1110, 1111, 1112, 1113, 1114, 1119, 1123, 1125, 1129, + 1134, 1139, 1141, 1143, 1145, 1147, 1149, 1151, 1160, 1171, + 1173, 1175, 1180, 1193, 1198, 1203, 1207, 1211, 1215, 1219, + 1223, 1227, 1231, 1233, 1236, 1240, 1246, 1249, 1258, 1264, + 1269, 1270, 1271, 1277, 1281, 1289, 1296, 1301, 1306, 1308, + 1310, 1315, 1317, 1322, 1323, 1325, 1340, 1344, 1350, 1356, + 1362, 1368, 1374, 1381, 1383, 1385, 1388 }; #endif @@ -216,10 +217,11 @@ static const char *const yytname[] = "mexpr", "mnexpr", "miexpr", "label", "decl", "peg", "format", "formname", "mysubrout", "subrout", "startsub", "startanonsub", "startformsub", "subname", "proto", "subattrlist", "myattrlist", - "subbody", "package", "use", "$@1", "expr", "argexpr", "listop", "@2", - "method", "subscripted", "termbinop", "termunop", "anonymous", "termdo", - "term", "myattrterm", "myterm", "listexpr", "listexprcom", "my_scalar", - "amper", "scalar", "ary", "hsh", "arylen", "star", "indirob", 0 + "subbody", "package", "package_block", "@1", "use", "@2", "expr", + "argexpr", "listop", "@3", "method", "subscripted", "termbinop", + "termunop", "anonymous", "termdo", "term", "myattrterm", "myterm", + "listexpr", "listexprcom", "my_scalar", "amper", "scalar", "ary", "hsh", + "arylen", "star", "indirob", 0 }; #endif @@ -245,54 +247,54 @@ static const yytype_uint16 yytoknum[] = static const yytype_uint8 yyr1[] = { 0, 93, 94, 95, 96, 97, 98, 99, 100, 101, - 101, 101, 102, 102, 102, 102, 102, 102, 102, 103, - 103, 103, 103, 103, 103, 103, 103, 104, 104, 104, - 105, 105, 106, 106, 107, 107, 108, 108, 108, 108, - 108, 108, 108, 109, 110, 111, 111, 112, 112, 113, - 114, 115, 116, 117, 117, 118, 118, 118, 118, 118, - 118, 119, 120, 121, 121, 122, 123, 124, 125, 126, - 127, 128, 128, 129, 129, 129, 130, 130, 131, 131, - 132, 134, 133, 135, 135, 135, 135, 136, 136, 136, - 137, 137, 137, 137, 137, 137, 137, 137, 138, 137, - 139, 139, 140, 140, 140, 140, 140, 140, 140, 140, - 140, 140, 140, 140, 140, 141, 141, 141, 141, 141, - 141, 141, 141, 141, 141, 141, 141, 141, 141, 142, - 142, 142, 142, 142, 142, 142, 142, 143, 143, 143, - 143, 143, 144, 144, 144, 144, 144, 144, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 146, 146, 147, 147, 147, 147, 147, 148, 148, - 149, 149, 149, 150, 151, 152, 153, 154, 155, 156, - 157, 157, 157, 157 + 101, 101, 102, 102, 102, 102, 102, 102, 102, 102, + 103, 103, 103, 103, 103, 103, 103, 103, 104, 104, + 104, 105, 105, 106, 106, 107, 107, 108, 108, 108, + 108, 108, 108, 108, 109, 110, 111, 111, 112, 112, + 113, 114, 115, 116, 117, 117, 118, 118, 118, 118, + 118, 118, 119, 120, 121, 121, 122, 123, 124, 125, + 126, 127, 128, 128, 129, 129, 129, 130, 130, 131, + 131, 132, 134, 133, 136, 135, 137, 137, 137, 137, + 138, 138, 138, 139, 139, 139, 139, 139, 139, 139, + 139, 140, 139, 141, 141, 142, 142, 142, 142, 142, + 142, 142, 142, 142, 142, 142, 142, 142, 143, 143, + 143, 143, 143, 143, 143, 143, 143, 143, 143, 143, + 143, 143, 144, 144, 144, 144, 144, 144, 144, 144, + 145, 145, 145, 145, 145, 146, 146, 146, 146, 146, + 146, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 147, 148, 148, 149, 149, 149, 149, + 149, 150, 150, 151, 151, 151, 152, 153, 154, 155, + 156, 157, 158, 159, 159, 159, 159 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ static const yytype_uint8 yyr2[] = { 0, 2, 2, 4, 0, 0, 0, 4, 0, 0, - 2, 2, 2, 1, 1, 2, 2, 3, 2, 1, - 1, 3, 3, 3, 3, 3, 3, 0, 2, 6, - 7, 7, 6, 2, 0, 2, 9, 9, 10, 9, - 8, 12, 3, 8, 0, 0, 1, 0, 1, 1, - 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 4, 1, 0, 6, 6, 0, 0, 0, - 1, 0, 1, 0, 2, 1, 2, 1, 1, 1, - 4, 0, 7, 3, 3, 3, 1, 2, 3, 1, - 3, 5, 6, 3, 3, 5, 2, 4, 0, 5, - 1, 1, 5, 4, 5, 4, 5, 6, 5, 4, - 5, 4, 3, 6, 5, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, - 2, 2, 2, 2, 2, 2, 2, 3, 2, 4, - 3, 5, 2, 2, 4, 5, 4, 5, 1, 1, - 1, 1, 5, 2, 1, 2, 3, 2, 1, 1, - 1, 1, 1, 1, 4, 5, 1, 1, 3, 4, - 3, 1, 2, 2, 1, 2, 2, 1, 2, 1, - 2, 1, 3, 1, 3, 4, 4, 1, 1, 1, - 1, 3, 2, 3, 2, 1, 1, 1, 0, 1, - 0, 1, 2, 1, 2, 2, 2, 2, 2, 2, - 1, 1, 1, 1 + 2, 2, 2, 1, 1, 2, 2, 3, 1, 2, + 1, 1, 3, 3, 3, 3, 3, 3, 0, 2, + 6, 7, 7, 6, 2, 0, 2, 9, 9, 10, + 9, 8, 12, 3, 8, 0, 0, 1, 0, 1, + 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, + 1, 1, 1, 4, 1, 0, 6, 6, 0, 0, + 0, 1, 0, 1, 0, 2, 1, 2, 1, 1, + 1, 4, 0, 8, 0, 7, 3, 3, 3, 1, + 2, 3, 1, 3, 5, 6, 3, 3, 5, 2, + 4, 0, 5, 1, 1, 5, 4, 5, 4, 5, + 6, 5, 4, 5, 4, 3, 6, 5, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, + 3, 2, 4, 3, 5, 2, 2, 4, 5, 4, + 5, 1, 1, 1, 1, 5, 2, 1, 2, 3, + 2, 1, 1, 1, 1, 1, 1, 4, 5, 1, + 1, 3, 4, 3, 1, 2, 2, 1, 2, 2, + 1, 2, 1, 2, 1, 3, 1, 3, 4, 4, + 1, 1, 1, 1, 3, 2, 3, 2, 1, 1, + 1, 0, 1, 0, 1, 2, 1, 2, 2, 2, + 2, 2, 2, 1, 1, 1, 1 }; /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state @@ -300,458 +302,497 @@ static const yytype_uint8 yyr2[] = means the default is an error. */ static const yytype_uint8 yydefact[] = { - 6, 0, 9, 1, 53, 54, 69, 67, 0, 67, - 67, 61, 11, 13, 14, 0, 10, 60, 55, 57, - 56, 58, 59, 64, 0, 0, 81, 0, 19, 4, - 0, 0, 0, 0, 0, 0, 0, 0, 16, 187, - 0, 0, 166, 0, 183, 179, 68, 190, 18, 68, - 0, 0, 0, 0, 0, 0, 0, 0, 171, 189, - 181, 0, 0, 174, 198, 0, 0, 0, 0, 0, - 0, 177, 0, 0, 0, 0, 0, 0, 0, 34, - 0, 12, 15, 20, 86, 188, 163, 148, 149, 150, - 151, 89, 154, 167, 158, 161, 160, 162, 159, 63, - 0, 70, 71, 0, 0, 71, 9, 138, 0, 129, - 130, 210, 213, 212, 211, 205, 206, 207, 209, 204, - 198, 0, 0, 180, 0, 71, 4, 4, 4, 4, - 4, 4, 0, 4, 4, 33, 172, 0, 0, 200, - 175, 176, 210, 199, 96, 211, 0, 208, 187, 143, - 142, 158, 0, 0, 198, 155, 0, 192, 195, 197, - 196, 178, 173, 131, 132, 153, 136, 135, 157, 0, - 0, 42, 17, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 87, 0, 0, 0, 0, 0, 0, 0, + 6, 0, 9, 1, 54, 55, 70, 68, 0, 68, + 68, 62, 11, 13, 14, 0, 10, 61, 56, 58, + 57, 59, 18, 60, 65, 0, 0, 84, 0, 20, + 4, 0, 0, 0, 0, 0, 0, 0, 0, 16, + 190, 0, 0, 169, 0, 186, 182, 69, 193, 19, + 69, 0, 0, 0, 0, 0, 0, 0, 0, 174, + 192, 184, 0, 0, 177, 201, 0, 0, 0, 0, + 0, 0, 180, 0, 0, 0, 0, 0, 0, 0, + 35, 0, 12, 15, 21, 89, 191, 166, 151, 152, + 153, 154, 92, 157, 170, 161, 164, 163, 165, 162, + 64, 0, 71, 72, 0, 0, 72, 9, 141, 0, + 132, 133, 213, 216, 215, 214, 208, 209, 210, 212, + 207, 201, 0, 0, 183, 0, 72, 4, 4, 4, + 4, 4, 4, 0, 4, 4, 34, 175, 0, 0, + 203, 178, 179, 213, 202, 99, 214, 0, 211, 190, + 146, 145, 161, 0, 0, 201, 158, 0, 195, 198, + 200, 199, 181, 176, 134, 135, 156, 139, 138, 160, + 0, 0, 43, 17, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 134, 133, 0, 0, 0, 0, 0, 0, 0, - 62, 72, 73, 80, 0, 73, 53, 137, 94, 200, - 0, 98, 73, 47, 0, 0, 0, 0, 0, 4, - 5, 0, 182, 184, 0, 201, 0, 0, 90, 0, - 0, 140, 0, 170, 194, 0, 77, 191, 0, 156, - 35, 23, 24, 49, 21, 22, 25, 26, 85, 84, - 83, 88, 0, 0, 112, 0, 124, 120, 121, 117, - 118, 115, 0, 127, 126, 125, 123, 122, 119, 128, - 116, 0, 0, 100, 0, 93, 101, 168, 0, 0, - 0, 0, 0, 0, 75, 0, 198, 0, 3, 0, - 186, 198, 0, 0, 48, 0, 0, 50, 52, 0, - 0, 203, 46, 51, 0, 0, 20, 0, 0, 0, - 185, 202, 97, 0, 144, 0, 146, 0, 139, 193, - 76, 0, 0, 0, 105, 111, 0, 0, 0, 109, - 0, 200, 169, 0, 103, 0, 164, 0, 74, 79, - 78, 66, 0, 65, 95, 99, 141, 44, 44, 0, - 0, 0, 0, 47, 0, 0, 0, 91, 145, 147, - 114, 0, 108, 152, 0, 104, 110, 0, 106, 165, - 102, 82, 0, 0, 8, 27, 27, 0, 34, 0, - 0, 0, 32, 113, 107, 92, 34, 34, 9, 0, - 0, 30, 31, 0, 40, 44, 34, 43, 36, 37, - 53, 28, 0, 34, 0, 39, 7, 0, 38, 0, - 0, 0, 27, 41, 29 + 0, 0, 137, 136, 0, 0, 0, 0, 0, 0, + 0, 63, 73, 74, 4, 81, 0, 74, 54, 140, + 97, 203, 0, 101, 74, 48, 0, 0, 0, 0, + 0, 4, 5, 0, 185, 187, 0, 204, 0, 0, + 93, 0, 0, 143, 0, 173, 197, 0, 78, 194, + 0, 159, 36, 24, 25, 50, 22, 23, 26, 27, + 88, 87, 86, 91, 0, 0, 115, 0, 127, 123, + 124, 120, 121, 118, 0, 130, 129, 128, 126, 125, + 122, 131, 119, 0, 0, 103, 0, 96, 104, 171, + 0, 0, 0, 0, 0, 0, 76, 0, 82, 201, + 0, 3, 0, 189, 201, 0, 0, 49, 0, 0, + 51, 53, 0, 0, 206, 47, 52, 0, 0, 21, + 0, 0, 0, 188, 205, 100, 0, 147, 0, 149, + 0, 142, 196, 77, 0, 0, 0, 108, 114, 0, + 0, 0, 112, 0, 203, 172, 0, 106, 0, 167, + 0, 75, 80, 79, 67, 9, 0, 66, 98, 102, + 144, 45, 45, 0, 0, 0, 0, 48, 0, 0, + 0, 94, 148, 150, 117, 0, 111, 155, 0, 107, + 113, 0, 109, 168, 105, 54, 85, 0, 0, 8, + 28, 28, 0, 35, 0, 0, 0, 33, 116, 110, + 95, 83, 35, 35, 9, 0, 0, 31, 32, 0, + 41, 45, 35, 44, 37, 38, 54, 29, 0, 35, + 0, 40, 7, 0, 39, 0, 0, 0, 28, 42, + 30 }; /* YYDEFGOTO[NTERM-NUM]. */ static const yytype_int16 yydefgoto[] = { - -1, 1, 113, 106, 318, 2, 385, 398, 4, 12, - 312, 401, 81, 82, 171, 13, 14, 382, 313, 303, - 252, 306, 315, 309, 15, 16, 17, 18, 100, 19, - 20, 24, 124, 23, 102, 212, 295, 247, 351, 21, - 22, 104, 307, 84, 85, 301, 285, 86, 87, 88, - 89, 90, 91, 92, 157, 144, 236, 310, 93, 94, - 95, 96, 97, 98, 115 + -1, 1, 114, 107, 321, 2, 390, 404, 4, 12, + 315, 407, 82, 83, 172, 13, 14, 387, 316, 306, + 254, 309, 318, 312, 15, 16, 17, 18, 101, 19, + 20, 25, 125, 24, 103, 213, 297, 249, 354, 21, + 22, 355, 23, 105, 310, 85, 86, 304, 287, 87, + 88, 89, 90, 91, 92, 93, 158, 145, 238, 313, + 94, 95, 96, 97, 98, 99, 116 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -373 +#define YYPACT_NINF -383 static const yytype_int16 yypact[] = { - -373, 28, -373, -373, 3, -373, -373, -373, 65, -373, - -373, -373, -373, -373, -373, 320, -373, -373, -373, -373, - -373, -373, -373, 74, 75, 84, -373, 75, -373, -373, - 899, 1765, 1765, 378, 378, 378, 378, 378, -373, -373, - 378, 378, -373, -67, -373, 1765, -373, -373, -373, -373, - -51, -24, -8, -5, 9, 37, 76, 147, 1765, -373, - 89, 92, 97, 666, 579, 378, 753, 984, 141, 1765, - 12, 1765, 1765, 1765, 1765, 1765, 1765, 1765, 1069, 137, - 167, -373, -373, 1067, 115, -373, 48, -373, -373, -373, - -373, 1907, -373, 104, 93, 110, -373, -373, 207, -373, - 147, -373, 200, 209, 214, 200, -373, -373, 140, 68, - 68, -373, -373, -373, -373, -373, -373, -373, -373, -373, - 1765, 135, 1765, 230, 147, 200, -373, -373, -373, -373, - -373, -373, 146, -373, -373, -373, 1907, 151, 1156, 579, - -373, 230, 1825, 115, -373, 813, 1765, -373, 169, -373, - 230, 52, 260, 120, 1765, 230, 1243, 202, -373, -373, - -373, 230, 115, 68, 68, 68, 59, 59, 263, 319, - 147, -373, -373, 1765, 1765, 1765, 1765, 1765, 1765, 1765, - 1765, 1765, 1765, 1765, 1765, 1330, 1765, 1765, 1765, 1765, - 1765, 1765, 1765, 1765, 1765, 1765, 1765, 1765, 1765, 1765, - 1765, -373, -373, 88, 1417, 1765, 1765, 1765, 1765, 1765, - -373, -373, 212, -373, 259, 212, 81, -373, -373, 1765, - -43, -373, 212, 1765, 1765, 1765, 1765, 270, 405, -373, - -373, 1765, -373, -373, 366, 71, 195, 1765, 115, 1504, - 1591, -373, 288, -373, -373, 461, 276, -373, 1765, 290, - -373, 224, -373, 224, 224, 224, 224, 224, 231, 231, - -373, 1907, 221, 149, -373, 540, 1985, 970, 884, 525, - 217, 1907, 1868, 478, 478, 566, 652, 931, 393, 68, - 68, 1765, 1765, -373, 1678, 216, -373, -373, 627, 245, - 165, 291, 196, 306, 282, 24, 1765, 24, -373, 223, - -373, 1765, 147, 228, 224, 232, 234, 224, -373, 250, - 255, -373, -373, -373, 257, 336, 404, 1765, 1765, 261, - -373, -373, -373, 653, -373, 714, -373, 724, -373, -373, - -373, 206, 1765, 360, -373, -373, 1765, 375, 211, -373, - 727, 1765, -373, 370, -373, 379, -373, 386, -373, -373, - -373, -373, 377, -373, -373, -373, -373, -373, -373, 391, - 391, 1765, 391, 1765, 305, 307, 391, -373, -373, -373, - -373, 215, -373, 1946, 392, -373, -373, 313, -373, -373, - -373, -373, 391, 391, -373, 25, 25, 314, 137, 411, - 391, 391, -373, -373, -373, -373, 137, 137, -373, 391, - 339, -373, -373, 391, -373, -373, 137, -373, -373, -373, - 90, -373, 1765, 137, 490, -373, -373, 315, -373, 345, - 391, 391, 25, -373, -373 + -383, 35, -383, -383, 51, -383, -383, -383, -8, -383, + -383, -383, -383, -383, -383, 399, -383, -383, -383, -383, + -383, -383, -383, -383, 40, 45, 69, -383, 45, -383, + -383, 978, 1844, 1844, 216, 216, 216, 216, 216, -383, + -383, 216, 216, -383, -50, -383, 1844, -383, -383, -383, + -383, -21, 9, 18, 22, 5, 25, 46, 145, 1844, + -383, 66, 67, 77, 745, 658, 216, 832, 1063, 173, + 1844, 23, 1844, 1844, 1844, 1844, 1844, 1844, 1844, 1148, + 140, 182, -383, -383, 1146, 133, -383, 3, -383, -383, + -383, -383, 1939, -383, 112, 148, 176, -383, -383, 206, + -383, 145, -383, 198, 26, 197, 198, -383, -383, 32, + 60, 60, -383, -383, -383, -383, -383, -383, -383, -383, + -383, 1844, 130, 1844, 863, 145, 198, -383, -383, -383, + -383, -383, -383, 131, -383, -383, -383, 1939, 142, 1235, + 658, -383, 863, 304, 133, -383, 892, 1844, -383, 150, + -383, 863, 10, 229, 89, 1844, 863, 1322, 202, -383, + -383, -383, 863, 133, 60, 60, 60, 1, 1, 267, + 250, 145, -383, -383, 1844, 1844, 1844, 1844, 1844, 1844, + 1844, 1844, 1844, 1844, 1844, 1844, 1409, 1844, 1844, 1844, + 1844, 1844, 1844, 1844, 1844, 1844, 1844, 1844, 1844, 1844, + 1844, 1844, -383, -383, 47, 1496, 1844, 1844, 1844, 1844, + 1844, -383, -383, 207, -383, -383, 270, 207, 91, -383, + -383, 1844, -51, -383, 207, 1844, 1844, 1844, 1844, 277, + 484, -383, -383, 1844, -383, -383, 360, 449, 203, 1844, + 133, 1583, 1670, -383, 283, -383, -383, 386, 276, -383, + 1844, 290, -383, -45, -383, -45, -45, -45, -45, -45, + 221, 221, -383, 1939, 194, 41, -383, 445, 2017, 1010, + 730, 265, 384, 1939, 1900, 472, 472, 556, 644, 963, + 246, 60, 60, 1844, 1844, -383, 1757, 215, -383, -383, + 455, 294, 74, 297, 208, 319, 284, 55, -383, 1844, + 55, -383, 222, -383, 1844, 145, 223, -45, 224, 231, + -45, -383, 237, 228, -383, -383, -383, 244, 291, 257, + 1844, 1844, 251, -383, -383, -383, 530, -383, 619, -383, + 645, -383, -383, -383, 211, 1844, 322, -383, -383, 1844, + 332, 214, -383, 706, 1844, -383, 338, -383, 349, -383, + 361, -383, -383, -383, -383, -383, 352, -383, -383, -383, + -383, -383, -383, 365, 365, 1844, 365, 1844, 282, 301, + 365, -383, -383, -383, -383, 217, -383, 1978, 383, -383, + -383, 306, -383, -383, -383, 146, -383, 365, 365, -383, + 38, 38, 311, 140, 389, 365, 365, -383, -383, -383, + -383, -383, 140, 140, -383, 365, 328, -383, -383, 365, + -383, -383, 140, -383, -383, -383, 236, -383, 1844, 140, + 569, -383, -383, 339, -383, 340, 365, 365, 38, -383, + -383 }; /* YYPGOTO[NTERM-NUM]. */ static const yytype_int16 yypgoto[] = { - -373, -373, 2, -52, -373, -373, -163, -373, -105, -373, - 429, -372, -373, -373, 128, -373, -373, -349, -373, 86, - -48, -212, 43, -373, -373, -373, -373, -373, -373, -373, - -373, 61, 409, -373, 432, -59, -183, -373, 171, -373, - -373, -373, -15, -62, -373, -373, -373, -373, -373, -373, - -373, -373, 56, -373, -373, -100, -206, -373, -373, -29, - 396, 406, -373, -373, 8 + -383, -383, 4, -104, -383, -383, 1541, -383, -97, -383, + 420, -382, -383, -383, -336, -383, -383, -357, -383, 76, + -44, -229, 16, -383, -383, -383, -383, -383, -383, -383, + -383, 177, 410, -383, 434, -89, -113, -383, 164, -383, + -383, -383, -383, -383, -15, -62, -383, -383, -383, -383, + -383, -383, -383, -383, 56, -383, -383, -119, -209, -383, + -383, 163, 394, 395, -383, -383, 7 }; /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule which number is the opposite. If zero, do what YYDEFACT says. If YYTABLE_NINF, syntax error. */ -#define YYTABLE_NINF -188 +#define YYTABLE_NINF -191 static const yytype_int16 yytable[] = { - 83, 216, 143, -2, 114, 114, 114, 114, 114, 383, - 162, 114, 114, 299, 402, 108, 314, 79, 33, 319, - 218, 33, 34, 35, 122, 132, 182, 29, 3, 5, - 6, 7, 297, 8, 9, 145, 114, 151, 349, 302, - 126, 158, 116, 117, 118, 119, 215, 300, 120, 121, - 424, 183, 153, 184, 243, 205, 414, 206, 143, 135, - 220, 399, 400, 169, 10, 140, 222, 127, 149, 130, - 26, 27, 146, 147, 223, 224, 225, 226, 227, 228, - 25, 230, 231, 128, 238, 298, 129, 109, 110, 99, - 101, 281, 143, 282, 416, 11, 205, 33, 206, 103, - 131, 123, 210, 156, 283, 364, 365, 5, 6, 7, - 145, 8, 9, 207, 136, 208, 5, 6, 7, 141, - 8, 9, 150, 234, 235, 155, 221, 161, 133, 163, - 164, 165, 166, 167, 242, 377, 179, 180, 181, 185, - 321, 245, 10, 240, -188, -188, 217, 237, 203, 387, - 29, 10, 200, 201, 202, 334, 154, 203, 251, 253, - 254, 255, 256, 257, 258, 259, 260, 134, 262, 263, - 265, 344, 250, 11, 286, 170, 305, 317, 308, 284, - 137, 172, 11, 138, 182, 179, 180, 181, 139, 288, - 289, 290, 291, 292, 293, 204, 352, 386, 311, 388, - 417, 355, 346, 392, 235, 179, 180, 181, 304, 253, - 209, 253, 370, 316, 179, 180, 181, 375, 211, 396, - 397, 393, 323, 213, 325, 327, 219, 406, 407, 214, - 179, 180, 181, 331, 143, 333, 411, 229, 261, 143, - 413, 232, 266, 267, 268, 269, 270, 271, 272, 273, - 274, 275, 276, 277, 278, 279, 280, 422, 423, 343, - 239, 179, 180, 181, 241, 246, 337, 338, 248, 340, - 189, 179, 180, 181, 296, 294, 179, 180, 181, 33, - 179, 180, 181, 189, 190, 322, 179, 180, 181, 179, - 180, 181, 328, 410, 330, 332, 199, 350, 181, 350, - 348, 200, 201, 202, 356, 345, 203, 341, 198, 199, - 179, 180, 181, 354, 200, 201, 202, 371, 357, 203, - 347, 28, 358, 29, 359, 30, 235, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, - 360, 44, 45, 46, 47, 48, 361, 362, 304, 49, - 363, 366, 50, 51, 52, 53, 179, 180, 181, 54, - 55, 56, 57, 58, 372, 59, 60, 61, 62, 63, - 64, 179, 180, 181, 378, 65, 66, 67, 68, 69, - 70, 29, 71, 379, 179, 180, 181, 33, 72, 374, - 380, 381, 373, 111, 384, 390, 394, 391, 112, 83, - 73, 74, 75, 395, 403, 420, 28, 76, 77, 249, - 30, 78, 31, 32, 33, 34, 35, 36, 37, -45, - 39, 40, 41, 42, 43, 405, 44, 45, 46, 47, - 412, 179, 180, 181, 49, 421, 173, 174, 175, 176, - 179, 180, 181, 177, 80, 178, 189, 190, 58, 389, - 59, 60, 61, 62, 63, 64, 320, 419, 125, 105, - 65, 66, 67, 68, 69, 70, 159, 71, 353, 179, - 180, 181, 199, 72, 0, 0, 160, 200, 201, 202, - 0, 0, 203, 0, 0, 73, 74, 75, 0, 0, - 0, 28, 76, 77, -50, 30, 78, 31, 32, 33, - 34, 35, 36, 37, 0, 39, 40, 41, 42, 43, - 0, 44, 45, 46, 47, 0, 404, 0, 0, 49, - 0, 0, 0, 0, 408, 409, 179, 180, 181, 187, - 188, 189, 190, 58, 415, 59, 60, 61, 62, 63, - 64, 418, 0, 0, 0, 65, 66, 67, 68, 69, - 70, 329, 71, 195, 196, 197, 198, 199, 72, 0, - 0, 0, 200, 201, 202, 0, 0, 203, 0, 0, - 73, 74, 75, 0, 0, 0, 0, 76, 77, 0, - -45, 78, 29, 0, 30, 0, 31, 32, 33, 34, - 35, 36, 37, 0, 142, 40, 41, 42, 43, 112, - 44, 45, 46, 47, 199, 179, 180, 181, 49, 200, - 201, 202, 0, 0, 203, 0, 0, 187, 188, 189, - 190, 0, 58, 0, 59, 60, 61, 62, 63, 64, - 335, 0, 0, 0, 65, 66, 67, 68, 69, 70, - 0, 71, 196, 197, 198, 199, 0, 72, 0, 0, - 200, 201, 202, 0, 0, 203, 0, 0, 0, 73, - 74, 75, 0, 0, 0, 0, 76, 77, 0, 29, - 78, 30, 0, 31, 32, 33, 34, 35, 36, 37, - 0, 39, 40, 41, 42, 43, 0, 44, 45, 46, - 47, 0, 179, 180, 181, 49, 0, 0, 0, 0, - 0, 0, 0, 187, 188, 189, 190, 0, 0, 58, - 0, 59, 60, 61, 62, 63, 64, 342, 179, 180, - 181, 65, 66, 67, 68, 69, 70, 0, 71, 197, - 198, 199, 0, 0, 72, 0, 200, 201, 202, 0, - 0, 203, 0, 367, 0, 0, 73, 74, 75, 0, - 0, 0, 0, 76, 77, 0, 29, 78, 30, 0, - 31, 32, 33, 34, 35, 36, 37, 0, 148, 40, - 41, 42, 43, 0, 44, 45, 46, 47, 0, 179, - 180, 181, 49, 0, 0, 0, 0, 0, 0, 179, - 180, 181, 179, 180, 181, 0, 58, 0, 59, 60, - 61, 62, 63, 64, 368, 0, 0, 0, 65, 66, - 67, 68, 69, 70, 369, 71, 205, 376, 206, -158, - 0, 72, 0, 0, 0, 0, 0, -158, 0, 0, - 0, 0, 0, 73, 74, 75, 0, 0, 0, 0, - 76, 77, 0, 0, 78, -158, -158, -158, -158, 0, - 0, 0, -158, 0, -158, 0, 0, -158, 0, 0, - 0, 0, 0, 0, -158, -158, -158, -158, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -158, -158, - -158, 0, -158, -158, -158, -158, -158, -158, -158, -158, - -158, -158, -158, 0, 0, 0, 0, -158, -158, -158, - 0, 0, -158, -158, 30, 107, 31, 32, 33, 34, - 35, 36, 37, 0, 39, 40, 41, 42, 43, 0, - 44, 45, 46, 47, 0, 0, 0, 0, 49, 0, - 0, 0, 0, 0, 0, 187, -188, 189, 190, 0, - 0, 0, 58, 0, 59, 60, 61, 62, 63, 64, - 0, 0, 0, 0, 65, 66, 67, 68, 69, 70, - 0, 71, 198, 199, 0, 0, 0, 72, 200, 201, - 202, 0, 0, 203, 0, 0, 0, 0, 0, 73, - 74, 75, 187, 188, 189, 190, 76, 77, 0, 30, - 78, 31, 32, 33, 34, 35, 36, 37, 152, 39, - 40, 41, 42, 43, 0, 44, 45, 46, 47, 198, - 199, 0, 0, 49, 0, 200, 201, 202, 0, 0, - 203, -188, 0, 189, 190, 0, 0, 58, 0, 59, - 60, 61, 62, 63, 64, 0, 0, 0, 0, 65, - 66, 67, 68, 69, 70, 0, 71, 0, 198, 199, - 0, 0, 72, 0, 200, 201, 202, 0, 0, 203, - 0, 0, 0, 0, 73, 74, 75, 0, 0, 0, - 0, 76, 77, 0, 30, 78, 31, 32, 33, 34, - 35, 36, 37, 0, 39, 40, 41, 42, 43, 0, - 44, 45, 46, 47, 0, 0, 0, 0, 49, 173, - 174, 175, 176, 0, 0, 0, 177, 0, 178, 0, - 0, 0, 58, 0, 59, 60, 61, 62, 63, 64, - 0, 0, 0, 0, 65, 66, 67, 68, 69, 70, - 0, 71, 179, 180, 181, 0, 0, 72, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 73, - 74, 75, 0, 0, 0, 0, 76, 77, 0, 168, - 78, 30, 0, 31, 32, 33, 34, 35, 36, 37, - 0, 39, 40, 41, 42, 43, 0, 44, 45, 46, - 47, 0, 0, 0, 0, 49, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, - 0, 59, 60, 61, 62, 63, 64, 0, 0, 0, - 0, 65, 66, 67, 68, 69, 70, 0, 71, 0, - 0, 0, 0, 0, 72, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 73, 74, 75, 0, - 0, 0, 0, 76, 77, 0, 233, 78, 30, 0, - 31, 32, 33, 34, 35, 36, 37, 0, 39, 40, - 41, 42, 43, 0, 44, 45, 46, 47, 0, 0, - 0, 0, 49, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 58, 0, 59, 60, - 61, 62, 63, 64, 0, 0, 0, 0, 65, 66, - 67, 68, 69, 70, 0, 71, 0, 0, 0, 0, - 0, 72, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 73, 74, 75, 0, 0, 0, 0, - 76, 77, 0, 244, 78, 30, 0, 31, 32, 33, - 34, 35, 36, 37, 0, 39, 40, 41, 42, 43, - 0, 44, 45, 46, 47, 0, 0, 0, 0, 49, + 84, 317, 220, 144, 322, 388, 184, 26, 185, 408, + 218, 163, 302, 206, 34, 207, 109, 217, 183, 80, + 180, 181, 182, 225, 226, 227, 228, 229, 230, 214, + 232, 233, 34, 35, 36, 3, 245, 224, 219, 303, + 215, 123, 117, 118, 119, 120, 430, 337, 121, 122, + 283, -2, 284, 154, 420, 100, 34, 410, 30, 144, + 102, 222, 136, 285, 170, 131, 414, 415, 141, 352, + 127, 150, 147, 148, 405, 406, 421, 5, 6, 7, + 347, 8, 9, 424, 104, 240, -191, -191, 110, 111, + 204, 368, 369, 144, 186, 301, 132, 180, 181, 182, + 128, 242, 124, 244, 300, 211, 180, 181, 182, 129, + 298, 305, 10, 130, 157, 137, 134, 5, 6, 7, + 142, 8, 9, 151, 236, 237, 156, 320, 162, 223, + 164, 165, 166, 167, 168, 381, 392, 135, 286, 180, + 181, 182, 247, 11, 201, 202, 203, 239, 30, 204, + 401, 206, 10, 207, 180, 181, 182, 138, 139, 253, + 255, 256, 257, 258, 259, 260, 261, 262, 140, 264, + 265, 267, 5, 6, 7, 252, 8, 9, 171, 208, + 356, 209, 308, 11, 311, 359, 27, 28, 155, 423, + 290, 291, 292, 293, 294, 295, 173, 115, 115, 115, + 115, 115, 183, 205, 115, 115, 237, 10, 336, 210, + 307, 255, 216, 255, 349, 319, 212, 374, 133, 30, + 379, 221, 231, 398, 326, 34, 328, 330, 146, 115, + 152, 112, 234, 243, 159, 334, 113, 144, 11, 263, + 422, 241, 144, 268, 269, 270, 271, 272, 273, 274, + 275, 276, 277, 278, 279, 280, 281, 282, 385, 180, + 181, 182, 5, 6, 7, 248, 8, 9, 340, 341, + 296, 343, 250, 180, 181, 182, 180, 181, 182, 180, + 181, 182, 180, 181, 182, 299, 34, 331, 182, 174, + 175, 176, 177, 325, 333, 335, 178, 10, 179, 190, + 191, 353, 351, 146, 353, 367, 344, 416, 346, 360, + -190, 348, 358, 361, 362, 180, 181, 182, -190, 365, + 375, 363, 180, 181, 182, 200, 376, 364, 11, 237, + 201, 202, 203, 350, 366, 204, -190, -190, -190, -190, + 251, 370, 382, -190, 200, -190, 378, -51, -190, 201, + 202, 203, 307, 383, 204, -190, -190, -190, -190, 180, + 181, 182, 180, 181, 182, 384, 386, 288, 389, -190, + -190, -190, 395, -190, -190, -190, -190, -190, -190, -190, + -190, -190, -190, -190, 180, 181, 182, 399, -190, -190, + -190, 396, 314, -190, -190, 377, 400, 180, 181, 182, + 29, 409, 30, 411, 31, 84, 32, 33, 34, 35, + 36, 37, 38, 39, 40, 41, 42, 43, 44, 418, + 45, 46, 47, 48, 49, 180, 181, 182, 50, 426, + 427, 51, 52, 53, 54, 81, 425, 190, 55, 56, + 57, 58, 59, 394, 60, 61, 62, 63, 64, 65, + 323, 180, 181, 182, 66, 67, 68, 69, 70, 71, + 126, 72, 106, 200, 357, 160, 161, 73, 201, 202, + 203, 0, 0, 204, 0, 0, 332, 0, 0, 74, + 75, 76, 0, 0, 0, 29, 77, 78, 0, 31, + 79, 32, 33, 34, 35, 36, 37, 38, -46, 40, + 41, 42, 43, 44, 0, 45, 46, 47, 48, 0, + 180, 181, 182, 50, 180, 181, 182, 0, 324, 0, + 180, 181, 182, 188, 189, 190, 191, 59, 0, 60, + 61, 62, 63, 64, 65, 338, 0, 0, 0, 66, + 67, 68, 69, 70, 71, 345, 72, 196, 197, 198, + 199, 200, 73, 0, 0, 0, 201, 202, 203, 0, + 0, 204, 0, 0, 74, 75, 76, 0, 0, 0, + 29, 77, 78, 0, 31, 79, 32, 33, 34, 35, + 36, 37, 38, 0, 40, 41, 42, 43, 44, 0, + 45, 46, 47, 48, 0, 180, 181, 182, 50, 0, + 0, 0, 0, 0, 0, 0, 0, 188, 189, 190, + 191, 0, 59, 0, 60, 61, 62, 63, 64, 65, + 371, 0, 0, 0, 66, 67, 68, 69, 70, 71, + 0, 72, 197, 198, 199, 200, 0, 73, 0, 0, + 201, 202, 203, 0, 0, 204, 0, 0, 0, 74, + 75, 76, 0, 0, 0, 0, 77, 78, 0, -46, + 79, 30, 0, 31, 0, 32, 33, 34, 35, 36, + 37, 38, 0, 143, 41, 42, 43, 44, 113, 45, + 46, 47, 48, 0, 180, 181, 182, 50, 0, 0, + 0, 0, 0, 0, 0, 188, 189, 190, 191, 0, + 0, 59, 0, 60, 61, 62, 63, 64, 65, 372, + 180, 181, 182, 66, 67, 68, 69, 70, 71, 0, + 72, 198, 199, 200, 0, 0, 73, 0, 201, 202, + 203, 0, 0, 204, 0, 373, 0, 0, 74, 75, + 76, 0, 0, 0, 0, 77, 78, 0, 30, 79, + 31, 0, 32, 33, 34, 35, 36, 37, 38, 0, + 40, 41, 42, 43, 44, 0, 45, 46, 47, 48, + 0, 180, 181, 182, 50, 0, 0, 0, 0, 0, + 0, 188, -191, 190, 191, 0, 0, 0, 59, 0, + 60, 61, 62, 63, 64, 65, 380, 0, 0, 0, + 66, 67, 68, 69, 70, 71, 0, 72, 199, 200, + 0, 0, 0, 73, 201, 202, 203, 0, 0, 204, + 0, 0, 0, 0, 0, 74, 75, 76, 0, 0, + 0, 0, 77, 78, 0, 30, 79, 31, 0, 32, + 33, 34, 35, 36, 37, 38, 0, 149, 41, 42, + 43, 44, 0, 45, 46, 47, 48, 0, 0, 0, + 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 59, 0, 60, 61, 62, + 63, 64, 65, 0, 0, 0, 0, 66, 67, 68, + 69, 70, 71, 0, 72, 206, 0, 207, -161, 0, + 73, 0, 0, 0, 0, 0, -161, 0, 0, 0, + 0, 0, 74, 75, 76, 0, 190, 191, 0, 77, + 78, 0, 0, 79, -161, -161, -161, -161, 0, 0, + 0, -161, 0, -161, 0, 0, -161, 0, 0, 0, + 0, 199, 200, -161, -161, -161, -161, 201, 202, 203, + 0, 0, 204, 0, 0, 0, 0, -161, -161, -161, + 0, -161, -161, -161, -161, -161, -161, -161, -161, -161, + -161, -161, 0, 0, 0, 0, -161, -161, -161, 0, + 0, -161, -161, 31, 108, 32, 33, 34, 35, 36, + 37, 38, 0, 40, 41, 42, 43, 44, 0, 45, + 46, 47, 48, 0, 0, 0, 0, 50, 0, 0, + 0, 0, 0, 0, 188, 189, 190, 191, 0, 0, + 0, 59, 0, 60, 61, 62, 63, 64, 65, 0, + 0, 0, 0, 66, 67, 68, 69, 70, 71, 0, + 72, 199, 200, 0, 0, 0, 73, 201, 202, 203, + 0, 0, 204, 0, 0, 0, 0, 0, 74, 75, + 76, -191, 0, 190, 191, 77, 78, 0, 31, 79, + 32, 33, 34, 35, 36, 37, 38, 153, 40, 41, + 42, 43, 44, 0, 45, 46, 47, 48, 199, 200, + 0, 0, 50, 0, 201, 202, 203, 0, 0, 204, + 0, 0, 0, 0, 0, 0, 59, 0, 60, 61, + 62, 63, 64, 65, 0, 0, 0, 0, 66, 67, + 68, 69, 70, 71, 0, 72, 0, 0, 0, 0, + 0, 73, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 74, 75, 76, 0, 0, 0, 0, + 77, 78, 0, 31, 79, 32, 33, 34, 35, 36, + 37, 38, 0, 40, 41, 42, 43, 44, 0, 45, + 46, 47, 48, 0, 0, 0, 0, 50, 174, 175, + 176, 177, 0, 0, 0, 178, 0, 179, 0, 0, + 0, 59, 0, 60, 61, 62, 63, 64, 65, 0, + 0, 0, 0, 66, 67, 68, 69, 70, 71, 0, + 72, 180, 181, 182, 0, 0, 73, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 74, 75, + 76, 0, 0, 0, 0, 77, 78, 0, 169, 79, + 31, 0, 32, 33, 34, 35, 36, 37, 38, 0, + 40, 41, 42, 43, 44, 0, 45, 46, 47, 48, + 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 59, 0, + 60, 61, 62, 63, 64, 65, 0, 0, 0, 0, + 66, 67, 68, 69, 70, 71, 0, 72, 0, 0, + 0, 0, 0, 73, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 74, 75, 76, 0, 0, + 0, 0, 77, 78, 0, 235, 79, 31, 0, 32, + 33, 34, 35, 36, 37, 38, 0, 40, 41, 42, + 43, 44, 0, 45, 46, 47, 48, 0, 0, 0, + 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 59, 0, 60, 61, 62, + 63, 64, 65, 0, 0, 0, 0, 66, 67, 68, + 69, 70, 71, 0, 72, 0, 0, 0, 0, 0, + 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 74, 75, 76, 0, 0, 0, 0, 77, + 78, 0, 246, 79, 31, 0, 32, 33, 34, 35, + 36, 37, 38, 0, 40, 41, 42, 43, 44, 0, + 45, 46, 47, 48, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 58, 0, 59, 60, 61, 62, 63, - 64, 0, 0, 0, 0, 65, 66, 67, 68, 69, - 70, 0, 71, 0, 0, 0, 0, 0, 72, 0, + 0, 0, 59, 0, 60, 61, 62, 63, 64, 65, + 0, 0, 0, 0, 66, 67, 68, 69, 70, 71, + 0, 72, 0, 0, 0, 0, 0, 73, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, + 75, 76, 0, 0, 0, 0, 77, 78, 0, 266, + 79, 31, 0, 32, 33, 34, 35, 36, 37, 38, + 0, 40, 41, 42, 43, 44, 0, 45, 46, 47, + 48, 0, 0, 0, 0, 50, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 59, + 0, 60, 61, 62, 63, 64, 65, 0, 0, 0, + 0, 66, 67, 68, 69, 70, 71, 0, 72, 0, + 0, 0, 0, 0, 73, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 74, 75, 76, 0, + 0, 0, 0, 77, 78, 0, 289, 79, 31, 0, + 32, 33, 34, 35, 36, 37, 38, 0, 40, 41, + 42, 43, 44, 0, 45, 46, 47, 48, 0, 0, + 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 59, 0, 60, 61, + 62, 63, 64, 65, 0, 0, 0, 0, 66, 67, + 68, 69, 70, 71, 0, 72, 0, 0, 0, 0, + 0, 73, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 74, 75, 76, 0, 0, 0, 0, + 77, 78, 0, 327, 79, 31, 0, 32, 33, 34, + 35, 36, 37, 38, 0, 40, 41, 42, 43, 44, + 0, 45, 46, 47, 48, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 73, 74, 75, 0, 0, 0, 0, 76, 77, 0, - 264, 78, 30, 0, 31, 32, 33, 34, 35, 36, - 37, 0, 39, 40, 41, 42, 43, 0, 44, 45, - 46, 47, 0, 0, 0, 0, 49, 0, 0, 0, + 0, 0, 0, 59, 0, 60, 61, 62, 63, 64, + 65, 0, 0, 0, 0, 66, 67, 68, 69, 70, + 71, 0, 72, 0, 0, 0, 0, 0, 73, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 58, 0, 59, 60, 61, 62, 63, 64, 0, 0, - 0, 0, 65, 66, 67, 68, 69, 70, 0, 71, - 0, 0, 0, 0, 0, 72, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 73, 74, 75, - 0, 0, 0, 0, 76, 77, 0, 287, 78, 30, - 0, 31, 32, 33, 34, 35, 36, 37, 0, 39, - 40, 41, 42, 43, 0, 44, 45, 46, 47, 0, - 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 58, 0, 59, - 60, 61, 62, 63, 64, 0, 0, 0, 0, 65, - 66, 67, 68, 69, 70, 0, 71, 0, 0, 0, - 0, 0, 72, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 73, 74, 75, 0, 0, 0, - 0, 76, 77, 0, 324, 78, 30, 0, 31, 32, - 33, 34, 35, 36, 37, 0, 39, 40, 41, 42, - 43, 0, 44, 45, 46, 47, 0, 0, 0, 0, - 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 58, 0, 59, 60, 61, 62, - 63, 64, 0, 0, 0, 0, 65, 66, 67, 68, - 69, 70, 0, 71, 0, 0, 0, 0, 0, 72, + 74, 75, 76, 0, 0, 0, 0, 77, 78, 0, + 329, 79, 31, 0, 32, 33, 34, 35, 36, 37, + 38, 0, 40, 41, 42, 43, 44, 0, 45, 46, + 47, 48, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 73, 74, 75, 0, 0, 0, 0, 76, 77, - 0, 326, 78, 30, 0, 31, 32, 33, 34, 35, - 36, 37, 0, 39, 40, 41, 42, 43, 0, 44, - 45, 46, 47, 0, 0, 0, 0, 49, 0, 0, + 59, 0, 60, 61, 62, 63, 64, 65, 0, 0, + 0, 0, 66, 67, 68, 69, 70, 71, 0, 72, + 0, 0, 0, 0, 0, 73, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 74, 75, 76, + 0, 0, 0, 0, 77, 78, 0, 342, 79, 31, + 0, 32, 33, 34, 35, 36, 37, 38, 0, 40, + 41, 42, 43, 44, 0, 45, 46, 47, 48, 0, + 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 59, 0, 60, + 61, 62, 63, 64, 65, 0, 0, 0, 0, 66, + 67, 68, 69, 70, 71, 391, 72, 393, 0, 0, + 0, 397, 73, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 74, 75, 76, 0, 402, 403, + 0, 77, 78, 0, 0, 79, 412, 413, 0, 0, + 0, 0, 0, 0, 187, 0, 417, 0, 0, 0, + 419, 188, 189, 190, 191, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 428, 429, 0, + 192, 193, 339, 194, 195, 196, 197, 198, 199, 200, + 0, 0, 0, 187, 201, 202, 203, 0, 0, 204, + 188, 189, 190, 191, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 192, + 193, 0, 194, 195, 196, 197, 198, 199, 200, 0, + 0, 0, 187, 201, 202, 203, 0, 0, 204, 188, + 189, 190, 191, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 193, + 0, 194, 195, 196, 197, 198, 199, 200, 0, 0, + 0, -191, 201, 202, 203, 0, 0, 204, 188, 189, + 190, 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 58, 0, 59, 60, 61, 62, 63, 64, 0, - 0, 0, 0, 65, 66, 67, 68, 69, 70, 0, - 71, 0, 0, 0, 0, 0, 72, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 73, 74, - 75, 0, 0, 0, 0, 76, 77, 0, 339, 78, - 30, 0, 31, 32, 33, 34, 35, 36, 37, 0, - 39, 40, 41, 42, 43, 0, 44, 45, 46, 47, - 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 58, 0, - 59, 60, 61, 62, 63, 64, 0, 0, 0, 0, - 65, 66, 67, 68, 69, 70, 0, 71, 0, 0, - 0, -187, 0, 72, 0, 0, 0, 0, 0, -187, - 0, 0, 0, 0, 0, 73, 74, 75, 0, 0, - 0, 0, 76, 77, 0, 0, 78, -187, -187, -187, - -187, 0, 0, 0, -187, 0, -187, 0, 0, -187, - 0, 0, 0, 0, 0, 0, -187, -187, -187, -187, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - -187, -187, -187, 0, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, 0, 0, 0, 0, -187, - -187, -187, 186, 0, -187, -187, 0, 0, 0, 187, - 188, 189, 190, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 191, 192, - 336, 193, 194, 195, 196, 197, 198, 199, 0, 0, - 0, 186, 200, 201, 202, 0, 0, 203, 187, 188, - 189, 190, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 191, 192, 0, - 193, 194, 195, 196, 197, 198, 199, 0, 0, 0, - 186, 200, 201, 202, 0, 0, 203, 187, 188, 189, - 190, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 192, 0, 193, - 194, 195, 196, 197, 198, 199, 0, 0, 0, -188, - 200, 201, 202, 0, 0, 203, 187, 188, 189, 190, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 193, 194, - 195, 196, 197, 198, 199, 0, 0, 0, 0, 200, - 201, 202, 0, 0, 203 + 194, 195, 196, 197, 198, 199, 200, 0, 0, 0, + 0, 201, 202, 203, 0, 0, 204 }; static const yytype_int16 yycheck[] = { - 15, 106, 64, 0, 33, 34, 35, 36, 37, 358, - 72, 40, 41, 219, 386, 30, 228, 15, 9, 231, - 120, 9, 10, 11, 91, 54, 69, 3, 0, 26, - 27, 28, 215, 30, 31, 64, 65, 66, 14, 222, - 91, 70, 34, 35, 36, 37, 105, 90, 40, 41, - 422, 3, 67, 5, 154, 3, 405, 5, 120, 57, - 122, 36, 37, 78, 61, 63, 125, 91, 66, 60, - 9, 10, 64, 65, 126, 127, 128, 129, 130, 131, - 15, 133, 134, 91, 146, 4, 91, 31, 32, 15, - 15, 3, 154, 5, 4, 92, 3, 9, 5, 15, - 91, 45, 100, 91, 16, 317, 318, 26, 27, 28, - 139, 30, 31, 3, 58, 5, 26, 27, 28, 63, - 30, 31, 66, 138, 139, 69, 124, 71, 91, 73, - 74, 75, 76, 77, 14, 341, 65, 66, 67, 91, - 69, 156, 61, 91, 85, 86, 6, 139, 89, 361, - 3, 61, 84, 85, 86, 6, 15, 89, 173, 174, - 175, 176, 177, 178, 179, 180, 181, 91, 183, 184, - 185, 6, 170, 92, 203, 38, 224, 229, 226, 91, - 91, 14, 92, 91, 69, 65, 66, 67, 91, 204, - 205, 206, 207, 208, 209, 91, 296, 360, 227, 362, - 412, 301, 6, 366, 219, 65, 66, 67, 223, 224, - 3, 226, 6, 228, 65, 66, 67, 6, 18, 382, - 383, 6, 237, 14, 239, 240, 91, 390, 391, 15, - 65, 66, 67, 248, 296, 14, 399, 91, 182, 301, - 403, 90, 186, 187, 188, 189, 190, 191, 192, 193, - 194, 195, 196, 197, 198, 199, 200, 420, 421, 14, - 91, 65, 66, 67, 4, 63, 281, 282, 5, 284, - 53, 65, 66, 67, 15, 63, 65, 66, 67, 9, - 65, 66, 67, 53, 54, 90, 65, 66, 67, 65, - 66, 67, 4, 398, 18, 5, 79, 295, 67, 297, - 18, 84, 85, 86, 302, 14, 89, 91, 78, 79, - 65, 66, 67, 90, 84, 85, 86, 332, 90, 89, - 14, 1, 90, 3, 90, 5, 341, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 90, 21, 22, 23, 24, 25, 91, 90, 363, 29, - 14, 90, 32, 33, 34, 35, 65, 66, 67, 39, - 40, 41, 42, 43, 4, 45, 46, 47, 48, 49, - 50, 65, 66, 67, 4, 55, 56, 57, 58, 59, - 60, 3, 62, 4, 65, 66, 67, 9, 68, 14, - 4, 14, 336, 15, 3, 90, 4, 90, 20, 414, - 80, 81, 82, 90, 90, 90, 1, 87, 88, 90, - 5, 91, 7, 8, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 14, 21, 22, 23, 24, - 91, 65, 66, 67, 29, 90, 32, 33, 34, 35, - 65, 66, 67, 39, 15, 41, 53, 54, 43, 363, - 45, 46, 47, 48, 49, 50, 90, 414, 49, 27, - 55, 56, 57, 58, 59, 60, 70, 62, 297, 65, - 66, 67, 79, 68, -1, -1, 70, 84, 85, 86, - -1, -1, 89, -1, -1, 80, 81, 82, -1, -1, - -1, 1, 87, 88, 90, 5, 91, 7, 8, 9, - 10, 11, 12, 13, -1, 15, 16, 17, 18, 19, - -1, 21, 22, 23, 24, -1, 388, -1, -1, 29, - -1, -1, -1, -1, 396, 397, 65, 66, 67, 51, - 52, 53, 54, 43, 406, 45, 46, 47, 48, 49, - 50, 413, -1, -1, -1, 55, 56, 57, 58, 59, - 60, 90, 62, 75, 76, 77, 78, 79, 68, -1, - -1, -1, 84, 85, 86, -1, -1, 89, -1, -1, - 80, 81, 82, -1, -1, -1, -1, 87, 88, -1, - 90, 91, 3, -1, 5, -1, 7, 8, 9, 10, - 11, 12, 13, -1, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 79, 65, 66, 67, 29, 84, - 85, 86, -1, -1, 89, -1, -1, 51, 52, 53, + 15, 230, 121, 65, 233, 362, 3, 15, 5, 391, + 107, 73, 221, 3, 9, 5, 31, 106, 69, 15, + 65, 66, 67, 127, 128, 129, 130, 131, 132, 3, + 134, 135, 9, 10, 11, 0, 155, 126, 6, 90, + 14, 91, 35, 36, 37, 38, 428, 6, 41, 42, + 3, 0, 5, 68, 411, 15, 9, 393, 3, 121, + 15, 123, 58, 16, 79, 60, 402, 403, 64, 14, + 91, 67, 65, 66, 36, 37, 412, 26, 27, 28, + 6, 30, 31, 419, 15, 147, 85, 86, 32, 33, + 89, 320, 321, 155, 91, 4, 91, 65, 66, 67, + 91, 91, 46, 14, 217, 101, 65, 66, 67, 91, + 214, 224, 61, 91, 91, 59, 91, 26, 27, 28, + 64, 30, 31, 67, 139, 140, 70, 231, 72, 125, + 74, 75, 76, 77, 78, 344, 365, 91, 91, 65, + 66, 67, 157, 92, 84, 85, 86, 140, 3, 89, + 4, 3, 61, 5, 65, 66, 67, 91, 91, 174, + 175, 176, 177, 178, 179, 180, 181, 182, 91, 184, + 185, 186, 26, 27, 28, 171, 30, 31, 38, 3, + 299, 5, 226, 92, 228, 304, 9, 10, 15, 418, + 205, 206, 207, 208, 209, 210, 14, 34, 35, 36, + 37, 38, 69, 91, 41, 42, 221, 61, 14, 3, + 225, 226, 15, 228, 6, 230, 18, 6, 55, 3, + 6, 91, 91, 6, 239, 9, 241, 242, 65, 66, + 67, 15, 90, 4, 71, 250, 20, 299, 92, 183, + 4, 91, 304, 187, 188, 189, 190, 191, 192, 193, + 194, 195, 196, 197, 198, 199, 200, 201, 355, 65, + 66, 67, 26, 27, 28, 63, 30, 31, 283, 284, + 63, 286, 5, 65, 66, 67, 65, 66, 67, 65, + 66, 67, 65, 66, 67, 15, 9, 4, 67, 32, + 33, 34, 35, 90, 18, 5, 39, 61, 41, 53, + 54, 297, 18, 140, 300, 14, 91, 404, 14, 305, + 6, 14, 90, 90, 90, 65, 66, 67, 14, 91, + 335, 90, 65, 66, 67, 79, 4, 90, 92, 344, + 84, 85, 86, 14, 90, 89, 32, 33, 34, 35, + 90, 90, 4, 39, 79, 41, 14, 90, 44, 84, + 85, 86, 367, 4, 89, 51, 52, 53, 54, 65, + 66, 67, 65, 66, 67, 4, 14, 204, 3, 65, + 66, 67, 90, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 78, 79, 65, 66, 67, 4, 84, 85, + 86, 90, 229, 89, 90, 339, 90, 65, 66, 67, + 1, 90, 3, 14, 5, 420, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 91, + 21, 22, 23, 24, 25, 65, 66, 67, 29, 90, + 90, 32, 33, 34, 35, 15, 420, 53, 39, 40, + 41, 42, 43, 367, 45, 46, 47, 48, 49, 50, + 90, 65, 66, 67, 55, 56, 57, 58, 59, 60, + 50, 62, 28, 79, 300, 71, 71, 68, 84, 85, + 86, -1, -1, 89, -1, -1, 90, -1, -1, 80, + 81, 82, -1, -1, -1, 1, 87, 88, -1, 5, + 91, 7, 8, 9, 10, 11, 12, 13, 14, 15, + 16, 17, 18, 19, -1, 21, 22, 23, 24, -1, + 65, 66, 67, 29, 65, 66, 67, -1, 69, -1, + 65, 66, 67, 51, 52, 53, 54, 43, -1, 45, + 46, 47, 48, 49, 50, 90, -1, -1, -1, 55, + 56, 57, 58, 59, 60, 90, 62, 75, 76, 77, + 78, 79, 68, -1, -1, -1, 84, 85, 86, -1, + -1, 89, -1, -1, 80, 81, 82, -1, -1, -1, + 1, 87, 88, -1, 5, 91, 7, 8, 9, 10, + 11, 12, 13, -1, 15, 16, 17, 18, 19, -1, + 21, 22, 23, 24, -1, 65, 66, 67, 29, -1, + -1, -1, -1, -1, -1, -1, -1, 51, 52, 53, 54, -1, 43, -1, 45, 46, 47, 48, 49, 50, 90, -1, -1, -1, 55, 56, 57, 58, 59, 60, -1, 62, 76, 77, 78, 79, -1, 68, -1, -1, 84, 85, 86, -1, -1, 89, -1, -1, -1, 80, - 81, 82, -1, -1, -1, -1, 87, 88, -1, 3, - 91, 5, -1, 7, 8, 9, 10, 11, 12, 13, - -1, 15, 16, 17, 18, 19, -1, 21, 22, 23, - 24, -1, 65, 66, 67, 29, -1, -1, -1, -1, - -1, -1, -1, 51, 52, 53, 54, -1, -1, 43, - -1, 45, 46, 47, 48, 49, 50, 90, 65, 66, - 67, 55, 56, 57, 58, 59, 60, -1, 62, 77, - 78, 79, -1, -1, 68, -1, 84, 85, 86, -1, - -1, 89, -1, 90, -1, -1, 80, 81, 82, -1, - -1, -1, -1, 87, 88, -1, 3, 91, 5, -1, - 7, 8, 9, 10, 11, 12, 13, -1, 15, 16, - 17, 18, 19, -1, 21, 22, 23, 24, -1, 65, - 66, 67, 29, -1, -1, -1, -1, -1, -1, 65, - 66, 67, 65, 66, 67, -1, 43, -1, 45, 46, - 47, 48, 49, 50, 90, -1, -1, -1, 55, 56, - 57, 58, 59, 60, 90, 62, 3, 90, 5, 6, - -1, 68, -1, -1, -1, -1, -1, 14, -1, -1, - -1, -1, -1, 80, 81, 82, -1, -1, -1, -1, - 87, 88, -1, -1, 91, 32, 33, 34, 35, -1, - -1, -1, 39, -1, 41, -1, -1, 44, -1, -1, + 81, 82, -1, -1, -1, -1, 87, 88, -1, 90, + 91, 3, -1, 5, -1, 7, 8, 9, 10, 11, + 12, 13, -1, 15, 16, 17, 18, 19, 20, 21, + 22, 23, 24, -1, 65, 66, 67, 29, -1, -1, + -1, -1, -1, -1, -1, 51, 52, 53, 54, -1, + -1, 43, -1, 45, 46, 47, 48, 49, 50, 90, + 65, 66, 67, 55, 56, 57, 58, 59, 60, -1, + 62, 77, 78, 79, -1, -1, 68, -1, 84, 85, + 86, -1, -1, 89, -1, 90, -1, -1, 80, 81, + 82, -1, -1, -1, -1, 87, 88, -1, 3, 91, + 5, -1, 7, 8, 9, 10, 11, 12, 13, -1, + 15, 16, 17, 18, 19, -1, 21, 22, 23, 24, + -1, 65, 66, 67, 29, -1, -1, -1, -1, -1, + -1, 51, 52, 53, 54, -1, -1, -1, 43, -1, + 45, 46, 47, 48, 49, 50, 90, -1, -1, -1, + 55, 56, 57, 58, 59, 60, -1, 62, 78, 79, + -1, -1, -1, 68, 84, 85, 86, -1, -1, 89, + -1, -1, -1, -1, -1, 80, 81, 82, -1, -1, + -1, -1, 87, 88, -1, 3, 91, 5, -1, 7, + 8, 9, 10, 11, 12, 13, -1, 15, 16, 17, + 18, 19, -1, 21, 22, 23, 24, -1, -1, -1, + -1, 29, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 43, -1, 45, 46, 47, + 48, 49, 50, -1, -1, -1, -1, 55, 56, 57, + 58, 59, 60, -1, 62, 3, -1, 5, 6, -1, + 68, -1, -1, -1, -1, -1, 14, -1, -1, -1, + -1, -1, 80, 81, 82, -1, 53, 54, -1, 87, + 88, -1, -1, 91, 32, 33, 34, 35, -1, -1, + -1, 39, -1, 41, -1, -1, 44, -1, -1, -1, + -1, 78, 79, 51, 52, 53, 54, 84, 85, 86, + -1, -1, 89, -1, -1, -1, -1, 65, 66, 67, + -1, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, -1, -1, -1, -1, 84, 85, 86, -1, + -1, 89, 90, 5, 6, 7, 8, 9, 10, 11, + 12, 13, -1, 15, 16, 17, 18, 19, -1, 21, + 22, 23, 24, -1, -1, -1, -1, 29, -1, -1, -1, -1, -1, -1, 51, 52, 53, 54, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 65, 66, - 67, -1, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 78, 79, -1, -1, -1, -1, 84, 85, 86, - -1, -1, 89, 90, 5, 6, 7, 8, 9, 10, + -1, 43, -1, 45, 46, 47, 48, 49, 50, -1, + -1, -1, -1, 55, 56, 57, 58, 59, 60, -1, + 62, 78, 79, -1, -1, -1, 68, 84, 85, 86, + -1, -1, 89, -1, -1, -1, -1, -1, 80, 81, + 82, 51, -1, 53, 54, 87, 88, -1, 5, 91, + 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, + 17, 18, 19, -1, 21, 22, 23, 24, 78, 79, + -1, -1, 29, -1, 84, 85, 86, -1, -1, 89, + -1, -1, -1, -1, -1, -1, 43, -1, 45, 46, + 47, 48, 49, 50, -1, -1, -1, -1, 55, 56, + 57, 58, 59, 60, -1, 62, -1, -1, -1, -1, + -1, 68, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 80, 81, 82, -1, -1, -1, -1, + 87, 88, -1, 5, 91, 7, 8, 9, 10, 11, + 12, 13, -1, 15, 16, 17, 18, 19, -1, 21, + 22, 23, 24, -1, -1, -1, -1, 29, 32, 33, + 34, 35, -1, -1, -1, 39, -1, 41, -1, -1, + -1, 43, -1, 45, 46, 47, 48, 49, 50, -1, + -1, -1, -1, 55, 56, 57, 58, 59, 60, -1, + 62, 65, 66, 67, -1, -1, 68, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 80, 81, + 82, -1, -1, -1, -1, 87, 88, -1, 90, 91, + 5, -1, 7, 8, 9, 10, 11, 12, 13, -1, + 15, 16, 17, 18, 19, -1, 21, 22, 23, 24, + -1, -1, -1, -1, 29, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, + 45, 46, 47, 48, 49, 50, -1, -1, -1, -1, + 55, 56, 57, 58, 59, 60, -1, 62, -1, -1, + -1, -1, -1, 68, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 80, 81, 82, -1, -1, + -1, -1, 87, 88, -1, 90, 91, 5, -1, 7, + 8, 9, 10, 11, 12, 13, -1, 15, 16, 17, + 18, 19, -1, 21, 22, 23, 24, -1, -1, -1, + -1, 29, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 43, -1, 45, 46, 47, + 48, 49, 50, -1, -1, -1, -1, 55, 56, 57, + 58, 59, 60, -1, 62, -1, -1, -1, -1, -1, + 68, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 80, 81, 82, -1, -1, -1, -1, 87, + 88, -1, 90, 91, 5, -1, 7, 8, 9, 10, 11, 12, 13, -1, 15, 16, 17, 18, 19, -1, 21, 22, 23, 24, -1, -1, -1, -1, 29, -1, - -1, -1, -1, -1, -1, 51, 52, 53, 54, -1, - -1, -1, 43, -1, 45, 46, 47, 48, 49, 50, - -1, -1, -1, -1, 55, 56, 57, 58, 59, 60, - -1, 62, 78, 79, -1, -1, -1, 68, 84, 85, - 86, -1, -1, 89, -1, -1, -1, -1, -1, 80, - 81, 82, 51, 52, 53, 54, 87, 88, -1, 5, - 91, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, -1, 21, 22, 23, 24, 78, - 79, -1, -1, 29, -1, 84, 85, 86, -1, -1, - 89, 51, -1, 53, 54, -1, -1, 43, -1, 45, - 46, 47, 48, 49, 50, -1, -1, -1, -1, 55, - 56, 57, 58, 59, 60, -1, 62, -1, 78, 79, - -1, -1, 68, -1, 84, 85, 86, -1, -1, 89, - -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, - -1, 87, 88, -1, 5, 91, 7, 8, 9, 10, - 11, 12, 13, -1, 15, 16, 17, 18, 19, -1, - 21, 22, 23, 24, -1, -1, -1, -1, 29, 32, - 33, 34, 35, -1, -1, -1, 39, -1, 41, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, 45, 46, 47, 48, 49, 50, -1, -1, -1, -1, 55, 56, 57, 58, 59, 60, - -1, 62, 65, 66, 67, -1, -1, 68, -1, -1, + -1, 62, -1, -1, -1, -1, -1, 68, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, -1, 87, 88, -1, 90, 91, 5, -1, 7, 8, 9, 10, 11, 12, 13, @@ -794,58 +835,27 @@ static const yytype_int16 yycheck[] = -1, -1, -1, 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, 45, 46, 47, 48, 49, 50, -1, -1, -1, -1, 55, - 56, 57, 58, 59, 60, -1, 62, -1, -1, -1, - -1, -1, 68, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 80, 81, 82, -1, -1, -1, - -1, 87, 88, -1, 90, 91, 5, -1, 7, 8, - 9, 10, 11, 12, 13, -1, 15, 16, 17, 18, - 19, -1, 21, 22, 23, 24, -1, -1, -1, -1, - 29, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 43, -1, 45, 46, 47, 48, - 49, 50, -1, -1, -1, -1, 55, 56, 57, 58, - 59, 60, -1, 62, -1, -1, -1, -1, -1, 68, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 80, 81, 82, -1, -1, -1, -1, 87, 88, - -1, 90, 91, 5, -1, 7, 8, 9, 10, 11, - 12, 13, -1, 15, 16, 17, 18, 19, -1, 21, - 22, 23, 24, -1, -1, -1, -1, 29, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 43, -1, 45, 46, 47, 48, 49, 50, -1, - -1, -1, -1, 55, 56, 57, 58, 59, 60, -1, - 62, -1, -1, -1, -1, -1, 68, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 80, 81, - 82, -1, -1, -1, -1, 87, 88, -1, 90, 91, - 5, -1, 7, 8, 9, 10, 11, 12, 13, -1, - 15, 16, 17, 18, 19, -1, 21, 22, 23, 24, - -1, -1, -1, -1, 29, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 43, -1, - 45, 46, 47, 48, 49, 50, -1, -1, -1, -1, - 55, 56, 57, 58, 59, 60, -1, 62, -1, -1, - -1, 6, -1, 68, -1, -1, -1, -1, -1, 14, - -1, -1, -1, -1, -1, 80, 81, 82, -1, -1, - -1, -1, 87, 88, -1, -1, 91, 32, 33, 34, - 35, -1, -1, -1, 39, -1, 41, -1, -1, 44, - -1, -1, -1, -1, -1, -1, 51, 52, 53, 54, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 65, 66, 67, -1, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, -1, -1, -1, -1, 84, - 85, 86, 44, -1, 89, 90, -1, -1, -1, 51, + 56, 57, 58, 59, 60, 364, 62, 366, -1, -1, + -1, 370, 68, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 80, 81, 82, -1, 387, 388, + -1, 87, 88, -1, -1, 91, 395, 396, -1, -1, + -1, -1, -1, -1, 44, -1, 405, -1, -1, -1, + 409, 51, 52, 53, 54, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 426, 427, -1, + 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, + -1, -1, -1, 44, 84, 85, 86, -1, -1, 89, + 51, 52, 53, 54, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 70, + 71, -1, 73, 74, 75, 76, 77, 78, 79, -1, + -1, -1, 44, 84, 85, 86, -1, -1, 89, 51, 52, 53, 54, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 71, + -1, 73, 74, 75, 76, 77, 78, 79, -1, -1, -1, 44, 84, 85, 86, -1, -1, 89, 51, 52, 53, 54, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 70, 71, -1, - 73, 74, 75, 76, 77, 78, 79, -1, -1, -1, - 44, 84, 85, 86, -1, -1, 89, 51, 52, 53, - 54, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 71, -1, 73, - 74, 75, 76, 77, 78, 79, -1, -1, -1, 44, - 84, 85, 86, -1, -1, 89, 51, 52, 53, 54, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 73, 74, - 75, 76, 77, 78, 79, -1, -1, -1, -1, 84, - 85, 86, -1, -1, 89 + 73, 74, 75, 76, 77, 78, 79, -1, -1, -1, + -1, 84, 85, 86, -1, -1, 89 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -854,47 +864,48 @@ static const yytype_uint8 yystos[] = { 0, 94, 98, 0, 101, 26, 27, 28, 30, 31, 61, 92, 102, 108, 109, 117, 118, 119, 120, 122, - 123, 132, 133, 126, 124, 15, 124, 124, 1, 3, - 5, 7, 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 21, 22, 23, 24, 25, 29, - 32, 33, 34, 35, 39, 40, 41, 42, 43, 45, - 46, 47, 48, 49, 50, 55, 56, 57, 58, 59, - 60, 62, 68, 80, 81, 82, 87, 88, 91, 95, - 103, 105, 106, 135, 136, 137, 140, 141, 142, 143, - 144, 145, 146, 151, 152, 153, 154, 155, 156, 15, - 121, 15, 127, 15, 134, 127, 96, 6, 135, 145, - 145, 15, 20, 95, 152, 157, 157, 157, 157, 157, - 157, 157, 91, 145, 125, 125, 91, 91, 91, 91, - 60, 91, 152, 91, 91, 95, 145, 91, 91, 91, - 95, 145, 15, 136, 148, 152, 157, 157, 15, 95, - 145, 152, 14, 135, 15, 145, 91, 147, 152, 153, - 154, 145, 136, 145, 145, 145, 145, 145, 90, 135, - 38, 107, 14, 32, 33, 34, 35, 39, 41, 65, - 66, 67, 69, 3, 5, 91, 44, 51, 52, 53, - 54, 70, 71, 73, 74, 75, 76, 77, 78, 79, - 84, 85, 86, 89, 91, 3, 5, 3, 5, 3, - 95, 18, 128, 14, 15, 128, 101, 6, 148, 91, - 136, 95, 128, 96, 96, 96, 96, 96, 96, 91, - 96, 96, 90, 90, 135, 135, 149, 157, 136, 91, - 91, 4, 14, 148, 90, 135, 63, 130, 5, 90, - 95, 135, 113, 135, 135, 135, 135, 135, 135, 135, - 135, 145, 135, 135, 90, 135, 145, 145, 145, 145, - 145, 145, 145, 145, 145, 145, 145, 145, 145, 145, - 145, 3, 5, 16, 91, 139, 152, 90, 135, 135, - 135, 135, 135, 135, 63, 129, 15, 129, 4, 149, - 90, 138, 129, 112, 135, 113, 114, 135, 113, 116, - 150, 152, 103, 111, 114, 115, 135, 96, 97, 114, - 90, 69, 90, 135, 90, 135, 90, 135, 4, 90, - 18, 135, 5, 14, 6, 90, 72, 135, 135, 90, - 135, 91, 90, 14, 6, 14, 6, 14, 18, 14, - 95, 131, 148, 131, 90, 148, 95, 90, 90, 90, - 90, 91, 90, 14, 114, 114, 90, 90, 90, 90, - 6, 135, 4, 145, 14, 6, 90, 149, 4, 4, - 4, 14, 110, 110, 3, 99, 99, 114, 99, 112, - 90, 90, 99, 6, 4, 90, 99, 99, 100, 36, - 37, 104, 104, 90, 107, 14, 99, 99, 107, 107, - 101, 99, 91, 99, 110, 107, 4, 114, 107, 115, - 90, 90, 99, 99, 104 + 123, 132, 133, 135, 126, 124, 15, 124, 124, 1, + 3, 5, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 21, 22, 23, 24, 25, + 29, 32, 33, 34, 35, 39, 40, 41, 42, 43, + 45, 46, 47, 48, 49, 50, 55, 56, 57, 58, + 59, 60, 62, 68, 80, 81, 82, 87, 88, 91, + 95, 103, 105, 106, 137, 138, 139, 142, 143, 144, + 145, 146, 147, 148, 153, 154, 155, 156, 157, 158, + 15, 121, 15, 127, 15, 136, 127, 96, 6, 137, + 147, 147, 15, 20, 95, 154, 159, 159, 159, 159, + 159, 159, 159, 91, 147, 125, 125, 91, 91, 91, + 91, 60, 91, 154, 91, 91, 95, 147, 91, 91, + 91, 95, 147, 15, 138, 150, 154, 159, 159, 15, + 95, 147, 154, 14, 137, 15, 147, 91, 149, 154, + 155, 156, 147, 138, 147, 147, 147, 147, 147, 90, + 137, 38, 107, 14, 32, 33, 34, 35, 39, 41, + 65, 66, 67, 69, 3, 5, 91, 44, 51, 52, + 53, 54, 70, 71, 73, 74, 75, 76, 77, 78, + 79, 84, 85, 86, 89, 91, 3, 5, 3, 5, + 3, 95, 18, 128, 3, 14, 15, 128, 101, 6, + 150, 91, 138, 95, 128, 96, 96, 96, 96, 96, + 96, 91, 96, 96, 90, 90, 137, 137, 151, 159, + 138, 91, 91, 4, 14, 150, 90, 137, 63, 130, + 5, 90, 95, 137, 113, 137, 137, 137, 137, 137, + 137, 137, 137, 147, 137, 137, 90, 137, 147, 147, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 147, + 147, 147, 147, 3, 5, 16, 91, 141, 154, 90, + 137, 137, 137, 137, 137, 137, 63, 129, 96, 15, + 129, 4, 151, 90, 140, 129, 112, 137, 113, 114, + 137, 113, 116, 152, 154, 103, 111, 114, 115, 137, + 96, 97, 114, 90, 69, 90, 137, 90, 137, 90, + 137, 4, 90, 18, 137, 5, 14, 6, 90, 72, + 137, 137, 90, 137, 91, 90, 14, 6, 14, 6, + 14, 18, 14, 95, 131, 134, 150, 131, 90, 150, + 95, 90, 90, 90, 90, 91, 90, 14, 114, 114, + 90, 90, 90, 90, 6, 137, 4, 147, 14, 6, + 90, 151, 4, 4, 4, 101, 14, 110, 110, 3, + 99, 99, 114, 99, 112, 90, 90, 99, 6, 4, + 90, 4, 99, 99, 100, 36, 37, 104, 104, 90, + 107, 14, 99, 99, 107, 107, 101, 99, 91, 99, + 110, 107, 4, 114, 107, 115, 90, 90, 99, 99, + 104 }; typedef enum { @@ -922,8 +933,9 @@ static const toketypes yy_type_tab[] = toketype_opval, toketype_opval, toketype_opval, toketype_p_tkval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_ival, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_ival, toketype_opval, + toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, - toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval + toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, + toketype_opval, toketype_opval, toketype_opval }; @@ -92,7 +92,7 @@ %type <opval> decl format subrout mysubrout package use peg -%type <opval> block mblock lineseq line loop cond else +%type <opval> block package_block mblock lineseq line loop cond else %type <opval> expr term subscripted scalar ary hsh arylen star amper sideff %type <opval> argexpr nexpr texpr iexpr mexpr mnexpr miexpr %type <opval> listexpr listexprcom indirob listop method @@ -242,6 +242,12 @@ line : label cond } }) } + | package_block + { $$ = newSTATEOP(0, NULL, + newWHILEOP(0, 1, (LOOP*)(OP*)NULL, + NOLINE, (OP*)NULL, $1, + (OP*)NULL, 0)); + TOKEN_GETMAD($1,((LISTOP*)$$)->op_first,'L'); } | label PLUGSTMT { $$ = newSTATEOP(0, PVAL($1), $2); } ; @@ -659,6 +665,21 @@ package : PACKAGE WORD WORD ';' } ; +package_block: PACKAGE WORD WORD '{' remember + { + package($3); + if ($2) + package_version($2); + } + lineseq '}' + { if (PL_parser->copline > (line_t)IVAL($4)) + PL_parser->copline = (line_t)IVAL($4); + $$ = block_end($5, $7); + TOKEN_GETMAD($4,$$,'{'); + TOKEN_GETMAD($8,$$,'}'); + } + ; + use : USE startsub { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ } WORD WORD listexpr ';' diff --git a/pod/perlfunc.pod b/pod/perlfunc.pod index 5e89035129..76bf048a8b 100644 --- a/pod/perlfunc.pod +++ b/pod/perlfunc.pod @@ -4243,10 +4243,19 @@ X<package> X<module> X<namespace> X<version> =item package NAMESPACE -Declares the compilation unit as being in the given namespace. The scope -of the package declaration is from the declaration itself through the end -of the enclosing block, file, or eval (the same as the C<my> operator). -All further unqualified dynamic identifiers will be in this namespace. +=item package NAMESPACE VERSION BLOCK +X<package> X<module> X<namespace> X<version> + +=item package NAMESPACE BLOCK + +Declares the BLOCK, or the rest of the compilation unit, as being in +the given namespace. The scope of the package declaration is either the +supplied code BLOCK or, in the absence of a BLOCK, from the declaration +itself through the end of the enclosing block, file, or eval (the same +as the C<my> operator). All unqualified dynamic identifiers in this +scope will be in the given namespace, except where overridden by another +C<package> declaration. + A package statement affects dynamic variables only, including those you've used C<local> on, but I<not> lexical variables, which are created with C<my> (or C<our> (or C<state>)). Typically it would be the first diff --git a/t/comp/package_block.t b/t/comp/package_block.t new file mode 100644 index 0000000000..8645f1a175 --- /dev/null +++ b/t/comp/package_block.t @@ -0,0 +1,37 @@ +#!./perl + +print "1..3\n"; + +$main::result = ""; +eval q{ + $main::result .= "a(".__PACKAGE__.")"; + package Foo { + $main::result .= "b(".__PACKAGE__.")"; + package Bar::Baz { + $main::result .= "c(".__PACKAGE__.")"; + } + $main::result .= "d(".__PACKAGE__.")"; + } + $main::result .= "e(".__PACKAGE__.")"; +}; +print $main::result eq "a(main)b(Foo)c(Bar::Baz)d(Foo)e(main)" ? + "ok 1\n" : "not ok 1\n"; + +$main::result = ""; +eval q{ + $main::result .= "a($Foo::VERSION)"; + $main::result .= "b($Bar::VERSION)"; + package Foo 11 { ; } + package Bar 22 { $main::result .= "c(".__PACKAGE__.")"; } +}; +print $main::result eq "a(11)b(22)c(Bar)" ? "ok 2\n" : "not ok 2\n"; + +$main::result = ""; +eval q{ + $main::result .= "a(".__PACKAGE__.")"; + package Foo { } + $main::result .= "b(".__PACKAGE__.")"; +}; +print $main::result eq "a(main)b(main)" ? "ok 3\n" : "not ok 3\n"; + +1; @@ -2098,7 +2098,7 @@ S_force_version(pTHX_ char *s, int guessing) curmad('X', newSVpvn(s,d-s)); } #endif - if (*d == ';' || isSPACE(*d) || *d == '}' || !*d) { + if (*d == ';' || isSPACE(*d) || *d == '{' || *d == '}' || !*d) { SV *ver; #ifdef USE_LOCALE_NUMERIC char *loc = setlocale(LC_NUMERIC, "C"); @@ -2167,7 +2167,9 @@ S_force_strict_version(pTHX_ char *s) s = (char *)scan_version(s, ver, 0); version = newSVOP(OP_CONST, 0, ver); } - else if ( (*s != ';' && *s != '}' ) && (s = SKIPSPACE1(s), (*s != ';' && *s !='}' ))) { + else if ( (*s != ';' && *s != '{' && *s != '}' ) && + (s = SKIPSPACE1(s), (*s != ';' && *s != '{' && *s != '}' ))) + { PL_bufptr = s; if (errstr) yyerror(errstr); /* version required */ @@ -7271,6 +7273,7 @@ Perl_yylex(pTHX) s = force_word(s,WORD,FALSE,TRUE,FALSE); s = SKIPSPACE1(s); s = force_strict_version(s); + PL_lex_expect = XBLOCK; OPERATOR(PACKAGE); case KEY_pipe: @@ -4482,7 +4482,7 @@ dotted_decimal_version: saw_decimal++; d++; } - else if (!*d || *d == ';' || isSPACE(*d) || *d == '}') { + else if (!*d || *d == ';' || isSPACE(*d) || *d == '{' || *d == '}') { if ( d == s ) { /* found nothing */ BADVERSION(s,errstr,"Invalid version format (version required)"); @@ -4513,7 +4513,7 @@ dotted_decimal_version: /* scan the fractional part after the decimal point*/ - if (!isDIGIT(*d) && (strict || ! (!*d || *d == ';' || isSPACE(*d) || *d == '}') )) { + if (!isDIGIT(*d) && (strict || ! (!*d || *d == ';' || isSPACE(*d) || *d == '{' || *d == '}') )) { /* strict or lax-but-not-the-end */ BADVERSION(s,errstr,"Invalid version format (fractional part required)"); } @@ -4551,7 +4551,7 @@ version_prescan_finish: while (isSPACE(*d)) d++; - if (!isDIGIT(*d) && (! (!*d || *d == ';' || *d == '}') )) { + if (!isDIGIT(*d) && (! (!*d || *d == ';' || *d == '{' || *d == '}') )) { /* trailing non-numeric data */ BADVERSION(s,errstr,"Invalid version format (non-numeric data)"); } |