From: Dave Mitchell Date: Sun, 10 Oct 2004 19:18:00 +0000 (+0000) Subject: Turn regcomp into a list op X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=131b3ad08b25bcfcb31b9933319b3186bdd13248;p=p5sagit%2Fp5-mst-13.2.git Turn regcomp into a list op p4raw-id: //depot/perl@23357 --- diff --git a/embed.fnc b/embed.fnc index 3a52c18..a847b95 100644 --- a/embed.fnc +++ b/embed.fnc @@ -594,7 +594,7 @@ Apd |void |pack_cat |SV *cat|char *pat|char *patend|SV **beglist|SV **endlist|SV Apd |void |packlist |SV *cat|char *pat|char *patend|SV **beglist|SV **endlist p |void |pidgone |Pid_t pid|int status Ap |void |pmflag |U32* pmfl|int ch -p |OP* |pmruntime |OP* pm|OP* expr|OP* repl +p |OP* |pmruntime |OP* pm|OP* expr|bool isreg p |OP* |pmtrans |OP* o|OP* expr|OP* repl Ap |void |pop_scope p |OP* |prepend_elem |I32 optype|OP* head|OP* tail diff --git a/ext/B/B/Deparse.pm b/ext/B/B/Deparse.pm index 9ab926b..6071af8 100644 --- a/ext/B/B/Deparse.pm +++ b/ext/B/B/Deparse.pm @@ -3950,6 +3950,18 @@ sub regcomp { my $kid = $op->first; $kid = $kid->first if $kid->name eq "regcmaybe"; $kid = $kid->first if $kid->name eq "regcreset"; + if ($kid->name eq "null" and !null($kid->first) + and $kid->first->name eq 'pushmark') + { + my $str = ''; + $kid = $kid->first->sibling; + while (!null($kid)) { + $str .= $self->re_dq($kid, $extended); + $kid = $kid->sibling; + } + return $str, 1; + } + return ($self->re_dq($kid, $extended), 1) if $self->pure_string($kid); return ($self->deparse($kid, $cx), 0); } diff --git a/lib/overload.t b/lib/overload.t index c1b92c5..7d076c2 100644 --- a/lib/overload.t +++ b/lib/overload.t @@ -1174,5 +1174,29 @@ foreach my $op (qw(<=> == != < <= > >=)) { } } } +{ + # check that overloading works in regexes + { + package Foo493; + use overload + '""' => sub { "^$_[0][0]\$" }, + '.' => sub { + bless [ + $_[2] + ? (ref $_[1] ? $_[1][0] : $_[1]) . ':' .$_[0][0] + : $_[0][0] . ':' . (ref $_[1] ? $_[1][0] : $_[1]) + ], 'Foo493' + }; + } + + my $a = bless [ "a" ], 'Foo493'; + test('a' =~ /$a/); + test('x:a' =~ /x$a/); + test('x:a:=' =~ /x$a=$/); + test('x:a:a:=' =~ /x$a$a=$/); + +} + + # Last test is: -sub last {492} +sub last {496} diff --git a/op.c b/op.c index d99045b..9b33ff2 100644 --- a/op.c +++ b/op.c @@ -1761,7 +1761,7 @@ Perl_bind_match(pTHX_ I32 type, OP *left, OP *right) } else return bind_match(type, left, - pmruntime(newPMOP(OP_MATCH, 0), right, Nullop)); + pmruntime(newPMOP(OP_MATCH, 0), right, 0)); } OP * @@ -2660,15 +2660,56 @@ Perl_newPMOP(pTHX_ I32 type, I32 flags) return CHECKOP(type, pmop); } +/* Given some sort of match op o, and an expression expr containing a + * pattern, either compile expr into a regex and attach it to o (if it's + * constant), or convert expr into a runtime regcomp op sequence (if it's + * not) + * + * isreg indicates that the pattern is part of a regex construct, eg + * $x =~ /pattern/ or split /pattern/, as opposed to $x =~ $pattern or + * split "pattern", which aren't. In the former case, expr will be a list + * if the pattern contains more than one term (eg /a$b/) or if it contains + * a replacement, ie s/// or tr///. + */ + OP * -Perl_pmruntime(pTHX_ OP *o, OP *expr, OP *repl) +Perl_pmruntime(pTHX_ OP *o, OP *expr, bool isreg) { PMOP *pm; LOGOP *rcop; I32 repl_has_vars = 0; + OP* repl = Nullop; + bool reglist; + + if (o->op_type == OP_SUBST || o->op_type == OP_TRANS) { + /* last element in list is the replacement; pop it */ + OP* kid; + repl = cLISTOPx(expr)->op_last; + kid = cLISTOPx(expr)->op_first; + while (kid->op_sibling != repl) + kid = kid->op_sibling; + kid->op_sibling = Nullop; + cLISTOPx(expr)->op_last = kid; + } - if (o->op_type == OP_TRANS) + if (isreg && expr->op_type == OP_LIST && + cLISTOPx(expr)->op_first->op_sibling == cLISTOPx(expr)->op_last) + { + /* convert single element list to element */ + OP* oe = expr; + expr = cLISTOPx(oe)->op_first->op_sibling; + cLISTOPx(oe)->op_first->op_sibling = Nullop; + cLISTOPx(oe)->op_last = Nullop; + op_free(oe); + } + + if (o->op_type == OP_TRANS) { return pmtrans(o, expr, repl); + } + + reglist = isreg && expr->op_type == OP_LIST; + if (reglist) + op_null(expr); PL_hints |= HINT_BLOCK_SCOPE; pm = (PMOP*)o; @@ -2699,11 +2740,14 @@ Perl_pmruntime(pTHX_ OP *o, OP *expr, OP *repl) rcop->op_type = OP_REGCOMP; rcop->op_ppaddr = PL_ppaddr[OP_REGCOMP]; rcop->op_first = scalar(expr); - rcop->op_flags |= ((PL_hints & HINT_RE_EVAL) - ? (OPf_SPECIAL | OPf_KIDS) - : OPf_KIDS); + rcop->op_flags |= OPf_KIDS + | ((PL_hints & HINT_RE_EVAL) ? OPf_SPECIAL : 0) + | (reglist ? OPf_STACKED : 0); rcop->op_private = 1; rcop->op_other = o; + if (reglist) + rcop->op_targ = pad_alloc(rcop->op_type, SVs_PADTMP); + /* /$x/ may cause an eval, since $x might be qr/(?{..})/ */ PL_cv_has_eval = 1; @@ -6019,7 +6063,7 @@ Perl_ck_split(pTHX_ OP *o) if (kid->op_type != OP_MATCH || kid->op_flags & OPf_STACKED) { OP *sibl = kid->op_sibling; kid->op_sibling = 0; - kid = pmruntime( newPMOP(OP_MATCH, OPf_SPECIAL), kid, Nullop); + kid = pmruntime( newPMOP(OP_MATCH, OPf_SPECIAL), kid, 0); if (cLISTOPo->op_first == cLISTOPo->op_last) cLISTOPo->op_last = kid; cLISTOPo->op_first = kid; diff --git a/perly.act b/perly.act index 5ad8ba3..bfb3922 100644 --- a/perly.act +++ b/perly.act @@ -922,32 +922,32 @@ case 2: case 174: #line 679 "perly.y" - { yyval.opval = pmruntime(yyvsp[-3].opval, yyvsp[-1].opval, Nullop); ;} + { yyval.opval = pmruntime(yyvsp[-3].opval, yyvsp[-1].opval, 1); ;} break; - case 175: -#line 681 "perly.y" - { yyval.opval = pmruntime(yyvsp[-5].opval, yyvsp[-3].opval, yyvsp[-1].opval); ;} + case 177: +#line 686 "perly.y" + { yyval.opval = my_attrs(yyvsp[-1].opval,yyvsp[0].opval); ;} break; case 178: #line 688 "perly.y" - { yyval.opval = my_attrs(yyvsp[-1].opval,yyvsp[0].opval); ;} + { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); ;} break; case 179: -#line 690 "perly.y" - { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); ;} +#line 693 "perly.y" + { yyval.opval = sawparens(yyvsp[-1].opval); ;} break; case 180: #line 695 "perly.y" - { yyval.opval = sawparens(yyvsp[-1].opval); ;} + { yyval.opval = sawparens(newNULLLIST()); ;} break; case 181: #line 697 "perly.y" - { yyval.opval = sawparens(newNULLLIST()); ;} + { yyval.opval = yyvsp[0].opval; ;} break; case 182: @@ -961,87 +961,82 @@ case 2: break; case 184: -#line 703 "perly.y" - { yyval.opval = yyvsp[0].opval; ;} +#line 706 "perly.y" + { yyval.opval = Nullop; ;} break; case 185: #line 708 "perly.y" - { yyval.opval = Nullop; ;} + { yyval.opval = yyvsp[0].opval; ;} break; case 186: -#line 710 "perly.y" - { yyval.opval = yyvsp[0].opval; ;} +#line 712 "perly.y" + { yyval.opval = Nullop; ;} break; case 187: #line 714 "perly.y" - { yyval.opval = Nullop; ;} + { yyval.opval = yyvsp[0].opval; ;} break; case 188: #line 716 "perly.y" - { yyval.opval = yyvsp[0].opval; ;} + { yyval.opval = yyvsp[-1].opval; ;} break; case 189: -#line 718 "perly.y" - { yyval.opval = yyvsp[-1].opval; ;} +#line 722 "perly.y" + { PL_in_my = 0; yyval.opval = my(yyvsp[0].opval); ;} break; case 190: -#line 724 "perly.y" - { PL_in_my = 0; yyval.opval = my(yyvsp[0].opval); ;} +#line 726 "perly.y" + { yyval.opval = newCVREF(yyvsp[-1].ival,yyvsp[0].opval); ;} break; case 191: -#line 728 "perly.y" - { yyval.opval = newCVREF(yyvsp[-1].ival,yyvsp[0].opval); ;} +#line 730 "perly.y" + { yyval.opval = newSVREF(yyvsp[0].opval); ;} break; case 192: -#line 732 "perly.y" - { yyval.opval = newSVREF(yyvsp[0].opval); ;} +#line 734 "perly.y" + { yyval.opval = newAVREF(yyvsp[0].opval); ;} break; case 193: -#line 736 "perly.y" - { yyval.opval = newAVREF(yyvsp[0].opval); ;} +#line 738 "perly.y" + { yyval.opval = newHVREF(yyvsp[0].opval); ;} break; case 194: -#line 740 "perly.y" - { yyval.opval = newHVREF(yyvsp[0].opval); ;} +#line 742 "perly.y" + { yyval.opval = newAVREF(yyvsp[0].opval); ;} break; case 195: -#line 744 "perly.y" - { yyval.opval = newAVREF(yyvsp[0].opval); ;} +#line 746 "perly.y" + { yyval.opval = newGVREF(0,yyvsp[0].opval); ;} break; case 196: -#line 748 "perly.y" - { yyval.opval = newGVREF(0,yyvsp[0].opval); ;} +#line 751 "perly.y" + { yyval.opval = scalar(yyvsp[0].opval); ;} break; case 197: #line 753 "perly.y" - { yyval.opval = scalar(yyvsp[0].opval); ;} + { yyval.opval = scalar(yyvsp[0].opval); ;} break; case 198: #line 755 "perly.y" - { yyval.opval = scalar(yyvsp[0].opval); ;} - break; - - case 199: -#line 757 "perly.y" { yyval.opval = scope(yyvsp[0].opval); ;} break; - case 200: -#line 760 "perly.y" + case 199: +#line 758 "perly.y" { yyval.opval = yyvsp[0].opval; ;} break; diff --git a/perly.tab b/perly.tab index 981e6ba..1b32b62 100644 --- a/perly.tab +++ b/perly.tab @@ -1,15 +1,15 @@ #define YYFINAL 3 /* YYLAST -- Last index in YYTABLE. */ -#define YYLAST 2062 +#define YYLAST 1948 /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS 85 /* YYNNTS -- Number of nonterminals. */ #define YYNNTS 62 /* YYNRULES -- Number of rules. */ -#define YYNRULES 200 +#define YYNRULES 199 /* YYNRULES -- Number of states. */ -#define YYNSTATES 400 +#define YYNSTATES 397 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ #define YYUNDEFTOK 2 @@ -78,10 +78,9 @@ static const unsigned short yyprhs[] = 516, 518, 524, 527, 529, 532, 536, 539, 541, 543, 545, 547, 549, 551, 558, 564, 569, 575, 577, 579, 583, 588, 592, 594, 597, 600, 602, 605, 608, 611, - 613, 617, 619, 623, 628, 633, 640, 642, 644, 648, - 651, 655, 658, 660, 662, 664, 665, 667, 668, 670, - 673, 675, 678, 681, 684, 687, 690, 693, 695, 697, - 699 + 613, 617, 619, 623, 628, 633, 635, 637, 641, 644, + 648, 651, 653, 655, 657, 658, 660, 661, 663, 666, + 668, 671, 674, 677, 680, 683, 686, 688, 690, 692 }; /* YYRHS -- A `-1'-separated list of the rules' RHS. */ @@ -150,14 +149,13 @@ static const short yyrhs[] = 32, -1, 32, 87, -1, 32, 134, -1, 11, 134, -1, 29, -1, 29, 74, 73, -1, 10, -1, 30, 74, 73, -1, 30, 74, 124, 73, -1, 8, 74, - 134, 73, -1, 8, 74, 134, 52, 134, 73, -1, - 4, -1, 126, -1, 43, 136, 119, -1, 43, 136, - -1, 74, 124, 73, -1, 74, 73, -1, 141, -1, - 143, -1, 142, -1, -1, 125, -1, -1, 124, -1, - 124, 52, -1, 141, -1, 46, 146, -1, 81, 146, - -1, 82, 146, -1, 83, 146, -1, 38, 146, -1, - 84, 146, -1, 4, -1, 141, -1, 87, -1, 9, - -1 + 125, 73, -1, 4, -1, 126, -1, 43, 136, 119, + -1, 43, 136, -1, 74, 124, 73, -1, 74, 73, + -1, 141, -1, 143, -1, 142, -1, -1, 125, -1, + -1, 124, -1, 124, 52, -1, 141, -1, 46, 146, + -1, 81, 146, -1, 82, 146, -1, 83, 146, -1, + 38, 146, -1, 84, 146, -1, 4, -1, 141, -1, + 87, -1, 9, -1 }; /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ @@ -180,10 +178,9 @@ static const unsigned short yyrline[] = 597, 598, 600, 602, 604, 606, 608, 610, 612, 614, 616, 618, 620, 622, 624, 626, 632, 639, 641, 643, 645, 648, 651, 654, 656, 658, 660, 662, 664, 667, - 669, 671, 674, 676, 678, 680, 682, 683, 687, 689, - 694, 696, 698, 700, 702, 707, 709, 714, 715, 717, - 723, 727, 731, 735, 739, 743, 747, 752, 754, 756, - 759 + 669, 671, 674, 676, 678, 680, 681, 685, 687, 692, + 694, 696, 698, 700, 705, 707, 712, 713, 715, 721, + 725, 729, 733, 737, 741, 745, 750, 752, 754, 757 }; #endif @@ -253,10 +250,9 @@ static const unsigned char yyr1[] = 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, - 134, 134, 134, 134, 134, 134, 134, 134, 135, 135, - 136, 136, 136, 136, 136, 137, 137, 138, 138, 138, - 139, 140, 141, 142, 143, 144, 145, 146, 146, 146, - 146 + 134, 134, 134, 134, 134, 134, 134, 135, 135, 136, + 136, 136, 136, 136, 137, 137, 138, 138, 138, 139, + 140, 141, 142, 143, 144, 145, 146, 146, 146, 146 }; /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */ @@ -279,10 +275,9 @@ static const unsigned char yyr2[] = 1, 5, 2, 1, 2, 3, 2, 1, 1, 1, 1, 1, 1, 6, 5, 4, 5, 1, 1, 3, 4, 3, 1, 2, 2, 1, 2, 2, 2, 1, - 3, 1, 3, 4, 4, 6, 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 + 3, 1, 3, 4, 4, 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 @@ -293,219 +288,255 @@ static const unsigned char yydefact[] = 5, 0, 9, 1, 8, 60, 58, 0, 58, 58, 46, 10, 48, 50, 49, 51, 52, 55, 0, 0, 72, 0, 47, 11, 13, 0, 54, 0, 61, 62, - 71, 0, 62, 16, 4, 176, 0, 0, 157, 0, + 71, 0, 62, 16, 4, 175, 0, 0, 157, 0, 171, 0, 59, 59, 0, 0, 0, 0, 0, 162, - 169, 0, 0, 165, 185, 0, 0, 0, 0, 0, + 169, 0, 0, 165, 184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 28, 0, 12, - 17, 77, 177, 152, 137, 138, 139, 140, 80, 143, + 17, 77, 176, 152, 137, 138, 139, 140, 80, 143, 158, 147, 150, 149, 151, 148, 53, 63, 64, 0, - 64, 9, 197, 200, 199, 198, 185, 0, 0, 168, + 64, 9, 196, 199, 198, 197, 184, 0, 0, 168, 0, 62, 4, 4, 4, 4, 4, 4, 0, 163, - 0, 0, 187, 166, 167, 197, 186, 87, 198, 0, - 195, 176, 132, 131, 147, 0, 0, 185, 144, 0, - 179, 182, 184, 183, 191, 164, 120, 121, 142, 125, - 124, 146, 0, 127, 0, 118, 119, 192, 193, 194, - 196, 0, 36, 15, 0, 0, 0, 0, 0, 0, + 0, 0, 186, 166, 167, 196, 185, 87, 197, 0, + 194, 175, 132, 131, 147, 0, 0, 184, 144, 0, + 178, 181, 183, 182, 190, 164, 120, 121, 142, 125, + 124, 146, 0, 127, 0, 118, 119, 191, 192, 193, + 195, 0, 36, 15, 0, 0, 0, 0, 0, 0, 0, 0, 78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, 122, 0, 0, 0, 0, 0, 0, 0, - 66, 0, 185, 0, 8, 85, 187, 0, 89, 64, + 66, 0, 184, 0, 8, 85, 186, 0, 89, 64, 39, 0, 0, 0, 0, 0, 4, 170, 172, 0, - 188, 0, 0, 81, 0, 0, 129, 0, 161, 181, - 0, 68, 178, 0, 145, 126, 29, 20, 21, 41, + 187, 0, 0, 81, 0, 0, 129, 0, 161, 180, + 0, 68, 177, 0, 145, 126, 29, 20, 21, 41, 18, 19, 22, 76, 75, 74, 79, 0, 103, 0, 0, 113, 109, 110, 106, 107, 104, 0, 116, 115, 114, 112, 111, 108, 117, 105, 0, 91, 0, 0, 84, 92, 159, 0, 0, 0, 0, 0, 0, 65, - 70, 69, 57, 0, 56, 3, 0, 0, 174, 185, - 0, 44, 0, 40, 45, 0, 0, 42, 0, 0, - 190, 38, 43, 0, 0, 17, 0, 173, 189, 88, - 0, 133, 0, 135, 0, 128, 180, 67, 0, 0, - 0, 102, 96, 0, 0, 100, 0, 0, 187, 160, - 0, 94, 0, 155, 0, 73, 86, 0, 90, 130, - 0, 0, 0, 0, 0, 0, 39, 0, 82, 134, - 136, 154, 0, 99, 141, 0, 101, 95, 0, 97, - 156, 93, 175, 7, 28, 28, 23, 23, 0, 28, - 0, 0, 153, 98, 83, 9, 30, 31, 0, 0, - 26, 27, 0, 34, 0, 28, 8, 24, 0, 28, - 0, 33, 6, 0, 32, 0, 0, 35, 23, 25 + 70, 69, 57, 0, 56, 3, 0, 174, 184, 0, + 44, 0, 40, 45, 0, 0, 42, 0, 0, 189, + 38, 43, 0, 0, 17, 0, 173, 188, 88, 0, + 133, 0, 135, 0, 128, 179, 67, 0, 0, 0, + 102, 96, 0, 0, 100, 0, 0, 186, 160, 0, + 94, 0, 155, 0, 73, 86, 90, 130, 0, 0, + 0, 0, 0, 0, 39, 0, 82, 134, 136, 154, + 0, 99, 141, 0, 101, 95, 0, 97, 156, 93, + 7, 28, 28, 23, 23, 0, 28, 0, 0, 153, + 98, 83, 9, 30, 31, 0, 0, 26, 27, 0, + 34, 0, 28, 8, 24, 0, 28, 0, 33, 6, + 0, 32, 0, 0, 35, 23, 25 }; /* YYDEFGOTO[NTERM-NUM]. */ static const short yydefgoto[] = { - -1, 1, 104, 101, 2, 364, 375, 10, 4, 23, - 301, 380, 79, 162, 24, 302, 291, 294, 296, 304, - 292, 295, 25, 11, 12, 27, 13, 14, 18, 110, - 17, 29, 98, 201, 232, 282, 15, 16, 31, 297, - 81, 82, 289, 270, 83, 84, 85, 86, 87, 88, - 89, 140, 127, 221, 299, 90, 91, 92, 93, 94, + -1, 1, 104, 101, 2, 361, 372, 10, 4, 23, + 300, 377, 79, 162, 24, 301, 290, 293, 295, 303, + 291, 294, 25, 11, 12, 27, 13, 14, 18, 110, + 17, 29, 98, 201, 232, 282, 15, 16, 31, 296, + 81, 82, 288, 270, 83, 84, 85, 86, 87, 88, + 89, 140, 127, 221, 298, 90, 91, 92, 93, 94, 95, 106 }; /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ -#define YYPACT_NINF -359 +#define YYPACT_NINF -343 static const short yypact[] = { - -359, 23, -359, -359, 192, -359, -359, 22, -359, -359, - 16, -359, -359, -359, -359, -359, -359, 27, 50, -39, - -359, 50, -359, -359, -359, 303, -359, 59, -359, 64, - -359, 70, 64, -359, -359, -359, 9, 9, -359, 5, - -359, 1608, -359, -359, 38, 44, 52, 54, 10, 1608, - 63, 78, 79, 635, 553, 9, 717, 798, 151, 1608, - -6, 9, 1608, 1608, 1608, 1608, 1608, 1608, 879, 960, - -359, 1608, 1608, 9, 9, 9, 9, 99, 88, -359, - 600, 114, -359, 19, -359, -359, -359, -359, 1906, -359, - 105, 7, 14, -359, -359, 179, -359, -359, 144, 189, - 144, -359, -359, -359, -359, -359, 1608, 122, 1608, 784, - 59, 64, -359, -359, -359, -359, -359, -359, 129, 1906, - 157, 1041, 553, -359, 784, 1734, 114, -359, 1674, 1608, - -359, 160, -359, 784, 34, 161, -14, 1608, 784, 1122, - 194, -359, -359, -359, -359, 114, 89, 89, 89, -48, - -48, 165, 290, -359, 86, 89, 89, -359, -359, -359, - -359, 59, -359, -359, 1608, 1608, 1608, 1608, 1608, 1608, - 1608, 1608, 1608, 1608, 1203, 1608, 1608, 1608, 1608, 1608, - 1608, 1608, 1608, 1608, 1608, 1608, 1608, 1608, 1608, 1608, - 1608, -359, -359, 120, 1284, 1608, 1608, 1608, 1608, 1608, - 238, 4, 1608, 4, 55, -359, 1608, 1780, -359, 144, - 1608, 1608, 1608, 1608, 170, 387, -359, -359, -359, 308, - 268, 173, 1608, 114, 1365, 1446, -359, 176, -359, -359, - 358, 246, -359, 1608, 184, -359, -359, -34, -359, -34, - -34, -34, -34, 210, 210, -359, 1906, 127, -359, 373, - 164, 1990, 703, 539, 864, 230, 1906, 1864, 221, 221, - 375, 458, 621, 830, 89, 89, 1608, -359, 1527, 1608, - 191, -359, -359, 540, 214, 322, 302, 406, 653, -359, - -359, -359, -359, 193, -359, -359, 196, 1608, -359, 1608, - 59, -359, 198, -34, -359, 200, 201, -34, 211, 213, - -359, -359, -359, 222, 219, 228, 1608, -359, -359, -359, - 622, -359, 663, -359, 693, -359, -359, -359, 489, 1608, - 224, -359, -359, 1608, 735, -359, 704, 499, 1608, -359, - 229, -359, 236, -359, 251, -359, -359, 1822, -359, -359, - 325, 325, 325, 325, 1608, 325, 1608, 258, -359, -359, - -359, -359, 581, -359, 1948, 261, -359, -359, 274, -359, - -359, -359, -359, -359, 99, 99, 18, 18, 275, 99, - 276, 325, -359, -359, -359, -359, -359, -359, 325, 281, - -359, -359, 325, -359, 471, 99, 115, -359, 1608, 99, - 287, -359, -359, 288, -359, 325, 325, -359, 18, -359 + -343, 9, -343, -343, 147, -343, -343, 8, -343, -343, + 7, -343, -343, -343, -343, -343, -343, 19, 52, -8, + -343, 52, -343, -343, -343, 257, -343, 51, -343, 63, + -343, 86, 63, -343, -343, -343, 31, 31, -343, 30, + -343, 1563, -343, -343, 36, 37, 42, 45, -6, 1563, + 80, 82, 83, 590, 508, 31, 672, 753, 154, 1563, + 41, 31, 1563, 1563, 1563, 1563, 1563, 1563, 834, 915, + -343, 1563, 1563, 31, 31, 31, 31, 57, 99, -343, + 555, 125, -343, 18, -343, -343, -343, -343, 1777, -343, + 89, 10, 33, -343, -343, 176, -343, -343, 137, 179, + 137, -343, -343, -343, -343, -343, 1563, 119, 1563, 245, + 51, 63, -343, -343, -343, -343, -343, -343, 120, 1777, + 122, 996, 508, -343, 245, 1689, 125, -343, 1629, 1563, + -343, 124, -343, 245, 46, 128, 608, 1563, 245, 1077, + 161, -343, -343, -343, -343, 125, 5, 5, 5, -43, + -43, 134, 186, -343, 118, 5, 5, -343, -343, -343, + -343, 51, -343, -343, 1563, 1563, 1563, 1563, 1563, 1563, + 1563, 1563, 1563, 1563, 1158, 1563, 1563, 1563, 1563, 1563, + 1563, 1563, 1563, 1563, 1563, 1563, 1563, 1563, 1563, 1563, + 1563, -343, -343, 78, 1239, 1563, 1563, 1563, 1563, 1563, + 203, 28, 1563, 28, 111, -343, 1563, -2, -343, 137, + 1563, 1563, 1563, 1563, 149, 342, -343, -343, -343, 329, + 190, 159, 1563, 125, 1320, 1401, -343, 172, -343, -343, + 397, 244, -343, 1563, 177, -343, -343, 87, -343, 87, + 87, 87, 87, 221, 221, -343, 1777, 690, -343, 412, + 153, 1861, 739, 576, 901, 819, 1777, 1735, 1876, 1876, + 414, 495, 658, 785, 5, 5, 1563, -343, 1482, 1563, + 211, -343, -343, 430, 700, 197, 852, 318, 862, -343, + -343, -343, -343, 214, -343, -343, 180, -343, 1563, 51, + -343, 219, 87, -343, 228, 231, 87, 232, 220, -343, + -343, -343, 236, 233, 207, 1563, -343, -343, -343, 536, + -343, 566, -343, 577, -343, -343, -343, 350, 1563, 235, + -343, -343, 1563, 885, -343, 618, 361, 1563, -343, 239, + -343, 240, -343, 242, -343, -343, -343, -343, 320, 320, + 320, 320, 1563, 320, 1563, 251, -343, -343, -343, -343, + 444, -343, 1819, 249, -343, -343, 253, -343, -343, -343, + -343, 57, 57, 56, 56, 256, 57, 258, 320, -343, + -343, -343, -343, -343, -343, 320, 259, -343, -343, 320, + -343, 426, 57, 116, -343, 1563, 57, 269, -343, -343, + 271, -343, 320, 320, -343, 56, -343 }; /* YYPGOTO[NTERM-NUM]. */ static const short yypgoto[] = { - -359, -359, -23, -56, -359, -110, -359, -359, -100, -359, - 339, -358, -359, -202, -359, -359, -359, 204, -190, -19, - 29, 163, -359, -359, -359, -359, -359, -359, 40, 346, - -359, 369, -26, -92, -359, 199, -359, -359, -359, -25, - -51, -359, -359, -359, -359, -359, -359, -359, -359, 39, - -359, -359, -87, -201, -359, -359, -9, 336, 341, -359, - -359, 46 + -343, -343, -23, -98, -343, 22, -343, -343, -100, -343, + 305, -342, -343, -112, -343, -343, -343, 194, -210, -36, + 11, 138, -343, -343, -343, -343, -343, -343, 50, 317, + -343, 343, -22, -92, -343, 167, -343, -343, -343, -25, + -51, -343, -343, -343, -343, -343, -343, -343, -343, 35, + -343, -343, -99, -200, -343, -343, -9, 316, 326, -343, + -343, -13 }; /* 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 -177 +#define YYTABLE_NINF -176 static const short yytable[] = { - 80, 204, 77, 126, 96, 286, 100, 34, 203, 381, - 195, 145, 34, 102, 169, 170, 171, 197, 103, 205, - -177, -177, 173, 3, 193, 303, 19, 105, 105, 22, - 123, 26, 136, 132, 169, 170, 171, 195, 30, 118, - 399, 378, 379, 152, 154, 128, 105, 134, 20, 21, - 228, 141, 105, 116, 28, 126, 210, 211, 212, 213, - 214, 215, 34, 227, 105, 105, 105, 105, 139, 5, - 6, 97, 7, 8, 99, 73, 74, 75, 223, 108, - 109, 280, 196, 107, 117, 209, 126, 208, 119, 198, - 73, 73, 124, 174, 175, 133, 219, 220, 138, 9, - 129, 130, 146, 147, 148, 149, 150, 144, 225, 196, - 155, 156, 112, 128, 230, 283, 347, 290, 113, 157, - 158, 159, 160, 266, 161, 267, 114, 358, 115, 5, - 6, 285, 7, 8, 169, 170, 171, 120, 236, 237, - 239, 240, 241, 242, 243, 244, 245, 207, 247, 249, - 250, 126, 121, 122, 368, 137, 190, 191, 192, 9, - 306, 193, 376, 377, 235, 163, 172, 383, 222, 273, - 274, 275, 276, 277, 278, 169, 170, 171, 281, 194, - 281, 220, 199, 391, 271, 293, 239, 394, 239, 200, - 305, 392, -2, 202, 268, 269, 206, 310, 393, 312, - 314, 73, 338, 216, 320, 300, 5, 6, 318, 7, - 8, 246, 169, 170, 171, 251, 252, 253, 254, 255, - 256, 257, 258, 259, 260, 261, 262, 263, 264, 265, - 217, 365, 366, 367, 224, 369, 9, 226, 126, 231, - 233, 324, 322, 326, 327, 279, 309, 164, 165, 166, - 167, 73, 315, 317, 168, 177, 178, 179, 180, 319, - 171, 385, 169, 170, 171, 328, 179, 339, 387, 336, - 335, 340, 389, 341, 342, 386, 169, 170, 171, 185, - 186, 187, 188, 189, 343, 397, 398, 344, 190, 191, - 192, 330, 189, 193, 352, 345, 346, 190, 191, 192, - 353, -42, 193, 220, 33, 359, 34, 35, 36, 37, - 38, 39, 360, 40, 41, 42, 169, 170, 171, 43, - 308, 293, 44, 45, 46, 47, 337, 361, 363, 48, - 49, 371, 50, 51, 52, 53, 54, 373, 169, 170, - 171, 55, 56, 57, 58, 59, 60, 374, 382, 61, - 169, 170, 171, 384, 62, 388, 169, 170, 171, 80, - 395, 396, 354, 234, 78, 390, 63, 64, 65, 238, - 169, 170, 171, 66, 67, 370, 298, 68, 69, 332, - 70, 307, 71, 72, 73, 74, 75, 76, 33, 111, - 32, 35, 36, 37, 38, 39, 142, 40, 41, 42, - 331, 143, 284, 43, 0, 0, 169, 170, 171, 177, - 178, 179, 180, 0, 49, 0, 50, 51, 52, 53, - 54, 169, 170, 171, 0, 55, 56, 57, 58, 59, - 60, 316, 0, 61, 186, 187, 188, 189, 62, 0, - 0, 0, 190, 191, 192, 0, 321, 193, 0, 0, - 63, 64, 65, 0, 169, 170, 171, 66, 67, 0, - 0, 68, 69, 0, -37, 0, 71, 72, 73, 74, - 75, 76, 33, 0, 0, 35, 36, 37, 38, 39, - 0, 40, 41, 42, 333, 0, 0, 43, 0, 0, - 0, 0, 177, 178, 179, 180, 0, 0, 49, 0, - 50, 51, 52, 53, 54, 0, 0, 0, 0, 55, - 56, 57, 58, 59, 60, 0, 0, 61, 187, 188, - 189, 0, 62, 0, 0, 190, 191, 192, 0, 0, - 193, 0, 0, 0, 63, 64, 65, 169, 170, 171, - 0, 66, 67, 0, -37, 68, 69, 169, 170, 171, - 71, 72, 73, 74, 75, 76, 34, 125, 36, 37, - 38, 39, 103, 40, 41, 42, 0, 351, 0, 43, - 0, 0, 0, 177, -177, 179, 180, 357, 0, 0, - 49, 0, 50, 51, 52, 53, 54, 0, 169, 170, - 171, 55, 56, 57, 58, 59, 60, 0, 0, 61, + 80, 204, 77, 126, 96, 302, 286, 205, 203, 3, + 100, 145, 19, 195, 210, 211, 212, 213, 214, 215, + 22, 173, 378, 26, 107, -176, -176, 105, 105, 193, + 123, 34, 136, 132, 34, 102, 197, 116, 228, 118, + 103, 129, 130, 152, 154, 128, 105, 134, 144, 195, + 172, 141, 105, 396, 34, 126, 28, 207, 20, 21, + 157, 158, 159, 160, 105, 105, 105, 105, 117, 30, + 97, 287, 190, 191, 192, 73, 109, 193, 223, 375, + 376, 266, 161, 267, 119, 196, 126, 208, 124, 209, + 99, 133, 174, 175, 138, 345, 219, 220, 146, 147, + 148, 149, 150, 283, 108, 280, 155, 156, 198, 222, + 112, 113, 73, 128, 230, 139, 114, 289, 305, 115, + 225, 196, 73, 74, 75, 5, 6, 356, 7, 8, + 5, 6, 365, 7, 8, 169, 170, 171, 236, 237, + 239, 240, 241, 242, 243, 244, 245, -2, 247, 249, + 250, 126, 268, 269, 120, 9, 121, 122, 137, 73, + 9, 5, 6, 194, 7, 8, 169, 170, 171, 273, + 274, 275, 276, 277, 278, 390, 163, 172, 281, 199, + 281, 220, 200, 202, 271, 292, 239, 285, 239, 336, + 304, 9, 389, 206, 216, 217, 235, 309, 224, 311, + 313, 169, 170, 171, 226, 299, 231, 246, 317, 233, + 279, 251, 252, 253, 254, 255, 256, 257, 258, 259, + 260, 261, 262, 263, 264, 265, 164, 165, 166, 167, + 73, 321, 308, 168, 169, 170, 171, 126, 169, 170, + 171, 323, 307, 325, 326, 169, 170, 171, 314, 373, + 374, 316, 318, 335, 380, 169, 170, 171, 33, 234, + 34, 35, 36, 37, 38, 39, 337, 40, 41, 42, + 388, 171, 383, 43, 391, 330, 44, 45, 46, 47, + -42, 179, 180, 48, 49, 327, 50, 51, 52, 53, + 54, 334, 338, 350, 342, 55, 56, 57, 58, 59, + 60, 339, 220, 61, 340, 341, 188, 189, 62, 343, + 344, 351, 190, 191, 192, 357, 358, 193, 359, 292, + 63, 64, 65, 360, 368, 370, 371, 66, 67, 379, + 78, 68, 69, 385, 70, 381, 71, 72, 73, 74, + 75, 76, 392, 33, 393, 387, 35, 36, 37, 38, + 39, 297, 40, 41, 42, 367, 80, 352, 43, 238, + 111, 362, 363, 364, 32, 366, 169, 170, 171, 49, + 284, 50, 51, 52, 53, 54, 142, 169, 170, 171, + 55, 56, 57, 58, 59, 60, 143, 0, 61, 0, + 382, 0, 0, 62, 0, 0, 332, 384, 169, 170, + 171, 386, 306, 0, 0, 63, 64, 65, 0, 169, + 170, 171, 66, 67, 394, 395, 68, 69, 0, -37, + 0, 71, 72, 73, 74, 75, 76, 33, 349, 0, + 35, 36, 37, 38, 39, 0, 40, 41, 42, 355, + 0, 0, 43, 0, 0, 169, 170, 171, 177, 178, + 179, 180, 0, 49, 0, 50, 51, 52, 53, 54, + 169, 170, 171, 0, 55, 56, 57, 58, 59, 60, + 315, 0, 61, 186, 187, 188, 189, 62, 169, 170, + 171, 190, 191, 192, 0, 320, 193, 0, 0, 63, + 64, 65, 169, 170, 171, 0, 66, 67, 0, -37, + 68, 69, 0, 328, 0, 71, 72, 73, 74, 75, + 76, 34, 125, 36, 37, 38, 39, 103, 40, 41, + 42, 0, 369, 0, 43, 0, 0, 0, 0, 177, + 178, 179, 180, 0, 0, 49, 0, 50, 51, 52, + 53, 54, 0, 0, 0, 0, 55, 56, 57, 58, + 59, 60, 0, 0, 61, 187, 188, 189, 0, 62, + 0, 0, 190, 191, 192, 0, 0, 193, 0, 0, + 0, 63, 64, 65, 164, 165, 166, 167, 66, 67, + 0, 168, 68, 69, 169, 170, 171, 71, 72, 73, + 74, 75, 76, 34, 35, 36, 37, 38, 39, 0, + 40, 41, 42, 169, 170, 171, 43, 0, 0, 346, + 177, -176, 179, 180, 169, 170, 171, 49, 0, 50, + 51, 52, 53, 54, 0, 169, 170, 171, 55, 56, + 57, 58, 59, 60, 0, 0, 61, 188, 189, 347, + 0, 62, 0, 190, 191, 192, 0, 0, 193, 0, + 348, 0, 0, 63, 64, 65, 169, 170, 171, 0, + 66, 67, 0, 0, 68, 69, 169, 170, 171, 71, + 72, 73, 74, 75, 76, 34, 131, 36, 37, 38, + 39, 0, 40, 41, 42, 227, 0, 0, 43, 0, + 0, 354, 177, 178, 179, 180, 0, 0, 0, 49, + 0, 50, 51, 52, 53, 54, 0, 0, 0, 0, + 55, 56, 57, 58, 59, 60, 0, 0, 61, 188, + 189, 0, 0, 62, 0, 190, 191, 192, 0, 0, + 193, 0, 0, 0, 0, 63, 64, 65, 169, 170, + 171, 0, 66, 67, 0, 0, 68, 69, 169, 170, + 171, 71, 72, 73, 74, 75, 76, 35, 36, 37, + 38, 39, 0, 40, 41, 42, 0, 319, 0, 43, + 0, 0, 0, -176, 0, 179, 180, 329, 0, 0, + 49, 0, 50, 51, 52, 53, 54, 0, 0, 0, + 0, 55, 56, 57, 58, 59, 60, 0, 0, 61, 188, 189, 0, 0, 62, 0, 190, 191, 192, 0, - 0, 193, 0, 329, 0, 0, 63, 64, 65, 164, - 165, 166, 167, 66, 67, 0, 168, 68, 69, 169, - 170, 171, 71, 72, 73, 74, 75, 76, 34, 35, - 36, 37, 38, 39, 0, 40, 41, 42, 169, 170, - 171, 43, 0, 0, 0, 177, 178, 179, 180, 372, + 0, 193, 0, 0, 0, 0, 63, 64, 65, 0, + 0, 179, 180, 66, 67, 0, 0, 68, 69, 0, + 135, 0, 71, 72, 73, 74, 75, 76, 35, 36, + 37, 38, 39, 0, 40, 41, 42, 189, 0, 0, + 43, 0, 190, 191, 192, 179, 0, 193, 0, 0, + 0, 49, 0, 50, 51, 52, 53, 54, 0, 0, + 0, 0, 55, 56, 57, 58, 59, 60, 0, 0, + 61, 189, 0, 0, 0, 62, 190, 191, 192, 0, + 0, 193, 0, 0, 0, 0, 0, 63, 64, 65, + 169, 170, 171, 0, 66, 67, 0, 151, 68, 69, + 169, 170, 171, 71, 72, 73, 74, 75, 76, 35, + 36, 37, 38, 39, 0, 40, 41, 42, 0, 331, + 0, 43, 0, 169, 170, 171, 0, 0, 0, 333, 0, 0, 49, 0, 50, 51, 52, 53, 54, 0, - 169, 170, 171, 55, 56, 57, 58, 59, 60, 0, - 0, 61, 188, 189, 0, 0, 62, 0, 190, 191, - 192, 0, 0, 193, 0, 348, 0, 0, 63, 64, - 65, 169, 170, 171, 0, 66, 67, 0, 0, 68, - 69, 169, 170, 171, 71, 72, 73, 74, 75, 76, - 34, 131, 36, 37, 38, 39, 0, 40, 41, 42, - 334, 0, 0, 43, 0, 0, 349, -177, 0, 179, - 180, 169, 170, 171, 49, 0, 50, 51, 52, 53, - 54, 0, 169, 170, 171, 55, 56, 57, 58, 59, - 60, 0, 0, 61, 188, 189, 350, 0, 62, 0, - 190, 191, 192, 0, 0, 193, 0, 356, 0, 0, - 63, 64, 65, 169, 170, 171, 0, 66, 67, 0, - 0, 68, 69, 0, 0, 0, 71, 72, 73, 74, + 0, 0, 0, 55, 56, 57, 58, 59, 60, 0, + 0, 61, 353, 189, 0, 0, 62, 0, 190, 191, + 192, 0, 0, 193, 0, 0, 0, 0, 63, 64, + 65, 0, 0, 0, 0, 66, 67, 0, 0, 68, + 69, 0, 0, 153, 71, 72, 73, 74, 75, 76, + 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, + 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 49, 0, 50, 51, 52, 53, 54, + 0, 0, 0, 0, 55, 56, 57, 58, 59, 60, + 0, 0, 61, 0, 0, 0, 0, 62, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, + 64, 65, 0, 0, 0, 0, 66, 67, 0, 218, + 68, 69, 0, 0, 0, 71, 72, 73, 74, 75, + 76, 35, 36, 37, 38, 39, 0, 40, 41, 42, + 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 49, 0, 50, 51, 52, 53, + 54, 0, 0, 0, 0, 55, 56, 57, 58, 59, + 60, 0, 0, 61, 0, 0, 0, 0, 62, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 63, 64, 65, 0, 0, 0, 0, 66, 67, 0, + 229, 68, 69, 0, 0, 0, 71, 72, 73, 74, 75, 76, 35, 36, 37, 38, 39, 0, 40, 41, - 42, 0, 355, 0, 43, 0, 0, 0, 0, 0, - 179, 180, 0, 0, 0, 49, 0, 50, 51, 52, + 42, 0, 0, 0, 43, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 49, 0, 50, 51, 52, 53, 54, 0, 0, 0, 0, 55, 56, 57, 58, - 59, 60, 0, 0, 61, 188, 189, 0, 0, 62, - 0, 190, 191, 192, 0, 0, 193, 0, 0, 0, - 0, 63, 64, 65, 0, 0, 179, 180, 66, 67, - 0, 0, 68, 69, 0, 135, 0, 71, 72, 73, + 59, 60, 0, 0, 61, 0, 0, 0, 0, 62, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 63, 64, 65, 0, 0, 0, 0, 66, 67, + 0, 248, 68, 69, 0, 0, 0, 71, 72, 73, 74, 75, 76, 35, 36, 37, 38, 39, 0, 40, - 41, 42, 189, 0, 0, 43, 0, 190, 191, 192, - 0, 0, 193, 0, 0, 0, 49, 0, 50, 51, + 41, 42, 0, 0, 0, 43, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 49, 0, 50, 51, 52, 53, 54, 0, 0, 0, 0, 55, 56, 57, - 58, 59, 60, 0, 0, 61, 189, 0, 0, 0, - 62, 190, 191, 192, 0, 0, 193, 0, 0, 0, + 58, 59, 60, 0, 0, 61, 0, 0, 0, 0, + 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 64, 65, 0, 0, 0, 0, 66, - 67, 0, 151, 68, 69, 0, 0, 0, 71, 72, + 67, 0, 272, 68, 69, 0, 0, 0, 71, 72, 73, 74, 75, 76, 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, 50, @@ -513,7 +544,7 @@ static const short yytable[] = 57, 58, 59, 60, 0, 0, 61, 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 64, 65, 0, 0, 0, 0, - 66, 67, 0, 0, 68, 69, 0, 0, 153, 71, + 66, 67, 0, 310, 68, 69, 0, 0, 0, 71, 72, 73, 74, 75, 76, 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0, @@ -521,7 +552,7 @@ static const short yytable[] = 56, 57, 58, 59, 60, 0, 0, 61, 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 64, 65, 0, 0, 0, - 0, 66, 67, 0, 218, 68, 69, 0, 0, 0, + 0, 66, 67, 0, 312, 68, 69, 0, 0, 0, 71, 72, 73, 74, 75, 76, 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, @@ -529,7 +560,7 @@ static const short yytable[] = 55, 56, 57, 58, 59, 60, 0, 0, 61, 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 64, 65, 0, 0, - 0, 0, 66, 67, 0, 229, 68, 69, 0, 0, + 0, 0, 66, 67, 0, 324, 68, 69, 0, 0, 0, 71, 72, 73, 74, 75, 76, 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -537,184 +568,172 @@ static const short yytable[] = 0, 55, 56, 57, 58, 59, 60, 0, 0, 61, 0, 0, 0, 0, 62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, 64, 65, 0, - 0, 0, 0, 66, 67, 0, 248, 68, 69, 0, - 0, 0, 71, 72, 73, 74, 75, 76, 35, 36, - 37, 38, 39, 0, 40, 41, 42, 0, 0, 0, - 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 49, 0, 50, 51, 52, 53, 54, 0, 0, - 0, 0, 55, 56, 57, 58, 59, 60, 0, 0, - 61, 0, 0, 0, 0, 62, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 63, 64, 65, - 0, 0, 0, 0, 66, 67, 0, 272, 68, 69, - 0, 0, 0, 71, 72, 73, 74, 75, 76, 35, - 36, 37, 38, 39, 0, 40, 41, 42, 0, 0, - 0, 43, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 49, 0, 50, 51, 52, 53, 54, 0, - 0, 0, 0, 55, 56, 57, 58, 59, 60, 0, - 0, 61, 0, 0, 0, 0, 62, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 63, 64, - 65, 0, 0, 0, 0, 66, 67, 0, 311, 68, - 69, 0, 0, 0, 71, 72, 73, 74, 75, 76, - 35, 36, 37, 38, 39, 0, 40, 41, 42, 0, - 0, 0, 43, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 49, 0, 50, 51, 52, 53, 54, - 0, 0, 0, 0, 55, 56, 57, 58, 59, 60, - 0, 0, 61, 0, 0, 0, 0, 62, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 63, - 64, 65, 0, 0, 0, 0, 66, 67, 0, 313, - 68, 69, 0, 0, 0, 71, 72, 73, 74, 75, - 76, 35, 36, 37, 38, 39, 0, 40, 41, 42, - 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 49, 0, 50, 51, 52, 53, - 54, 0, 0, 0, 0, 55, 56, 57, 58, 59, - 60, 0, 0, 61, 0, 0, 0, 0, 62, 0, + 0, 0, 195, 66, 67, 0, 0, 68, 69, 0, + 0, 0, 71, 72, 73, 74, 75, 76, -147, -147, + -147, -147, 0, 0, 0, -147, 0, -147, 0, 0, + 0, 0, 0, -147, -147, -147, -147, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -147, -147, -147, + 0, -147, -147, -147, -147, -147, -147, -147, -147, -147, + -147, -147, 0, 0, 0, 0, -147, -147, -147, 0, + 0, -147, -147, 0, 196, 0, -147, -147, -175, -175, + -175, -175, 0, 0, 0, -175, 0, -175, 0, 0, + 0, 0, 0, -175, -175, -175, -175, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, -175, -175, -175, + 0, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, 0, 0, 0, 0, -175, -175, -175, 0, + 0, -175, -175, 176, 0, 0, -175, -175, 0, 177, + 178, 179, 180, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 181, 182, + 322, 183, 184, 185, 186, 187, 188, 189, 0, 0, + 0, 0, 190, 191, 192, 176, 0, 193, 0, 0, + 0, 177, 178, 179, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 63, 64, 65, 0, 0, 0, 0, 66, 67, 0, - 325, 68, 69, 0, 0, 0, 71, 72, 73, 74, - 75, 76, 35, 36, 37, 38, 39, 0, 40, 41, - 42, 0, 0, 0, 43, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 49, 0, 50, 51, 52, - 53, 54, 0, 0, 0, 0, 55, 56, 57, 58, - 59, 60, 0, 0, 61, 0, 0, 0, 0, 62, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 63, 64, 65, 0, 0, 0, 195, 66, 67, - 0, 0, 68, 69, 0, 0, 0, 71, 72, 73, - 74, 75, 76, -147, -147, -147, -147, 0, 0, 0, - -147, 0, -147, 0, 0, 0, 0, 0, -147, -147, - -147, -147, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -147, -147, -147, 0, -147, -147, -147, -147, - -147, -147, -147, -147, -147, -147, -147, 0, 0, 0, - 0, -147, -147, -147, 0, 0, -147, -147, 0, 196, - 0, -147, -147, -176, -176, -176, -176, 0, 0, 0, - -176, 0, -176, 0, 0, 0, 0, 0, -176, -176, - -176, -176, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, -176, -176, -176, 0, -176, -176, -176, -176, - -176, -176, -176, -176, -176, -176, -176, 0, 0, 0, - 0, -176, -176, -176, 0, 0, -176, -176, 176, 0, - 0, -176, -176, 0, 177, 178, 179, 180, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 287, 181, 182, 0, 183, 184, 185, 186, - 187, 188, 189, 0, 0, 0, 0, 190, 191, 192, - 176, 0, 193, 288, 0, 0, 177, 178, 179, 180, + 181, 182, 0, 183, 184, 185, 186, 187, 188, 189, + 0, 0, 0, 0, 190, 191, 192, 176, 0, 193, + 0, 0, 0, 177, 178, 179, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 181, 182, 0, 183, 184, - 185, 186, 187, 188, 189, 0, 0, 0, 0, 190, - 191, 192, 176, 0, 193, 362, 0, 0, 177, 178, - 179, 180, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 181, 182, 323, - 183, 184, 185, 186, 187, 188, 189, 0, 0, 0, - 0, 190, 191, 192, 176, 0, 193, 0, 0, 0, - 177, 178, 179, 180, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 181, - 182, 0, 183, 184, 185, 186, 187, 188, 189, 0, - 0, 0, 0, 190, 191, 192, 176, 0, 193, 0, - 0, 0, 177, 178, 179, 180, 0, 0, 0, 0, + 0, 0, 0, 182, 0, 183, 184, 185, 186, 187, + 188, 189, 0, 0, 0, 0, 190, 191, 192, -176, + 0, 193, 0, 0, 0, 177, 178, 179, 180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 182, 0, 183, 184, 185, 186, 187, 188, - 189, 0, 0, 0, 0, 190, 191, 192, -177, 0, - 193, 0, 0, 0, 177, 178, 179, 180, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 183, 184, 185, 186, - 187, 188, 189, 0, 0, 0, 0, 190, 191, 192, - 0, 0, 193 + 177, 178, 179, 180, 0, 0, 0, 183, 184, 185, + 186, 187, 188, 189, 0, 0, 0, 0, 190, 191, + 192, 0, 0, 193, 185, 186, 187, 188, 189, 0, + 0, 0, 0, 190, 191, 192, 0, 0, 193 }; static const short yycheck[] = { - 25, 101, 25, 54, 27, 206, 32, 3, 100, 367, - 3, 62, 3, 4, 48, 49, 50, 3, 9, 106, - 68, 69, 3, 0, 72, 215, 4, 36, 37, 13, - 53, 4, 57, 56, 48, 49, 50, 3, 77, 48, - 398, 23, 24, 68, 69, 54, 55, 56, 8, 9, - 137, 60, 61, 43, 4, 106, 112, 113, 114, 115, - 116, 117, 3, 77, 73, 74, 75, 76, 74, 14, - 15, 7, 17, 18, 4, 81, 82, 83, 129, 74, - 41, 77, 75, 37, 74, 111, 137, 110, 49, 75, - 81, 81, 53, 74, 75, 56, 121, 122, 59, 44, - 54, 55, 63, 64, 65, 66, 67, 61, 74, 75, - 71, 72, 74, 122, 139, 202, 306, 209, 74, 73, - 74, 75, 76, 3, 25, 5, 74, 328, 74, 14, - 15, 76, 17, 18, 48, 49, 50, 74, 161, 164, - 165, 166, 167, 168, 169, 170, 171, 108, 173, 174, - 175, 202, 74, 74, 344, 4, 67, 68, 69, 44, - 216, 72, 364, 365, 78, 77, 52, 369, 122, 194, - 195, 196, 197, 198, 199, 48, 49, 50, 201, 74, - 203, 206, 3, 385, 193, 210, 211, 389, 213, 45, - 215, 76, 0, 4, 74, 75, 74, 222, 388, 224, - 225, 81, 289, 74, 77, 214, 14, 15, 233, 17, - 18, 172, 48, 49, 50, 176, 177, 178, 179, 180, - 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, - 73, 341, 342, 343, 74, 345, 44, 76, 289, 45, - 75, 266, 78, 268, 269, 7, 73, 19, 20, 21, - 22, 81, 76, 7, 26, 34, 35, 36, 37, 75, - 50, 371, 48, 49, 50, 74, 36, 290, 378, 73, - 77, 73, 382, 73, 73, 375, 48, 49, 50, 58, - 59, 60, 61, 62, 73, 395, 396, 74, 67, 68, - 69, 77, 62, 72, 319, 73, 77, 67, 68, 69, - 76, 73, 72, 328, 1, 76, 3, 4, 5, 6, - 7, 8, 76, 10, 11, 12, 48, 49, 50, 16, - 52, 346, 19, 20, 21, 22, 287, 76, 3, 26, - 27, 73, 29, 30, 31, 32, 33, 76, 48, 49, - 50, 38, 39, 40, 41, 42, 43, 73, 73, 46, - 48, 49, 50, 77, 51, 74, 48, 49, 50, 384, - 73, 73, 323, 73, 25, 384, 63, 64, 65, 165, - 48, 49, 50, 70, 71, 346, 213, 74, 75, 77, - 77, 73, 79, 80, 81, 82, 83, 84, 1, 43, - 21, 4, 5, 6, 7, 8, 60, 10, 11, 12, - 78, 60, 203, 16, -1, -1, 48, 49, 50, 34, - 35, 36, 37, -1, 27, -1, 29, 30, 31, 32, - 33, 48, 49, 50, -1, 38, 39, 40, 41, 42, - 43, 73, -1, 46, 59, 60, 61, 62, 51, -1, - -1, -1, 67, 68, 69, -1, 73, 72, -1, -1, - 63, 64, 65, -1, 48, 49, 50, 70, 71, -1, - -1, 74, 75, -1, 77, -1, 79, 80, 81, 82, - 83, 84, 1, -1, -1, 4, 5, 6, 7, 8, - -1, 10, 11, 12, 78, -1, -1, 16, -1, -1, - -1, -1, 34, 35, 36, 37, -1, -1, 27, -1, - 29, 30, 31, 32, 33, -1, -1, -1, -1, 38, - 39, 40, 41, 42, 43, -1, -1, 46, 60, 61, - 62, -1, 51, -1, -1, 67, 68, 69, -1, -1, - 72, -1, -1, -1, 63, 64, 65, 48, 49, 50, - -1, 70, 71, -1, 73, 74, 75, 48, 49, 50, - 79, 80, 81, 82, 83, 84, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, -1, 78, -1, 16, - -1, -1, -1, 34, 35, 36, 37, 78, -1, -1, - 27, -1, 29, 30, 31, 32, 33, -1, 48, 49, - 50, 38, 39, 40, 41, 42, 43, -1, -1, 46, + 25, 101, 25, 54, 27, 215, 206, 106, 100, 0, + 32, 62, 4, 3, 112, 113, 114, 115, 116, 117, + 13, 3, 364, 4, 37, 68, 69, 36, 37, 72, + 53, 3, 57, 56, 3, 4, 3, 43, 137, 48, + 9, 54, 55, 68, 69, 54, 55, 56, 61, 3, + 52, 60, 61, 395, 3, 106, 4, 108, 8, 9, + 73, 74, 75, 76, 73, 74, 75, 76, 74, 77, + 7, 73, 67, 68, 69, 81, 41, 72, 129, 23, + 24, 3, 25, 5, 49, 75, 137, 110, 53, 111, + 4, 56, 74, 75, 59, 305, 121, 122, 63, 64, + 65, 66, 67, 202, 74, 77, 71, 72, 75, 122, + 74, 74, 81, 122, 139, 74, 74, 209, 216, 74, + 74, 75, 81, 82, 83, 14, 15, 327, 17, 18, + 14, 15, 342, 17, 18, 48, 49, 50, 161, 164, + 165, 166, 167, 168, 169, 170, 171, 0, 173, 174, + 175, 202, 74, 75, 74, 44, 74, 74, 4, 81, + 44, 14, 15, 74, 17, 18, 48, 49, 50, 194, + 195, 196, 197, 198, 199, 385, 77, 52, 201, 3, + 203, 206, 45, 4, 193, 210, 211, 76, 213, 288, + 215, 44, 76, 74, 74, 73, 78, 222, 74, 224, + 225, 48, 49, 50, 76, 214, 45, 172, 233, 75, + 7, 176, 177, 178, 179, 180, 181, 182, 183, 184, + 185, 186, 187, 188, 189, 190, 19, 20, 21, 22, + 81, 78, 73, 26, 48, 49, 50, 288, 48, 49, + 50, 266, 52, 268, 269, 48, 49, 50, 76, 361, + 362, 7, 75, 73, 366, 48, 49, 50, 1, 73, + 3, 4, 5, 6, 7, 8, 289, 10, 11, 12, + 382, 50, 372, 16, 386, 78, 19, 20, 21, 22, + 73, 36, 37, 26, 27, 74, 29, 30, 31, 32, + 33, 77, 73, 318, 74, 38, 39, 40, 41, 42, + 43, 73, 327, 46, 73, 73, 61, 62, 51, 73, + 77, 76, 67, 68, 69, 76, 76, 72, 76, 344, + 63, 64, 65, 3, 73, 76, 73, 70, 71, 73, + 25, 74, 75, 74, 77, 77, 79, 80, 81, 82, + 83, 84, 73, 1, 73, 381, 4, 5, 6, 7, + 8, 213, 10, 11, 12, 344, 381, 322, 16, 165, + 43, 339, 340, 341, 21, 343, 48, 49, 50, 27, + 203, 29, 30, 31, 32, 33, 60, 48, 49, 50, + 38, 39, 40, 41, 42, 43, 60, -1, 46, -1, + 368, -1, -1, 51, -1, -1, 78, 375, 48, 49, + 50, 379, 73, -1, -1, 63, 64, 65, -1, 48, + 49, 50, 70, 71, 392, 393, 74, 75, -1, 77, + -1, 79, 80, 81, 82, 83, 84, 1, 78, -1, + 4, 5, 6, 7, 8, -1, 10, 11, 12, 78, + -1, -1, 16, -1, -1, 48, 49, 50, 34, 35, + 36, 37, -1, 27, -1, 29, 30, 31, 32, 33, + 48, 49, 50, -1, 38, 39, 40, 41, 42, 43, + 73, -1, 46, 59, 60, 61, 62, 51, 48, 49, + 50, 67, 68, 69, -1, 73, 72, -1, -1, 63, + 64, 65, 48, 49, 50, -1, 70, 71, -1, 73, + 74, 75, -1, 73, -1, 79, 80, 81, 82, 83, + 84, 3, 4, 5, 6, 7, 8, 9, 10, 11, + 12, -1, 78, -1, 16, -1, -1, -1, -1, 34, + 35, 36, 37, -1, -1, 27, -1, 29, 30, 31, + 32, 33, -1, -1, -1, -1, 38, 39, 40, 41, + 42, 43, -1, -1, 46, 60, 61, 62, -1, 51, + -1, -1, 67, 68, 69, -1, -1, 72, -1, -1, + -1, 63, 64, 65, 19, 20, 21, 22, 70, 71, + -1, 26, 74, 75, 48, 49, 50, 79, 80, 81, + 82, 83, 84, 3, 4, 5, 6, 7, 8, -1, + 10, 11, 12, 48, 49, 50, 16, -1, -1, 73, + 34, 35, 36, 37, 48, 49, 50, 27, -1, 29, + 30, 31, 32, 33, -1, 48, 49, 50, 38, 39, + 40, 41, 42, 43, -1, -1, 46, 61, 62, 73, + -1, 51, -1, 67, 68, 69, -1, -1, 72, -1, + 73, -1, -1, 63, 64, 65, 48, 49, 50, -1, + 70, 71, -1, -1, 74, 75, 48, 49, 50, 79, + 80, 81, 82, 83, 84, 3, 4, 5, 6, 7, + 8, -1, 10, 11, 12, 77, -1, -1, 16, -1, + -1, 73, 34, 35, 36, 37, -1, -1, -1, 27, + -1, 29, 30, 31, 32, 33, -1, -1, -1, -1, + 38, 39, 40, 41, 42, 43, -1, -1, 46, 61, + 62, -1, -1, 51, -1, 67, 68, 69, -1, -1, + 72, -1, -1, -1, -1, 63, 64, 65, 48, 49, + 50, -1, 70, 71, -1, -1, 74, 75, 48, 49, + 50, 79, 80, 81, 82, 83, 84, 4, 5, 6, + 7, 8, -1, 10, 11, 12, -1, 77, -1, 16, + -1, -1, -1, 34, -1, 36, 37, 77, -1, -1, + 27, -1, 29, 30, 31, 32, 33, -1, -1, -1, + -1, 38, 39, 40, 41, 42, 43, -1, -1, 46, 61, 62, -1, -1, 51, -1, 67, 68, 69, -1, - -1, 72, -1, 73, -1, -1, 63, 64, 65, 19, - 20, 21, 22, 70, 71, -1, 26, 74, 75, 48, - 49, 50, 79, 80, 81, 82, 83, 84, 3, 4, - 5, 6, 7, 8, -1, 10, 11, 12, 48, 49, - 50, 16, -1, -1, -1, 34, 35, 36, 37, 78, + -1, 72, -1, -1, -1, -1, 63, 64, 65, -1, + -1, 36, 37, 70, 71, -1, -1, 74, 75, -1, + 77, -1, 79, 80, 81, 82, 83, 84, 4, 5, + 6, 7, 8, -1, 10, 11, 12, 62, -1, -1, + 16, -1, 67, 68, 69, 36, -1, 72, -1, -1, + -1, 27, -1, 29, 30, 31, 32, 33, -1, -1, + -1, -1, 38, 39, 40, 41, 42, 43, -1, -1, + 46, 62, -1, -1, -1, 51, 67, 68, 69, -1, + -1, 72, -1, -1, -1, -1, -1, 63, 64, 65, + 48, 49, 50, -1, 70, 71, -1, 73, 74, 75, + 48, 49, 50, 79, 80, 81, 82, 83, 84, 4, + 5, 6, 7, 8, -1, 10, 11, 12, -1, 77, + -1, 16, -1, 48, 49, 50, -1, -1, -1, 77, -1, -1, 27, -1, 29, 30, 31, 32, 33, -1, - 48, 49, 50, 38, 39, 40, 41, 42, 43, -1, - -1, 46, 61, 62, -1, -1, 51, -1, 67, 68, - 69, -1, -1, 72, -1, 73, -1, -1, 63, 64, - 65, 48, 49, 50, -1, 70, 71, -1, -1, 74, - 75, 48, 49, 50, 79, 80, 81, 82, 83, 84, - 3, 4, 5, 6, 7, 8, -1, 10, 11, 12, - 77, -1, -1, 16, -1, -1, 73, 34, -1, 36, - 37, 48, 49, 50, 27, -1, 29, 30, 31, 32, - 33, -1, 48, 49, 50, 38, 39, 40, 41, 42, - 43, -1, -1, 46, 61, 62, 73, -1, 51, -1, - 67, 68, 69, -1, -1, 72, -1, 73, -1, -1, - 63, 64, 65, 48, 49, 50, -1, 70, 71, -1, - -1, 74, 75, -1, -1, -1, 79, 80, 81, 82, + -1, -1, -1, 38, 39, 40, 41, 42, 43, -1, + -1, 46, 77, 62, -1, -1, 51, -1, 67, 68, + 69, -1, -1, 72, -1, -1, -1, -1, 63, 64, + 65, -1, -1, -1, -1, 70, 71, -1, -1, 74, + 75, -1, -1, 78, 79, 80, 81, 82, 83, 84, + 4, 5, 6, 7, 8, -1, 10, 11, 12, -1, + -1, -1, 16, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 27, -1, 29, 30, 31, 32, 33, + -1, -1, -1, -1, 38, 39, 40, 41, 42, 43, + -1, -1, 46, -1, -1, -1, -1, 51, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, + 64, 65, -1, -1, -1, -1, 70, 71, -1, 73, + 74, 75, -1, -1, -1, 79, 80, 81, 82, 83, + 84, 4, 5, 6, 7, 8, -1, 10, 11, 12, + -1, -1, -1, 16, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 27, -1, 29, 30, 31, 32, + 33, -1, -1, -1, -1, 38, 39, 40, 41, 42, + 43, -1, -1, 46, -1, -1, -1, -1, 51, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 63, 64, 65, -1, -1, -1, -1, 70, 71, -1, + 73, 74, 75, -1, -1, -1, 79, 80, 81, 82, 83, 84, 4, 5, 6, 7, 8, -1, 10, 11, - 12, -1, 77, -1, 16, -1, -1, -1, -1, -1, - 36, 37, -1, -1, -1, 27, -1, 29, 30, 31, + 12, -1, -1, -1, 16, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 27, -1, 29, 30, 31, 32, 33, -1, -1, -1, -1, 38, 39, 40, 41, - 42, 43, -1, -1, 46, 61, 62, -1, -1, 51, - -1, 67, 68, 69, -1, -1, 72, -1, -1, -1, - -1, 63, 64, 65, -1, -1, 36, 37, 70, 71, - -1, -1, 74, 75, -1, 77, -1, 79, 80, 81, + 42, 43, -1, -1, 46, -1, -1, -1, -1, 51, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 63, 64, 65, -1, -1, -1, -1, 70, 71, + -1, 73, 74, 75, -1, -1, -1, 79, 80, 81, 82, 83, 84, 4, 5, 6, 7, 8, -1, 10, - 11, 12, 62, -1, -1, 16, -1, 67, 68, 69, - -1, -1, 72, -1, -1, -1, 27, -1, 29, 30, + 11, 12, -1, -1, -1, 16, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 27, -1, 29, 30, 31, 32, 33, -1, -1, -1, -1, 38, 39, 40, - 41, 42, 43, -1, -1, 46, 62, -1, -1, -1, - 51, 67, 68, 69, -1, -1, 72, -1, -1, -1, + 41, 42, 43, -1, -1, 46, -1, -1, -1, -1, + 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, 64, 65, -1, -1, -1, -1, 70, 71, -1, 73, 74, 75, -1, -1, -1, 79, 80, 81, 82, 83, 84, 4, 5, 6, 7, 8, -1, @@ -724,7 +743,7 @@ static const short yycheck[] = 40, 41, 42, 43, -1, -1, 46, -1, -1, -1, -1, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, 64, 65, -1, -1, -1, -1, - 70, 71, -1, -1, 74, 75, -1, -1, 78, 79, + 70, 71, -1, 73, 74, 75, -1, -1, -1, 79, 80, 81, 82, 83, 84, 4, 5, 6, 7, 8, -1, 10, 11, 12, -1, -1, -1, 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 27, -1, @@ -748,86 +767,38 @@ static const short yycheck[] = -1, 38, 39, 40, 41, 42, 43, -1, -1, 46, -1, -1, -1, -1, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, 64, 65, -1, - -1, -1, -1, 70, 71, -1, 73, 74, 75, -1, - -1, -1, 79, 80, 81, 82, 83, 84, 4, 5, - 6, 7, 8, -1, 10, 11, 12, -1, -1, -1, - 16, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 27, -1, 29, 30, 31, 32, 33, -1, -1, - -1, -1, 38, 39, 40, 41, 42, 43, -1, -1, - 46, -1, -1, -1, -1, 51, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 63, 64, 65, - -1, -1, -1, -1, 70, 71, -1, 73, 74, 75, - -1, -1, -1, 79, 80, 81, 82, 83, 84, 4, - 5, 6, 7, 8, -1, 10, 11, 12, -1, -1, - -1, 16, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 27, -1, 29, 30, 31, 32, 33, -1, - -1, -1, -1, 38, 39, 40, 41, 42, 43, -1, - -1, 46, -1, -1, -1, -1, 51, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 63, 64, - 65, -1, -1, -1, -1, 70, 71, -1, 73, 74, - 75, -1, -1, -1, 79, 80, 81, 82, 83, 84, - 4, 5, 6, 7, 8, -1, 10, 11, 12, -1, - -1, -1, 16, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 27, -1, 29, 30, 31, 32, 33, - -1, -1, -1, -1, 38, 39, 40, 41, 42, 43, - -1, -1, 46, -1, -1, -1, -1, 51, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 63, - 64, 65, -1, -1, -1, -1, 70, 71, -1, 73, - 74, 75, -1, -1, -1, 79, 80, 81, 82, 83, - 84, 4, 5, 6, 7, 8, -1, 10, 11, 12, - -1, -1, -1, 16, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 27, -1, 29, 30, 31, 32, - 33, -1, -1, -1, -1, 38, 39, 40, 41, 42, - 43, -1, -1, 46, -1, -1, -1, -1, 51, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 63, 64, 65, -1, -1, -1, -1, 70, 71, -1, - 73, 74, 75, -1, -1, -1, 79, 80, 81, 82, - 83, 84, 4, 5, 6, 7, 8, -1, 10, 11, - 12, -1, -1, -1, 16, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 27, -1, 29, 30, 31, - 32, 33, -1, -1, -1, -1, 38, 39, 40, 41, - 42, 43, -1, -1, 46, -1, -1, -1, -1, 51, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 63, 64, 65, -1, -1, -1, 3, 70, 71, - -1, -1, 74, 75, -1, -1, -1, 79, 80, 81, - 82, 83, 84, 19, 20, 21, 22, -1, -1, -1, - 26, -1, 28, -1, -1, -1, -1, -1, 34, 35, - 36, 37, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 48, 49, 50, -1, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, -1, -1, -1, - -1, 67, 68, 69, -1, -1, 72, 73, -1, 75, - -1, 77, 78, 19, 20, 21, 22, -1, -1, -1, - 26, -1, 28, -1, -1, -1, -1, -1, 34, 35, - 36, 37, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 48, 49, 50, -1, 52, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, -1, -1, -1, - -1, 67, 68, 69, -1, -1, 72, 73, 28, -1, - -1, 77, 78, -1, 34, 35, 36, 37, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 52, 53, 54, -1, 56, 57, 58, 59, - 60, 61, 62, -1, -1, -1, -1, 67, 68, 69, - 28, -1, 72, 73, -1, -1, 34, 35, 36, 37, + -1, -1, 3, 70, 71, -1, -1, 74, 75, -1, + -1, -1, 79, 80, 81, 82, 83, 84, 19, 20, + 21, 22, -1, -1, -1, 26, -1, 28, -1, -1, + -1, -1, -1, 34, 35, 36, 37, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 48, 49, 50, + -1, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, -1, -1, -1, -1, 67, 68, 69, -1, + -1, 72, 73, -1, 75, -1, 77, 78, 19, 20, + 21, 22, -1, -1, -1, 26, -1, 28, -1, -1, + -1, -1, -1, 34, 35, 36, 37, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 48, 49, 50, + -1, 52, 53, 54, 55, 56, 57, 58, 59, 60, + 61, 62, -1, -1, -1, -1, 67, 68, 69, -1, + -1, 72, 73, 28, -1, -1, 77, 78, -1, 34, + 35, 36, 37, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 53, 54, + 55, 56, 57, 58, 59, 60, 61, 62, -1, -1, + -1, -1, 67, 68, 69, 28, -1, 72, -1, -1, + -1, 34, 35, 36, 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 53, 54, -1, 56, 57, - 58, 59, 60, 61, 62, -1, -1, -1, -1, 67, - 68, 69, 28, -1, 72, 73, -1, -1, 34, 35, - 36, 37, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 53, 54, 55, - 56, 57, 58, 59, 60, 61, 62, -1, -1, -1, - -1, 67, 68, 69, 28, -1, 72, -1, -1, -1, - 34, 35, 36, 37, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 53, - 54, -1, 56, 57, 58, 59, 60, 61, 62, -1, - -1, -1, -1, 67, 68, 69, 28, -1, 72, -1, - -1, -1, 34, 35, 36, 37, -1, -1, -1, -1, + 53, 54, -1, 56, 57, 58, 59, 60, 61, 62, + -1, -1, -1, -1, 67, 68, 69, 28, -1, 72, + -1, -1, -1, 34, 35, 36, 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 54, -1, 56, 57, 58, 59, 60, 61, - 62, -1, -1, -1, -1, 67, 68, 69, 28, -1, - 72, -1, -1, -1, 34, 35, 36, 37, -1, -1, + -1, -1, -1, 54, -1, 56, 57, 58, 59, 60, + 61, 62, -1, -1, -1, -1, 67, 68, 69, 28, + -1, 72, -1, -1, -1, 34, 35, 36, 37, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 56, 57, 58, 59, - 60, 61, 62, -1, -1, -1, -1, 67, 68, 69, - -1, -1, 72 + 34, 35, 36, 37, -1, -1, -1, 56, 57, 58, + 59, 60, 61, 62, -1, -1, -1, -1, 67, 68, + 69, -1, -1, 72, 58, 59, 60, 61, 62, -1, + -1, -1, -1, 67, 68, 69, -1, -1, 72 }; /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing @@ -854,7 +825,7 @@ static const unsigned char yystos[] = 49, 50, 52, 3, 74, 75, 28, 34, 35, 36, 37, 53, 54, 56, 57, 58, 59, 60, 61, 62, 67, 68, 69, 72, 74, 3, 75, 3, 75, 3, - 45, 118, 4, 118, 93, 137, 74, 134, 87, 117, + 45, 118, 4, 118, 93, 137, 74, 125, 87, 117, 88, 88, 88, 88, 88, 88, 74, 73, 73, 124, 124, 138, 146, 125, 74, 74, 76, 77, 137, 73, 124, 45, 119, 75, 73, 78, 87, 124, 102, 124, @@ -862,16 +833,16 @@ static const unsigned char yystos[] = 124, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 134, 3, 5, 74, 75, 128, 141, 73, 124, 124, 124, 124, 124, 124, 7, - 77, 87, 120, 137, 120, 76, 138, 52, 73, 127, - 118, 101, 105, 124, 102, 106, 103, 124, 106, 139, - 141, 95, 100, 103, 104, 124, 88, 73, 52, 73, - 124, 73, 124, 73, 124, 76, 73, 7, 124, 75, - 77, 73, 78, 55, 124, 73, 124, 124, 74, 73, - 77, 78, 77, 78, 77, 77, 73, 134, 137, 87, - 73, 73, 73, 73, 74, 73, 77, 103, 73, 73, - 73, 78, 124, 76, 134, 77, 73, 78, 138, 76, - 76, 76, 73, 3, 90, 90, 90, 90, 103, 90, - 105, 73, 78, 76, 73, 91, 98, 98, 23, 24, - 96, 96, 73, 98, 77, 90, 93, 90, 74, 90, - 104, 98, 76, 103, 98, 73, 73, 90, 90, 96 + 77, 87, 120, 137, 120, 76, 138, 73, 127, 118, + 101, 105, 124, 102, 106, 103, 124, 106, 139, 141, + 95, 100, 103, 104, 124, 88, 73, 52, 73, 124, + 73, 124, 73, 124, 76, 73, 7, 124, 75, 77, + 73, 78, 55, 124, 73, 124, 124, 74, 73, 77, + 78, 77, 78, 77, 77, 73, 137, 87, 73, 73, + 73, 73, 74, 73, 77, 103, 73, 73, 73, 78, + 124, 76, 134, 77, 73, 78, 138, 76, 76, 76, + 3, 90, 90, 90, 90, 103, 90, 105, 73, 78, + 76, 73, 91, 98, 98, 23, 24, 96, 96, 73, + 98, 77, 90, 93, 90, 74, 90, 104, 98, 76, + 103, 98, 73, 73, 90, 90, 96 }; diff --git a/perly.y b/perly.y index 0d00b95..11c1bd3 100644 --- a/perly.y +++ b/perly.y @@ -675,10 +675,8 @@ term : termbinop { $$ = newOP($1, OPf_SPECIAL); } | FUNC1 '(' expr ')' /* not($foo) */ { $$ = newUNOP($1, 0, $3); } - | PMFUNC '(' term ')' /* /foo/ */ - { $$ = pmruntime($1, $3, Nullop); } - | PMFUNC '(' term ',' term ')' /* s/foo/bar/ (or tr) */ - { $$ = pmruntime($1, $3, $5); } + | PMFUNC '(' argexpr ')' /* m//, s///, tr/// */ + { $$ = pmruntime($1, $3, 1); } | WORD | listop ; diff --git a/pp_ctl.c b/pp_ctl.c index dd6962c..2c18cf5 100644 --- a/pp_ctl.c +++ b/pp_ctl.c @@ -83,13 +83,40 @@ PP(pp_regcomp) STRLEN len; MAGIC *mg = Null(MAGIC*); - tmpstr = POPs; - /* prevent recompiling under /o and ithreads. */ #if defined(USE_ITHREADS) - if (pm->op_pmflags & PMf_KEEP && PM_GETRE(pm)) - RETURN; + if (pm->op_pmflags & PMf_KEEP && PM_GETRE(pm)) { + if (PL_op->op_flags & OPf_STACKED) { + dMARK; + SP = MARK; + } + else + (void)POPs; + RETURN; + } #endif + if (PL_op->op_flags & OPf_STACKED) { + /* multiple args; concatentate them */ + dMARK; dORIGMARK; + tmpstr = PAD_SV(ARGTARG); + sv_setpvn(tmpstr, "", 0); + while (++MARK <= SP) { + if (PL_amagic_generation) { + SV *sv; + if ((SvAMAGIC(tmpstr) || SvAMAGIC(*MARK)) && + (sv = amagic_call(tmpstr, *MARK, concat_amg, AMGf_assign))) + { + sv_setsv(tmpstr, sv); + continue; + } + } + sv_catsv(tmpstr, *MARK); + } + SvSETMAGIC(tmpstr); + SP = ORIGMARK; + } + else + tmpstr = POPs; if (SvROK(tmpstr)) { SV *sv = SvRV(tmpstr); diff --git a/proto.h b/proto.h index 53b5897..c118c0f 100644 --- a/proto.h +++ b/proto.h @@ -570,7 +570,7 @@ PERL_CALLCONV void Perl_pack_cat(pTHX_ SV *cat, char *pat, char *patend, SV **be PERL_CALLCONV void Perl_packlist(pTHX_ SV *cat, char *pat, char *patend, SV **beglist, SV **endlist); PERL_CALLCONV void Perl_pidgone(pTHX_ Pid_t pid, int status); PERL_CALLCONV void Perl_pmflag(pTHX_ U32* pmfl, int ch); -PERL_CALLCONV OP* Perl_pmruntime(pTHX_ OP* pm, OP* expr, OP* repl); +PERL_CALLCONV OP* Perl_pmruntime(pTHX_ OP* pm, OP* expr, bool isreg); PERL_CALLCONV OP* Perl_pmtrans(pTHX_ OP* o, OP* expr, OP* repl); PERL_CALLCONV void Perl_pop_scope(pTHX); PERL_CALLCONV OP* Perl_prepend_elem(pTHX_ I32 optype, OP* head, OP* tail); diff --git a/toke.c b/toke.c index 80a9ba7..7c9d88f 100644 --- a/toke.c +++ b/toke.c @@ -2411,7 +2411,11 @@ Perl_yylex(pTHX) if (PL_lex_starts) { s = PL_bufptr; PL_lex_starts = 0; - Aop(OP_CONCAT); + /* commas only at base level: /$a\Ub$c/ => ($a,uc(b.$c)) */ + if (PL_lex_casemods == 1 && PL_lex_inpat) + OPERATOR(','); + else + Aop(OP_CONCAT); } else return yylex(); @@ -2441,7 +2445,11 @@ Perl_yylex(pTHX) } if (PL_lex_starts++) { s = PL_bufptr; - Aop(OP_CONCAT); + /* commas only at base level: /$a\Ub$c/ => ($a,uc(b.$c)) */ + if (!PL_lex_casemods && PL_lex_inpat) + OPERATOR(','); + else + Aop(OP_CONCAT); } return yylex(); @@ -2495,8 +2503,13 @@ Perl_yylex(pTHX) PL_nextval[PL_nexttoke] = yylval; PL_expect = XTERM; force_next(THING); - if (PL_lex_starts++) - Aop(OP_CONCAT); + if (PL_lex_starts++) { + /* commas only at base level: /$a\Ub$c/ => ($a,uc(b.$c)) */ + if (!PL_lex_casemods && PL_lex_inpat) + OPERATOR(','); + else + Aop(OP_CONCAT); + } else { PL_bufptr = s; return yylex();