summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--embed.fnc1
-rw-r--r--embed.h1
-rw-r--r--op.c12
-rw-r--r--perly.act840
-rw-r--r--perly.h94
-rw-r--r--perly.tab1618
-rw-r--r--perly.y50
-rw-r--r--proto.h1
-rw-r--r--t/op/write.t33
-rw-r--r--toke.c43
10 files changed, 1416 insertions, 1277 deletions
diff --git a/embed.fnc b/embed.fnc
index b65e41c91a..2b25b3c8ad 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -966,6 +966,7 @@ p |PerlIO*|nextargv |NN GV* gv
AnpP |char* |ninstr |NN const char* big|NN const char* bigend \
|NN const char* little|NN const char* lend
Ap |void |op_free |NULLOK OP* arg
+Mp |OP* |op_unscope |NULLOK OP* o
#ifdef PERL_CORE
p |void |opslab_free |NN OPSLAB *slab
p |void |opslab_free_nopad|NN OPSLAB *slab
diff --git a/embed.h b/embed.h
index 2eb01b961a..fd03e8a768 100644
--- a/embed.h
+++ b/embed.h
@@ -1171,6 +1171,7 @@
#define oopsAV(a) Perl_oopsAV(aTHX_ a)
#define oopsHV(a) Perl_oopsHV(aTHX_ a)
#define op_const_sv(a,b) Perl_op_const_sv(aTHX_ a,b)
+#define op_unscope(a) Perl_op_unscope(aTHX_ a)
#define package_version(a) Perl_package_version(aTHX_ a)
#define pad_block_start(a) Perl_pad_block_start(aTHX_ a)
#define pad_fixup_inner_anons(a,b,c) Perl_pad_fixup_inner_anons(aTHX_ a,b,c)
diff --git a/op.c b/op.c
index 5f19e68ed5..3aacc83c76 100644
--- a/op.c
+++ b/op.c
@@ -2843,6 +2843,18 @@ Perl_op_scope(pTHX_ OP *o)
return o;
}
+OP *
+Perl_op_unscope(pTHX_ OP *o)
+{
+ if (o && o->op_type == OP_LINESEQ) {
+ OP *kid = cLISTOPo->op_first;
+ for(; kid; kid = kid->op_sibling)
+ if (kid->op_type == OP_NEXTSTATE || kid->op_type == OP_DBSTATE)
+ op_null(kid);
+ }
+ return o;
+}
+
int
Perl_block_start(pTHX_ int full)
{
diff --git a/perly.act b/perly.act
index c961797751..270d6175aa 100644
--- a/perly.act
+++ b/perly.act
@@ -5,14 +5,14 @@
*/
case 2:
-#line 140 "perly.y"
+#line 141 "perly.y"
{
PL_parser->expect = XSTATE;
;}
break;
case 3:
-#line 144 "perly.y"
+#line 145 "perly.y"
{
newPROG(block_end((ps[(3) - (4)].val.ival),(ps[(4) - (4)].val.opval)));
(yyval.ival) = 0;
@@ -20,14 +20,14 @@ case 2:
break;
case 4:
-#line 149 "perly.y"
+#line 150 "perly.y"
{
parser->expect = XTERM;
;}
break;
case 5:
-#line 153 "perly.y"
+#line 154 "perly.y"
{
PL_eval_root = (ps[(3) - (3)].val.opval);
(yyval.ival) = 0;
@@ -35,14 +35,14 @@ case 2:
break;
case 6:
-#line 158 "perly.y"
+#line 159 "perly.y"
{
parser->expect = XBLOCK;
;}
break;
case 7:
-#line 162 "perly.y"
+#line 163 "perly.y"
{
PL_pad_reset_pending = TRUE;
PL_eval_root = (ps[(3) - (3)].val.opval);
@@ -53,14 +53,14 @@ case 2:
break;
case 8:
-#line 170 "perly.y"
+#line 171 "perly.y"
{
parser->expect = XSTATE;
;}
break;
case 9:
-#line 174 "perly.y"
+#line 175 "perly.y"
{
PL_pad_reset_pending = TRUE;
PL_eval_root = (ps[(3) - (3)].val.opval);
@@ -71,14 +71,14 @@ case 2:
break;
case 10:
-#line 182 "perly.y"
+#line 183 "perly.y"
{
parser->expect = XSTATE;
;}
break;
case 11:
-#line 186 "perly.y"
+#line 187 "perly.y"
{
PL_pad_reset_pending = TRUE;
PL_eval_root = (ps[(3) - (3)].val.opval);
@@ -89,14 +89,14 @@ case 2:
break;
case 12:
-#line 194 "perly.y"
+#line 195 "perly.y"
{
parser->expect = XSTATE;
;}
break;
case 13:
-#line 198 "perly.y"
+#line 199 "perly.y"
{
PL_eval_root = (ps[(3) - (3)].val.opval);
(yyval.ival) = 0;
@@ -104,7 +104,7 @@ case 2:
break;
case 14:
-#line 206 "perly.y"
+#line 207 "perly.y"
{ if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval)))
PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval));
(yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
@@ -114,22 +114,22 @@ case 2:
break;
case 15:
-#line 216 "perly.y"
- { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval)))
- PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval));
- (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
- TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{');
- TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),'}');
+#line 217 "perly.y"
+ { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (7)].val.i_tkval)))
+ PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
+ (yyval.opval) = block_end((ps[(2) - (7)].val.ival), (ps[(5) - (7)].val.opval));
+ TOKEN_GETMAD((ps[(1) - (7)].val.i_tkval),(yyval.opval),'{');
+ TOKEN_GETMAD((ps[(7) - (7)].val.i_tkval),(yyval.opval),'}');
;}
break;
case 16:
-#line 225 "perly.y"
+#line 226 "perly.y"
{ (yyval.ival) = block_start(TRUE); ;}
break;
case 17:
-#line 229 "perly.y"
+#line 230 "perly.y"
{ if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval)))
PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval));
(yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
@@ -139,17 +139,17 @@ case 2:
break;
case 18:
-#line 238 "perly.y"
+#line 239 "perly.y"
{ (yyval.ival) = block_start(FALSE); ;}
break;
case 19:
-#line 243 "perly.y"
+#line 244 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
case 20:
-#line 245 "perly.y"
+#line 246 "perly.y"
{ (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval));
PL_pad_reset_pending = TRUE;
if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
@@ -158,7 +158,21 @@ case 2:
break;
case 21:
-#line 254 "perly.y"
+#line 255 "perly.y"
+ { (yyval.opval) = (OP*)NULL; ;}
+ break;
+
+ case 22:
+#line 257 "perly.y"
+ { (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval));
+ PL_pad_reset_pending = TRUE;
+ if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
+ PL_hints |= HINT_BLOCK_SCOPE;
+ ;}
+ break;
+
+ case 23:
+#line 266 "perly.y"
{
if((ps[(1) - (1)].val.opval)) {
(yyval.opval) = newSTATEOP(0, NULL, (ps[(1) - (1)].val.opval));
@@ -168,13 +182,13 @@ case 2:
;}
break;
- case 22:
-#line 262 "perly.y"
+ case 24:
+#line 274 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 23:
-#line 266 "perly.y"
+ case 25:
+#line 278 "perly.y"
{
(yyval.opval) = newSTATEOP(SvUTF8(((SVOP*)(ps[(1) - (2)].val.p_tkval))->op_sv),
savepv(SvPVX(((SVOP*)(ps[(1) - (2)].val.p_tkval))->op_sv)), (ps[(2) - (2)].val.opval));
@@ -183,8 +197,8 @@ case 2:
;}
break;
- case 24:
-#line 273 "perly.y"
+ case 26:
+#line 285 "perly.y"
{
(yyval.opval) = newSTATEOP(SvUTF8(((SVOP*)(ps[(1) - (2)].val.p_tkval))->op_sv),
savepv(SvPVX(((SVOP*)(ps[(1) - (2)].val.p_tkval))->op_sv)), (ps[(2) - (2)].val.opval));
@@ -192,21 +206,21 @@ case 2:
;}
break;
- case 25:
-#line 282 "perly.y"
+ case 27:
+#line 294 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 26:
-#line 284 "perly.y"
+ case 28:
+#line 296 "perly.y"
{
(yyval.opval) = newOP(OP_NULL,0);
TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p');
;}
break;
- case 27:
-#line 289 "perly.y"
+ case 29:
+#line 301 "perly.y"
{
CV *fmtcv = PL_compcv;
#ifdef MAD
@@ -225,8 +239,8 @@ case 2:
;}
break;
- case 28:
-#line 306 "perly.y"
+ case 30:
+#line 318 "perly.y"
{
SvREFCNT_inc_simple_void(PL_compcv);
#ifdef MAD
@@ -249,8 +263,8 @@ case 2:
;}
break;
- case 29:
-#line 327 "perly.y"
+ case 31:
+#line 339 "perly.y"
{
/* Unimplemented "my sub foo { }" */
SvREFCNT_inc_simple_void(PL_compcv);
@@ -264,8 +278,8 @@ case 2:
;}
break;
- case 30:
-#line 339 "perly.y"
+ case 32:
+#line 351 "perly.y"
{
#ifdef MAD
(yyval.opval) = package((ps[(3) - (4)].val.opval));
@@ -282,13 +296,13 @@ case 2:
;}
break;
- case 31:
-#line 354 "perly.y"
+ case 33:
+#line 366 "perly.y"
{ CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
break;
- case 32:
-#line 356 "perly.y"
+ case 34:
+#line 368 "perly.y"
{
SvREFCNT_inc_simple_void(PL_compcv);
#ifdef MAD
@@ -305,8 +319,8 @@ case 2:
;}
break;
- case 33:
-#line 371 "perly.y"
+ case 35:
+#line 383 "perly.y"
{
(yyval.opval) = block_end((ps[(3) - (7)].val.ival),
newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -317,8 +331,8 @@ case 2:
;}
break;
- case 34:
-#line 380 "perly.y"
+ case 36:
+#line 392 "perly.y"
{
(yyval.opval) = block_end((ps[(3) - (7)].val.ival),
newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -329,8 +343,8 @@ case 2:
;}
break;
- case 35:
-#line 389 "perly.y"
+ case 37:
+#line 401 "perly.y"
{
const PADOFFSET offset = pad_findmy_pvs("$_", 0);
(yyval.opval) = block_end((ps[(3) - (6)].val.ival),
@@ -343,18 +357,18 @@ case 2:
;}
break;
- case 36:
-#line 400 "perly.y"
+ case 38:
+#line 412 "perly.y"
{ (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;}
break;
- case 37:
-#line 402 "perly.y"
+ case 39:
+#line 414 "perly.y"
{ (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;}
break;
- case 38:
-#line 404 "perly.y"
+ case 40:
+#line 416 "perly.y"
{
(yyval.opval) = block_end((ps[(3) - (8)].val.ival),
newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -366,8 +380,8 @@ case 2:
;}
break;
- case 39:
-#line 414 "perly.y"
+ case 41:
+#line 426 "perly.y"
{
(yyval.opval) = block_end((ps[(3) - (8)].val.ival),
newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -379,8 +393,8 @@ case 2:
;}
break;
- case 40:
-#line 425 "perly.y"
+ case 42:
+#line 437 "perly.y"
{
OP *initop = IF_MAD((ps[(4) - (11)].val.opval) ? (ps[(4) - (11)].val.opval) : newOP(OP_NULL, 0), (ps[(4) - (11)].val.opval));
OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -402,8 +416,8 @@ case 2:
;}
break;
- case 41:
-#line 445 "perly.y"
+ case 43:
+#line 457 "perly.y"
{
(yyval.opval) = block_end((ps[(3) - (9)].val.ival), newFOROP(0, (ps[(4) - (9)].val.opval), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval)));
TOKEN_GETMAD((ps[(1) - (9)].val.i_tkval),(yyval.opval),'W');
@@ -414,8 +428,8 @@ case 2:
;}
break;
- case 42:
-#line 454 "perly.y"
+ case 44:
+#line 466 "perly.y"
{
(yyval.opval) = block_end((ps[(4) - (8)].val.ival), newFOROP(0,
op_lvalue((ps[(2) - (8)].val.opval), OP_ENTERLOOP), (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval)));
@@ -426,8 +440,8 @@ case 2:
;}
break;
- case 43:
-#line 463 "perly.y"
+ case 45:
+#line 475 "perly.y"
{
(yyval.opval) = block_end((ps[(3) - (7)].val.ival),
newFOROP(0, (OP*)NULL, (ps[(4) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval)));
@@ -438,8 +452,8 @@ case 2:
;}
break;
- case 44:
-#line 472 "perly.y"
+ case 46:
+#line 484 "perly.y"
{
/* a block is a loop that happens once */
(yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -447,8 +461,8 @@ case 2:
;}
break;
- case 45:
-#line 478 "perly.y"
+ case 47:
+#line 490 "perly.y"
{
package((ps[(3) - (5)].val.opval));
if ((ps[(2) - (5)].val.opval)) {
@@ -457,8 +471,8 @@ case 2:
;}
break;
- case 46:
-#line 485 "perly.y"
+ case 48:
+#line 497 "perly.y"
{
/* a block is a loop that happens once */
(yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
@@ -470,8 +484,8 @@ case 2:
;}
break;
- case 47:
-#line 495 "perly.y"
+ case 49:
+#line 507 "perly.y"
{
PL_parser->expect = XSTATE;
(yyval.opval) = (ps[(1) - (2)].val.opval);
@@ -479,8 +493,8 @@ case 2:
;}
break;
- case 48:
-#line 501 "perly.y"
+ case 50:
+#line 513 "perly.y"
{
PL_parser->expect = XSTATE;
(yyval.opval) = IF_MAD(newOP(OP_NULL, 0), (OP*)NULL);
@@ -489,64 +503,98 @@ case 2:
;}
break;
- case 49:
-#line 511 "perly.y"
+ case 51:
+#line 523 "perly.y"
+ { OP *list;
+ if ((ps[(2) - (2)].val.opval)) {
+ OP *term = (ps[(2) - (2)].val.opval);
+ DO_MAD(term = newUNOP(OP_NULL, 0, term));
+ list = op_append_elem(OP_LIST, (ps[(1) - (2)].val.opval), term);
+ }
+ else {
+#ifdef MAD
+ OP *op = newNULLLIST();
+ list = op_append_elem(OP_LIST, (ps[(1) - (2)].val.opval), op);
+#else
+ list = (ps[(1) - (2)].val.opval);
+#endif
+ }
+ if (PL_parser->copline == NOLINE)
+ PL_parser->copline = CopLINE(PL_curcop)-1;
+ else PL_parser->copline--;
+ (yyval.opval) = newSTATEOP(0, NULL,
+ convert(OP_FORMLINE, 0, list));
+ ;}
+ break;
+
+ case 52:
+#line 546 "perly.y"
+ { (yyval.opval) = NULL; ;}
+ break;
+
+ case 53:
+#line 548 "perly.y"
+ { (yyval.opval) = op_unscope((ps[(2) - (3)].val.opval)); ;}
+ break;
+
+ case 54:
+#line 553 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
- case 50:
-#line 513 "perly.y"
+ case 55:
+#line 555 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 51:
-#line 515 "perly.y"
+ case 56:
+#line 557 "perly.y"
{ (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
;}
break;
- case 52:
-#line 519 "perly.y"
+ case 57:
+#line 561 "perly.y"
{ (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
;}
break;
- case 53:
-#line 523 "perly.y"
+ case 58:
+#line 565 "perly.y"
{ (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
;}
break;
- case 54:
-#line 527 "perly.y"
+ case 59:
+#line 569 "perly.y"
{ (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
;}
break;
- case 55:
-#line 531 "perly.y"
+ case 60:
+#line 573 "perly.y"
{ (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL);
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
PL_parser->copline = (line_t)IVAL((ps[(2) - (3)].val.i_tkval));
;}
break;
- case 56:
-#line 536 "perly.y"
+ case 61:
+#line 578 "perly.y"
{ (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); ;}
break;
- case 57:
-#line 541 "perly.y"
+ case 62:
+#line 583 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
- case 58:
-#line 543 "perly.y"
+ case 63:
+#line 585 "perly.y"
{
((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS;
(yyval.opval) = op_scope((ps[(2) - (2)].val.opval));
@@ -554,8 +602,8 @@ case 2:
;}
break;
- case 59:
-#line 549 "perly.y"
+ case 64:
+#line 591 "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)),
@@ -567,88 +615,88 @@ case 2:
;}
break;
- case 60:
-#line 562 "perly.y"
+ case 65:
+#line 604 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
- case 61:
-#line 564 "perly.y"
+ case 66:
+#line 606 "perly.y"
{
(yyval.opval) = op_scope((ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 62:
-#line 572 "perly.y"
+ case 67:
+#line 614 "perly.y"
{ (yyval.ival) = (PL_min_intro_pending &&
PL_max_intro_pending >= PL_min_intro_pending);
intro_my(); ;}
break;
- case 63:
-#line 578 "perly.y"
+ case 68:
+#line 620 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
- case 65:
-#line 584 "perly.y"
+ case 70:
+#line 626 "perly.y"
{ YYSTYPE tmplval;
(void)scan_num("1", &tmplval);
(yyval.opval) = tmplval.opval; ;}
break;
- case 67:
-#line 592 "perly.y"
+ case 72:
+#line 634 "perly.y"
{ (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
break;
- case 68:
-#line 597 "perly.y"
+ case 73:
+#line 639 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
break;
- case 69:
-#line 601 "perly.y"
+ case 74:
+#line 643 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
break;
- case 70:
-#line 605 "perly.y"
+ case 75:
+#line 647 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
break;
- case 71:
-#line 608 "perly.y"
+ case 76:
+#line 650 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 72:
-#line 609 "perly.y"
+ case 77:
+#line 651 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
- case 73:
-#line 613 "perly.y"
+ case 78:
+#line 655 "perly.y"
{ (yyval.ival) = start_subparse(FALSE, 0);
SAVEFREESV(PL_compcv); ;}
break;
- case 74:
-#line 619 "perly.y"
+ case 79:
+#line 661 "perly.y"
{ (yyval.ival) = start_subparse(FALSE, CVf_ANON);
SAVEFREESV(PL_compcv); ;}
break;
- case 75:
-#line 624 "perly.y"
+ case 80:
+#line 666 "perly.y"
{ (yyval.ival) = start_subparse(TRUE, 0);
SAVEFREESV(PL_compcv); ;}
break;
- case 76:
-#line 629 "perly.y"
+ case 81:
+#line 671 "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")
@@ -657,25 +705,25 @@ case 2:
(yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 77:
-#line 639 "perly.y"
+ case 82:
+#line 681 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
- case 79:
-#line 645 "perly.y"
+ case 84:
+#line 687 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
- case 80:
-#line 647 "perly.y"
+ case 85:
+#line 689 "perly.y"
{ (yyval.opval) = (ps[(2) - (2)].val.opval);
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
;}
break;
- case 81:
-#line 651 "perly.y"
+ case 86:
+#line 693 "perly.y"
{ (yyval.opval) = IF_MAD(
newOP(OP_NULL, 0),
(OP*)NULL
@@ -684,15 +732,15 @@ case 2:
;}
break;
- case 82:
-#line 661 "perly.y"
+ case 87:
+#line 703 "perly.y"
{ (yyval.opval) = (ps[(2) - (2)].val.opval);
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
;}
break;
- case 83:
-#line 665 "perly.y"
+ case 88:
+#line 707 "perly.y"
{ (yyval.opval) = IF_MAD(
newOP(OP_NULL, 0),
(OP*)NULL
@@ -701,13 +749,13 @@ case 2:
;}
break;
- case 84:
-#line 674 "perly.y"
+ case 89:
+#line 716 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 85:
-#line 675 "perly.y"
+ case 90:
+#line 717 "perly.y"
{ (yyval.opval) = IF_MAD(
newOP(OP_NULL,0),
(OP*)NULL
@@ -717,29 +765,29 @@ case 2:
;}
break;
- case 86:
-#line 686 "perly.y"
+ case 91:
+#line 728 "perly.y"
{ (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 87:
-#line 690 "perly.y"
+ case 92:
+#line 732 "perly.y"
{ (yyval.opval) = newLOGOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 88:
-#line 694 "perly.y"
+ case 93:
+#line 736 "perly.y"
{ (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 90:
-#line 702 "perly.y"
+ case 95:
+#line 744 "perly.y"
{
#ifdef MAD
OP* op = newNULLLIST();
@@ -751,8 +799,8 @@ case 2:
;}
break;
- case 91:
-#line 712 "perly.y"
+ case 96:
+#line 754 "perly.y"
{
OP* term = (ps[(3) - (3)].val.opval);
DO_MAD(
@@ -763,16 +811,16 @@ case 2:
;}
break;
- case 93:
-#line 725 "perly.y"
+ case 98:
+#line 767 "perly.y"
{ (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED,
op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (3)].val.i_tkval)),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) );
TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 94:
-#line 730 "perly.y"
+ case 99:
+#line 772 "perly.y"
{ (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED,
op_prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (5)].val.i_tkval)),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) );
TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
@@ -781,8 +829,8 @@ case 2:
;}
break;
- case 95:
-#line 737 "perly.y"
+ case 100:
+#line 779 "perly.y"
{ (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)),
@@ -793,8 +841,8 @@ case 2:
;}
break;
- case 96:
-#line 746 "perly.y"
+ case 101:
+#line 788 "perly.y"
{ (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)),
newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval))));
@@ -802,8 +850,8 @@ case 2:
;}
break;
- case 97:
-#line 752 "perly.y"
+ case 102:
+#line 794 "perly.y"
{ (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)),
@@ -811,8 +859,8 @@ case 2:
;}
break;
- case 98:
-#line 758 "perly.y"
+ case 103:
+#line 800 "perly.y"
{ (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)),
@@ -822,15 +870,15 @@ case 2:
;}
break;
- case 99:
-#line 766 "perly.y"
+ case 104:
+#line 808 "perly.y"
{ (yyval.opval) = convert(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 100:
-#line 770 "perly.y"
+ case 105:
+#line 812 "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),'(');
@@ -838,22 +886,22 @@ case 2:
;}
break;
- case 101:
-#line 776 "perly.y"
+ case 106:
+#line 818 "perly.y"
{ SvREFCNT_inc_simple_void(PL_compcv);
(yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;}
break;
- case 102:
-#line 779 "perly.y"
+ case 107:
+#line 821 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST,
op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval)));
;}
break;
- case 105:
-#line 794 "perly.y"
+ case 110:
+#line 836 "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),'{');
@@ -862,16 +910,16 @@ case 2:
;}
break;
- case 106:
-#line 801 "perly.y"
+ case 111:
+#line 843 "perly.y"
{ (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval)));
TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
;}
break;
- case 107:
-#line 806 "perly.y"
+ case 112:
+#line 848 "perly.y"
{ (yyval.opval) = newBINOP(OP_AELEM, 0,
ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV),
scalar((ps[(4) - (5)].val.opval)));
@@ -881,8 +929,8 @@ case 2:
;}
break;
- case 108:
-#line 814 "perly.y"
+ case 113:
+#line 856 "perly.y"
{ (yyval.opval) = newBINOP(OP_AELEM, 0,
ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV),
scalar((ps[(3) - (4)].val.opval)));
@@ -891,8 +939,8 @@ case 2:
;}
break;
- case 109:
-#line 821 "perly.y"
+ case 114:
+#line 863 "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),'{');
@@ -901,8 +949,8 @@ case 2:
;}
break;
- case 110:
-#line 828 "perly.y"
+ case 115:
+#line 870 "perly.y"
{ (yyval.opval) = newBINOP(OP_HELEM, 0,
ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV),
jmaybe((ps[(4) - (6)].val.opval)));
@@ -914,8 +962,8 @@ case 2:
;}
break;
- case 111:
-#line 838 "perly.y"
+ case 116:
+#line 880 "perly.y"
{ (yyval.opval) = newBINOP(OP_HELEM, 0,
ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV),
jmaybe((ps[(3) - (5)].val.opval)));
@@ -926,8 +974,8 @@ case 2:
;}
break;
- case 112:
-#line 847 "perly.y"
+ case 117:
+#line 889 "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');
@@ -936,8 +984,8 @@ case 2:
;}
break;
- case 113:
-#line 854 "perly.y"
+ case 118:
+#line 896 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[(4) - (5)].val.opval),
newCVREF(0, scalar((ps[(1) - (5)].val.opval)))));
@@ -947,8 +995,8 @@ case 2:
;}
break;
- case 114:
-#line 863 "perly.y"
+ case 119:
+#line 905 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval),
newCVREF(0, scalar((ps[(1) - (4)].val.opval)))));
@@ -957,8 +1005,8 @@ case 2:
;}
break;
- case 115:
-#line 870 "perly.y"
+ case 120:
+#line 912 "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),'(');
@@ -966,8 +1014,8 @@ case 2:
;}
break;
- case 116:
-#line 876 "perly.y"
+ case 121:
+#line 918 "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),')');
@@ -976,16 +1024,16 @@ case 2:
;}
break;
- case 117:
-#line 883 "perly.y"
+ case 122:
+#line 925 "perly.y"
{ (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - (4)].val.opval));
TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
;}
break;
- case 118:
-#line 888 "perly.y"
+ case 123:
+#line 930 "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),')');
@@ -994,22 +1042,22 @@ case 2:
;}
break;
- case 119:
-#line 898 "perly.y"
+ case 124:
+#line 940 "perly.y"
{ (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(3) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 120:
-#line 902 "perly.y"
+ case 125:
+#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 121:
-#line 906 "perly.y"
+ case 126:
+#line 948 "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)));
@@ -1017,50 +1065,50 @@ case 2:
;}
break;
- case 122:
-#line 912 "perly.y"
+ case 127:
+#line 954 "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 916 "perly.y"
+ case 128:
+#line 958 "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 920 "perly.y"
+ case 129:
+#line 962 "perly.y"
{ (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 125:
-#line 924 "perly.y"
+ case 130:
+#line 966 "perly.y"
{ (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 126:
-#line 928 "perly.y"
+ case 131:
+#line 970 "perly.y"
{ (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 127:
-#line 932 "perly.y"
+ case 132:
+#line 974 "perly.y"
{ (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 128:
-#line 936 "perly.y"
+ case 133:
+#line 978 "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({
@@ -1074,29 +1122,29 @@ case 2:
;}
break;
- case 129:
-#line 948 "perly.y"
+ case 134:
+#line 990 "perly.y"
{ (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 130:
-#line 952 "perly.y"
+ case 135:
+#line 994 "perly.y"
{ (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 131:
-#line 956 "perly.y"
+ case 136:
+#line 998 "perly.y"
{ (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 132:
-#line 960 "perly.y"
+ case 137:
+#line 1002 "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
@@ -1105,15 +1153,15 @@ case 2:
;}
break;
- case 133:
-#line 970 "perly.y"
+ case 138:
+#line 1012 "perly.y"
{ (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval)));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 134:
-#line 974 "perly.y"
+ case 139:
+#line 1016 "perly.y"
{ (yyval.opval) = IF_MAD(
newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)),
(ps[(2) - (2)].val.opval)
@@ -1122,70 +1170,70 @@ case 2:
;}
break;
- case 135:
-#line 981 "perly.y"
+ case 140:
+#line 1023 "perly.y"
{ (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 136:
-#line 985 "perly.y"
+ case 141:
+#line 1027 "perly.y"
{ (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((ps[(2) - (2)].val.opval)));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 137:
-#line 989 "perly.y"
+ case 142:
+#line 1031 "perly.y"
{ (yyval.opval) = newUNOP(OP_POSTINC, 0,
op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC));
TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 138:
-#line 994 "perly.y"
+ case 143:
+#line 1036 "perly.y"
{ (yyval.opval) = newUNOP(OP_POSTDEC, 0,
op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC));
TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 139:
-#line 999 "perly.y"
+ case 144:
+#line 1041 "perly.y"
{ (yyval.opval) = newUNOP(OP_PREINC, 0,
op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREINC));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 140:
-#line 1004 "perly.y"
+ case 145:
+#line 1046 "perly.y"
{ (yyval.opval) = newUNOP(OP_PREDEC, 0,
op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 141:
-#line 1013 "perly.y"
+ case 146:
+#line 1055 "perly.y"
{ (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval));
TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'[');
TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),']');
;}
break;
- case 142:
-#line 1018 "perly.y"
+ case 147:
+#line 1060 "perly.y"
{ (yyval.opval) = newANONLIST((OP*)NULL);
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'[');
TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),']');
;}
break;
- case 143:
-#line 1023 "perly.y"
+ case 148:
+#line 1065 "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),';');
@@ -1193,8 +1241,8 @@ case 2:
;}
break;
- case 144:
-#line 1029 "perly.y"
+ case 149:
+#line 1071 "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),';');
@@ -1202,8 +1250,8 @@ case 2:
;}
break;
- case 145:
-#line 1035 "perly.y"
+ case 150:
+#line 1077 "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');
@@ -1212,22 +1260,22 @@ case 2:
;}
break;
- case 146:
-#line 1046 "perly.y"
+ case 151:
+#line 1088 "perly.y"
{ (yyval.opval) = dofile((ps[(2) - (2)].val.opval), IVAL((ps[(1) - (2)].val.i_tkval)));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 147:
-#line 1050 "perly.y"
+ case 152:
+#line 1092 "perly.y"
{ (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - (2)].val.opval)));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D');
;}
break;
- case 148:
-#line 1054 "perly.y"
+ case 153:
+#line 1096 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB,
OPf_SPECIAL|OPf_STACKED,
op_prepend_elem(OP_LIST,
@@ -1241,8 +1289,8 @@ case 2:
;}
break;
- case 149:
-#line 1066 "perly.y"
+ case 154:
+#line 1108 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB,
OPf_SPECIAL|OPf_STACKED,
op_append_elem(OP_LIST,
@@ -1257,8 +1305,8 @@ case 2:
;}
break;
- case 150:
-#line 1079 "perly.y"
+ case 155:
+#line 1121 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
op_prepend_elem(OP_LIST,
scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep();
@@ -1268,8 +1316,8 @@ case 2:
;}
break;
- case 151:
-#line 1087 "perly.y"
+ case 156:
+#line 1129 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
op_prepend_elem(OP_LIST,
(ps[(4) - (5)].val.opval),
@@ -1280,86 +1328,86 @@ case 2:
;}
break;
- case 156:
-#line 1103 "perly.y"
+ case 161:
+#line 1145 "perly.y"
{ (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval));
TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'?');
TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),':');
;}
break;
- case 157:
-#line 1108 "perly.y"
+ case 162:
+#line 1150 "perly.y"
{ (yyval.opval) = newUNOP(OP_REFGEN, 0, op_lvalue((ps[(2) - (2)].val.opval),OP_REFGEN));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 158:
-#line 1112 "perly.y"
+ case 163:
+#line 1154 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 159:
-#line 1114 "perly.y"
+ case 164:
+#line 1156 "perly.y"
{ (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'k');
;}
break;
- case 160:
-#line 1118 "perly.y"
+ case 165:
+#line 1160 "perly.y"
{ (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(ps[(2) - (3)].val.opval)), (ps[(2) - (3)].val.opval)));
TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
;}
break;
- case 161:
-#line 1123 "perly.y"
+ case 166:
+#line 1165 "perly.y"
{ (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); ;}
break;
- case 162:
-#line 1125 "perly.y"
+ case 167:
+#line 1167 "perly.y"
{ (yyval.opval) = sawparens(newNULLLIST());
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'(');
TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')');
;}
break;
- case 163:
-#line 1130 "perly.y"
+ case 168:
+#line 1172 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 164:
-#line 1132 "perly.y"
+ case 169:
+#line 1174 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 165:
-#line 1134 "perly.y"
+ case 170:
+#line 1176 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 166:
-#line 1136 "perly.y"
+ case 171:
+#line 1178 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 167:
-#line 1138 "perly.y"
+ case 172:
+#line 1180 "perly.y"
{ (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
break;
- case 168:
-#line 1140 "perly.y"
+ case 173:
+#line 1182 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 169:
-#line 1142 "perly.y"
+ case 174:
+#line 1184 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_ASLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_ASLICE, 0,
@@ -1370,8 +1418,8 @@ case 2:
;}
break;
- case 170:
-#line 1151 "perly.y"
+ case 175:
+#line 1193 "perly.y"
{ (yyval.opval) = op_prepend_elem(OP_HSLICE,
newOP(OP_PUSHMARK, 0),
newLISTOP(OP_HSLICE, 0,
@@ -1384,26 +1432,26 @@ case 2:
;}
break;
- case 171:
-#line 1162 "perly.y"
+ case 176:
+#line 1204 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 172:
-#line 1164 "perly.y"
+ case 177:
+#line 1206 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
break;
- case 173:
-#line 1166 "perly.y"
+ case 178:
+#line 1208 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval)));
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
;}
break;
- case 174:
-#line 1171 "perly.y"
+ case 179:
+#line 1213 "perly.y"
{
(yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval))));
@@ -1418,91 +1466,91 @@ case 2:
;}
break;
- case 175:
-#line 1184 "perly.y"
+ case 180:
+#line 1226 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[(3) - (3)].val.opval), scalar((ps[(2) - (3)].val.opval))));
TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 176:
-#line 1189 "perly.y"
+ case 181:
+#line 1231 "perly.y"
{ (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), OPf_SPECIAL);
PL_hints |= HINT_BLOCK_SCOPE;
TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 177:
-#line 1194 "perly.y"
+ case 182:
+#line 1236 "perly.y"
{ (yyval.opval) = newLOOPEX(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 178:
-#line 1198 "perly.y"
+ case 183:
+#line 1240 "perly.y"
{ (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 179:
-#line 1202 "perly.y"
+ case 184:
+#line 1244 "perly.y"
{ (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 180:
-#line 1206 "perly.y"
+ case 185:
+#line 1248 "perly.y"
{ (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 181:
-#line 1210 "perly.y"
+ case 186:
+#line 1252 "perly.y"
{ (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 182:
-#line 1214 "perly.y"
+ case 187:
+#line 1256 "perly.y"
{ (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.i_tkval) ? OPf_SPECIAL : 0);
TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 183:
-#line 1218 "perly.y"
+ case 188:
+#line 1260 "perly.y"
{ (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.i_tkval) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 184:
-#line 1222 "perly.y"
+ case 189:
+#line 1264 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
break;
- case 185:
-#line 1224 "perly.y"
+ case 190:
+#line 1266 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
break;
- case 186:
-#line 1227 "perly.y"
+ case 191:
+#line 1269 "perly.y"
{ (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
;}
break;
- case 187:
-#line 1231 "perly.y"
+ case 192:
+#line 1273 "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),'(');
@@ -1510,27 +1558,27 @@ case 2:
;}
break;
- case 188:
-#line 1237 "perly.y"
+ case 193:
+#line 1279 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 189:
-#line 1239 "perly.y"
+ case 194:
+#line 1281 "perly.y"
{ (yyval.opval) = (ps[(1) - (3)].val.opval);
TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
;}
break;
- case 190:
-#line 1244 "perly.y"
+ case 195:
+#line 1286 "perly.y"
{ (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
scalar((ps[(1) - (1)].val.opval))); ;}
break;
- case 191:
-#line 1247 "perly.y"
+ case 196:
+#line 1289 "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);
@@ -1541,8 +1589,8 @@ case 2:
;}
break;
- case 192:
-#line 1256 "perly.y"
+ case 197:
+#line 1298 "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),'(');
@@ -1550,8 +1598,8 @@ case 2:
;}
break;
- case 193:
-#line 1262 "perly.y"
+ case 198:
+#line 1304 "perly.y"
{
if ( (ps[(1) - (1)].val.opval)->op_type != OP_TRANS
&& (ps[(1) - (1)].val.opval)->op_type != OP_TRANSR
@@ -1564,16 +1612,16 @@ case 2:
;}
break;
- case 194:
-#line 1273 "perly.y"
+ case 199:
+#line 1315 "perly.y"
{ (yyval.opval) = pmruntime((ps[(1) - (5)].val.opval), (ps[(4) - (5)].val.opval), 1, (ps[(2) - (5)].val.ival));
TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
;}
break;
- case 197:
-#line 1280 "perly.y"
+ case 202:
+#line 1322 "perly.y"
{
(yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
@@ -1581,8 +1629,8 @@ case 2:
;}
break;
- case 199:
-#line 1290 "perly.y"
+ case 204:
+#line 1332 "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');
@@ -1592,128 +1640,128 @@ case 2:
;}
break;
- case 200:
-#line 1298 "perly.y"
+ case 205:
+#line 1340 "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 201:
-#line 1305 "perly.y"
+ case 206:
+#line 1347 "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 202:
-#line 1310 "perly.y"
+ case 207:
+#line 1352 "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 203:
-#line 1315 "perly.y"
+ case 208:
+#line 1357 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 204:
-#line 1317 "perly.y"
+ case 209:
+#line 1359 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 205:
-#line 1319 "perly.y"
+ case 210:
+#line 1361 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 206:
-#line 1324 "perly.y"
+ case 211:
+#line 1366 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
- case 207:
-#line 1326 "perly.y"
+ case 212:
+#line 1368 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 208:
-#line 1330 "perly.y"
+ case 213:
+#line 1372 "perly.y"
{ (yyval.opval) = (OP*)NULL; ;}
break;
- case 209:
-#line 1332 "perly.y"
+ case 214:
+#line 1374 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
- case 210:
-#line 1338 "perly.y"
+ case 215:
+#line 1380 "perly.y"
{ PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
break;
- case 211:
-#line 1342 "perly.y"
+ case 216:
+#line 1384 "perly.y"
{ (yyval.opval) = newCVREF(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'&');
;}
break;
- case 212:
-#line 1348 "perly.y"
+ case 217:
+#line 1390 "perly.y"
{ (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$');
;}
break;
- case 213:
-#line 1354 "perly.y"
+ case 218:
+#line 1396 "perly.y"
{ (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@');
;}
break;
- case 214:
-#line 1360 "perly.y"
+ case 219:
+#line 1402 "perly.y"
{ (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%');
;}
break;
- case 215:
-#line 1366 "perly.y"
+ case 220:
+#line 1408 "perly.y"
{ (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l');
;}
break;
- case 216:
-#line 1372 "perly.y"
+ case 221:
+#line 1414 "perly.y"
{ (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval));
TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*');
;}
break;
- case 217:
-#line 1379 "perly.y"
+ case 222:
+#line 1421 "perly.y"
{ (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
break;
- case 218:
-#line 1381 "perly.y"
+ case 223:
+#line 1423 "perly.y"
{ (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
break;
- case 219:
-#line 1383 "perly.y"
+ case 224:
+#line 1425 "perly.y"
{ (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;}
break;
- case 220:
-#line 1386 "perly.y"
+ case 225:
+#line 1428 "perly.y"
{ (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
break;
@@ -1724,6 +1772,6 @@ case 2:
/* Generated from:
- * 50649beb21bb272a5dafa43d5fbe244206c6a99e0e67b39b3123a22a35702873 perly.y
+ * 580d1bac82838fb0ae1e092010e776fb247f0d4cb68834a166507fae86707700 perly.y
* 4a3ced51fe6585f6ec59e65e1ffd74bc976c498b0e6992eaab337219fee72e51 regen_perly.pl
* ex: set ro: */
diff --git a/perly.h b/perly.h
index 29c317c3c4..daa777be2f 100644
--- a/perly.h
+++ b/perly.h
@@ -103,28 +103,30 @@
MYSUB = 312,
REQUIRE = 313,
COLONATTR = 314,
- PREC_LOW = 315,
- DOROP = 316,
- OROP = 317,
- ANDOP = 318,
- NOTOP = 319,
- ASSIGNOP = 320,
- DORDOR = 321,
- OROR = 322,
- ANDAND = 323,
- BITOROP = 324,
- BITANDOP = 325,
- SHIFTOP = 326,
- MATCHOP = 327,
- REFGEN = 328,
- UMINUS = 329,
- POWOP = 330,
- POSTDEC = 331,
- POSTINC = 332,
- PREDEC = 333,
- PREINC = 334,
- ARROW = 335,
- PEG = 336
+ FORMLBRACK = 315,
+ FORMRBRACK = 316,
+ PREC_LOW = 317,
+ DOROP = 318,
+ OROP = 319,
+ ANDOP = 320,
+ NOTOP = 321,
+ ASSIGNOP = 322,
+ DORDOR = 323,
+ OROR = 324,
+ ANDAND = 325,
+ BITOROP = 326,
+ BITANDOP = 327,
+ SHIFTOP = 328,
+ MATCHOP = 329,
+ REFGEN = 330,
+ UMINUS = 331,
+ POWOP = 332,
+ POSTDEC = 333,
+ POSTINC = 334,
+ PREDEC = 335,
+ PREINC = 336,
+ ARROW = 337,
+ PEG = 338
};
#endif
/* Tokens. */
@@ -185,28 +187,30 @@
#define MYSUB 312
#define REQUIRE 313
#define COLONATTR 314
-#define PREC_LOW 315
-#define DOROP 316
-#define OROP 317
-#define ANDOP 318
-#define NOTOP 319
-#define ASSIGNOP 320
-#define DORDOR 321
-#define OROR 322
-#define ANDAND 323
-#define BITOROP 324
-#define BITANDOP 325
-#define SHIFTOP 326
-#define MATCHOP 327
-#define REFGEN 328
-#define UMINUS 329
-#define POWOP 330
-#define POSTDEC 331
-#define POSTINC 332
-#define PREDEC 333
-#define PREINC 334
-#define ARROW 335
-#define PEG 336
+#define FORMLBRACK 315
+#define FORMRBRACK 316
+#define PREC_LOW 317
+#define DOROP 318
+#define OROP 319
+#define ANDOP 320
+#define NOTOP 321
+#define ASSIGNOP 322
+#define DORDOR 323
+#define OROR 324
+#define ANDAND 325
+#define BITOROP 326
+#define BITANDOP 327
+#define SHIFTOP 328
+#define MATCHOP 329
+#define REFGEN 330
+#define UMINUS 331
+#define POWOP 332
+#define POSTDEC 333
+#define POSTINC 334
+#define PREDEC 335
+#define PREINC 336
+#define ARROW 337
+#define PEG 338
@@ -264,6 +268,6 @@ typedef union YYSTYPE
/* Generated from:
- * 50649beb21bb272a5dafa43d5fbe244206c6a99e0e67b39b3123a22a35702873 perly.y
+ * 580d1bac82838fb0ae1e092010e776fb247f0d4cb68834a166507fae86707700 perly.y
* 4a3ced51fe6585f6ec59e65e1ffd74bc976c498b0e6992eaab337219fee72e51 regen_perly.pl
* ex: set ro: */
diff --git a/perly.tab b/perly.tab
index edb9de4f75..e7982ece95 100644
--- a/perly.tab
+++ b/perly.tab
@@ -6,20 +6,20 @@
#define YYFINAL 14
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 2878
+#define YYLAST 2806
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 103
+#define YYNTOKENS 105
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 62
+#define YYNNTS 65
/* YYNRULES -- Number of rules. */
-#define YYNRULES 220
+#define YYNRULES 225
/* YYNRULES -- Number of states. */
-#define YYNSTATES 449
+#define YYNSTATES 458
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 336
+#define YYMAXUTOK 338
#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -30,16 +30,16 @@ static const yytype_uint8 yytranslate[] =
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 90, 2, 2, 15, 17, 19, 2,
- 101, 100, 18, 14, 79, 13, 22, 2, 2, 2,
- 2, 2, 2, 2, 2, 2, 2, 2, 82, 20,
- 2, 21, 2, 81, 16, 2, 2, 2, 2, 2,
+ 2, 2, 2, 92, 2, 2, 15, 17, 19, 2,
+ 103, 102, 18, 14, 81, 13, 22, 2, 2, 2,
+ 2, 2, 2, 2, 2, 2, 2, 2, 84, 20,
+ 2, 21, 2, 83, 16, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 11, 2, 12, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 9, 2, 10, 91, 2, 2, 2,
+ 2, 2, 2, 9, 2, 10, 93, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -59,8 +59,8 @@ static const yytype_uint8 yytranslate[] =
49, 50, 51, 52, 53, 54, 55, 56, 57, 58,
59, 60, 61, 62, 63, 64, 65, 66, 67, 68,
69, 70, 71, 72, 73, 74, 75, 76, 77, 78,
- 80, 83, 84, 85, 86, 87, 88, 89, 92, 93,
- 94, 95, 96, 97, 98, 99, 102
+ 79, 80, 82, 85, 86, 87, 88, 89, 90, 91,
+ 94, 95, 96, 97, 98, 99, 100, 101, 104
};
#if YYDEBUG
@@ -69,138 +69,139 @@ static const yytype_uint8 yytranslate[] =
static const yytype_uint16 yyprhs[] =
{
0, 0, 3, 4, 9, 10, 14, 15, 19, 20,
- 24, 25, 29, 30, 34, 39, 44, 45, 50, 51,
- 52, 55, 57, 59, 62, 65, 67, 69, 74, 81,
- 88, 93, 94, 102, 110, 118, 125, 132, 135, 144,
- 153, 165, 175, 184, 192, 195, 196, 205, 208, 210,
- 212, 214, 218, 222, 226, 230, 234, 238, 239, 242,
- 249, 250, 253, 254, 255, 257, 258, 260, 262, 264,
- 266, 268, 270, 271, 272, 273, 274, 276, 277, 279,
- 280, 283, 285, 288, 290, 292, 294, 298, 302, 306,
- 308, 311, 315, 317, 321, 327, 334, 338, 342, 348,
- 351, 356, 357, 363, 365, 367, 373, 378, 384, 389,
- 395, 402, 408, 413, 419, 424, 428, 435, 440, 446,
- 450, 454, 458, 462, 466, 470, 474, 478, 482, 486,
- 490, 494, 498, 502, 505, 508, 511, 514, 517, 520,
- 523, 526, 530, 533, 538, 542, 548, 551, 554, 559,
- 565, 570, 576, 578, 580, 582, 584, 590, 593, 595,
- 598, 602, 604, 607, 609, 611, 613, 615, 617, 619,
- 624, 630, 632, 634, 638, 643, 647, 649, 652, 655,
- 657, 660, 663, 665, 668, 670, 673, 675, 679, 681,
- 685, 687, 691, 696, 697, 703, 705, 707, 709, 711,
- 715, 718, 722, 725, 727, 729, 731, 732, 734, 735,
- 737, 739, 742, 745, 748, 751, 754, 757, 759, 761,
- 763
+ 24, 25, 29, 30, 34, 39, 47, 48, 53, 54,
+ 55, 58, 59, 62, 64, 66, 69, 72, 74, 76,
+ 81, 88, 95, 100, 101, 109, 117, 125, 132, 139,
+ 142, 151, 160, 172, 182, 191, 199, 202, 203, 212,
+ 215, 217, 220, 221, 225, 227, 229, 233, 237, 241,
+ 245, 249, 253, 254, 257, 264, 265, 268, 269, 270,
+ 272, 273, 275, 277, 279, 281, 283, 285, 286, 287,
+ 288, 289, 291, 292, 294, 295, 298, 300, 303, 305,
+ 307, 309, 313, 317, 321, 323, 326, 330, 332, 336,
+ 342, 349, 353, 357, 363, 366, 371, 372, 378, 380,
+ 382, 388, 393, 399, 404, 410, 417, 423, 428, 434,
+ 439, 443, 450, 455, 461, 465, 469, 473, 477, 481,
+ 485, 489, 493, 497, 501, 505, 509, 513, 517, 520,
+ 523, 526, 529, 532, 535, 538, 541, 545, 548, 553,
+ 557, 563, 566, 569, 574, 580, 585, 591, 593, 595,
+ 597, 599, 605, 608, 610, 613, 617, 619, 622, 624,
+ 626, 628, 630, 632, 634, 639, 645, 647, 649, 653,
+ 658, 662, 664, 667, 670, 672, 675, 678, 680, 683,
+ 685, 688, 690, 694, 696, 700, 702, 706, 711, 712,
+ 718, 720, 722, 724, 726, 730, 733, 737, 740, 742,
+ 744, 746, 747, 749, 750, 752, 754, 757, 760, 763,
+ 766, 769, 772, 774, 776, 778
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
static const yytype_int16 yyrhs[] =
{
- 104, 0, -1, -1, 3, 105, 113, 116, -1, -1,
- 4, 106, 156, -1, -1, 5, 107, 111, -1, -1,
- 6, 108, 119, -1, -1, 7, 109, 117, -1, -1,
- 8, 110, 116, -1, 9, 113, 116, 10, -1, 21,
- 113, 116, 22, -1, -1, 9, 115, 116, 10, -1,
- -1, -1, 116, 117, -1, 119, -1, 118, -1, 36,
- 119, -1, 36, 118, -1, 35, -1, 102, -1, 37,
- 135, 132, 112, -1, 38, 133, 136, 137, 138, 140,
- -1, 71, 133, 136, 137, 138, 140, -1, 40, 23,
- 23, 20, -1, -1, 41, 133, 120, 23, 23, 155,
- 20, -1, 44, 101, 113, 129, 100, 114, 123, -1,
- 45, 101, 113, 131, 100, 114, 123, -1, 50, 101,
- 113, 129, 100, 114, -1, 51, 101, 113, 129, 100,
- 114, -1, 52, 111, -1, 42, 101, 113, 127, 100,
- 125, 114, 124, -1, 43, 101, 113, 128, 100, 125,
- 114, 124, -1, 49, 101, 113, 130, 20, 127, 20,
- 125, 130, 100, 114, -1, 49, 70, 113, 157, 101,
- 129, 100, 114, 124, -1, 49, 159, 101, 113, 129,
- 100, 114, 124, -1, 49, 101, 113, 129, 100, 114,
- 124, -1, 111, 124, -1, -1, 40, 23, 23, 9,
- 113, 121, 116, 10, -1, 122, 20, -1, 20, -1,
- 1, -1, 141, -1, 141, 44, 141, -1, 141, 45,
- 141, -1, 141, 42, 141, -1, 141, 43, 128, -1,
- 141, 49, 141, -1, 141, 51, 141, -1, -1, 46,
- 114, -1, 47, 101, 129, 100, 114, 123, -1, -1,
- 48, 111, -1, -1, -1, 122, -1, -1, 141, -1,
- 141, -1, 141, -1, 126, -1, 128, -1, 23, -1,
- -1, -1, -1, -1, 23, -1, -1, 26, -1, -1,
- 73, 26, -1, 73, -1, 73, 26, -1, 73, -1,
- 111, -1, 20, -1, 141, 77, 141, -1, 141, 76,
- 141, -1, 141, 75, 141, -1, 142, -1, 142, 79,
- -1, 142, 79, 151, -1, 151, -1, 60, 164, 142,
- -1, 58, 101, 164, 141, 100, -1, 151, 99, 145,
- 101, 156, 100, -1, 151, 99, 145, -1, 24, 164,
- 155, -1, 25, 164, 101, 156, 100, -1, 60, 155,
- -1, 58, 101, 156, 100, -1, -1, 33, 134, 111,
- 144, 155, -1, 24, -1, 159, -1, 163, 9, 141,
- 20, 10, -1, 159, 11, 141, 12, -1, 151, 99,
- 11, 141, 12, -1, 146, 11, 141, 12, -1, 159,
- 9, 141, 20, 10, -1, 151, 99, 9, 141, 20,
- 10, -1, 146, 9, 141, 20, 10, -1, 151, 99,
- 101, 100, -1, 151, 99, 101, 141, 100, -1, 146,
- 101, 141, 100, -1, 146, 101, 100, -1, 101, 141,
- 100, 11, 141, 12, -1, 29, 11, 141, 12, -1,
- 101, 100, 11, 141, 12, -1, 151, 80, 151, -1,
- 151, 94, 151, -1, 151, 63, 151, -1, 151, 64,
- 151, -1, 151, 88, 151, -1, 151, 61, 151, -1,
- 151, 62, 151, -1, 151, 87, 151, -1, 151, 86,
- 151, -1, 151, 54, 151, -1, 151, 85, 151, -1,
- 151, 84, 151, -1, 151, 83, 151, -1, 151, 89,
- 151, -1, 13, 151, -1, 14, 151, -1, 90, 151,
- -1, 91, 151, -1, 151, 96, -1, 151, 95, -1,
- 98, 151, -1, 97, 151, -1, 11, 141, 12, -1,
- 11, 12, -1, 67, 141, 20, 10, -1, 67, 20,
- 10, -1, 39, 134, 137, 138, 111, -1, 66, 151,
- -1, 66, 111, -1, 66, 23, 101, 100, -1, 66,
- 23, 101, 141, 100, -1, 66, 159, 101, 100, -1,
- 66, 159, 101, 141, 100, -1, 147, -1, 148, -1,
- 149, -1, 150, -1, 151, 81, 151, 82, 151, -1,
- 92, 151, -1, 153, -1, 69, 151, -1, 101, 141,
- 100, -1, 29, -1, 101, 100, -1, 159, -1, 163,
- -1, 161, -1, 160, -1, 162, -1, 146, -1, 160,
- 11, 141, 12, -1, 160, 9, 141, 20, 10, -1,
- 26, -1, 158, -1, 158, 101, 100, -1, 158, 101,
- 141, 100, -1, 68, 23, 155, -1, 53, -1, 53,
- 151, -1, 78, 142, -1, 59, -1, 59, 111, -1,
- 59, 151, -1, 72, -1, 72, 151, -1, 32, -1,
- 32, 151, -1, 56, -1, 56, 101, 100, -1, 30,
- -1, 30, 101, 100, -1, 31, -1, 57, 101, 100,
- -1, 57, 101, 141, 100, -1, -1, 27, 152, 101,
- 142, 100, -1, 23, -1, 143, -1, 55, -1, 34,
- -1, 70, 154, 139, -1, 70, 154, -1, 101, 141,
- 100, -1, 101, 100, -1, 159, -1, 161, -1, 160,
- -1, -1, 142, -1, -1, 141, -1, 159, -1, 19,
- 164, -1, 15, 164, -1, 16, 164, -1, 17, 164,
- -1, 65, 164, -1, 18, 164, -1, 23, -1, 159,
- -1, 111, -1, 28, -1
+ 106, 0, -1, -1, 3, 107, 115, 118, -1, -1,
+ 4, 108, 161, -1, -1, 5, 109, 113, -1, -1,
+ 6, 110, 122, -1, -1, 7, 111, 120, -1, -1,
+ 8, 112, 118, -1, 9, 115, 118, 10, -1, 21,
+ 115, 20, 75, 119, 20, 22, -1, -1, 9, 117,
+ 118, 10, -1, -1, -1, 118, 120, -1, -1, 119,
+ 125, -1, 122, -1, 121, -1, 36, 122, -1, 36,
+ 121, -1, 35, -1, 104, -1, 37, 140, 137, 114,
+ -1, 38, 138, 141, 142, 143, 145, -1, 71, 138,
+ 141, 142, 143, 145, -1, 40, 23, 23, 20, -1,
+ -1, 41, 138, 123, 23, 23, 160, 20, -1, 44,
+ 103, 115, 134, 102, 116, 128, -1, 45, 103, 115,
+ 136, 102, 116, 128, -1, 50, 103, 115, 134, 102,
+ 116, -1, 51, 103, 115, 134, 102, 116, -1, 52,
+ 113, -1, 42, 103, 115, 132, 102, 130, 116, 129,
+ -1, 43, 103, 115, 133, 102, 130, 116, 129, -1,
+ 49, 103, 115, 135, 20, 132, 20, 130, 135, 102,
+ 116, -1, 49, 70, 115, 162, 103, 134, 102, 116,
+ 129, -1, 49, 164, 103, 115, 134, 102, 116, 129,
+ -1, 49, 103, 115, 134, 102, 116, 129, -1, 113,
+ 129, -1, -1, 40, 23, 23, 9, 115, 124, 118,
+ 10, -1, 127, 20, -1, 20, -1, 26, 126, -1,
+ -1, 74, 118, 75, -1, 1, -1, 146, -1, 146,
+ 44, 146, -1, 146, 45, 146, -1, 146, 42, 146,
+ -1, 146, 43, 133, -1, 146, 49, 146, -1, 146,
+ 51, 146, -1, -1, 46, 116, -1, 47, 103, 134,
+ 102, 116, 128, -1, -1, 48, 113, -1, -1, -1,
+ 127, -1, -1, 146, -1, 146, -1, 146, -1, 131,
+ -1, 133, -1, 23, -1, -1, -1, -1, -1, 23,
+ -1, -1, 26, -1, -1, 73, 26, -1, 73, -1,
+ 73, 26, -1, 73, -1, 113, -1, 20, -1, 146,
+ 79, 146, -1, 146, 78, 146, -1, 146, 77, 146,
+ -1, 147, -1, 147, 81, -1, 147, 81, 156, -1,
+ 156, -1, 60, 169, 147, -1, 58, 103, 169, 146,
+ 102, -1, 156, 101, 150, 103, 161, 102, -1, 156,
+ 101, 150, -1, 24, 169, 160, -1, 25, 169, 103,
+ 161, 102, -1, 60, 160, -1, 58, 103, 161, 102,
+ -1, -1, 33, 139, 113, 149, 160, -1, 24, -1,
+ 164, -1, 168, 9, 146, 20, 10, -1, 164, 11,
+ 146, 12, -1, 156, 101, 11, 146, 12, -1, 151,
+ 11, 146, 12, -1, 164, 9, 146, 20, 10, -1,
+ 156, 101, 9, 146, 20, 10, -1, 151, 9, 146,
+ 20, 10, -1, 156, 101, 103, 102, -1, 156, 101,
+ 103, 146, 102, -1, 151, 103, 146, 102, -1, 151,
+ 103, 102, -1, 103, 146, 102, 11, 146, 12, -1,
+ 29, 11, 146, 12, -1, 103, 102, 11, 146, 12,
+ -1, 156, 82, 156, -1, 156, 96, 156, -1, 156,
+ 63, 156, -1, 156, 64, 156, -1, 156, 90, 156,
+ -1, 156, 61, 156, -1, 156, 62, 156, -1, 156,
+ 89, 156, -1, 156, 88, 156, -1, 156, 54, 156,
+ -1, 156, 87, 156, -1, 156, 86, 156, -1, 156,
+ 85, 156, -1, 156, 91, 156, -1, 13, 156, -1,
+ 14, 156, -1, 92, 156, -1, 93, 156, -1, 156,
+ 98, -1, 156, 97, -1, 100, 156, -1, 99, 156,
+ -1, 11, 146, 12, -1, 11, 12, -1, 67, 146,
+ 20, 10, -1, 67, 20, 10, -1, 39, 139, 142,
+ 143, 113, -1, 66, 156, -1, 66, 113, -1, 66,
+ 23, 103, 102, -1, 66, 23, 103, 146, 102, -1,
+ 66, 164, 103, 102, -1, 66, 164, 103, 146, 102,
+ -1, 152, -1, 153, -1, 154, -1, 155, -1, 156,
+ 83, 156, 84, 156, -1, 94, 156, -1, 158, -1,
+ 69, 156, -1, 103, 146, 102, -1, 29, -1, 103,
+ 102, -1, 164, -1, 168, -1, 166, -1, 165, -1,
+ 167, -1, 151, -1, 165, 11, 146, 12, -1, 165,
+ 9, 146, 20, 10, -1, 26, -1, 163, -1, 163,
+ 103, 102, -1, 163, 103, 146, 102, -1, 68, 23,
+ 160, -1, 53, -1, 53, 156, -1, 80, 147, -1,
+ 59, -1, 59, 113, -1, 59, 156, -1, 72, -1,
+ 72, 156, -1, 32, -1, 32, 156, -1, 56, -1,
+ 56, 103, 102, -1, 30, -1, 30, 103, 102, -1,
+ 31, -1, 57, 103, 102, -1, 57, 103, 146, 102,
+ -1, -1, 27, 157, 103, 147, 102, -1, 23, -1,
+ 148, -1, 55, -1, 34, -1, 70, 159, 144, -1,
+ 70, 159, -1, 103, 146, 102, -1, 103, 102, -1,
+ 164, -1, 166, -1, 165, -1, -1, 147, -1, -1,
+ 146, -1, 164, -1, 19, 169, -1, 15, 169, -1,
+ 16, 169, -1, 17, 169, -1, 65, 169, -1, 18,
+ 169, -1, 23, -1, 164, -1, 113, -1, 28, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 140, 140, 139, 149, 148, 158, 157, 170, 169,
- 182, 181, 194, 193, 205, 215, 225, 228, 238, 243,
- 244, 253, 261, 265, 272, 281, 283, 288, 305, 326,
- 338, 354, 353, 370, 379, 388, 399, 401, 403, 413,
- 423, 444, 453, 462, 471, 478, 477, 494, 500, 510,
- 512, 514, 518, 522, 526, 530, 535, 541, 542, 548,
- 562, 563, 572, 578, 579, 584, 587, 591, 596, 600,
- 604, 608, 609, 613, 619, 624, 629, 639, 640, 645,
- 646, 650, 660, 664, 674, 675, 685, 689, 693, 697,
- 701, 711, 720, 724, 729, 736, 745, 751, 757, 765,
- 769, 776, 775, 786, 787, 791, 800, 805, 813, 820,
- 827, 837, 846, 853, 862, 869, 875, 882, 887, 897,
- 901, 905, 911, 915, 919, 923, 927, 931, 935, 947,
- 951, 955, 959, 969, 973, 980, 984, 988, 993, 998,
- 1003, 1012, 1017, 1022, 1028, 1034, 1045, 1049, 1053, 1065,
- 1078, 1086, 1098, 1099, 1100, 1101, 1102, 1107, 1111, 1113,
- 1117, 1122, 1124, 1129, 1131, 1133, 1135, 1137, 1139, 1141,
- 1150, 1161, 1163, 1165, 1170, 1183, 1188, 1193, 1197, 1201,
- 1205, 1209, 1213, 1217, 1221, 1223, 1226, 1230, 1236, 1238,
- 1243, 1246, 1255, 1262, 1261, 1277, 1278, 1279, 1285, 1289,
- 1297, 1304, 1309, 1314, 1316, 1318, 1323, 1325, 1330, 1331,
- 1337, 1341, 1347, 1353, 1359, 1365, 1371, 1378, 1380, 1382,
- 1385
+ 0, 141, 141, 140, 150, 149, 159, 158, 171, 170,
+ 183, 182, 195, 194, 206, 216, 226, 229, 239, 244,
+ 245, 255, 256, 265, 273, 277, 284, 293, 295, 300,
+ 317, 338, 350, 366, 365, 382, 391, 400, 411, 413,
+ 415, 425, 435, 456, 465, 474, 483, 490, 489, 506,
+ 512, 522, 546, 547, 552, 554, 556, 560, 564, 568,
+ 572, 577, 583, 584, 590, 604, 605, 614, 620, 621,
+ 626, 629, 633, 638, 642, 646, 650, 651, 655, 661,
+ 666, 671, 681, 682, 687, 688, 692, 702, 706, 716,
+ 717, 727, 731, 735, 739, 743, 753, 762, 766, 771,
+ 778, 787, 793, 799, 807, 811, 818, 817, 828, 829,
+ 833, 842, 847, 855, 862, 869, 879, 888, 895, 904,
+ 911, 917, 924, 929, 939, 943, 947, 953, 957, 961,
+ 965, 969, 973, 977, 989, 993, 997, 1001, 1011, 1015,
+ 1022, 1026, 1030, 1035, 1040, 1045, 1054, 1059, 1064, 1070,
+ 1076, 1087, 1091, 1095, 1107, 1120, 1128, 1140, 1141, 1142,
+ 1143, 1144, 1149, 1153, 1155, 1159, 1164, 1166, 1171, 1173,
+ 1175, 1177, 1179, 1181, 1183, 1192, 1203, 1205, 1207, 1212,
+ 1225, 1230, 1235, 1239, 1243, 1247, 1251, 1255, 1259, 1263,
+ 1265, 1268, 1272, 1278, 1280, 1285, 1288, 1297, 1304, 1303,
+ 1319, 1320, 1321, 1327, 1331, 1339, 1346, 1351, 1356, 1358,
+ 1360, 1365, 1367, 1372, 1373, 1379, 1383, 1389, 1395, 1401,
+ 1407, 1413, 1420, 1422, 1424, 1427
};
#endif
@@ -219,13 +220,14 @@ static const char *const yytname[] =
"GIVEN", "WHEN", "DEFAULT", "LOOPEX", "DOTDOT", "YADAYADA", "FUNC0",
"FUNC1", "FUNC", "UNIOP", "LSTOP", "RELOP", "EQOP", "MULOP", "ADDOP",
"DOLSHARP", "DO", "HASHBRACK", "NOAMP", "LOCAL", "MY", "MYSUB",
- "REQUIRE", "COLONATTR", "PREC_LOW", "DOROP", "OROP", "ANDOP", "NOTOP",
- "','", "ASSIGNOP", "'?'", "':'", "DORDOR", "OROR", "ANDAND", "BITOROP",
- "BITANDOP", "SHIFTOP", "MATCHOP", "'!'", "'~'", "REFGEN", "UMINUS",
- "POWOP", "POSTDEC", "POSTINC", "PREDEC", "PREINC", "ARROW", "')'", "'('",
- "PEG", "$accept", "grammar", "@1", "@2", "@3", "@4", "@5", "@6", "block",
- "formblock", "remember", "mblock", "mremember", "stmtseq", "fullstmt",
- "labfullstmt", "barestmt", "@7", "@8", "sideff", "else", "cont",
+ "REQUIRE", "COLONATTR", "FORMLBRACK", "FORMRBRACK", "PREC_LOW", "DOROP",
+ "OROP", "ANDOP", "NOTOP", "','", "ASSIGNOP", "'?'", "':'", "DORDOR",
+ "OROR", "ANDAND", "BITOROP", "BITANDOP", "SHIFTOP", "MATCHOP", "'!'",
+ "'~'", "REFGEN", "UMINUS", "POWOP", "POSTDEC", "POSTINC", "PREDEC",
+ "PREINC", "ARROW", "')'", "'('", "PEG", "$accept", "grammar", "@1", "@2",
+ "@3", "@4", "@5", "@6", "block", "formblock", "remember", "mblock",
+ "mremember", "stmtseq", "formstmtseq", "fullstmt", "labfullstmt",
+ "barestmt", "@7", "@8", "formline", "formarg", "sideff", "else", "cont",
"mintro", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "miexpr",
"formname", "startsub", "startanonsub", "startformsub", "subname",
"proto", "subattrlist", "myattrlist", "subbody", "expr", "listexpr",
@@ -248,67 +250,67 @@ static const yytype_uint16 yytoknum[] =
281, 282, 283, 284, 285, 286, 287, 288, 289, 290,
291, 292, 293, 294, 295, 296, 297, 298, 299, 300,
301, 302, 303, 304, 305, 306, 307, 308, 309, 310,
- 311, 312, 313, 314, 315, 316, 317, 318, 319, 44,
- 320, 63, 58, 321, 322, 323, 324, 325, 326, 327,
- 33, 126, 328, 329, 330, 331, 332, 333, 334, 335,
- 41, 40, 336
+ 311, 312, 313, 314, 315, 316, 317, 318, 319, 320,
+ 321, 44, 322, 63, 58, 323, 324, 325, 326, 327,
+ 328, 329, 33, 126, 330, 331, 332, 333, 334, 335,
+ 336, 337, 41, 40, 338
};
# endif
/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
static const yytype_uint8 yyr1[] =
{
- 0, 103, 105, 104, 106, 104, 107, 104, 108, 104,
- 109, 104, 110, 104, 111, 112, 113, 114, 115, 116,
- 116, 117, 117, 118, 118, 119, 119, 119, 119, 119,
- 119, 120, 119, 119, 119, 119, 119, 119, 119, 119,
- 119, 119, 119, 119, 119, 121, 119, 119, 119, 122,
- 122, 122, 122, 122, 122, 122, 122, 123, 123, 123,
- 124, 124, 125, 126, 126, 127, 127, 128, 129, 130,
- 131, 132, 132, 133, 134, 135, 136, 137, 137, 138,
- 138, 138, 139, 139, 140, 140, 141, 141, 141, 141,
- 142, 142, 142, 143, 143, 143, 143, 143, 143, 143,
- 143, 144, 143, 145, 145, 146, 146, 146, 146, 146,
- 146, 146, 146, 146, 146, 146, 146, 146, 146, 147,
- 147, 147, 147, 147, 147, 147, 147, 147, 147, 147,
- 147, 147, 147, 148, 148, 148, 148, 148, 148, 148,
- 148, 149, 149, 149, 149, 149, 150, 150, 150, 150,
- 150, 150, 151, 151, 151, 151, 151, 151, 151, 151,
+ 0, 105, 107, 106, 108, 106, 109, 106, 110, 106,
+ 111, 106, 112, 106, 113, 114, 115, 116, 117, 118,
+ 118, 119, 119, 120, 120, 121, 121, 122, 122, 122,
+ 122, 122, 122, 123, 122, 122, 122, 122, 122, 122,
+ 122, 122, 122, 122, 122, 122, 122, 124, 122, 122,
+ 122, 125, 126, 126, 127, 127, 127, 127, 127, 127,
+ 127, 127, 128, 128, 128, 129, 129, 130, 131, 131,
+ 132, 132, 133, 134, 135, 136, 137, 137, 138, 139,
+ 140, 141, 142, 142, 143, 143, 143, 144, 144, 145,
+ 145, 146, 146, 146, 146, 147, 147, 147, 148, 148,
+ 148, 148, 148, 148, 148, 148, 149, 148, 150, 150,
151, 151, 151, 151, 151, 151, 151, 151, 151, 151,
- 151, 151, 151, 151, 151, 151, 151, 151, 151, 151,
- 151, 151, 151, 151, 151, 151, 151, 151, 151, 151,
- 151, 151, 151, 152, 151, 151, 151, 151, 151, 153,
- 153, 154, 154, 154, 154, 154, 155, 155, 156, 156,
- 157, 158, 159, 160, 161, 162, 163, 164, 164, 164,
- 164
+ 151, 151, 151, 151, 152, 152, 152, 152, 152, 152,
+ 152, 152, 152, 152, 152, 152, 152, 152, 153, 153,
+ 153, 153, 153, 153, 153, 153, 154, 154, 154, 154,
+ 154, 155, 155, 155, 155, 155, 155, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 156, 156, 157, 156,
+ 156, 156, 156, 156, 158, 158, 159, 159, 159, 159,
+ 159, 160, 160, 161, 161, 162, 163, 164, 165, 166,
+ 167, 168, 169, 169, 169, 169
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
static const yytype_uint8 yyr2[] =
{
0, 2, 0, 4, 0, 3, 0, 3, 0, 3,
- 0, 3, 0, 3, 4, 4, 0, 4, 0, 0,
- 2, 1, 1, 2, 2, 1, 1, 4, 6, 6,
- 4, 0, 7, 7, 7, 6, 6, 2, 8, 8,
- 11, 9, 8, 7, 2, 0, 8, 2, 1, 1,
- 1, 3, 3, 3, 3, 3, 3, 0, 2, 6,
- 0, 2, 0, 0, 1, 0, 1, 1, 1, 1,
- 1, 1, 0, 0, 0, 0, 1, 0, 1, 0,
- 2, 1, 2, 1, 1, 1, 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, 4, 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, 1, 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,
- 1, 3, 4, 0, 5, 1, 1, 1, 1, 3,
- 2, 3, 2, 1, 1, 1, 0, 1, 0, 1,
- 1, 2, 2, 2, 2, 2, 2, 1, 1, 1,
- 1
+ 0, 3, 0, 3, 4, 7, 0, 4, 0, 0,
+ 2, 0, 2, 1, 1, 2, 2, 1, 1, 4,
+ 6, 6, 4, 0, 7, 7, 7, 6, 6, 2,
+ 8, 8, 11, 9, 8, 7, 2, 0, 8, 2,
+ 1, 2, 0, 3, 1, 1, 3, 3, 3, 3,
+ 3, 3, 0, 2, 6, 0, 2, 0, 0, 1,
+ 0, 1, 1, 1, 1, 1, 1, 0, 0, 0,
+ 0, 1, 0, 1, 0, 2, 1, 2, 1, 1,
+ 1, 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, 4, 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, 1, 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, 1, 3, 4, 0, 5,
+ 1, 1, 1, 1, 3, 2, 3, 2, 1, 1,
+ 1, 0, 1, 0, 1, 1, 2, 2, 2, 2,
+ 2, 2, 1, 1, 1, 1
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -316,234 +318,228 @@ static const yytype_uint8 yyr2[] =
means the default is an error. */
static const yytype_uint8 yydefact[] =
{
- 0, 2, 4, 6, 8, 10, 12, 0, 16, 208,
+ 0, 2, 4, 6, 8, 10, 12, 0, 16, 213,
0, 0, 0, 19, 1, 19, 0, 0, 0, 0,
- 0, 0, 0, 0, 195, 0, 0, 171, 193, 161,
- 188, 190, 184, 74, 198, 74, 176, 197, 186, 0,
- 0, 179, 206, 0, 0, 0, 0, 0, 0, 182,
- 0, 0, 0, 0, 0, 0, 0, 209, 89, 196,
- 168, 152, 153, 154, 155, 92, 158, 5, 172, 163,
- 166, 165, 167, 164, 16, 7, 49, 48, 25, 75,
- 73, 0, 73, 0, 0, 0, 0, 0, 0, 0,
- 0, 73, 26, 60, 9, 0, 50, 0, 11, 22,
- 21, 0, 0, 142, 0, 133, 134, 217, 220, 219,
- 218, 212, 213, 214, 216, 211, 206, 0, 0, 0,
- 0, 185, 0, 77, 177, 0, 0, 208, 180, 181,
- 217, 207, 99, 218, 0, 215, 195, 147, 146, 163,
- 0, 0, 206, 159, 0, 200, 203, 205, 204, 183,
- 178, 135, 136, 157, 140, 139, 162, 0, 0, 0,
- 0, 90, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 200, 0, 0, 176, 198, 166,
+ 193, 195, 189, 79, 203, 79, 181, 202, 191, 0,
+ 0, 184, 211, 0, 0, 0, 0, 0, 0, 187,
+ 0, 0, 0, 0, 0, 0, 0, 214, 94, 201,
+ 173, 157, 158, 159, 160, 97, 163, 5, 177, 168,
+ 171, 170, 172, 169, 16, 7, 54, 50, 27, 80,
+ 78, 0, 78, 0, 0, 0, 0, 0, 0, 0,
+ 0, 78, 28, 65, 9, 0, 55, 0, 11, 24,
+ 23, 0, 0, 147, 0, 138, 139, 222, 225, 224,
+ 223, 217, 218, 219, 221, 216, 211, 0, 0, 0,
+ 0, 190, 0, 82, 182, 0, 0, 213, 185, 186,
+ 222, 212, 104, 223, 0, 220, 200, 152, 151, 168,
+ 0, 0, 211, 164, 0, 205, 208, 210, 209, 188,
+ 183, 140, 141, 162, 145, 144, 167, 0, 0, 0,
+ 0, 95, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 138, 137, 0, 0, 0, 0, 0, 0, 0, 19,
- 72, 0, 0, 31, 16, 16, 16, 16, 16, 16,
- 0, 16, 16, 37, 0, 0, 44, 47, 0, 0,
- 0, 0, 0, 0, 24, 23, 20, 141, 97, 208,
- 0, 0, 189, 101, 78, 79, 187, 191, 0, 0,
- 0, 93, 0, 0, 144, 0, 175, 202, 0, 83,
- 199, 0, 160, 88, 87, 86, 91, 0, 0, 115,
- 0, 128, 124, 125, 121, 122, 119, 0, 131, 130,
- 129, 127, 126, 123, 132, 120, 0, 0, 103, 0,
- 96, 104, 173, 0, 0, 0, 0, 0, 0, 0,
- 71, 0, 76, 77, 0, 0, 65, 0, 0, 0,
- 0, 0, 16, 0, 0, 77, 61, 53, 54, 67,
- 51, 52, 55, 56, 0, 0, 117, 206, 81, 0,
- 192, 100, 0, 148, 0, 150, 0, 143, 201, 82,
- 0, 0, 0, 108, 114, 0, 0, 0, 112, 0,
- 208, 174, 0, 106, 0, 169, 0, 14, 16, 27,
- 79, 16, 30, 0, 0, 66, 0, 0, 68, 70,
- 0, 0, 210, 64, 69, 0, 0, 50, 0, 0,
- 0, 79, 98, 194, 102, 80, 145, 94, 149, 151,
- 118, 0, 111, 156, 0, 107, 113, 0, 109, 170,
- 105, 19, 0, 45, 206, 62, 62, 0, 0, 0,
- 0, 65, 0, 0, 0, 0, 116, 110, 95, 0,
- 85, 84, 28, 19, 0, 0, 0, 18, 57, 57,
- 0, 60, 0, 0, 35, 36, 29, 15, 0, 32,
- 60, 60, 19, 0, 0, 33, 34, 0, 43, 62,
- 60, 46, 38, 39, 0, 58, 0, 60, 0, 42,
- 17, 0, 41, 0, 0, 0, 57, 40, 59
+ 143, 142, 0, 0, 0, 0, 0, 0, 0, 19,
+ 77, 0, 0, 33, 16, 16, 16, 16, 16, 16,
+ 0, 16, 16, 39, 0, 0, 46, 49, 0, 0,
+ 0, 0, 0, 0, 26, 25, 20, 146, 102, 213,
+ 0, 0, 194, 106, 83, 84, 192, 196, 0, 0,
+ 0, 98, 0, 0, 149, 0, 180, 207, 0, 88,
+ 204, 0, 165, 93, 92, 91, 96, 0, 0, 120,
+ 0, 133, 129, 130, 126, 127, 124, 0, 136, 135,
+ 134, 132, 131, 128, 137, 125, 0, 0, 108, 0,
+ 101, 109, 178, 0, 0, 0, 0, 0, 0, 0,
+ 76, 0, 81, 82, 0, 0, 70, 0, 0, 0,
+ 0, 0, 16, 0, 0, 82, 66, 58, 59, 72,
+ 56, 57, 60, 61, 0, 0, 122, 211, 86, 0,
+ 197, 105, 0, 153, 0, 155, 0, 148, 206, 87,
+ 0, 0, 0, 113, 119, 0, 0, 0, 117, 0,
+ 213, 179, 0, 111, 0, 174, 0, 14, 16, 29,
+ 84, 16, 32, 0, 0, 71, 0, 0, 73, 75,
+ 0, 0, 215, 69, 74, 0, 0, 55, 0, 0,
+ 0, 84, 103, 199, 107, 85, 150, 99, 154, 156,
+ 123, 0, 116, 161, 0, 112, 118, 0, 114, 175,
+ 110, 0, 0, 47, 211, 67, 67, 0, 0, 0,
+ 0, 70, 0, 0, 0, 0, 121, 115, 100, 0,
+ 90, 89, 30, 19, 0, 0, 0, 18, 62, 62,
+ 0, 65, 0, 0, 37, 38, 31, 21, 0, 34,
+ 65, 65, 19, 0, 0, 35, 36, 0, 45, 67,
+ 65, 0, 48, 40, 41, 0, 63, 0, 65, 0,
+ 44, 0, 52, 22, 17, 0, 43, 0, 15, 19,
+ 51, 0, 0, 0, 62, 42, 53, 64
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
-1, 7, 8, 9, 10, 11, 12, 13, 109, 339,
- 15, 408, 422, 101, 216, 99, 100, 285, 403, 95,
- 425, 206, 405, 354, 344, 298, 347, 356, 350, 281,
- 191, 122, 190, 283, 225, 309, 240, 402, 96, 58,
- 59, 307, 270, 60, 61, 62, 63, 64, 65, 118,
- 66, 145, 132, 67, 351, 68, 69, 70, 71, 72,
- 73, 111
+ 15, 408, 422, 101, 431, 216, 99, 100, 285, 403,
+ 443, 450, 95, 425, 206, 405, 354, 344, 298, 347,
+ 356, 350, 281, 191, 122, 190, 283, 225, 309, 240,
+ 402, 96, 58, 59, 307, 270, 60, 61, 62, 63,
+ 64, 65, 118, 66, 145, 132, 67, 351, 68, 69,
+ 70, 71, 72, 73, 111
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -373
+#define YYPACT_NINF -377
static const yytype_int16 yypact[] =
{
- 787, -373, -373, -373, -373, -373, -373, 75, -373, 2682,
- -3, 1087, 993, -373, -373, -373, 1776, 2682, 2682, 403,
- 403, 403, 403, 403, -373, 403, 403, -373, -373, 28,
- -56, -373, 2682, -373, -373, -373, 2682, -373, -4, 31,
- 33, 1594, 1503, 403, 1685, 1865, 122, 2682, 18, 2682,
- 2682, 2682, 2682, 2682, 2682, 2682, 1954, 152, 73, -373,
- 0, -373, -373, -373, -373, 2701, -373, -373, 58, 114,
- 117, -373, -373, 160, -373, -373, -373, -373, -373, -373,
- -373, 147, -373, 60, 80, 82, 93, 26, 95, 104,
- -3, -373, -373, 141, -373, 170, 1315, 993, -373, -373,
- -373, 424, 523, -373, 4, 223, 223, -373, -373, -373,
- -373, -373, -373, -373, -373, -373, 2682, 108, 115, 2682,
- 92, 1670, -3, 171, 2701, 120, 2045, 1503, -373, 1670,
- 1411, 73, -373, 1333, 2682, -373, 121, -373, 1670, 11,
- 215, 45, 2682, 1670, 2136, 158, -373, -373, -373, 1670,
- 73, 223, 223, 223, -28, -28, 222, 233, 2682, 2682,
- 2682, 2682, 2682, 2682, 2227, 2682, 2682, 2682, 2682, 2682,
- 2682, 2682, 2682, 2682, 2682, 2682, 2682, 2682, 2682, 2682,
- -373, -373, 29, 2318, 2682, 2682, 2682, 2682, 2682, -373,
- 227, 238, 245, -373, -373, -373, -373, -373, -373, -373,
- 155, -373, -373, -373, 238, -3, -373, -373, 2682, 2682,
- 2682, 2682, 2682, 2682, -373, -373, -373, -373, -373, 2682,
- 2682, 9, -373, -373, -373, 193, -373, -373, 323, 174,
- 2682, 73, 2409, 2500, -373, 260, -373, -373, 330, 249,
- -373, 2682, 265, 210, 210, -373, 2701, 91, 12, -373,
- 430, 2779, 1579, 252, 602, 199, 2701, 243, 1167, 1167,
- 1382, 315, 1488, 294, 223, 223, 2682, 2682, -373, 2591,
- 191, -373, -373, 433, 138, 30, 178, 39, 188, 617,
- -373, 250, -373, 171, 50, 266, 2682, 2682, 2682, 2682,
- 287, 1179, -373, 2682, 2682, 171, -373, 152, -373, 152,
- 152, 152, 152, 152, 203, -17, -373, 2682, 308, -3,
- -373, -373, 509, -373, 522, -373, 529, -373, -373, -373,
- 61, 2682, 310, -373, -373, 2682, 224, 88, -373, 603,
- 2682, -373, 325, -373, 326, -373, 333, -373, -373, -373,
- 193, -373, -373, 322, 253, 152, 254, 256, 152, -373,
- 275, 251, -373, -373, -373, 281, 365, 142, 2682, 286,
- 291, 193, -373, -373, -373, -373, -373, -373, -373, -373,
- -373, 96, -373, 2740, 340, -373, -373, 292, -373, -373,
- -373, -373, 89, -373, 2682, -373, -373, 378, 378, 2682,
- 378, 2682, 295, 378, 378, 89, -373, -373, -373, 711,
- -373, -373, -373, -373, 374, 378, 378, -373, 110, 110,
- 313, 141, 388, 378, -373, -373, -373, -373, 805, -373,
- 141, 141, -373, 378, 316, -373, -373, 378, -373, -373,
- 141, -373, -373, -373, 899, -373, 2682, 141, 1271, -373,
- -373, 319, -373, 321, 378, 378, 110, -373, -373
+ 695, -377, -377, -377, -377, -377, -377, 26, -377, 2654,
+ 33, 1105, 1009, -377, -377, -377, 1728, 2654, 2654, 403,
+ 403, 403, 403, 403, -377, 403, 403, -377, -377, 62,
+ -13, -377, 2654, -377, -377, -377, 2654, -377, -1, 45,
+ 53, 1542, 1449, 403, 1635, 1819, 75, 2654, 21, 2654,
+ 2654, 2654, 2654, 2654, 2654, 2654, 1910, 320, 29, -377,
+ 24, -377, -377, -377, -377, 2705, -377, -377, 109, 185,
+ 230, -377, -377, 142, -377, -377, -377, -377, -377, -377,
+ -377, 129, -377, 110, 114, 115, 121, -2, 157, 168,
+ 33, -377, -377, 225, -377, 259, 351, 1009, -377, -377,
+ -377, 433, 529, -377, -7, 137, 137, -377, -377, -377,
+ -377, -377, -377, -377, -377, -377, 2654, 182, 184, 2654,
+ 194, 1804, 33, 265, 2705, 195, 2003, 1449, -377, 1804,
+ 278, 29, -377, 1355, 2654, -377, 201, -377, 1804, 38,
+ 296, 39, 2654, 1804, 2096, 234, -377, -377, -377, 1804,
+ 29, 137, 137, 137, 253, 253, 298, 216, 2654, 2654,
+ 2654, 2654, 2654, 2654, 2189, 2654, 2654, 2654, 2654, 2654,
+ 2654, 2654, 2654, 2654, 2654, 2654, 2654, 2654, 2654, 2654,
+ -377, -377, 5, 2282, 2654, 2654, 2654, 2654, 2654, -377,
+ 291, 292, 301, -377, -377, -377, -377, -377, -377, -377,
+ 227, -377, -377, -377, 292, 33, -377, -377, 2654, 2654,
+ 2654, 2654, 2654, 2654, -377, -377, -377, -377, -377, 2654,
+ 2654, -3, -377, -377, -377, 258, -377, -377, 224, 235,
+ 2654, 29, 2375, 2468, -377, 333, -377, -377, 304, 310,
+ -377, 2654, 337, 273, 273, -377, 2705, 59, 7, -377,
+ 417, 1437, 1713, 125, 515, 237, 2705, 2688, 326, 326,
+ 1280, 1527, 1620, 179, 137, 137, 2654, 2654, -377, 2561,
+ 241, -377, -377, 429, 68, 27, 93, 65, 153, 625,
+ -377, 350, -377, 265, 47, 335, 2654, 2654, 2654, 2654,
+ 358, 1199, -377, 2654, 2654, 265, -377, 320, -377, 320,
+ 320, 320, 320, 320, 275, -38, -377, 2654, 352, 33,
+ -377, -377, 432, -377, 437, -377, 513, -377, -377, -377,
+ 97, 2654, 382, -377, -377, 2654, 189, 113, -377, 525,
+ 2654, -377, 391, -377, 393, -377, 395, -377, -377, -377,
+ 258, -377, -377, 384, 307, 320, 309, 317, 320, -377,
+ 318, 332, -377, -377, -377, 319, 416, 268, 2654, 336,
+ 338, 258, -377, -377, -377, -377, -377, -377, -377, -377,
+ -377, 123, -377, 1187, 431, -377, -377, 343, -377, -377,
+ -377, 419, 49, -377, 2654, -377, -377, 445, 445, 2654,
+ 445, 2654, 353, 445, 445, 49, -377, -377, -377, 386,
+ -377, -377, -377, -377, 459, 445, 445, -377, 48, 48,
+ 378, 225, 461, 445, -377, -377, -377, -377, 721, -377,
+ 225, 225, -377, 445, 394, -377, -377, 445, -377, -377,
+ 225, 173, -377, -377, -377, 817, -377, 2654, 225, 1293,
+ -377, 465, 438, -377, -377, 415, -377, 418, -377, -377,
+ -377, 445, 445, 913, 48, -377, -377, -377
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -373, -373, -373, -373, -373, -373, -373, -373, 2, -373,
- -55, -154, -373, -7, 404, 331, -6, -373, -373, -290,
- -372, 67, -363, -373, 38, -158, -276, -16, -373, -373,
- -19, 397, -373, 230, -231, -271, -373, 51, -9, -40,
- -373, -373, -373, -373, -373, -373, -373, -373, 194, -373,
- -373, -373, -112, -124, -373, -373, 6, 422, 423, -373,
- -373, 35
+ -377, -377, -377, -377, -377, -377, -377, -377, -10, -377,
+ -33, 2312, -377, -12, -377, 506, 424, 6, -377, -377,
+ -377, -377, -279, -361, -201, -376, -377, 131, -24, -239,
+ 84, -377, -377, 58, 489, -377, 324, -265, -283, -377,
+ 140, -5, -35, -377, -377, -377, -377, -377, -377, -377,
+ -377, 79, -377, -377, -377, -110, -119, -377, -377, 2,
+ 493, 502, -377, -377, 40
};
/* 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 -196
+#define YYTABLE_NINF -201
static const yytype_int16 yytable[] =
{
- 57, 353, 131, 229, 218, 94, 74, 104, 102, 162,
- 150, 163, 75, 93, 93, 355, 217, 359, 360, 189,
- 184, 306, 185, 406, 323, 110, 110, 110, 110, 110,
- 236, 110, 110, 19, 20, 21, 141, 426, 266, 119,
- 267, 19, 333, 128, 19, 120, 137, 157, 133, 110,
- 139, 335, 340, 268, 146, 112, 113, 114, 115, 341,
- 116, 117, 161, 193, 361, 235, 438, -196, -196, 382,
- 342, 182, 204, 370, 448, 14, 131, 134, 135, 158,
- 159, 160, 392, 363, 158, 159, 160, 158, 159, 160,
- 395, 215, 203, 200, 231, 304, 198, 125, 74, 93,
- 375, 164, 131, 93, 93, 158, 159, 160, 396, 400,
- 221, 322, 233, 410, 158, 159, 160, 228, 57, 144,
- 158, 159, 160, 184, 223, 185, 186, 199, 187, 346,
- 269, 349, 126, 133, 127, 238, 158, 159, 160, 286,
- 287, 288, 289, 290, 291, 142, 293, 294, 353, 243,
- 244, 245, 161, 247, 248, 250, 423, 424, 332, 183,
- 441, 194, 230, 158, 159, 160, 158, 159, 160, 188,
- 192, 158, 159, 160, 273, 274, 275, 276, 277, 278,
- 305, 195, 279, 196, 208, 209, 210, 211, 271, 205,
- 207, 212, 222, 213, 197, 364, 201, 224, 334, 297,
- 299, 300, 301, 302, 303, 202, 377, 296, 336, 219,
- 57, 105, 106, 158, 159, 160, 220, 158, 159, 160,
- 226, 312, 232, 314, 316, 234, 121, 158, 159, 160,
- 124, 239, 320, 241, 409, 129, 411, 358, 138, 414,
- 415, 143, -68, 149, 374, 151, 152, 153, 154, 155,
- 280, 420, 421, 158, 159, 160, 292, 326, 327, 430,
- 329, 282, 168, 158, 159, 160, 308, 131, 284, 435,
- 317, 338, 404, 437, 311, 319, 321, 345, 299, 348,
- 299, 93, 357, 381, 348, 348, 383, 160, 178, 343,
- 446, 447, 330, 179, 180, 181, 352, 165, 182, 158,
- 159, 160, 19, 362, 166, 167, 168, 169, 158, 159,
- 160, 366, 371, 166, -196, 168, 169, 179, 180, 181,
- 372, 57, 182, 170, 171, 325, 172, 173, 174, 175,
- 176, 177, 178, 242, 365, 378, 379, 179, 180, 181,
- 177, 178, 182, 380, 131, 384, 179, 180, 181, 348,
- 397, 182, 389, 385, 386, 246, 387, 168, 169, 251,
- 252, 253, 254, 255, 256, 257, 258, 259, 260, 261,
- 262, 263, 264, 265, 399, 388, 166, 167, 168, 169,
- 348, 390, 345, 178, 401, 391, 393, 407, 179, 180,
- 181, 394, 398, 182, 419, 413, 418, 401, 158, 159,
- 160, 93, 176, 177, 178, 158, 159, 160, 429, 179,
- 180, 181, 74, 427, 182, 434, 98, 436, 19, 444,
- 93, 445, 443, 310, -13, 76, 107, 348, 214, 412,
- 318, 108, 123, 74, 295, 16, 93, 17, 18, 19,
- 20, 21, 22, 23, 77, 0, 416, 24, 25, 26,
- 27, 28, 0, 29, 30, 31, 32, 33, 34, 78,
- 97, 79, 80, 35, 81, 82, 83, 84, 85, 86,
- 147, 148, 0, 87, 88, 89, 90, 36, 428, 37,
- 38, 39, 40, 41, 42, 0, 0, 432, 433, 43,
- 44, 45, 46, 47, 48, 91, 49, 439, 0, 0,
- 0, 0, 50, 0, 442, 158, 159, 160, 158, 159,
- 160, 0, 0, 0, 51, 52, 53, 0, 0, 373,
- 0, 54, 55, -3, 76, 56, 92, 0, 0, 0,
- 324, 0, 74, 331, 16, 0, 17, 18, 19, 20,
- 21, 22, 23, 77, 0, 0, 24, 25, 26, 27,
- 28, 0, 29, 30, 31, 32, 33, 34, 78, 97,
- 79, 80, 35, 81, 82, 83, 84, 85, 86, 0,
- 0, 0, 87, 88, 89, 90, 36, 0, 37, 38,
- 39, 40, 41, 42, 158, 159, 160, 0, 43, 44,
- 45, 46, 47, 48, 91, 49, 0, 158, 159, 160,
- 0, 50, 0, 0, 158, 159, 160, 0, 0, 367,
- 0, 0, 0, 51, 52, 53, 0, 0, 76, 0,
- 54, 55, 368, 0, 56, 92, 74, 337, 16, 369,
- 17, 18, 19, 20, 21, 22, 23, 77, 0, 0,
- 24, 25, 26, 27, 28, 0, 29, 30, 31, 32,
- 33, 34, 78, 97, 79, 80, 35, 81, 82, 83,
- 84, 85, 86, 0, 0, 0, 87, 88, 89, 90,
- 36, 0, 37, 38, 39, 40, 41, 42, 158, 159,
- 160, 0, 43, 44, 45, 46, 47, 48, 91, 49,
- 0, 178, 0, 0, 0, 50, 179, 180, 181, 0,
- 0, 182, 0, 376, 0, 0, 0, 51, 52, 53,
- 0, 0, 76, 0, 54, 55, 0, 0, 56, 92,
- 74, 0, 16, 0, 17, 18, 19, 20, 21, 22,
- 23, 77, 0, 417, 24, 25, 26, 27, 28, 0,
- 29, 30, 31, 32, 33, 34, 78, 97, 79, 80,
- 35, 81, 82, 83, 84, 85, 86, 0, 0, 0,
- 87, 88, 89, 90, 36, 0, 37, 38, 39, 40,
- 41, 42, 0, 0, 0, 0, 43, 44, 45, 46,
- 47, 48, 91, 49, 0, 0, 0, 0, 0, 50,
- 1, 2, 3, 4, 5, 6, 0, 0, 0, 0,
- 0, 51, 52, 53, 0, 0, 76, 0, 54, 55,
- 0, 0, 56, 92, 74, 431, 16, 0, 17, 18,
+ 75, 93, 93, 102, 57, 217, 218, 131, 229, 306,
+ 406, 104, 353, 19, 266, 150, 267, 94, 340, 323,
+ 19, 110, 110, 110, 110, 110, 14, 110, 110, 268,
+ 361, 128, 236, 162, 137, 163, 19, 20, 21, 333,
+ 141, 189, 74, 161, 133, 110, 139, 184, 426, 185,
+ 146, 157, 355, 439, 359, 360, 341, 382, 74, 235,
+ 112, 113, 114, 115, 363, 116, 117, 342, 198, 400,
+ 158, 159, 160, 119, 158, 159, 160, 335, 395, 322,
+ 203, 131, 134, 135, 158, 159, 160, 93, 332, 200,
+ 120, 93, 93, 457, 423, 424, 105, 106, 142, 231,
+ 304, 199, 125, 215, 158, 159, 160, 131, 269, 370,
+ 161, 121, 223, 334, 221, 124, 158, 159, 160, 392,
+ 129, 228, 57, 138, 144, 375, 143, 164, 149, 133,
+ 151, 152, 153, 154, 155, 396, 158, 159, 160, 238,
+ 193, 233, 158, 159, 160, 158, 159, 160, 126, 204,
+ 410, 188, 192, 243, 244, 245, 127, 247, 248, 250,
+ 353, 286, 287, 288, 289, 290, 291, 230, 293, 294,
+ 158, 159, 160, 336, 158, 159, 160, 279, 273, 274,
+ 275, 276, 277, 278, 271, 305, 166, -201, 168, 169,
+ 158, 159, 160, 441, 184, 296, 185, 364, 445, 442,
+ 158, 159, 160, 297, 299, 300, 301, 302, 303, 374,
+ 428, 377, 183, 194, 57, 177, 178, 195, 196, 433,
+ 434, 179, 180, 181, 197, 312, 182, 314, 316, 440,
+ 158, 159, 160, 179, 180, 181, 320, 446, 182, 186,
+ 246, 187, 168, 169, 251, 252, 253, 254, 255, 256,
+ 257, 258, 259, 260, 261, 262, 263, 264, 265, 358,
+ 201, 326, 327, 346, 329, 349, 158, 159, 160, 93,
+ 178, 202, 131, 205, 404, 179, 180, 181, -200, 207,
+ 182, 345, 299, 348, 299, 219, 357, 220, 348, 348,
+ -200, 224, 352, 158, 159, 160, 222, 226, -200, 366,
+ 168, 158, 159, 160, 232, 381, 234, 239, 383, 241,
+ 208, 209, 210, 211, 280, 282, 371, 212, 242, 213,
+ -200, -200, -200, -200, 284, 57, 310, -200, 178, -200,
+ 292, 308, -200, 179, 180, 181, 319, 311, 182, -200,
+ -200, -200, -200, 317, 330, 158, 159, 160, 321, 131,
+ -201, -201, 160, 348, 182, -200, -200, -200, 343, -200,
+ -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
+ -73, 338, 401, 19, -200, -200, -200, 362, 365, -200,
+ -200, 158, 159, 160, 348, 401, 345, 166, 167, 168,
+ 169, 418, 372, 208, 209, 210, 211, 158, 159, 160,
+ 212, 378, 213, 379, 373, 380, 318, 384, 93, 385,
+ 435, 386, 74, 174, 175, 176, 177, 178, 19, 387,
+ 388, 390, 179, 180, 181, 93, 107, 182, 158, 159,
+ 160, 108, 348, -13, 76, 389, 391, 453, 393, 399,
+ 394, 397, 74, 93, 16, 398, 17, 18, 19, 20,
+ 21, 22, 23, 77, 407, 413, 24, 25, 26, 27,
+ 28, 417, 29, 30, 31, 32, 33, 34, 78, 97,
+ 79, 80, 35, 81, 82, 83, 84, 85, 86, 419,
+ 427, 429, 87, 88, 89, 90, 36, 448, 37, 38,
+ 39, 40, 41, 42, 158, 159, 160, 437, 43, 44,
+ 45, 46, 47, 48, 91, 49, 158, 159, 160, 158,
+ 159, 160, 449, 50, 158, 159, 160, 451, 98, 324,
+ 452, 214, 412, 447, 123, 51, 52, 53, 295, -3,
+ 76, 331, 54, 55, 367, 416, 56, 92, 74, 368,
+ 16, 147, 17, 18, 19, 20, 21, 22, 23, 77,
+ 148, 0, 24, 25, 26, 27, 28, 0, 29, 30,
+ 31, 32, 33, 34, 78, 97, 79, 80, 35, 81,
+ 82, 83, 84, 85, 86, 0, 0, 0, 87, 88,
+ 89, 90, 36, 0, 37, 38, 39, 40, 41, 42,
+ 158, 159, 160, 0, 43, 44, 45, 46, 47, 48,
+ 91, 49, 158, 159, 160, 0, 178, 0, 0, 50,
+ 0, 179, 180, 181, 0, 369, 182, 0, 0, 0,
+ 0, 51, 52, 53, 0, 0, 76, 376, 54, 55,
+ 0, 0, 56, 92, 74, 337, 16, 0, 17, 18,
19, 20, 21, 22, 23, 77, 0, 0, 24, 25,
26, 27, 28, 0, 29, 30, 31, 32, 33, 34,
78, 97, 79, 80, 35, 81, 82, 83, 84, 85,
86, 0, 0, 0, 87, 88, 89, 90, 36, 0,
37, 38, 39, 40, 41, 42, 0, 0, 0, 0,
- 43, 44, 45, 46, 47, 48, 91, 49, 0, 0,
- 0, 0, 0, 50, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 51, 52, 53, 0, 0,
- 76, 0, 54, 55, 0, 0, 56, 92, 74, 440,
- 16, 0, 17, 18, 19, 20, 21, 22, 23, 77,
- 0, 0, 24, 25, 26, 27, 28, 0, 29, 30,
- 31, 32, 33, 34, 78, 97, 79, 80, 35, 81,
- 82, 83, 84, 85, 86, 0, 0, 0, 87, 88,
- 89, 90, 36, 0, 37, 38, 39, 40, 41, 42,
- 0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
- 91, 49, 0, 0, 0, 0, 0, 50, 0, 0,
+ 43, 44, 45, 46, 47, 48, 91, 49, 1, 2,
+ 3, 4, 5, 6, 0, 50, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 51, 52, 53,
+ 0, 0, 76, 0, 54, 55, 0, 0, 56, 92,
+ 74, 432, 16, 0, 17, 18, 19, 20, 21, 22,
+ 23, 77, 0, 0, 24, 25, 26, 27, 28, 0,
+ 29, 30, 31, 32, 33, 34, 78, 97, 79, 80,
+ 35, 81, 82, 83, 84, 85, 86, 0, 0, 0,
+ 87, 88, 89, 90, 36, 0, 37, 38, 39, 40,
+ 41, 42, 0, 0, 0, 0, 43, 44, 45, 46,
+ 47, 48, 91, 49, 0, 0, 0, 0, 0, 0,
+ 0, 50, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 51, 52, 53, 0, 0, 76, 0,
+ 54, 55, 0, 0, 56, 92, 74, 444, 16, 0,
+ 17, 18, 19, 20, 21, 22, 23, 77, 0, 0,
+ 24, 25, 26, 27, 28, 0, 29, 30, 31, 32,
+ 33, 34, 78, 97, 79, 80, 35, 81, 82, 83,
+ 84, 85, 86, 0, 0, 0, 87, 88, 89, 90,
+ 36, 0, 37, 38, 39, 40, 41, 42, 0, 0,
+ 0, 0, 43, 44, 45, 46, 47, 48, 91, 49,
+ 0, 0, 0, 0, 0, 0, 0, 50, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 51,
52, 53, 0, 0, 76, 0, 54, 55, 0, 0,
56, 92, 74, 0, 16, 0, 17, 18, 19, 20,
@@ -552,158 +548,163 @@ static const yytype_int16 yytable[] =
79, 80, 35, 81, 82, 83, 84, 85, 86, 0,
0, 0, 87, 88, 89, 90, 36, 0, 37, 38,
39, 40, 41, 42, 0, 0, 0, 0, 43, 44,
- 45, 46, 47, 48, 91, 49, 0, 0, 0, 0,
- 0, 50, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 51, 52, 53, 0, 0, 76, 0,
- 54, 55, 0, 0, 56, 92, 74, 0, 16, 0,
- 17, 18, 19, 20, 21, 22, 23, 77, 0, 0,
- 24, 25, 26, 27, 28, 0, 29, 30, 31, 32,
- 33, 34, 78, 0, 79, 80, 35, 81, 82, 83,
- 84, 85, 86, 0, 0, 0, 87, 88, 89, 90,
- 36, 0, 37, 38, 39, 40, 41, 42, 0, 0,
- 0, 0, 43, 44, 45, 46, 47, 48, 91, 49,
+ 45, 46, 47, 48, 91, 49, 0, 0, 456, 0,
+ 0, 0, 0, 50, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 51, 52, 53, 0, 0,
+ 76, 0, 54, 55, 0, 0, 56, 92, 74, 0,
+ 16, 0, 17, 18, 19, 20, 21, 22, 23, 77,
+ 0, 0, 24, 25, 26, 27, 28, 0, 29, 30,
+ 31, 32, 33, 34, 78, 97, 79, 80, 35, 81,
+ 82, 83, 84, 85, 86, 0, 0, 0, 87, 88,
+ 89, 90, 36, 0, 37, 38, 39, 40, 41, 42,
+ 0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
+ 91, 49, 0, 0, 0, 0, 0, 0, 0, 50,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 51, 52, 53, 0, 0, 76, 0, 54, 55,
+ 0, 0, 56, 92, 74, 0, 16, 0, 17, 18,
+ 19, 20, 21, 22, 23, 77, 0, 0, 24, 25,
+ 26, 27, 28, 0, 29, 30, 31, 32, 33, 34,
+ 78, 0, 79, 80, 35, 81, 82, 83, 84, 85,
+ 86, 0, 0, 0, 87, 88, 89, 90, 36, 0,
+ 37, 38, 39, 40, 41, 42, 0, 0, 0, 0,
+ 43, 44, 45, 46, 47, 48, 91, 49, 0, 0,
0, 0, 0, 0, 0, 50, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 51, 52, 53,
76, 0, 0, 0, 54, 55, 0, 0, 56, 92,
- 16, 0, 17, 18, 19, 20, 21, 22, 23, -63,
+ 16, 0, 17, 18, 19, 20, 21, 22, 23, -68,
0, 0, 24, 25, 26, 27, 28, 0, 29, 30,
31, 32, 33, 34, 0, 0, 0, 0, 35, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 166, 167,
+ 0, 165, 0, 0, 0, 0, 0, 0, 166, 167,
168, 169, 36, 0, 37, 38, 39, 40, 41, 42,
0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
- 0, 49, 174, 175, 176, 177, 178, 50, 0, 0,
- 0, 179, 180, 181, 0, 0, 182, 0, 0, 51,
- 52, 53, 76, 0, 0, 0, 54, 55, 0, 0,
- 56, 0, 16, 0, 17, 18, 19, 20, 21, 22,
- 23, 0, 0, 0, 24, 25, 26, 27, 28, 0,
- 29, 30, 31, 32, 33, 34, 0, 0, 0, 0,
- 35, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 36, 0, 37, 38, 39, 40,
- 41, 42, 0, -163, 0, 0, 43, 44, 45, 46,
- 47, 48, 184, 49, 185, -163, 0, 0, 0, 50,
- 0, 0, 0, -163, 0, 0, 0, 208, 209, 210,
- 211, 51, 52, 53, 212, 0, 213, 0, 54, 55,
- 0, -63, 56, 0, 0, -163, -163, -163, -163, 0,
- 0, 0, -163, 0, -163, 0, 0, -163, 0, 0,
- 158, 159, 160, 0, -163, -163, -163, -163, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, -163, -163,
- -163, -195, -163, -163, -163, -163, -163, -163, -163, -163,
- -163, -163, -163, -195, 0, 0, 0, -163, -163, -163,
- 0, -195, -163, -163, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 166, 167, 168, 169, 0, 0, 0,
- 0, 0, 0, -195, -195, -195, -195, 0, 0, 0,
- -195, 0, -195, 0, 0, -195, 0, 0, 175, 176,
- 177, 178, -195, -195, -195, -195, 179, 180, 181, 0,
- 0, 182, 0, 0, 0, 0, -195, -195, -195, 0,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, 0, 0, 0, 0, -195, -195, -195, 0, 0,
- -195, -195, 74, 0, 16, 0, 17, 18, 19, 20,
- 21, 22, 23, 0, 0, 0, 130, 25, 26, 27,
- 28, 108, 29, 30, 31, 32, 33, 34, 0, 0,
- 0, 0, 35, 0, 0, 0, 0, 0, 0, 166,
- 167, 168, 169, 0, 0, 0, 36, 0, 37, 38,
- 39, 40, 41, 42, 0, 0, 0, 0, 43, 44,
- 45, 46, 47, 48, 0, 49, 177, 178, 0, 0,
- 0, 50, 179, 180, 181, 0, 0, 182, 0, 0,
- 0, 0, 0, 51, 52, 53, 0, 0, 0, 0,
- 54, 55, 0, 74, 56, 16, 0, 17, 18, 19,
- 20, 21, 22, 23, 0, 0, 0, 24, 25, 26,
- 27, 28, 0, 29, 30, 31, 32, 33, 34, 0,
- 0, 0, 0, 35, 0, 0, 0, 0, 0, 0,
- -196, 0, 168, 169, 0, 0, 0, 36, 0, 37,
- 38, 39, 40, 41, 42, 0, 0, 0, 0, 43,
- 44, 45, 46, 47, 48, 0, 49, 177, 178, 0,
+ 171, 49, 172, 173, 174, 175, 176, 177, 178, 50,
+ 0, 0, 0, 179, 180, 181, 0, 0, 182, 0,
+ 0, 51, 52, 53, 76, 0, 0, 0, 54, 55,
+ 0, 0, 56, 0, 16, 0, 17, 18, 19, 20,
+ 21, 22, 23, 0, 0, 0, 24, 25, 26, 27,
+ 28, 0, 29, 30, 31, 32, 33, 34, 0, 0,
+ 0, 0, 35, 0, 0, 0, 0, 0, 0, 0,
+ 0, 166, 167, 168, 169, 0, 36, 0, 37, 38,
+ 39, 40, 41, 42, 0, -168, 0, 0, 43, 44,
+ 45, 46, 47, 48, 184, 49, 185, -168, 175, 176,
+ 177, 178, 0, 50, 0, -168, 179, 180, 181, 0,
+ 0, 182, 0, 0, 0, 51, 52, 53, 0, 0,
+ 0, 0, 54, 55, 0, -68, 56, -168, -168, -168,
+ -168, 0, 0, 0, -168, 0, -168, 0, 0, -168,
+ 0, 0, 0, 0, 0, 0, -168, -168, -168, -168,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, -168, -168, -168, 0, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, 0, 0, 0,
+ 0, -168, -168, -168, 0, 0, -168, -168, 74, 0,
+ 16, 0, 17, 18, 19, 20, 21, 22, 23, 0,
+ 0, 0, 130, 25, 26, 27, 28, 108, 29, 30,
+ 31, 32, 33, 34, 0, 0, 0, 0, 35, 0,
+ 0, -201, 0, 0, 0, 0, 0, 0, 166, 167,
+ 168, 169, 36, 0, 37, 38, 39, 40, 41, 42,
+ 0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
+ 0, 49, 172, 173, 174, 175, 176, 177, 178, 50,
+ 0, 0, 0, 179, 180, 181, 0, 0, 182, 0,
+ 0, 51, 52, 53, 0, 0, 0, 0, 54, 55,
+ 0, 74, 56, 16, 0, 17, 18, 19, 20, 21,
+ 22, 23, 0, 0, 0, 24, 25, 26, 27, 28,
+ 0, 29, 30, 31, 32, 33, 34, 0, 0, 0,
+ 0, 35, 0, 0, 0, 0, 0, 0, 166, 167,
+ 168, 169, 0, 0, 0, 36, 0, 37, 38, 39,
+ 40, 41, 42, 0, 0, 0, 0, 43, 44, 45,
+ 46, 47, 48, 0, 49, 0, 176, 177, 178, 0,
0, 0, 50, 179, 180, 181, 0, 0, 182, 0,
0, 0, 0, 0, 51, 52, 53, 0, 0, 0,
0, 54, 55, 0, 74, 56, 16, 0, 17, 18,
19, 20, 21, 22, 23, 0, 0, 0, 136, 25,
26, 27, 28, 0, 29, 30, 31, 32, 33, 34,
0, 0, 0, 0, 35, 0, 0, 0, 0, 0,
- 0, 0, 0, 168, 169, 0, 0, 0, 36, 0,
+ 0, 166, 167, 168, 169, 0, 0, 0, 36, 0,
37, 38, 39, 40, 41, 42, 0, 0, 0, 0,
- 43, 44, 45, 46, 47, 48, 0, 49, 177, 178,
- 0, 0, 0, 50, 179, 180, 181, 0, 0, 182,
+ 43, 44, 45, 46, 47, 48, 0, 49, 0, 0,
+ 177, 178, 0, 0, 0, 50, 179, 180, 181, 0,
+ 0, 182, 0, 0, 0, 0, 0, 51, 52, 53,
+ 0, 0, 0, 0, 54, 55, 0, 0, 56, 16,
+ 103, 17, 18, 19, 20, 21, 22, 23, 0, 0,
+ 0, 24, 25, 26, 27, 28, 0, 29, 30, 31,
+ 32, 33, 34, 0, 0, 0, 0, 35, 0, 0,
+ 0, 0, 0, 0, -201, 0, 168, 169, 0, 0,
+ 0, 36, 0, 37, 38, 39, 40, 41, 42, 0,
+ 0, 0, 0, 43, 44, 45, 46, 47, 48, 0,
+ 49, 0, 0, 177, 178, 0, 0, 0, 50, 179,
+ 180, 181, 0, 0, 182, 0, 0, 0, 0, 0,
+ 51, 52, 53, 0, 0, 0, 0, 54, 55, 0,
+ 16, 56, 17, 18, 19, 20, 21, 22, 23, 140,
+ 0, 0, 24, 25, 26, 27, 28, 0, 29, 30,
+ 31, 32, 33, 34, 0, 0, 0, 0, 35, 0,
+ 0, 0, 0, 0, 0, 0, 0, 168, 169, 0,
+ 0, 0, 36, 0, 37, 38, 39, 40, 41, 42,
+ 0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
+ 0, 49, 0, 0, 177, 178, 0, 0, 0, 50,
+ 179, 180, 181, 0, 0, 182, 0, 0, 0, 0,
+ 0, 51, 52, 53, 0, 0, 0, 0, 54, 55,
+ 0, 16, 56, 17, 18, 19, 20, 21, 22, 23,
+ 0, 0, 0, 24, 25, 26, 27, 28, 0, 29,
+ 30, 31, 32, 33, 34, 0, 0, 0, 0, 35,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 36, 0, 37, 38, 39, 40, 41,
+ 42, 0, 0, 0, 0, 43, 44, 45, 46, 47,
+ 48, 0, 49, 0, 0, 0, 0, 0, 0, 0,
+ 50, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 51, 52, 53, 0, 0, 0, 0, 54,
+ 55, 0, 156, 56, 16, 0, 17, 18, 19, 20,
+ 21, 22, 23, 0, 0, 0, 24, 25, 26, 27,
+ 28, 0, 29, 30, 31, 32, 33, 34, 0, 0,
+ 0, 0, 35, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 36, 0, 37, 38,
+ 39, 40, 41, 42, 0, 0, 0, 0, 43, 44,
+ 45, 46, 47, 48, 0, 49, 0, 0, 0, 0,
+ 0, 0, 0, 50, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 51, 52, 53, 0, 0,
- 0, 0, 54, 55, 0, 0, 56, 16, 103, 17,
+ 0, 0, 54, 55, 0, 227, 56, 16, 0, 17,
18, 19, 20, 21, 22, 23, 0, 0, 0, 24,
25, 26, 27, 28, 0, 29, 30, 31, 32, 33,
34, 0, 0, 0, 0, 35, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 36,
0, 37, 38, 39, 40, 41, 42, 0, 0, 0,
0, 43, 44, 45, 46, 47, 48, 0, 49, 0,
- 0, 0, 0, 0, 50, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 51, 52, 53, 0,
- 0, 0, 0, 54, 55, 0, 16, 56, 17, 18,
- 19, 20, 21, 22, 23, 140, 0, 0, 24, 25,
- 26, 27, 28, 0, 29, 30, 31, 32, 33, 34,
- 0, 0, 0, 0, 35, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 36, 0,
- 37, 38, 39, 40, 41, 42, 0, 0, 0, 0,
- 43, 44, 45, 46, 47, 48, 0, 49, 0, 0,
- 0, 0, 0, 50, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 51, 52, 53, 0, 0,
- 0, 0, 54, 55, 0, 16, 56, 17, 18, 19,
- 20, 21, 22, 23, 0, 0, 0, 24, 25, 26,
- 27, 28, 0, 29, 30, 31, 32, 33, 34, 0,
- 0, 0, 0, 35, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 36, 0, 37,
- 38, 39, 40, 41, 42, 0, 0, 0, 0, 43,
- 44, 45, 46, 47, 48, 0, 49, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 50, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 51, 52,
+ 53, 0, 0, 0, 0, 54, 55, 0, 237, 56,
+ 16, 0, 17, 18, 19, 20, 21, 22, 23, 0,
+ 0, 0, 24, 25, 26, 27, 28, 0, 29, 30,
+ 31, 32, 33, 34, 0, 0, 0, 0, 35, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 36, 0, 37, 38, 39, 40, 41, 42,
+ 0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
+ 0, 49, 0, 0, 0, 0, 0, 0, 0, 50,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 51, 52, 53, 0, 0, 0, 0, 54, 55,
+ 0, 249, 56, 16, 0, 17, 18, 19, 20, 21,
+ 22, 23, 0, 0, 0, 24, 25, 26, 27, 28,
+ 0, 29, 30, 31, 32, 33, 34, 0, 0, 0,
+ 0, 35, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 36, 0, 37, 38, 39,
+ 40, 41, 42, 0, 0, 0, 0, 43, 44, 45,
+ 46, 47, 48, 0, 49, 0, 0, 0, 0, 0,
0, 0, 50, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 51, 52, 53, 0, 0, 0,
- 0, 54, 55, 0, 156, 56, 16, 0, 17, 18,
+ 0, 54, 55, 0, 272, 56, 16, 0, 17, 18,
19, 20, 21, 22, 23, 0, 0, 0, 24, 25,
26, 27, 28, 0, 29, 30, 31, 32, 33, 34,
0, 0, 0, 0, 35, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 36, 0,
37, 38, 39, 40, 41, 42, 0, 0, 0, 0,
43, 44, 45, 46, 47, 48, 0, 49, 0, 0,
- 0, 0, 0, 50, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 51, 52, 53, 0, 0,
- 0, 0, 54, 55, 0, 227, 56, 16, 0, 17,
- 18, 19, 20, 21, 22, 23, 0, 0, 0, 24,
- 25, 26, 27, 28, 0, 29, 30, 31, 32, 33,
- 34, 0, 0, 0, 0, 35, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 36,
- 0, 37, 38, 39, 40, 41, 42, 0, 0, 0,
- 0, 43, 44, 45, 46, 47, 48, 0, 49, 0,
- 0, 0, 0, 0, 50, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 51, 52, 53, 0,
- 0, 0, 0, 54, 55, 0, 237, 56, 16, 0,
- 17, 18, 19, 20, 21, 22, 23, 0, 0, 0,
- 24, 25, 26, 27, 28, 0, 29, 30, 31, 32,
- 33, 34, 0, 0, 0, 0, 35, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 36, 0, 37, 38, 39, 40, 41, 42, 0, 0,
- 0, 0, 43, 44, 45, 46, 47, 48, 0, 49,
0, 0, 0, 0, 0, 50, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 51, 52, 53,
- 0, 0, 0, 0, 54, 55, 0, 249, 56, 16,
+ 0, 0, 0, 0, 54, 55, 0, 313, 56, 16,
0, 17, 18, 19, 20, 21, 22, 23, 0, 0,
0, 24, 25, 26, 27, 28, 0, 29, 30, 31,
32, 33, 34, 0, 0, 0, 0, 35, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 36, 0, 37, 38, 39, 40, 41, 42, 0,
0, 0, 0, 43, 44, 45, 46, 47, 48, 0,
- 49, 0, 0, 0, 0, 0, 50, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 51, 52,
- 53, 0, 0, 0, 0, 54, 55, 0, 272, 56,
- 16, 0, 17, 18, 19, 20, 21, 22, 23, 0,
- 0, 0, 24, 25, 26, 27, 28, 0, 29, 30,
- 31, 32, 33, 34, 0, 0, 0, 0, 35, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 36, 0, 37, 38, 39, 40, 41, 42,
- 0, 0, 0, 0, 43, 44, 45, 46, 47, 48,
- 0, 49, 0, 0, 0, 0, 0, 50, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 51,
- 52, 53, 0, 0, 0, 0, 54, 55, 0, 313,
- 56, 16, 0, 17, 18, 19, 20, 21, 22, 23,
- 0, 0, 0, 24, 25, 26, 27, 28, 0, 29,
- 30, 31, 32, 33, 34, 0, 0, 0, 0, 35,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 36, 0, 37, 38, 39, 40, 41,
- 42, 0, 0, 0, 0, 43, 44, 45, 46, 47,
- 48, 0, 49, 0, 0, 0, 0, 0, 50, 0,
+ 49, 0, 0, 0, 0, 0, 0, 0, 50, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
51, 52, 53, 0, 0, 0, 0, 54, 55, 0,
315, 56, 16, 0, 17, 18, 19, 20, 21, 22,
@@ -712,371 +713,361 @@ static const yytype_int16 yytable[] =
35, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 36, 0, 37, 38, 39, 40,
41, 42, 0, 0, 0, 0, 43, 44, 45, 46,
- 47, 48, 0, 49, 0, 0, 0, 0, 0, 50,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 51, 52, 53, 0, 0, 0, 0, 54, 55,
- 0, 328, 56, 16, 0, 17, 18, 19, 20, 21,
- 22, 23, 0, 0, 0, 24, 25, 26, 27, 28,
- 0, 29, 30, 31, 32, 33, 34, 0, 0, 0,
- 0, 35, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 36, 0, 37, 38, 39,
- 40, 41, 42, 0, 0, 0, 0, 43, 44, 45,
- 46, 47, 48, 0, 49, 165, 0, 0, 0, 0,
- 50, 0, 166, 167, 168, 169, 0, 0, 0, 0,
- 0, 0, 51, 52, 53, 0, 0, 0, 0, 54,
- 55, 170, 171, 56, 172, 173, 174, 175, 176, 177,
- 178, 0, 0, 0, 165, 179, 180, 181, 0, 0,
- 182, 166, 167, 168, 169, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 171, 0, 172, 173, 174, 175, 176, 177, 178,
- 0, 0, 0, -196, 179, 180, 181, 0, 0, 182,
- 166, 167, 168, 169, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 172, 173, 174, 175, 176, 177, 178, 0,
- 0, 0, 0, 179, 180, 181, 0, 0, 182
+ 47, 48, 0, 49, 0, 0, 0, 0, 0, 0,
+ 0, 50, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 51, 52, 53, 0, 0, 0, 0,
+ 54, 55, 0, 328, 56, 16, 0, 17, 18, 19,
+ 20, 21, 22, 23, 0, 0, 0, 24, 25, 26,
+ 27, 28, 0, 29, 30, 31, 32, 33, 34, 0,
+ 0, 0, 0, 35, 0, 0, 0, 0, 0, 0,
+ 409, 0, 411, 0, 0, 414, 415, 36, 0, 37,
+ 38, 39, 40, 41, 42, 0, 0, 420, 421, 43,
+ 44, 45, 46, 47, 48, 430, 49, 0, 0, 0,
+ 0, 0, 0, 0, 50, 436, 0, 0, 0, 438,
+ 0, 0, 165, 0, 0, 0, 51, 52, 53, 166,
+ 167, 168, 169, 54, 55, 0, 0, 56, 0, 165,
+ 0, 0, 0, 454, 455, 0, 166, 167, 168, 169,
+ 170, 171, 325, 172, 173, 174, 175, 176, 177, 178,
+ 0, 0, 0, 0, 179, 180, 181, 170, 171, 182,
+ 172, 173, 174, 175, 176, 177, 178, 0, 0, 0,
+ 0, 179, 180, 181, 0, 0, 182
};
static const yytype_int16 yycheck[] =
{
- 9, 291, 42, 127, 116, 11, 9, 16, 15, 9,
- 50, 11, 10, 11, 12, 291, 12, 293, 294, 74,
- 9, 12, 11, 386, 12, 19, 20, 21, 22, 23,
- 142, 25, 26, 15, 16, 17, 45, 409, 9, 11,
- 11, 15, 12, 41, 15, 101, 44, 56, 42, 43,
- 44, 12, 283, 24, 48, 20, 21, 22, 23, 9,
- 25, 26, 79, 82, 295, 20, 429, 95, 96, 340,
- 20, 99, 91, 12, 446, 0, 116, 42, 43, 75,
- 76, 77, 358, 100, 75, 76, 77, 75, 76, 77,
- 361, 97, 90, 87, 134, 219, 70, 101, 9, 97,
- 12, 101, 142, 101, 102, 75, 76, 77, 12, 20,
- 119, 20, 101, 389, 75, 76, 77, 126, 127, 101,
- 75, 76, 77, 9, 122, 11, 9, 101, 11, 287,
- 101, 289, 101, 127, 101, 144, 75, 76, 77, 194,
- 195, 196, 197, 198, 199, 23, 201, 202, 438, 158,
- 159, 160, 79, 162, 163, 164, 46, 47, 20, 101,
- 436, 101, 127, 75, 76, 77, 75, 76, 77, 9,
- 23, 75, 76, 77, 183, 184, 185, 186, 187, 188,
- 220, 101, 189, 101, 42, 43, 44, 45, 182, 48,
- 20, 49, 100, 51, 101, 307, 101, 26, 20, 208,
- 209, 210, 211, 212, 213, 101, 330, 205, 20, 101,
- 219, 17, 18, 75, 76, 77, 101, 75, 76, 77,
- 100, 230, 101, 232, 233, 10, 32, 75, 76, 77,
- 36, 73, 241, 11, 388, 41, 390, 292, 44, 393,
- 394, 47, 100, 49, 20, 51, 52, 53, 54, 55,
- 23, 405, 406, 75, 76, 77, 101, 266, 267, 413,
- 269, 23, 63, 75, 76, 77, 73, 307, 23, 423,
- 10, 21, 384, 427, 100, 26, 11, 286, 287, 288,
- 289, 279, 291, 338, 293, 294, 341, 77, 89, 23,
- 444, 445, 101, 94, 95, 96, 290, 54, 99, 75,
- 76, 77, 15, 100, 61, 62, 63, 64, 75, 76,
- 77, 309, 321, 61, 62, 63, 64, 94, 95, 96,
- 10, 330, 99, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 100, 26, 10, 10, 94, 95, 96,
- 88, 89, 99, 10, 384, 23, 94, 95, 96, 358,
- 10, 99, 101, 100, 100, 161, 100, 63, 64, 165,
- 166, 167, 168, 169, 170, 171, 172, 173, 174, 175,
- 176, 177, 178, 179, 381, 100, 61, 62, 63, 64,
- 389, 100, 391, 89, 382, 20, 100, 9, 94, 95,
- 96, 100, 100, 99, 20, 100, 403, 395, 75, 76,
- 77, 399, 87, 88, 89, 75, 76, 77, 20, 94,
- 95, 96, 9, 100, 99, 422, 12, 101, 15, 100,
- 418, 100, 438, 100, 0, 1, 23, 436, 97, 391,
- 100, 28, 35, 9, 204, 11, 434, 13, 14, 15,
- 16, 17, 18, 19, 20, -1, 395, 23, 24, 25,
- 26, 27, -1, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 48, 48, -1, 49, 50, 51, 52, 53, 411, 55,
- 56, 57, 58, 59, 60, -1, -1, 420, 421, 65,
- 66, 67, 68, 69, 70, 71, 72, 430, -1, -1,
- -1, -1, 78, -1, 437, 75, 76, 77, 75, 76,
- 77, -1, -1, -1, 90, 91, 92, -1, -1, 325,
- -1, 97, 98, 0, 1, 101, 102, -1, -1, -1,
- 100, -1, 9, 100, 11, -1, 13, 14, 15, 16,
- 17, 18, 19, 20, -1, -1, 23, 24, 25, 26,
- 27, -1, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, -1,
- -1, -1, 49, 50, 51, 52, 53, -1, 55, 56,
- 57, 58, 59, 60, 75, 76, 77, -1, 65, 66,
- 67, 68, 69, 70, 71, 72, -1, 75, 76, 77,
- -1, 78, -1, -1, 75, 76, 77, -1, -1, 100,
- -1, -1, -1, 90, 91, 92, -1, -1, 1, -1,
- 97, 98, 100, -1, 101, 102, 9, 10, 11, 100,
- 13, 14, 15, 16, 17, 18, 19, 20, -1, -1,
- 23, 24, 25, 26, 27, -1, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, -1, -1, -1, 49, 50, 51, 52,
- 53, -1, 55, 56, 57, 58, 59, 60, 75, 76,
- 77, -1, 65, 66, 67, 68, 69, 70, 71, 72,
- -1, 89, -1, -1, -1, 78, 94, 95, 96, -1,
- -1, 99, -1, 100, -1, -1, -1, 90, 91, 92,
- -1, -1, 1, -1, 97, 98, -1, -1, 101, 102,
- 9, -1, 11, -1, 13, 14, 15, 16, 17, 18,
- 19, 20, -1, 22, 23, 24, 25, 26, 27, -1,
- 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
- 39, 40, 41, 42, 43, 44, 45, -1, -1, -1,
- 49, 50, 51, 52, 53, -1, 55, 56, 57, 58,
- 59, 60, -1, -1, -1, -1, 65, 66, 67, 68,
- 69, 70, 71, 72, -1, -1, -1, -1, -1, 78,
- 3, 4, 5, 6, 7, 8, -1, -1, -1, -1,
- -1, 90, 91, 92, -1, -1, 1, -1, 97, 98,
- -1, -1, 101, 102, 9, 10, 11, -1, 13, 14,
+ 10, 11, 12, 15, 9, 12, 116, 42, 127, 12,
+ 386, 16, 291, 15, 9, 50, 11, 11, 283, 12,
+ 15, 19, 20, 21, 22, 23, 0, 25, 26, 24,
+ 295, 41, 142, 9, 44, 11, 15, 16, 17, 12,
+ 45, 74, 9, 81, 42, 43, 44, 9, 409, 11,
+ 48, 56, 291, 429, 293, 294, 9, 340, 9, 20,
+ 20, 21, 22, 23, 102, 25, 26, 20, 70, 20,
+ 77, 78, 79, 11, 77, 78, 79, 12, 361, 20,
+ 90, 116, 42, 43, 77, 78, 79, 97, 20, 87,
+ 103, 101, 102, 454, 46, 47, 17, 18, 23, 134,
+ 219, 103, 103, 97, 77, 78, 79, 142, 103, 12,
+ 81, 32, 122, 20, 119, 36, 77, 78, 79, 358,
+ 41, 126, 127, 44, 103, 12, 47, 103, 49, 127,
+ 51, 52, 53, 54, 55, 12, 77, 78, 79, 144,
+ 82, 103, 77, 78, 79, 77, 78, 79, 103, 91,
+ 389, 9, 23, 158, 159, 160, 103, 162, 163, 164,
+ 439, 194, 195, 196, 197, 198, 199, 127, 201, 202,
+ 77, 78, 79, 20, 77, 78, 79, 189, 183, 184,
+ 185, 186, 187, 188, 182, 220, 61, 62, 63, 64,
+ 77, 78, 79, 20, 9, 205, 11, 307, 437, 26,
+ 77, 78, 79, 208, 209, 210, 211, 212, 213, 20,
+ 411, 330, 103, 103, 219, 90, 91, 103, 103, 420,
+ 421, 96, 97, 98, 103, 230, 101, 232, 233, 430,
+ 77, 78, 79, 96, 97, 98, 241, 438, 101, 9,
+ 161, 11, 63, 64, 165, 166, 167, 168, 169, 170,
+ 171, 172, 173, 174, 175, 176, 177, 178, 179, 292,
+ 103, 266, 267, 287, 269, 289, 77, 78, 79, 279,
+ 91, 103, 307, 48, 384, 96, 97, 98, 0, 20,
+ 101, 286, 287, 288, 289, 103, 291, 103, 293, 294,
+ 12, 26, 290, 77, 78, 79, 102, 102, 20, 309,
+ 63, 77, 78, 79, 103, 338, 10, 73, 341, 11,
+ 42, 43, 44, 45, 23, 23, 321, 49, 102, 51,
+ 42, 43, 44, 45, 23, 330, 102, 49, 91, 51,
+ 103, 73, 54, 96, 97, 98, 26, 102, 101, 61,
+ 62, 63, 64, 10, 103, 77, 78, 79, 11, 384,
+ 97, 98, 79, 358, 101, 77, 78, 79, 23, 81,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ 102, 21, 382, 15, 96, 97, 98, 102, 26, 101,
+ 102, 77, 78, 79, 389, 395, 391, 61, 62, 63,
+ 64, 403, 10, 42, 43, 44, 45, 77, 78, 79,
+ 49, 10, 51, 10, 325, 10, 102, 23, 418, 102,
+ 422, 102, 9, 87, 88, 89, 90, 91, 15, 102,
+ 102, 102, 96, 97, 98, 435, 23, 101, 77, 78,
+ 79, 28, 437, 0, 1, 103, 20, 449, 102, 20,
+ 102, 10, 9, 453, 11, 102, 13, 14, 15, 16,
+ 17, 18, 19, 20, 9, 102, 23, 24, 25, 26,
+ 27, 75, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 20,
+ 102, 20, 49, 50, 51, 52, 53, 22, 55, 56,
+ 57, 58, 59, 60, 77, 78, 79, 103, 65, 66,
+ 67, 68, 69, 70, 71, 72, 77, 78, 79, 77,
+ 78, 79, 74, 80, 77, 78, 79, 102, 12, 102,
+ 102, 97, 391, 439, 35, 92, 93, 94, 204, 0,
+ 1, 102, 99, 100, 102, 395, 103, 104, 9, 102,
+ 11, 48, 13, 14, 15, 16, 17, 18, 19, 20,
+ 48, -1, 23, 24, 25, 26, 27, -1, 29, 30,
+ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
+ 41, 42, 43, 44, 45, -1, -1, -1, 49, 50,
+ 51, 52, 53, -1, 55, 56, 57, 58, 59, 60,
+ 77, 78, 79, -1, 65, 66, 67, 68, 69, 70,
+ 71, 72, 77, 78, 79, -1, 91, -1, -1, 80,
+ -1, 96, 97, 98, -1, 102, 101, -1, -1, -1,
+ -1, 92, 93, 94, -1, -1, 1, 102, 99, 100,
+ -1, -1, 103, 104, 9, 10, 11, -1, 13, 14,
15, 16, 17, 18, 19, 20, -1, -1, 23, 24,
25, 26, 27, -1, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, -1, -1, -1, 49, 50, 51, 52, 53, -1,
55, 56, 57, 58, 59, 60, -1, -1, -1, -1,
- 65, 66, 67, 68, 69, 70, 71, 72, -1, -1,
- -1, -1, -1, 78, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 90, 91, 92, -1, -1,
- 1, -1, 97, 98, -1, -1, 101, 102, 9, 10,
+ 65, 66, 67, 68, 69, 70, 71, 72, 3, 4,
+ 5, 6, 7, 8, -1, 80, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 92, 93, 94,
+ -1, -1, 1, -1, 99, 100, -1, -1, 103, 104,
+ 9, 10, 11, -1, 13, 14, 15, 16, 17, 18,
+ 19, 20, -1, -1, 23, 24, 25, 26, 27, -1,
+ 29, 30, 31, 32, 33, 34, 35, 36, 37, 38,
+ 39, 40, 41, 42, 43, 44, 45, -1, -1, -1,
+ 49, 50, 51, 52, 53, -1, 55, 56, 57, 58,
+ 59, 60, -1, -1, -1, -1, 65, 66, 67, 68,
+ 69, 70, 71, 72, -1, -1, -1, -1, -1, -1,
+ -1, 80, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 92, 93, 94, -1, -1, 1, -1,
+ 99, 100, -1, -1, 103, 104, 9, 10, 11, -1,
+ 13, 14, 15, 16, 17, 18, 19, 20, -1, -1,
+ 23, 24, 25, 26, 27, -1, 29, 30, 31, 32,
+ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+ 43, 44, 45, -1, -1, -1, 49, 50, 51, 52,
+ 53, -1, 55, 56, 57, 58, 59, 60, -1, -1,
+ -1, -1, 65, 66, 67, 68, 69, 70, 71, 72,
+ -1, -1, -1, -1, -1, -1, -1, 80, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 92,
+ 93, 94, -1, -1, 1, -1, 99, 100, -1, -1,
+ 103, 104, 9, -1, 11, -1, 13, 14, 15, 16,
+ 17, 18, 19, 20, -1, -1, 23, 24, 25, 26,
+ 27, -1, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, -1,
+ -1, -1, 49, 50, 51, 52, 53, -1, 55, 56,
+ 57, 58, 59, 60, -1, -1, -1, -1, 65, 66,
+ 67, 68, 69, 70, 71, 72, -1, -1, 75, -1,
+ -1, -1, -1, 80, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 92, 93, 94, -1, -1,
+ 1, -1, 99, 100, -1, -1, 103, 104, 9, -1,
11, -1, 13, 14, 15, 16, 17, 18, 19, 20,
-1, -1, 23, 24, 25, 26, 27, -1, 29, 30,
31, 32, 33, 34, 35, 36, 37, 38, 39, 40,
41, 42, 43, 44, 45, -1, -1, -1, 49, 50,
51, 52, 53, -1, 55, 56, 57, 58, 59, 60,
-1, -1, -1, -1, 65, 66, 67, 68, 69, 70,
- 71, 72, -1, -1, -1, -1, -1, 78, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 90,
- 91, 92, -1, -1, 1, -1, 97, 98, -1, -1,
- 101, 102, 9, -1, 11, -1, 13, 14, 15, 16,
- 17, 18, 19, 20, -1, -1, 23, 24, 25, 26,
- 27, -1, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 43, 44, 45, -1,
- -1, -1, 49, 50, 51, 52, 53, -1, 55, 56,
- 57, 58, 59, 60, -1, -1, -1, -1, 65, 66,
- 67, 68, 69, 70, 71, 72, -1, -1, -1, -1,
- -1, 78, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 90, 91, 92, -1, -1, 1, -1,
- 97, 98, -1, -1, 101, 102, 9, -1, 11, -1,
- 13, 14, 15, 16, 17, 18, 19, 20, -1, -1,
- 23, 24, 25, 26, 27, -1, 29, 30, 31, 32,
- 33, 34, 35, -1, 37, 38, 39, 40, 41, 42,
- 43, 44, 45, -1, -1, -1, 49, 50, 51, 52,
- 53, -1, 55, 56, 57, 58, 59, 60, -1, -1,
- -1, -1, 65, 66, 67, 68, 69, 70, 71, 72,
- -1, -1, -1, -1, -1, 78, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 90, 91, 92,
- 1, -1, -1, -1, 97, 98, -1, -1, 101, 102,
+ 71, 72, -1, -1, -1, -1, -1, -1, -1, 80,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 92, 93, 94, -1, -1, 1, -1, 99, 100,
+ -1, -1, 103, 104, 9, -1, 11, -1, 13, 14,
+ 15, 16, 17, 18, 19, 20, -1, -1, 23, 24,
+ 25, 26, 27, -1, 29, 30, 31, 32, 33, 34,
+ 35, -1, 37, 38, 39, 40, 41, 42, 43, 44,
+ 45, -1, -1, -1, 49, 50, 51, 52, 53, -1,
+ 55, 56, 57, 58, 59, 60, -1, -1, -1, -1,
+ 65, 66, 67, 68, 69, 70, 71, 72, -1, -1,
+ -1, -1, -1, -1, -1, 80, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 92, 93, 94,
+ 1, -1, -1, -1, 99, 100, -1, -1, 103, 104,
11, -1, 13, 14, 15, 16, 17, 18, 19, 20,
-1, -1, 23, 24, 25, 26, 27, -1, 29, 30,
31, 32, 33, 34, -1, -1, -1, -1, 39, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 61, 62,
+ -1, 54, -1, -1, -1, -1, -1, -1, 61, 62,
63, 64, 53, -1, 55, 56, 57, 58, 59, 60,
-1, -1, -1, -1, 65, 66, 67, 68, 69, 70,
- -1, 72, 85, 86, 87, 88, 89, 78, -1, -1,
- -1, 94, 95, 96, -1, -1, 99, -1, -1, 90,
- 91, 92, 1, -1, -1, -1, 97, 98, -1, -1,
- 101, -1, 11, -1, 13, 14, 15, 16, 17, 18,
- 19, -1, -1, -1, 23, 24, 25, 26, 27, -1,
- 29, 30, 31, 32, 33, 34, -1, -1, -1, -1,
- 39, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 53, -1, 55, 56, 57, 58,
- 59, 60, -1, 0, -1, -1, 65, 66, 67, 68,
- 69, 70, 9, 72, 11, 12, -1, -1, -1, 78,
- -1, -1, -1, 20, -1, -1, -1, 42, 43, 44,
- 45, 90, 91, 92, 49, -1, 51, -1, 97, 98,
- -1, 100, 101, -1, -1, 42, 43, 44, 45, -1,
- -1, -1, 49, -1, 51, -1, -1, 54, -1, -1,
- 75, 76, 77, -1, 61, 62, 63, 64, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 75, 76,
- 77, 0, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 89, 12, -1, -1, -1, 94, 95, 96,
- -1, 20, 99, 100, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 61, 62, 63, 64, -1, -1, -1,
- -1, -1, -1, 42, 43, 44, 45, -1, -1, -1,
- 49, -1, 51, -1, -1, 54, -1, -1, 86, 87,
- 88, 89, 61, 62, 63, 64, 94, 95, 96, -1,
- -1, 99, -1, -1, -1, -1, 75, 76, 77, -1,
- 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,
- 89, -1, -1, -1, -1, 94, 95, 96, -1, -1,
- 99, 100, 9, -1, 11, -1, 13, 14, 15, 16,
+ 83, 72, 85, 86, 87, 88, 89, 90, 91, 80,
+ -1, -1, -1, 96, 97, 98, -1, -1, 101, -1,
+ -1, 92, 93, 94, 1, -1, -1, -1, 99, 100,
+ -1, -1, 103, -1, 11, -1, 13, 14, 15, 16,
17, 18, 19, -1, -1, -1, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, -1, -1,
- -1, -1, 39, -1, -1, -1, -1, -1, -1, 61,
- 62, 63, 64, -1, -1, -1, 53, -1, 55, 56,
- 57, 58, 59, 60, -1, -1, -1, -1, 65, 66,
- 67, 68, 69, 70, -1, 72, 88, 89, -1, -1,
- -1, 78, 94, 95, 96, -1, -1, 99, -1, -1,
- -1, -1, -1, 90, 91, 92, -1, -1, -1, -1,
- 97, 98, -1, 9, 101, 11, -1, 13, 14, 15,
- 16, 17, 18, 19, -1, -1, -1, 23, 24, 25,
- 26, 27, -1, 29, 30, 31, 32, 33, 34, -1,
- -1, -1, -1, 39, -1, -1, -1, -1, -1, -1,
- 61, -1, 63, 64, -1, -1, -1, 53, -1, 55,
- 56, 57, 58, 59, 60, -1, -1, -1, -1, 65,
- 66, 67, 68, 69, 70, -1, 72, 88, 89, -1,
- -1, -1, 78, 94, 95, 96, -1, -1, 99, -1,
- -1, -1, -1, -1, 90, 91, 92, -1, -1, -1,
- -1, 97, 98, -1, 9, 101, 11, -1, 13, 14,
+ 27, -1, 29, 30, 31, 32, 33, 34, -1, -1,
+ -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, 61, 62, 63, 64, -1, 53, -1, 55, 56,
+ 57, 58, 59, 60, -1, 0, -1, -1, 65, 66,
+ 67, 68, 69, 70, 9, 72, 11, 12, 88, 89,
+ 90, 91, -1, 80, -1, 20, 96, 97, 98, -1,
+ -1, 101, -1, -1, -1, 92, 93, 94, -1, -1,
+ -1, -1, 99, 100, -1, 102, 103, 42, 43, 44,
+ 45, -1, -1, -1, 49, -1, 51, -1, -1, 54,
+ -1, -1, -1, -1, -1, -1, 61, 62, 63, 64,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 77, 78, 79, -1, 81, 82, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, -1, -1, -1,
+ -1, 96, 97, 98, -1, -1, 101, 102, 9, -1,
+ 11, -1, 13, 14, 15, 16, 17, 18, 19, -1,
+ -1, -1, 23, 24, 25, 26, 27, 28, 29, 30,
+ 31, 32, 33, 34, -1, -1, -1, -1, 39, -1,
+ -1, 54, -1, -1, -1, -1, -1, -1, 61, 62,
+ 63, 64, 53, -1, 55, 56, 57, 58, 59, 60,
+ -1, -1, -1, -1, 65, 66, 67, 68, 69, 70,
+ -1, 72, 85, 86, 87, 88, 89, 90, 91, 80,
+ -1, -1, -1, 96, 97, 98, -1, -1, 101, -1,
+ -1, 92, 93, 94, -1, -1, -1, -1, 99, 100,
+ -1, 9, 103, 11, -1, 13, 14, 15, 16, 17,
+ 18, 19, -1, -1, -1, 23, 24, 25, 26, 27,
+ -1, 29, 30, 31, 32, 33, 34, -1, -1, -1,
+ -1, 39, -1, -1, -1, -1, -1, -1, 61, 62,
+ 63, 64, -1, -1, -1, 53, -1, 55, 56, 57,
+ 58, 59, 60, -1, -1, -1, -1, 65, 66, 67,
+ 68, 69, 70, -1, 72, -1, 89, 90, 91, -1,
+ -1, -1, 80, 96, 97, 98, -1, -1, 101, -1,
+ -1, -1, -1, -1, 92, 93, 94, -1, -1, -1,
+ -1, 99, 100, -1, 9, 103, 11, -1, 13, 14,
15, 16, 17, 18, 19, -1, -1, -1, 23, 24,
25, 26, 27, -1, 29, 30, 31, 32, 33, 34,
-1, -1, -1, -1, 39, -1, -1, -1, -1, -1,
- -1, -1, -1, 63, 64, -1, -1, -1, 53, -1,
+ -1, 61, 62, 63, 64, -1, -1, -1, 53, -1,
55, 56, 57, 58, 59, 60, -1, -1, -1, -1,
- 65, 66, 67, 68, 69, 70, -1, 72, 88, 89,
- -1, -1, -1, 78, 94, 95, 96, -1, -1, 99,
- -1, -1, -1, -1, -1, 90, 91, 92, -1, -1,
- -1, -1, 97, 98, -1, -1, 101, 11, 12, 13,
+ 65, 66, 67, 68, 69, 70, -1, 72, -1, -1,
+ 90, 91, -1, -1, -1, 80, 96, 97, 98, -1,
+ -1, 101, -1, -1, -1, -1, -1, 92, 93, 94,
+ -1, -1, -1, -1, 99, 100, -1, -1, 103, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, -1, -1,
+ -1, 23, 24, 25, 26, 27, -1, 29, 30, 31,
+ 32, 33, 34, -1, -1, -1, -1, 39, -1, -1,
+ -1, -1, -1, -1, 61, -1, 63, 64, -1, -1,
+ -1, 53, -1, 55, 56, 57, 58, 59, 60, -1,
+ -1, -1, -1, 65, 66, 67, 68, 69, 70, -1,
+ 72, -1, -1, 90, 91, -1, -1, -1, 80, 96,
+ 97, 98, -1, -1, 101, -1, -1, -1, -1, -1,
+ 92, 93, 94, -1, -1, -1, -1, 99, 100, -1,
+ 11, 103, 13, 14, 15, 16, 17, 18, 19, 20,
+ -1, -1, 23, 24, 25, 26, 27, -1, 29, 30,
+ 31, 32, 33, 34, -1, -1, -1, -1, 39, -1,
+ -1, -1, -1, -1, -1, -1, -1, 63, 64, -1,
+ -1, -1, 53, -1, 55, 56, 57, 58, 59, 60,
+ -1, -1, -1, -1, 65, 66, 67, 68, 69, 70,
+ -1, 72, -1, -1, 90, 91, -1, -1, -1, 80,
+ 96, 97, 98, -1, -1, 101, -1, -1, -1, -1,
+ -1, 92, 93, 94, -1, -1, -1, -1, 99, 100,
+ -1, 11, 103, 13, 14, 15, 16, 17, 18, 19,
+ -1, -1, -1, 23, 24, 25, 26, 27, -1, 29,
+ 30, 31, 32, 33, 34, -1, -1, -1, -1, 39,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 53, -1, 55, 56, 57, 58, 59,
+ 60, -1, -1, -1, -1, 65, 66, 67, 68, 69,
+ 70, -1, 72, -1, -1, -1, -1, -1, -1, -1,
+ 80, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 92, 93, 94, -1, -1, -1, -1, 99,
+ 100, -1, 102, 103, 11, -1, 13, 14, 15, 16,
+ 17, 18, 19, -1, -1, -1, 23, 24, 25, 26,
+ 27, -1, 29, 30, 31, 32, 33, 34, -1, -1,
+ -1, -1, 39, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 53, -1, 55, 56,
+ 57, 58, 59, 60, -1, -1, -1, -1, 65, 66,
+ 67, 68, 69, 70, -1, 72, -1, -1, -1, -1,
+ -1, -1, -1, 80, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 92, 93, 94, -1, -1,
+ -1, -1, 99, 100, -1, 102, 103, 11, -1, 13,
14, 15, 16, 17, 18, 19, -1, -1, -1, 23,
24, 25, 26, 27, -1, 29, 30, 31, 32, 33,
34, -1, -1, -1, -1, 39, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 53,
-1, 55, 56, 57, 58, 59, 60, -1, -1, -1,
-1, 65, 66, 67, 68, 69, 70, -1, 72, -1,
- -1, -1, -1, -1, 78, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 90, 91, 92, -1,
- -1, -1, -1, 97, 98, -1, 11, 101, 13, 14,
- 15, 16, 17, 18, 19, 20, -1, -1, 23, 24,
- 25, 26, 27, -1, 29, 30, 31, 32, 33, 34,
- -1, -1, -1, -1, 39, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 53, -1,
- 55, 56, 57, 58, 59, 60, -1, -1, -1, -1,
- 65, 66, 67, 68, 69, 70, -1, 72, -1, -1,
- -1, -1, -1, 78, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 90, 91, 92, -1, -1,
- -1, -1, 97, 98, -1, 11, 101, 13, 14, 15,
- 16, 17, 18, 19, -1, -1, -1, 23, 24, 25,
- 26, 27, -1, 29, 30, 31, 32, 33, 34, -1,
- -1, -1, -1, 39, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 53, -1, 55,
- 56, 57, 58, 59, 60, -1, -1, -1, -1, 65,
- 66, 67, 68, 69, 70, -1, 72, -1, -1, -1,
- -1, -1, 78, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 90, 91, 92, -1, -1, -1,
- -1, 97, 98, -1, 100, 101, 11, -1, 13, 14,
+ -1, -1, -1, -1, -1, -1, 80, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 92, 93,
+ 94, -1, -1, -1, -1, 99, 100, -1, 102, 103,
+ 11, -1, 13, 14, 15, 16, 17, 18, 19, -1,
+ -1, -1, 23, 24, 25, 26, 27, -1, 29, 30,
+ 31, 32, 33, 34, -1, -1, -1, -1, 39, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 53, -1, 55, 56, 57, 58, 59, 60,
+ -1, -1, -1, -1, 65, 66, 67, 68, 69, 70,
+ -1, 72, -1, -1, -1, -1, -1, -1, -1, 80,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 92, 93, 94, -1, -1, -1, -1, 99, 100,
+ -1, 102, 103, 11, -1, 13, 14, 15, 16, 17,
+ 18, 19, -1, -1, -1, 23, 24, 25, 26, 27,
+ -1, 29, 30, 31, 32, 33, 34, -1, -1, -1,
+ -1, 39, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 53, -1, 55, 56, 57,
+ 58, 59, 60, -1, -1, -1, -1, 65, 66, 67,
+ 68, 69, 70, -1, 72, -1, -1, -1, -1, -1,
+ -1, -1, 80, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 92, 93, 94, -1, -1, -1,
+ -1, 99, 100, -1, 102, 103, 11, -1, 13, 14,
15, 16, 17, 18, 19, -1, -1, -1, 23, 24,
25, 26, 27, -1, 29, 30, 31, 32, 33, 34,
-1, -1, -1, -1, 39, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, 53, -1,
55, 56, 57, 58, 59, 60, -1, -1, -1, -1,
65, 66, 67, 68, 69, 70, -1, 72, -1, -1,
- -1, -1, -1, 78, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 90, 91, 92, -1, -1,
- -1, -1, 97, 98, -1, 100, 101, 11, -1, 13,
- 14, 15, 16, 17, 18, 19, -1, -1, -1, 23,
- 24, 25, 26, 27, -1, 29, 30, 31, 32, 33,
- 34, -1, -1, -1, -1, 39, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 53,
- -1, 55, 56, 57, 58, 59, 60, -1, -1, -1,
- -1, 65, 66, 67, 68, 69, 70, -1, 72, -1,
- -1, -1, -1, -1, 78, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 90, 91, 92, -1,
- -1, -1, -1, 97, 98, -1, 100, 101, 11, -1,
- 13, 14, 15, 16, 17, 18, 19, -1, -1, -1,
- 23, 24, 25, 26, 27, -1, 29, 30, 31, 32,
- 33, 34, -1, -1, -1, -1, 39, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 53, -1, 55, 56, 57, 58, 59, 60, -1, -1,
- -1, -1, 65, 66, 67, 68, 69, 70, -1, 72,
- -1, -1, -1, -1, -1, 78, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 90, 91, 92,
- -1, -1, -1, -1, 97, 98, -1, 100, 101, 11,
+ -1, -1, -1, -1, -1, 80, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 92, 93, 94,
+ -1, -1, -1, -1, 99, 100, -1, 102, 103, 11,
-1, 13, 14, 15, 16, 17, 18, 19, -1, -1,
-1, 23, 24, 25, 26, 27, -1, 29, 30, 31,
32, 33, 34, -1, -1, -1, -1, 39, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, 53, -1, 55, 56, 57, 58, 59, 60, -1,
-1, -1, -1, 65, 66, 67, 68, 69, 70, -1,
- 72, -1, -1, -1, -1, -1, 78, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 90, 91,
- 92, -1, -1, -1, -1, 97, 98, -1, 100, 101,
- 11, -1, 13, 14, 15, 16, 17, 18, 19, -1,
- -1, -1, 23, 24, 25, 26, 27, -1, 29, 30,
- 31, 32, 33, 34, -1, -1, -1, -1, 39, -1,
+ 72, -1, -1, -1, -1, -1, -1, -1, 80, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 53, -1, 55, 56, 57, 58, 59, 60,
- -1, -1, -1, -1, 65, 66, 67, 68, 69, 70,
- -1, 72, -1, -1, -1, -1, -1, 78, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 90,
- 91, 92, -1, -1, -1, -1, 97, 98, -1, 100,
- 101, 11, -1, 13, 14, 15, 16, 17, 18, 19,
- -1, -1, -1, 23, 24, 25, 26, 27, -1, 29,
- 30, 31, 32, 33, 34, -1, -1, -1, -1, 39,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 53, -1, 55, 56, 57, 58, 59,
- 60, -1, -1, -1, -1, 65, 66, 67, 68, 69,
- 70, -1, 72, -1, -1, -1, -1, -1, 78, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 90, 91, 92, -1, -1, -1, -1, 97, 98, -1,
- 100, 101, 11, -1, 13, 14, 15, 16, 17, 18,
+ 92, 93, 94, -1, -1, -1, -1, 99, 100, -1,
+ 102, 103, 11, -1, 13, 14, 15, 16, 17, 18,
19, -1, -1, -1, 23, 24, 25, 26, 27, -1,
29, 30, 31, 32, 33, 34, -1, -1, -1, -1,
39, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, 53, -1, 55, 56, 57, 58,
59, 60, -1, -1, -1, -1, 65, 66, 67, 68,
- 69, 70, -1, 72, -1, -1, -1, -1, -1, 78,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 90, 91, 92, -1, -1, -1, -1, 97, 98,
- -1, 100, 101, 11, -1, 13, 14, 15, 16, 17,
- 18, 19, -1, -1, -1, 23, 24, 25, 26, 27,
- -1, 29, 30, 31, 32, 33, 34, -1, -1, -1,
- -1, 39, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 53, -1, 55, 56, 57,
- 58, 59, 60, -1, -1, -1, -1, 65, 66, 67,
- 68, 69, 70, -1, 72, 54, -1, -1, -1, -1,
- 78, -1, 61, 62, 63, 64, -1, -1, -1, -1,
- -1, -1, 90, 91, 92, -1, -1, -1, -1, 97,
- 98, 80, 81, 101, 83, 84, 85, 86, 87, 88,
- 89, -1, -1, -1, 54, 94, 95, 96, -1, -1,
- 99, 61, 62, 63, 64, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 81, -1, 83, 84, 85, 86, 87, 88, 89,
- -1, -1, -1, 54, 94, 95, 96, -1, -1, 99,
- 61, 62, 63, 64, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 83, 84, 85, 86, 87, 88, 89, -1,
- -1, -1, -1, 94, 95, 96, -1, -1, 99
+ 69, 70, -1, 72, -1, -1, -1, -1, -1, -1,
+ -1, 80, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 92, 93, 94, -1, -1, -1, -1,
+ 99, 100, -1, 102, 103, 11, -1, 13, 14, 15,
+ 16, 17, 18, 19, -1, -1, -1, 23, 24, 25,
+ 26, 27, -1, 29, 30, 31, 32, 33, 34, -1,
+ -1, -1, -1, 39, -1, -1, -1, -1, -1, -1,
+ 388, -1, 390, -1, -1, 393, 394, 53, -1, 55,
+ 56, 57, 58, 59, 60, -1, -1, 405, 406, 65,
+ 66, 67, 68, 69, 70, 413, 72, -1, -1, -1,
+ -1, -1, -1, -1, 80, 423, -1, -1, -1, 427,
+ -1, -1, 54, -1, -1, -1, 92, 93, 94, 61,
+ 62, 63, 64, 99, 100, -1, -1, 103, -1, 54,
+ -1, -1, -1, 451, 452, -1, 61, 62, 63, 64,
+ 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
+ -1, -1, -1, -1, 96, 97, 98, 82, 83, 101,
+ 85, 86, 87, 88, 89, 90, 91, -1, -1, -1,
+ -1, 96, 97, 98, -1, -1, 101
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
symbol of state STATE-NUM. */
static const yytype_uint8 yystos[] =
{
- 0, 3, 4, 5, 6, 7, 8, 104, 105, 106,
- 107, 108, 109, 110, 0, 113, 11, 13, 14, 15,
+ 0, 3, 4, 5, 6, 7, 8, 106, 107, 108,
+ 109, 110, 111, 112, 0, 115, 11, 13, 14, 15,
16, 17, 18, 19, 23, 24, 25, 26, 27, 29,
30, 31, 32, 33, 34, 39, 53, 55, 56, 57,
58, 59, 60, 65, 66, 67, 68, 69, 70, 72,
- 78, 90, 91, 92, 97, 98, 101, 141, 142, 143,
- 146, 147, 148, 149, 150, 151, 153, 156, 158, 159,
- 160, 161, 162, 163, 9, 111, 1, 20, 35, 37,
+ 80, 92, 93, 94, 99, 100, 103, 146, 147, 148,
+ 151, 152, 153, 154, 155, 156, 158, 161, 163, 164,
+ 165, 166, 167, 168, 9, 113, 1, 20, 35, 37,
38, 40, 41, 42, 43, 44, 45, 49, 50, 51,
- 52, 71, 102, 111, 119, 122, 141, 36, 117, 118,
- 119, 116, 116, 12, 141, 151, 151, 23, 28, 111,
- 159, 164, 164, 164, 164, 164, 164, 164, 152, 11,
- 101, 151, 134, 134, 151, 101, 101, 101, 111, 151,
- 23, 142, 155, 159, 164, 164, 23, 111, 151, 159,
- 20, 141, 23, 151, 101, 154, 159, 160, 161, 151,
- 142, 151, 151, 151, 151, 151, 100, 141, 75, 76,
- 77, 79, 9, 11, 101, 54, 61, 62, 63, 64,
- 80, 81, 83, 84, 85, 86, 87, 88, 89, 94,
- 95, 96, 99, 101, 9, 11, 9, 11, 9, 113,
- 135, 133, 23, 133, 101, 101, 101, 101, 70, 101,
- 159, 101, 101, 111, 133, 48, 124, 20, 42, 43,
- 44, 45, 49, 51, 118, 119, 117, 12, 155, 101,
- 101, 141, 100, 111, 26, 137, 100, 100, 141, 156,
- 164, 142, 101, 101, 10, 20, 155, 100, 141, 73,
- 139, 11, 100, 141, 141, 141, 151, 141, 141, 100,
- 141, 151, 151, 151, 151, 151, 151, 151, 151, 151,
- 151, 151, 151, 151, 151, 151, 9, 11, 24, 101,
- 145, 159, 100, 141, 141, 141, 141, 141, 141, 116,
- 23, 132, 23, 136, 23, 120, 113, 113, 113, 113,
- 113, 113, 101, 113, 113, 136, 111, 141, 128, 141,
- 141, 141, 141, 141, 156, 142, 12, 144, 73, 138,
- 100, 100, 141, 100, 141, 100, 141, 10, 100, 26,
- 141, 11, 20, 12, 100, 82, 141, 141, 100, 141,
- 101, 100, 20, 12, 20, 12, 20, 10, 21, 112,
- 137, 9, 20, 23, 127, 141, 128, 129, 141, 128,
- 131, 157, 159, 122, 126, 129, 130, 141, 113, 129,
- 129, 137, 100, 100, 155, 26, 111, 100, 100, 100,
- 12, 141, 10, 151, 20, 12, 100, 156, 10, 10,
- 10, 113, 138, 113, 23, 100, 100, 100, 100, 101,
- 100, 20, 129, 100, 100, 138, 12, 10, 100, 116,
- 20, 111, 140, 121, 155, 125, 125, 9, 114, 114,
- 129, 114, 127, 100, 114, 114, 140, 22, 116, 20,
- 114, 114, 115, 46, 47, 123, 123, 100, 124, 20,
- 114, 10, 124, 124, 116, 114, 101, 114, 125, 124,
- 10, 129, 124, 130, 100, 100, 114, 114, 123
+ 52, 71, 104, 113, 122, 127, 146, 36, 120, 121,
+ 122, 118, 118, 12, 146, 156, 156, 23, 28, 113,
+ 164, 169, 169, 169, 169, 169, 169, 169, 157, 11,
+ 103, 156, 139, 139, 156, 103, 103, 103, 113, 156,
+ 23, 147, 160, 164, 169, 169, 23, 113, 156, 164,
+ 20, 146, 23, 156, 103, 159, 164, 165, 166, 156,
+ 147, 156, 156, 156, 156, 156, 102, 146, 77, 78,
+ 79, 81, 9, 11, 103, 54, 61, 62, 63, 64,
+ 82, 83, 85, 86, 87, 88, 89, 90, 91, 96,
+ 97, 98, 101, 103, 9, 11, 9, 11, 9, 115,
+ 140, 138, 23, 138, 103, 103, 103, 103, 70, 103,
+ 164, 103, 103, 113, 138, 48, 129, 20, 42, 43,
+ 44, 45, 49, 51, 121, 122, 120, 12, 160, 103,
+ 103, 146, 102, 113, 26, 142, 102, 102, 146, 161,
+ 169, 147, 103, 103, 10, 20, 160, 102, 146, 73,
+ 144, 11, 102, 146, 146, 146, 156, 146, 146, 102,
+ 146, 156, 156, 156, 156, 156, 156, 156, 156, 156,
+ 156, 156, 156, 156, 156, 156, 9, 11, 24, 103,
+ 150, 164, 102, 146, 146, 146, 146, 146, 146, 118,
+ 23, 137, 23, 141, 23, 123, 115, 115, 115, 115,
+ 115, 115, 103, 115, 115, 141, 113, 146, 133, 146,
+ 146, 146, 146, 146, 161, 147, 12, 149, 73, 143,
+ 102, 102, 146, 102, 146, 102, 146, 10, 102, 26,
+ 146, 11, 20, 12, 102, 84, 146, 146, 102, 146,
+ 103, 102, 20, 12, 20, 12, 20, 10, 21, 114,
+ 142, 9, 20, 23, 132, 146, 133, 134, 146, 133,
+ 136, 162, 164, 127, 131, 134, 135, 146, 115, 134,
+ 134, 142, 102, 102, 160, 26, 113, 102, 102, 102,
+ 12, 146, 10, 156, 20, 12, 102, 161, 10, 10,
+ 10, 115, 143, 115, 23, 102, 102, 102, 102, 103,
+ 102, 20, 134, 102, 102, 143, 12, 10, 102, 20,
+ 20, 113, 145, 124, 160, 130, 130, 9, 116, 116,
+ 134, 116, 132, 102, 116, 116, 145, 75, 118, 20,
+ 116, 116, 117, 46, 47, 128, 128, 102, 129, 20,
+ 116, 119, 10, 129, 129, 118, 116, 103, 116, 130,
+ 129, 20, 26, 125, 10, 134, 129, 135, 22, 74,
+ 126, 102, 102, 118, 116, 116, 75, 128
};
typedef enum {
@@ -1096,13 +1087,14 @@ static const toketypes yy_type_tab[] =
toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval,
- toketype_i_tkval, toketype_i_tkval, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
+ toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_i_tkval, toketype_ival, toketype_ival,
toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
- toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
- toketype_i_tkval, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_opval,
- toketype_opval, toketype_ival, toketype_opval, toketype_ival, toketype_opval, toketype_opval,
- toketype_opval, toketype_opval, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval,
+ toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
+ toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_i_tkval, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
+ toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_ival, toketype_opval,
+ toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+ toketype_opval, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_opval,
toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
@@ -1113,6 +1105,6 @@ static const toketypes yy_type_tab[] =
};
/* Generated from:
- * 50649beb21bb272a5dafa43d5fbe244206c6a99e0e67b39b3123a22a35702873 perly.y
+ * 580d1bac82838fb0ae1e092010e776fb247f0d4cb68834a166507fae86707700 perly.y
* 4a3ced51fe6585f6ec59e65e1ffd74bc976c498b0e6992eaab337219fee72e51 regen_perly.pl
* ex: set ro: */
diff --git a/perly.y b/perly.y
index b9bc0eb859..04170b32f6 100644
--- a/perly.y
+++ b/perly.y
@@ -85,7 +85,7 @@
%token <i_tkval> RELOP EQOP MULOP ADDOP
%token <i_tkval> DOLSHARP DO HASHBRACK NOAMP
%token <i_tkval> LOCAL MY MYSUB REQUIRE
-%token <i_tkval> COLONATTR
+%token <i_tkval> COLONATTR FORMLBRACK FORMRBRACK
%type <ival> grammar remember mremember
%type <ival> startsub startanonsub startformsub
@@ -99,6 +99,7 @@
%type <opval> formname subname proto subbody cont my_scalar formblock
%type <opval> subattrlist myattrlist myattrterm myterm
%type <opval> termbinop termunop anonymous termdo
+%type <opval> formstmtseq formline formarg
%nonassoc <i_tkval> PREC_LOW
%nonassoc LOOPEX
@@ -212,12 +213,12 @@ block : '{' remember stmtseq '}'
;
/* format body */
-formblock: '=' remember stmtseq '.'
+formblock: '=' remember ';' FORMRBRACK formstmtseq ';' '.'
{ if (PL_parser->copline > (line_t)IVAL($1))
PL_parser->copline = (line_t)IVAL($1);
- $$ = block_end($2, $3);
+ $$ = block_end($2, $5);
TOKEN_GETMAD($1,$$,'{');
- TOKEN_GETMAD($4,$$,'}');
+ TOKEN_GETMAD($7,$$,'}');
}
;
@@ -249,6 +250,17 @@ stmtseq : /* NULL */
}
;
+/* A sequence of format lines */
+formstmtseq: /* NULL */
+ { $$ = (OP*)NULL; }
+ | formstmtseq formline
+ { $$ = op_append_list(OP_LINESEQ, $1, $2);
+ PL_pad_reset_pending = TRUE;
+ if ($1 && $2)
+ PL_hints |= HINT_BLOCK_SCOPE;
+ }
+ ;
+
/* A statement in the program, including optional labels */
fullstmt: barestmt
{
@@ -506,6 +518,36 @@ barestmt: PLUGSTMT
}
;
+/* Format line */
+formline: THING formarg
+ { OP *list;
+ if ($2) {
+ OP *term = $2;
+ DO_MAD(term = newUNOP(OP_NULL, 0, term));
+ list = op_append_elem(OP_LIST, $1, term);
+ }
+ else {
+#ifdef MAD
+ OP *op = newNULLLIST();
+ list = op_append_elem(OP_LIST, $1, op);
+#else
+ list = $1;
+#endif
+ }
+ if (PL_parser->copline == NOLINE)
+ PL_parser->copline = CopLINE(PL_curcop)-1;
+ else PL_parser->copline--;
+ $$ = newSTATEOP(0, NULL,
+ convert(OP_FORMLINE, 0, list));
+ }
+ ;
+
+formarg : /* NULL */
+ { $$ = NULL; }
+ | FORMLBRACK stmtseq FORMRBRACK
+ { $$ = op_unscope($2); }
+ ;
+
/* An expression which may have a side-effect */
sideff : error
{ $$ = (OP*)NULL; }
diff --git a/proto.h b/proto.h
index 55dc9ae55d..0a3e547988 100644
--- a/proto.h
+++ b/proto.h
@@ -2937,6 +2937,7 @@ PERL_CALLCONV OP* Perl_op_prepend_elem(pTHX_ I32 optype, OP* first, OP* last);
PERL_CALLCONV void Perl_op_refcnt_lock(pTHX);
PERL_CALLCONV void Perl_op_refcnt_unlock(pTHX);
PERL_CALLCONV OP* Perl_op_scope(pTHX_ OP* o);
+PERL_CALLCONV OP* Perl_op_unscope(pTHX_ OP* o);
PERL_CALLCONV void Perl_pack_cat(pTHX_ SV *cat, const char *pat, const char *patend, SV **beglist, SV **endlist, SV ***next_in_list, U32 flags)
__attribute__nonnull__(pTHX_1)
__attribute__nonnull__(pTHX_2)
diff --git a/t/op/write.t b/t/op/write.t
index 760de1a178..5706e49889 100644
--- a/t/op/write.t
+++ b/t/op/write.t
@@ -61,7 +61,7 @@ for my $tref ( @NumTests ){
my $bas_tests = 21;
# number of tests in section 3
-my $bug_tests = 8 + 3 * 3 * 5 * 2 * 3 + 2 + 66 + 4 + 2 + 3 + 96 + 7;
+my $bug_tests = 8 + 3 * 3 * 5 * 2 * 3 + 2 + 66 + 4 + 2 + 3 + 96 + 10;
# number of tests in section 4
my $hmb_tests = 35;
@@ -1072,6 +1072,37 @@ strict
pass('no crash with invalid use/format inside format');
+# Low-precedence operators on argument line
+format AND =
+@
+0 and die
+.
+$- = $=;
+ok eval { local $~ = "AND"; print "# "; write; 1 },
+ "low-prec ops on arg line" or diag $@;
+
+# Anonymous hashes
+open(HASH, '>Op_write.tmp') || die "Can't create Op_write.tmp";
+format HASH =
+@<<<
+${{qw[ Sun 0 Mon 1 Tue 2 Wed 3 Thu 4 Fri 5 Sat 6 ]}}{"Wed"}
+.
+write HASH;
+close HASH or die "Could not close: $!";
+is cat('Op_write.tmp'), "3\n", 'anonymous hashes';
+
+# pragmata inside argument line
+open(STRICT, '>Op_write.tmp') || die "Can't create Op_write.tmp";
+format STRICT =
+@<<<
+no strict; $foo
+.
+$::foo = 'oof::$';
+write STRICT;
+close STRICT or die "Could not close: $!";
+is cat('Op_write.tmp'), "oof:\n", 'pragmata on format line';
+
+
#############################
## Section 4
## Add new tests *above* here
diff --git a/toke.c b/toke.c
index d8f82895c1..2b8c2a9694 100644
--- a/toke.c
+++ b/toke.c
@@ -344,6 +344,8 @@ static struct debug_tokens {
{ EQOP, TOKENTYPE_OPNUM, "EQOP" },
{ FOR, TOKENTYPE_IVAL, "FOR" },
{ FORMAT, TOKENTYPE_NONE, "FORMAT" },
+ { FORMLBRACK, TOKENTYPE_NONE, "FORMLBRACK" },
+ { FORMRBRACK, TOKENTYPE_NONE, "FORMRBRACK" },
{ FUNC, TOKENTYPE_OPNUM, "FUNC" },
{ FUNC0, TOKENTYPE_OPNUM, "FUNC0" },
{ FUNC0OP, TOKENTYPE_OPVAL, "FUNC0OP" },
@@ -4400,7 +4402,8 @@ Perl_yylex(pTHX)
register char *s = PL_bufptr;
register char *d;
STRLEN len;
- bool bof = FALSE, formbrack = FALSE;
+ bool bof = FALSE;
+ U8 formbrack = 0;
U32 fake_eof = 0;
/* orig_keyword, gvp, and gv are initialized here because
@@ -4784,10 +4787,11 @@ Perl_yylex(pTHX)
s = scan_formline(PL_bufptr);
if (!PL_lex_formbrack)
{
- formbrack = TRUE;
+ formbrack = 1;
goto rightbracket;
}
- OPERATOR(';');
+ PL_bufptr = s;
+ return yylex();
}
s = PL_bufptr;
@@ -5179,9 +5183,11 @@ Perl_yylex(pTHX)
}
}
if (PL_lex_formbrack && PL_lex_brackets <= PL_lex_formbrack) {
- PL_bufptr = s;
PL_lex_state = LEX_FORMLINE;
- return yylex();
+ start_force(PL_curforce);
+ NEXTVAL_NEXTTOKE.ival = 0;
+ force_next(FORMRBRACK);
+ TOKEN(';');
}
goto retry;
case '\r':
@@ -5236,9 +5242,11 @@ Perl_yylex(pTHX)
incline(s);
}
if (PL_lex_formbrack && PL_lex_brackets <= PL_lex_formbrack) {
- PL_bufptr = s;
PL_lex_state = LEX_FORMLINE;
- return yylex();
+ start_force(PL_curforce);
+ NEXTVAL_NEXTTOKE.ival = 0;
+ force_next(FORMRBRACK);
+ TOKEN(';');
}
}
else {
@@ -5703,10 +5711,6 @@ Perl_yylex(pTHX)
}
switch (PL_expect) {
case XTERM:
- if (PL_lex_formbrack) {
- s--;
- PRETERMBLOCK(DO);
- }
if (PL_oldoldbufptr == PL_last_lop)
PL_lex_brackstack[PL_lex_brackets++] = XTERM;
else
@@ -5908,6 +5912,12 @@ Perl_yylex(pTHX)
if (!PL_thistoken)
PL_thistoken = newSVpvs("");
#endif
+ if (formbrack == 2) { /* means . where arguments were expected */
+ start_force(PL_curforce);
+ force_next(';');
+ start_force(PL_curforce);
+ force_next(FORMRBRACK);
+ }
TOKEN(';');
case '&':
s++;
@@ -6033,7 +6043,7 @@ Perl_yylex(pTHX)
#endif
t++;
if (*t == '\n' || *t == '#') {
- formbrack = TRUE;
+ formbrack = 1;
ENTER;
SAVEI8(PL_parser->form_lex_state);
SAVEI32(PL_lex_formbrack);
@@ -6398,7 +6408,7 @@ Perl_yylex(pTHX)
&& (s == PL_linestart || s[-1] == '\n') )
{
PL_expect = XSTATE;
- formbrack = TRUE;
+ formbrack = 2; /* dot seen where arguments expected */
goto rightbracket;
}
if (PL_expect == XSTATE && s[1] == '.' && s[2] == '.') {
@@ -10705,12 +10715,12 @@ S_scan_formline(pTHX_ register char *s)
}
enough:
if (SvCUR(stuff)) {
- PL_expect = XTERM;
+ PL_expect = XSTATE;
if (needargs) {
PL_lex_state = PL_parser->form_lex_state;
start_force(PL_curforce);
NEXTVAL_NEXTTOKE.ival = 0;
- force_next(',');
+ force_next(FORMLBRACK);
}
else
PL_lex_state = LEX_FORMLINE;
@@ -10723,9 +10733,6 @@ S_scan_formline(pTHX_ register char *s)
start_force(PL_curforce);
NEXTVAL_NEXTTOKE.opval = (OP*)newSVOP(OP_CONST, 0, stuff);
force_next(THING);
- start_force(PL_curforce);
- NEXTVAL_NEXTTOKE.ival = OP_FORMLINE;
- force_next(LSTOP);
}
else {
SvREFCNT_dec(stuff);