[perl #43425] local $[: fix scoping during parser error handling.

 Change 22306# inadvertently made 'local $[' statement-scoped
 rather than block-scoped; so revert that change and add a
 different fix. The problem was to ensure that the savestack got
 popped correctly while popping errored tokens. We how record the
 current value of PL_savestack_ix with each pushed parser state.

p4raw-id: //depot/perl@31615

diff --git a/op.c b/op.c
index d0c1c8b..ada5a3d 100644 (file)
--- a/op.c
+++ b/op.c
@@ -4969,6 +4969,12 @@ void
 Perl_cv_undef(pTHX_ CV *cv)
 {
     dVAR;
+
+    DEBUG_X(PerlIO_printf(Perl_debug_log,
+         "CV undef: cv=0x%"UVxf" comppad=0x%"UVxf"\n",
+           PTR2UV(cv), PTR2UV(PL_comppad))
+    );
+
 #ifdef USE_ITHREADS
     if (CvFILE(cv) && !CvISXSUB(cv)) {
        /* for XSUBs CvFILE point directly to static memory; __FILE__ */

diff --git a/pad.c b/pad.c
index 07f994a..44fafb6 100644 (file)
--- a/pad.c
+++ b/pad.c
@@ -255,8 +255,8 @@ Perl_pad_undef(pTHX_ CV* cv)
        return;
 
     DEBUG_X(PerlIO_printf(Perl_debug_log,
-         "Pad undef: cv=0x%"UVxf" padlist=0x%"UVxf"\n",
-           PTR2UV(cv), PTR2UV(padlist))
+         "Pad undef: cv=0x%"UVxf" padlist=0x%"UVxf" comppad=0x%"UVxf"\n",
+           PTR2UV(cv), PTR2UV(padlist), PTR2UV(PL_comppad))
     );
 
     /* detach any '&' anon children in the pad; if afterwards they

diff --git a/parser.h b/parser.h
index f62ac3d..363e0ee 100644 (file)
--- a/parser.h
+++ b/parser.h
@@ -17,6 +17,7 @@ typedef struct {
     AV     *comppad; /* value of PL_comppad when this value was created */
 #ifdef DEBUGGING
     const char  *name; /* token/rule name for -Dpv */
+    I32     savestack_ix;      /* size of savestack at this state */
 #endif
 } yy_stack_frame;
 

diff --git a/perly.act b/perly.act
index 997c96c..5e034ea 100644 (file)
--- a/perly.act
+++ b/perly.act
@@ -46,17 +46,12 @@ case 2:
     break;
 
   case 9:
-#line 179 "perly.y"
-    { (yyval.ival) = PL_savestack_ix; ;}
-    break;
-
-  case 10:
-#line 183 "perly.y"
+#line 180 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
-  case 11:
-#line 185 "perly.y"
+  case 10:
+#line 182 "perly.y"
     {
                        (yyval.opval) = IF_MAD(
                                append_list(OP_LINESEQ,
@@ -65,33 +60,34 @@ case 2:
                        ;}
     break;
 
-  case 12:
-#line 192 "perly.y"
-    {   LEAVE_SCOPE((ps[(2) - (3)].val.ival));
-                           (yyval.opval) = append_list(OP_LINESEQ,
-                               (LISTOP*)(ps[(1) - (3)].val.opval), (LISTOP*)(ps[(3) - (3)].val.opval));
+  case 11:
+#line 189 "perly.y"
+    {   (yyval.opval) = append_list(OP_LINESEQ,
+                               (LISTOP*)(ps[(1) - (2)].val.opval), (LISTOP*)(ps[(2) - (2)].val.opval));
                            PL_pad_reset_pending = TRUE;
-                           if ((ps[(1) - (3)].val.opval) && (ps[(3) - (3)].val.opval)) PL_hints |= HINT_BLOCK_SCOPE; ;}
+                           if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
+                               PL_hints |= HINT_BLOCK_SCOPE;
+                       ;}
     break;
 
-  case 13:
-#line 201 "perly.y"
+  case 12:
+#line 199 "perly.y"
     { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;}
     break;
 
-  case 15:
-#line 205 "perly.y"
+  case 14:
+#line 203 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 16:
-#line 207 "perly.y"
+  case 15:
+#line 205 "perly.y"
     { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;}
     break;
 
-  case 17:
-#line 209 "perly.y"
+  case 16:
+#line 207 "perly.y"
     {
                          if (PVAL((ps[(1) - (2)].val.p_tkval))) {
                              (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), newOP(OP_NULL, 0));
@@ -110,8 +106,8 @@ case 2:
                        ;}
     break;
 
-  case 18:
-#line 226 "perly.y"
+  case 17:
+#line 224 "perly.y"
     {
                          (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)), (ps[(2) - (3)].val.opval));
                          PL_parser->expect = XSTATE;
@@ -129,66 +125,66 @@ case 2:
                        ;}
     break;
 
-  case 19:
-#line 245 "perly.y"
+  case 18:
+#line 243 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
-  case 20:
-#line 247 "perly.y"
+  case 19:
+#line 245 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 21:
-#line 249 "perly.y"
+  case 20:
+#line 247 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
                        ;}
     break;
 
-  case 22:
-#line 253 "perly.y"
+  case 21:
+#line 251 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
                        ;}
     break;
 
-  case 23:
-#line 257 "perly.y"
+  case 22:
+#line 255 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
                        ;}
     break;
 
-  case 24:
-#line 261 "perly.y"
+  case 23:
+#line 259 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
                        ;}
     break;
 
-  case 25:
-#line 265 "perly.y"
+  case 24:
+#line 263 "perly.y"
     { (yyval.opval) = newFOROP(0, Nullch, (line_t)IVAL((ps[(2) - (3)].val.i_tkval)),
                                        Nullop, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), Nullop);
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w');
                        ;}
     break;
 
-  case 26:
-#line 273 "perly.y"
+  case 25:
+#line 271 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
-  case 27:
-#line 275 "perly.y"
+  case 26:
+#line 273 "perly.y"
     { ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = scope((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 28:
-#line 279 "perly.y"
+  case 27:
+#line 277 "perly.y"
     { PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval));
                            (yyval.opval) = newCONDOP(0, (ps[(3) - (6)].val.opval), scope((ps[(5) - (6)].val.opval)), (ps[(6) - (6)].val.opval));
                            PL_hints |= HINT_BLOCK_SCOPE;
@@ -198,8 +194,8 @@ case 2:
                        ;}
     break;
 
-  case 29:
-#line 290 "perly.y"
+  case 28:
+#line 288 "perly.y"
     { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
                            (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
                                   newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -209,8 +205,8 @@ case 2:
                        ;}
     break;
 
-  case 30:
-#line 298 "perly.y"
+  case 29:
+#line 296 "perly.y"
     { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
                            (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
                                   newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -220,31 +216,31 @@ case 2:
                        ;}
     break;
 
-  case 31:
-#line 309 "perly.y"
+  case 30:
+#line 307 "perly.y"
     { (yyval.opval) = block_end((ps[(3) - (6)].val.ival),
                newWHENOP((ps[(4) - (6)].val.opval), scope((ps[(6) - (6)].val.opval)))); ;}
     break;
 
-  case 32:
-#line 312 "perly.y"
+  case 31:
+#line 310 "perly.y"
     { (yyval.opval) = newWHENOP(0, scope((ps[(2) - (2)].val.opval))); ;}
     break;
 
-  case 33:
-#line 317 "perly.y"
+  case 32:
+#line 315 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
-  case 34:
-#line 319 "perly.y"
+  case 33:
+#line 317 "perly.y"
     { (yyval.opval) = scope((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 35:
-#line 326 "perly.y"
+  case 34:
+#line 324 "perly.y"
     { OP *innerop;
                          PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval);
                            (yyval.opval) = block_end((ps[(4) - (9)].val.ival),
@@ -258,8 +254,8 @@ case 2:
                        ;}
     break;
 
-  case 36:
-#line 339 "perly.y"
+  case 35:
+#line 337 "perly.y"
     { OP *innerop;
                          PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval);
                            (yyval.opval) = block_end((ps[(4) - (9)].val.ival),
@@ -273,8 +269,8 @@ case 2:
                        ;}
     break;
 
-  case 37:
-#line 351 "perly.y"
+  case 36:
+#line 349 "perly.y"
     { OP *innerop;
                          (yyval.opval) = block_end((ps[(4) - (10)].val.ival),
                             innerop = newFOROP(0, PVAL((ps[(1) - (10)].val.p_tkval)), (line_t)IVAL((ps[(2) - (10)].val.i_tkval)),
@@ -287,8 +283,8 @@ case 2:
                        ;}
     break;
 
-  case 38:
-#line 362 "perly.y"
+  case 37:
+#line 360 "perly.y"
     { OP *innerop;
                          (yyval.opval) = block_end((ps[(5) - (9)].val.ival),
                             innerop = newFOROP(0, PVAL((ps[(1) - (9)].val.p_tkval)), (line_t)IVAL((ps[(2) - (9)].val.i_tkval)),
@@ -300,8 +296,8 @@ case 2:
                        ;}
     break;
 
-  case 39:
-#line 372 "perly.y"
+  case 38:
+#line 370 "perly.y"
     { OP *innerop;
                          (yyval.opval) = block_end((ps[(4) - (8)].val.ival),
                             innerop = newFOROP(0, PVAL((ps[(1) - (8)].val.p_tkval)), (line_t)IVAL((ps[(2) - (8)].val.i_tkval)),
@@ -313,8 +309,8 @@ case 2:
                        ;}
     break;
 
-  case 40:
-#line 384 "perly.y"
+  case 39:
+#line 382 "perly.y"
     { OP *forop;
                          PL_parser->copline = (line_t)IVAL((ps[(2) - (12)].val.i_tkval));
                          forop = newSTATEOP(0, PVAL((ps[(1) - (12)].val.p_tkval)),
@@ -346,16 +342,16 @@ case 2:
                          (yyval.opval) = block_end((ps[(4) - (12)].val.ival), forop); ;}
     break;
 
-  case 41:
-#line 414 "perly.y"
+  case 40:
+#line 412 "perly.y"
     { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)),
                                 newWHILEOP(0, 1, (LOOP*)Nullop,
                                            NOLINE, Nullop, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval), 0));
                          TOKEN_GETMAD((ps[(1) - (3)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;}
     break;
 
-  case 42:
-#line 422 "perly.y"
+  case 41:
+#line 420 "perly.y"
     { PL_parser->copline = (line_t) (ps[(2) - (8)].val.i_tkval);
                            (yyval.opval) = block_end((ps[(4) - (8)].val.ival),
                                newSTATEOP(0, PVAL((ps[(1) - (8)].val.p_tkval)),
@@ -363,47 +359,47 @@ case 2:
                                        (PADOFFSET) (ps[(5) - (8)].val.ival)) )); ;}
     break;
 
-  case 43:
-#line 431 "perly.y"
+  case 42:
+#line 429 "perly.y"
     { (yyval.ival) = (PL_min_intro_pending &&
                            PL_max_intro_pending >=  PL_min_intro_pending);
                          intro_my(); ;}
     break;
 
-  case 44:
-#line 437 "perly.y"
+  case 43:
+#line 435 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
-  case 46:
-#line 443 "perly.y"
+  case 45:
+#line 441 "perly.y"
     { YYSTYPE tmplval;
                          (void)scan_num("1", &tmplval);
                          (yyval.opval) = tmplval.opval; ;}
     break;
 
-  case 48:
-#line 451 "perly.y"
+  case 47:
+#line 449 "perly.y"
     { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 49:
-#line 456 "perly.y"
+  case 48:
+#line 454 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
-  case 50:
-#line 460 "perly.y"
+  case 49:
+#line 458 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
-  case 51:
-#line 464 "perly.y"
+  case 50:
+#line 462 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
-  case 52:
-#line 469 "perly.y"
+  case 51:
+#line 467 "perly.y"
     {
 #ifdef MAD
                          YYSTYPE tmplval;
@@ -415,6 +411,11 @@ case 2:
                        ;}
     break;
 
+  case 53:
+#line 481 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
   case 54:
 #line 483 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
@@ -436,24 +437,19 @@ case 2:
     break;
 
   case 58:
-#line 491 "perly.y"
+#line 494 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 59:
-#line 496 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
-    break;
-
-  case 60:
-#line 500 "perly.y"
+#line 498 "perly.y"
     { (yyval.opval) = newOP(OP_NULL,0);
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p');
                        ;}
     break;
 
-  case 61:
-#line 506 "perly.y"
+  case 60:
+#line 504 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
                          (yyval.opval) = newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval));
@@ -467,18 +463,18 @@ case 2:
                        ;}
     break;
 
-  case 62:
-#line 519 "perly.y"
+  case 61:
+#line 517 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 63:
-#line 520 "perly.y"
+  case 62:
+#line 518 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
-  case 64:
-#line 525 "perly.y"
+  case 63:
+#line 523 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
                          (yyval.opval) = newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
@@ -490,8 +486,8 @@ case 2:
                        ;}
     break;
 
-  case 65:
-#line 538 "perly.y"
+  case 64:
+#line 536 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
                          {
@@ -513,26 +509,26 @@ case 2:
                        ;}
     break;
 
-  case 66:
-#line 560 "perly.y"
+  case 65:
+#line 558 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, 0);
                            SAVEFREESV(PL_compcv); ;}
     break;
 
-  case 67:
-#line 566 "perly.y"
+  case 66:
+#line 564 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
                            SAVEFREESV(PL_compcv); ;}
     break;
 
-  case 68:
-#line 571 "perly.y"
+  case 67:
+#line 569 "perly.y"
     { (yyval.ival) = start_subparse(TRUE, 0);
                            SAVEFREESV(PL_compcv); ;}
     break;
 
-  case 69:
-#line 576 "perly.y"
+  case 68:
+#line 574 "perly.y"
     { const char *const name = SvPV_nolen_const(((SVOP*)(ps[(1) - (1)].val.opval))->op_sv);
                          if (strEQ(name, "BEGIN") || strEQ(name, "END")
                              || strEQ(name, "INIT") || strEQ(name, "CHECK")
@@ -541,25 +537,25 @@ case 2:
                          (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 70:
-#line 586 "perly.y"
+  case 69:
+#line 584 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
-  case 72:
-#line 592 "perly.y"
+  case 71:
+#line 590 "perly.y"
     { (yyval.opval) = Nullop; ;}
     break;
 
-  case 73:
-#line 594 "perly.y"
+  case 72:
+#line 592 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
                        ;}
     break;
 
-  case 74:
-#line 598 "perly.y"
+  case 73:
+#line 596 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newOP(OP_NULL, 0),
                                    Nullop
@@ -568,15 +564,15 @@ case 2:
                        ;}
     break;
 
-  case 75:
-#line 608 "perly.y"
+  case 74:
+#line 606 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
                        ;}
     break;
 
-  case 76:
-#line 612 "perly.y"
+  case 75:
+#line 610 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newOP(OP_NULL, 0),
                                    Nullop
@@ -585,13 +581,13 @@ case 2:
                        ;}
     break;
 
-  case 77:
-#line 621 "perly.y"
+  case 76:
+#line 619 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 78:
-#line 622 "perly.y"
+  case 77:
+#line 620 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newOP(OP_NULL,0),
                                    Nullop
@@ -601,8 +597,8 @@ case 2:
                        ;}
     break;
 
-  case 79:
-#line 632 "perly.y"
+  case 78:
+#line 630 "perly.y"
     {
 #ifdef MAD
                          (yyval.opval) = package((ps[(2) - (3)].val.opval));
@@ -615,13 +611,13 @@ case 2:
                        ;}
     break;
 
-  case 80:
-#line 645 "perly.y"
+  case 79:
+#line 643 "perly.y"
     { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
     break;
 
-  case 81:
-#line 647 "perly.y"
+  case 80:
+#line 645 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
                          (yyval.opval) = utilize(IVAL((ps[(1) - (7)].val.i_tkval)), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval));
@@ -637,29 +633,29 @@ case 2:
                        ;}
     break;
 
-  case 82:
-#line 664 "perly.y"
+  case 81:
+#line 662 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 83:
-#line 668 "perly.y"
+  case 82:
+#line 666 "perly.y"
     { (yyval.opval) = newLOGOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 84:
-#line 672 "perly.y"
+  case 83:
+#line 670 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 86:
-#line 680 "perly.y"
+  case 85:
+#line 678 "perly.y"
     {
 #ifdef MAD
                          OP* op = newNULLLIST();
@@ -671,8 +667,8 @@ case 2:
                        ;}
     break;
 
-  case 87:
-#line 690 "perly.y"
+  case 86:
+#line 688 "perly.y"
     { 
                          OP* term = (ps[(3) - (3)].val.opval);
                          DO_MAD(
@@ -683,16 +679,16 @@ case 2:
                        ;}
     break;
 
-  case 89:
-#line 703 "perly.y"
+  case 88:
+#line 701 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED,
                                prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (3)].val.i_tkval)),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) );
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 90:
-#line 708 "perly.y"
+  case 89:
+#line 706 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED,
                                prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (5)].val.i_tkval)),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) );
                          TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
@@ -701,8 +697,8 @@ case 2:
                        ;}
     break;
 
-  case 91:
-#line 715 "perly.y"
+  case 90:
+#line 713 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST,
                                    prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)),
@@ -713,8 +709,8 @@ case 2:
                        ;}
     break;
 
-  case 92:
-#line 724 "perly.y"
+  case 91:
+#line 722 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)),
                                    newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval))));
@@ -722,8 +718,8 @@ case 2:
                        ;}
     break;
 
-  case 93:
-#line 730 "perly.y"
+  case 92:
+#line 728 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST,
                                    prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)),
@@ -731,8 +727,8 @@ case 2:
                        ;}
     break;
 
-  case 94:
-#line 736 "perly.y"
+  case 93:
+#line 734 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST,
                                    prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)),
@@ -742,15 +738,15 @@ case 2:
                        ;}
     break;
 
-  case 95:
-#line 744 "perly.y"
+  case 94:
+#line 742 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 96:
-#line 748 "perly.y"
+  case 95:
+#line 746 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
@@ -758,22 +754,22 @@ case 2:
                        ;}
     break;
 
-  case 97:
-#line 754 "perly.y"
+  case 96:
+#line 752 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
                          (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, Nullop, (ps[(3) - (3)].val.opval)); ;}
     break;
 
-  case 98:
-#line 757 "perly.y"
+  case 97:
+#line 755 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                 append_elem(OP_LIST,
                                   prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval)));
                        ;}
     break;
 
-  case 101:
-#line 772 "perly.y"
+  case 100:
+#line 770 "perly.y"
     { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), scalar((ps[(3) - (5)].val.opval)));
                            PL_parser->expect = XOPERATOR;
                          TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
@@ -782,16 +778,16 @@ case 2:
                        ;}
     break;
 
-  case 102:
-#line 779 "perly.y"
+  case 101:
+#line 777 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
                          TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
                        ;}
     break;
 
-  case 103:
-#line 784 "perly.y"
+  case 102:
+#line 782 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
                                        ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV),
                                        scalar((ps[(4) - (5)].val.opval)));
@@ -801,8 +797,8 @@ case 2:
                        ;}
     break;
 
-  case 104:
-#line 792 "perly.y"
+  case 103:
+#line 790 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
                                        ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV),
                                        scalar((ps[(3) - (4)].val.opval)));
@@ -811,8 +807,8 @@ case 2:
                        ;}
     break;
 
-  case 105:
-#line 799 "perly.y"
+  case 104:
+#line 797 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), jmaybe((ps[(3) - (5)].val.opval)));
                            PL_parser->expect = XOPERATOR;
                          TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
@@ -821,8 +817,8 @@ case 2:
                        ;}
     break;
 
-  case 106:
-#line 806 "perly.y"
+  case 105:
+#line 804 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV),
                                        jmaybe((ps[(4) - (6)].val.opval)));
@@ -834,8 +830,8 @@ case 2:
                        ;}
     break;
 
-  case 107:
-#line 816 "perly.y"
+  case 106:
+#line 814 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV),
                                        jmaybe((ps[(3) - (5)].val.opval)));
@@ -846,8 +842,8 @@ case 2:
                        ;}
     break;
 
-  case 108:
-#line 825 "perly.y"
+  case 107:
+#line 823 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   newCVREF(0, scalar((ps[(1) - (4)].val.opval))));
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'a');
@@ -856,8 +852,8 @@ case 2:
                        ;}
     break;
 
-  case 109:
-#line 832 "perly.y"
+  case 108:
+#line 830 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   append_elem(OP_LIST, (ps[(4) - (5)].val.opval),
                                       newCVREF(0, scalar((ps[(1) - (5)].val.opval)))));
@@ -867,8 +863,8 @@ case 2:
                        ;}
     break;
 
-  case 110:
-#line 841 "perly.y"
+  case 109:
+#line 839 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   append_elem(OP_LIST, (ps[(3) - (4)].val.opval),
                                               newCVREF(0, scalar((ps[(1) - (4)].val.opval)))));
@@ -877,8 +873,8 @@ case 2:
                        ;}
     break;
 
-  case 111:
-#line 848 "perly.y"
+  case 110:
+#line 846 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   newCVREF(0, scalar((ps[(1) - (3)].val.opval))));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
@@ -886,8 +882,8 @@ case 2:
                        ;}
     break;
 
-  case 112:
-#line 854 "perly.y"
+  case 111:
+#line 852 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - (6)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),')');
@@ -896,8 +892,8 @@ case 2:
                        ;}
     break;
 
-  case 113:
-#line 861 "perly.y"
+  case 112:
+#line 859 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), Nullop);
                          TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),')');
@@ -906,22 +902,22 @@ case 2:
                        ;}
     break;
 
-  case 114:
-#line 871 "perly.y"
+  case 113:
+#line 869 "perly.y"
     { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 115:
-#line 875 "perly.y"
+  case 114:
+#line 873 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 116:
-#line 879 "perly.y"
+  case 115:
+#line 877 "perly.y"
     {   if (IVAL((ps[(2) - (3)].val.i_tkval)) != OP_REPEAT)
                                scalar((ps[(1) - (3)].val.opval));
                            (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), scalar((ps[(3) - (3)].val.opval)));
@@ -929,50 +925,50 @@ case 2:
                        ;}
     break;
 
+  case 116:
+#line 883 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
+                         TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
+                       ;}
+    break;
+
   case 117:
-#line 885 "perly.y"
+#line 887 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 118:
-#line 889 "perly.y"
+#line 891 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 119:
-#line 893 "perly.y"
+#line 895 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 120:
-#line 897 "perly.y"
+#line 899 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 121:
-#line 901 "perly.y"
+#line 903 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 122:
-#line 905 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
-                         TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-                       ;}
-    break;
-
-  case 123:
-#line 909 "perly.y"
+#line 907 "perly.y"
     {
                          (yyval.opval) = newRANGE(IVAL((ps[(2) - (3)].val.i_tkval)), scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          DO_MAD({
@@ -986,29 +982,29 @@ case 2:
                        ;}
     break;
 
-  case 124:
-#line 921 "perly.y"
+  case 123:
+#line 919 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 125:
-#line 925 "perly.y"
+  case 124:
+#line 923 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 126:
-#line 929 "perly.y"
+  case 125:
+#line 927 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 127:
-#line 933 "perly.y"
+  case 126:
+#line 931 "perly.y"
     { (yyval.opval) = bind_match(IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),
                                ((yyval.opval)->op_type == OP_NOT
@@ -1017,15 +1013,15 @@ case 2:
                        ;}
     break;
 
-  case 128:
-#line 943 "perly.y"
+  case 127:
+#line 941 "perly.y"
     { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 129:
-#line 947 "perly.y"
+  case 128:
+#line 945 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)),
                                    (ps[(2) - (2)].val.opval)
@@ -1034,70 +1030,70 @@ case 2:
                        ;}
     break;
 
-  case 130:
-#line 954 "perly.y"
+  case 129:
+#line 952 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 131:
-#line 958 "perly.y"
+  case 130:
+#line 956 "perly.y"
     { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 132:
-#line 962 "perly.y"
+  case 131:
+#line 960 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
                                        mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC));
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 133:
-#line 967 "perly.y"
+  case 132:
+#line 965 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
                                        mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC));
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 134:
-#line 972 "perly.y"
+  case 133:
+#line 970 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
                                        mod(scalar((ps[(2) - (2)].val.opval)), OP_PREINC));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 135:
-#line 977 "perly.y"
+  case 134:
+#line 975 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
                                        mod(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 136:
-#line 986 "perly.y"
+  case 135:
+#line 984 "perly.y"
     { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'[');
                          TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),']');
                        ;}
     break;
 
-  case 137:
-#line 991 "perly.y"
+  case 136:
+#line 989 "perly.y"
     { (yyval.opval) = newANONLIST(Nullop);
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'[');
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),']');
                        ;}
     break;
 
-  case 138:
-#line 996 "perly.y"
+  case 137:
+#line 994 "perly.y"
     { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{');
                          TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),';');
@@ -1105,8 +1101,8 @@ case 2:
                        ;}
     break;
 
-  case 139:
-#line 1002 "perly.y"
+  case 138:
+#line 1000 "perly.y"
     { (yyval.opval) = newANONHASH(Nullop);
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'{');
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),';');
@@ -1114,8 +1110,8 @@ case 2:
                        ;}
     break;
 
-  case 140:
-#line 1008 "perly.y"
+  case 139:
+#line 1006 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
                          (yyval.opval) = newANONATTRSUB((ps[(2) - (5)].val.ival), (ps[(3) - (5)].val.opval), (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
@@ -1124,22 +1120,22 @@ case 2:
                        ;}
     break;
 
-  case 141:
-#line 1019 "perly.y"
+  case 140:
+#line 1017 "perly.y"
     { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), IVAL((ps[(1) - (2)].val.i_tkval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 142:
-#line 1023 "perly.y"
+  case 141:
+#line 1021 "perly.y"
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D');
                        ;}
     break;
 
-  case 143:
-#line 1027 "perly.y"
+  case 142:
+#line 1025 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
                            OPf_SPECIAL|OPf_STACKED,
                            prepend_elem(OP_LIST,
@@ -1153,8 +1149,8 @@ case 2:
                        ;}
     break;
 
-  case 144:
-#line 1039 "perly.y"
+  case 143:
+#line 1037 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
                            OPf_SPECIAL|OPf_STACKED,
                            append_elem(OP_LIST,
@@ -1169,8 +1165,8 @@ case 2:
                        ;}
     break;
 
-  case 145:
-#line 1052 "perly.y"
+  case 144:
+#line 1050 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
                            prepend_elem(OP_LIST,
                                scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), Nullop)); dep();
@@ -1180,8 +1176,8 @@ case 2:
                        ;}
     break;
 
-  case 146:
-#line 1060 "perly.y"
+  case 145:
+#line 1058 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
                            prepend_elem(OP_LIST,
                                (ps[(4) - (5)].val.opval),
@@ -1192,49 +1188,54 @@ case 2:
                        ;}
     break;
 
-  case 151:
-#line 1076 "perly.y"
+  case 150:
+#line 1074 "perly.y"
     { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'?');
                          TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),':');
                        ;}
     break;
 
-  case 152:
-#line 1081 "perly.y"
+  case 151:
+#line 1079 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((ps[(2) - (2)].val.opval),OP_REFGEN));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 153:
-#line 1085 "perly.y"
+  case 152:
+#line 1083 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 154:
-#line 1087 "perly.y"
+  case 153:
+#line 1085 "perly.y"
     { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'k');
                        ;}
     break;
 
-  case 155:
-#line 1091 "perly.y"
+  case 154:
+#line 1089 "perly.y"
     { (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(ps[(2) - (3)].val.opval)), (ps[(2) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 156:
-#line 1096 "perly.y"
+  case 155:
+#line 1094 "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 156:
+#line 1099 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
   case 157:
 #line 1101 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
@@ -1252,21 +1253,16 @@ case 2:
 
   case 160:
 #line 1107 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
     break;
 
   case 161:
 #line 1109 "perly.y"
-    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 162:
 #line 1111 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
-    break;
-
-  case 163:
-#line 1113 "perly.y"
     { (yyval.opval) = prepend_elem(OP_ASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_ASLICE, 0,
@@ -1277,8 +1273,8 @@ case 2:
                        ;}
     break;
 
-  case 164:
-#line 1122 "perly.y"
+  case 163:
+#line 1120 "perly.y"
     { (yyval.opval) = prepend_elem(OP_HSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_HSLICE, 0,
@@ -1291,26 +1287,26 @@ case 2:
                        ;}
     break;
 
-  case 165:
-#line 1133 "perly.y"
+  case 164:
+#line 1131 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 166:
-#line 1135 "perly.y"
+  case 165:
+#line 1133 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 167:
-#line 1137 "perly.y"
+  case 166:
+#line 1135 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 168:
-#line 1142 "perly.y"
+  case 167:
+#line 1140 "perly.y"
     {
                          (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval))));
@@ -1325,91 +1321,91 @@ case 2:
                        ;}
     break;
 
-  case 169:
-#line 1155 "perly.y"
+  case 168:
+#line 1153 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                            append_elem(OP_LIST, (ps[(3) - (3)].val.opval), scalar((ps[(2) - (3)].val.opval))));
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 170:
-#line 1160 "perly.y"
+  case 169:
+#line 1158 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), OPf_SPECIAL);
                            PL_hints |= HINT_BLOCK_SCOPE;
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 171:
-#line 1165 "perly.y"
+  case 170:
+#line 1163 "perly.y"
     { (yyval.opval) = newLOOPEX(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 172:
-#line 1169 "perly.y"
+  case 171:
+#line 1167 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 173:
-#line 1173 "perly.y"
+  case 172:
+#line 1171 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 174:
-#line 1177 "perly.y"
+  case 173:
+#line 1175 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 175:
-#line 1181 "perly.y"
+  case 174:
+#line 1179 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 176:
-#line 1185 "perly.y"
+  case 175:
+#line 1183 "perly.y"
     { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.i_tkval) ? OPf_SPECIAL : 0);
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 177:
-#line 1189 "perly.y"
+  case 176:
+#line 1187 "perly.y"
     { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.i_tkval) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 178:
-#line 1193 "perly.y"
+  case 177:
+#line 1191 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 179:
-#line 1195 "perly.y"
+  case 178:
+#line 1193 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                            append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
     break;
 
-  case 180:
-#line 1198 "perly.y"
+  case 179:
+#line 1196 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 181:
-#line 1202 "perly.y"
+  case 180:
+#line 1200 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0);
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
@@ -1417,14 +1413,14 @@ case 2:
                        ;}
     break;
 
-  case 182:
-#line 1208 "perly.y"
+  case 181:
+#line 1206 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 183:
-#line 1211 "perly.y"
+  case 182:
+#line 1209 "perly.y"
     { (yyval.opval) = (IVAL((ps[(1) - (3)].val.i_tkval)) == OP_NOT)
                            ? newUNOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0, newSVOP(OP_CONST, 0, newSViv(0)))
                            : newOP(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_SPECIAL);
@@ -1435,8 +1431,8 @@ case 2:
                        ;}
     break;
 
-  case 184:
-#line 1220 "perly.y"
+  case 183:
+#line 1218 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
@@ -1444,16 +1440,16 @@ case 2:
                        ;}
     break;
 
-  case 185:
-#line 1226 "perly.y"
+  case 184:
+#line 1224 "perly.y"
     { (yyval.opval) = pmruntime((ps[(1) - (4)].val.opval), (ps[(3) - (4)].val.opval), 1);
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 188:
-#line 1236 "perly.y"
+  case 187:
+#line 1234 "perly.y"
     { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval));
                          DO_MAD(
                              token_getmad((ps[(1) - (3)].val.i_tkval),(yyval.opval),'d');
@@ -1463,29 +1459,34 @@ case 2:
                        ;}
     break;
 
-  case 189:
-#line 1244 "perly.y"
+  case 188:
+#line 1242 "perly.y"
     { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'d');
                        ;}
     break;
 
-  case 190:
-#line 1251 "perly.y"
+  case 189:
+#line 1249 "perly.y"
     { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 191:
-#line 1256 "perly.y"
+  case 190:
+#line 1254 "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 191:
+#line 1259 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
   case 192:
 #line 1261 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
@@ -1497,32 +1498,27 @@ case 2:
     break;
 
   case 194:
-#line 1265 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1268 "perly.y"
+    { (yyval.opval) = Nullop; ;}
     break;
 
   case 195:
 #line 1270 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 196:
-#line 1272 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1274 "perly.y"
+    { (yyval.opval) = Nullop; ;}
     break;
 
   case 197:
 #line 1276 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 198:
 #line 1278 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
-    break;
-
-  case 199:
-#line 1280 "perly.y"
     {
 #ifdef MAD
                          OP* op = newNULLLIST();
@@ -1535,53 +1531,58 @@ case 2:
                        ;}
     break;
 
-  case 200:
-#line 1295 "perly.y"
+  case 199:
+#line 1293 "perly.y"
     { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 201:
-#line 1299 "perly.y"
+  case 200:
+#line 1297 "perly.y"
     { (yyval.opval) = newCVREF(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'&');
                        ;}
     break;
 
-  case 202:
-#line 1305 "perly.y"
+  case 201:
+#line 1303 "perly.y"
     { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$');
                        ;}
     break;
 
-  case 203:
-#line 1311 "perly.y"
+  case 202:
+#line 1309 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@');
                        ;}
     break;
 
-  case 204:
-#line 1317 "perly.y"
+  case 203:
+#line 1315 "perly.y"
     { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%');
                        ;}
     break;
 
-  case 205:
-#line 1323 "perly.y"
+  case 204:
+#line 1321 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l');
                        ;}
     break;
 
-  case 206:
-#line 1329 "perly.y"
+  case 205:
+#line 1327 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*');
                        ;}
     break;
 
+  case 206:
+#line 1334 "perly.y"
+    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
+    break;
+
   case 207:
 #line 1336 "perly.y"
     { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
@@ -1589,16 +1590,11 @@ case 2:
 
   case 208:
 #line 1338 "perly.y"
-    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
-    break;
-
-  case 209:
-#line 1340 "perly.y"
     { (yyval.opval) = scope((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 210:
-#line 1343 "perly.y"
+  case 209:
+#line 1341 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 

diff --git a/perly.c b/perly.c
index 95779a0..5a3d409 100644 (file)
--- a/perly.c
+++ b/perly.c
@@ -272,6 +272,7 @@ S_clear_yystack(pTHX_  const yy_parser *parser)
     /* clear any reducing ops (1st pass) */
 
     for (i=0; i< parser->yylen; i++) {
+       LEAVE_SCOPE(ps[-i].savestack_ix);
        if (yy_type_tab[yystos[ps[-i].state]] == toketype_opval
            && ps[-i].val.opval) {
            if ( ! (ps[-i].val.opval->op_attached
@@ -289,6 +290,7 @@ S_clear_yystack(pTHX_  const yy_parser *parser)
     /* now free whole the stack, including the just-reduced ops */
 
     while (ps > parser->stack) {
+       LEAVE_SCOPE(ps->savestack_ix);
        if (yy_type_tab[yystos[ps->state]] == toketype_opval
            && ps->val.opval)
        {
@@ -450,6 +452,7 @@ Perl_yyparse (pTHX)
     ps->state   = yyn;
     ps->val     = parser->yylval;
     ps->comppad = PL_comppad;
+    ps->savestack_ix = PL_savestack_ix;
 #ifdef DEBUGGING
     ps->name    = (const char *)(yytname[yytoken]);
 #endif
@@ -547,6 +550,7 @@ Perl_yyparse (pTHX)
 
     ps->val     = yyval;
     ps->comppad = PL_comppad;
+    ps->savestack_ix = PL_savestack_ix;
 #ifdef DEBUGGING
     ps->name    = (const char *)(yytname [yyr1[yyn]]);
 #endif
@@ -584,6 +588,7 @@ Perl_yyparse (pTHX)
            /* Pop the rest of the stack.  */
            while (ps > parser->stack) {
                YYDSYMPRINTF ("Error: popping", yystos[ps->state], &ps->val);
+               LEAVE_SCOPE(ps->savestack_ix);
                if (yy_type_tab[yystos[ps->state]] == toketype_opval
                        && ps->val.opval)
                {
@@ -631,6 +636,7 @@ Perl_yyparse (pTHX)
            YYABORT;
 
        YYDSYMPRINTF ("Error: popping", yystos[ps->state], &ps->val);
+       LEAVE_SCOPE(ps->savestack_ix);
        if (yy_type_tab[yystos[ps->state]] == toketype_opval && ps->val.opval) {
            YYDPRINTF ((Perl_debug_log, "(freeing op)\n"));
            if (ps->comppad != PL_comppad) {
@@ -654,6 +660,7 @@ Perl_yyparse (pTHX)
     ps->state   = yyn;
     ps->val     = parser->yylval;
     ps->comppad = PL_comppad;
+    ps->savestack_ix = PL_savestack_ix;
 #ifdef DEBUGGING
     ps->name    ="<err>";
 #endif

diff --git a/perly.tab b/perly.tab
index 81af8e8..bb232a5 100644 (file)
--- a/perly.tab
+++ b/perly.tab
@@ -1,15 +1,15 @@
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2064
+#define YYLAST   2049
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  90
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  66
+#define YYNNTS  65
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  210
+#define YYNRULES  209
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  420
+#define YYNSTATES  419
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -62,133 +62,130 @@ static const yytype_uint8 yytranslate[] =
 static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     6,    11,    12,    13,    14,    19,    20,
-      21,    22,    25,    29,    32,    34,    36,    39,    42,    46,
-      48,    50,    54,    58,    62,    66,    70,    71,    74,    81,
-      89,    97,   104,   107,   108,   111,   121,   131,   142,   152,
-     161,   174,   178,   187,   188,   189,   191,   192,   194,   196,
-     198,   200,   202,   203,   205,   207,   209,   211,   213,   215,
-     217,   219,   224,   226,   227,   234,   241,   242,   243,   244,
-     246,   247,   249,   250,   253,   255,   258,   260,   262,   264,
-     268,   269,   277,   281,   285,   289,   291,   294,   298,   300,
-     304,   310,   317,   321,   325,   331,   334,   339,   340,   346,
-     348,   350,   356,   361,   367,   372,   378,   385,   391,   396,
-     402,   407,   411,   418,   424,   428,   432,   436,   440,   444,
-     448,   452,   456,   460,   464,   468,   472,   476,   480,   483,
-     486,   489,   492,   495,   498,   501,   504,   508,   511,   516,
-     520,   526,   529,   532,   537,   543,   548,   554,   556,   558,
-     560,   562,   568,   571,   573,   576,   580,   583,   585,   587,
-     589,   591,   593,   595,   600,   606,   608,   610,   614,   619,
-     623,   625,   628,   631,   633,   636,   639,   641,   644,   646,
-     649,   651,   655,   657,   661,   666,   671,   673,   675,   679,
-     682,   686,   689,   691,   693,   695,   696,   698,   699,   701,
-     704,   706,   709,   712,   715,   718,   721,   724,   726,   728,
-     730
+      21,    24,    27,    30,    32,    34,    37,    40,    44,    46,
+      48,    52,    56,    60,    64,    68,    69,    72,    79,    87,
+      95,   102,   105,   106,   109,   119,   129,   140,   150,   159,
+     172,   176,   185,   186,   187,   189,   190,   192,   194,   196,
+     198,   200,   201,   203,   205,   207,   209,   211,   213,   215,
+     217,   222,   224,   225,   232,   239,   240,   241,   242,   244,
+     245,   247,   248,   251,   253,   256,   258,   260,   262,   266,
+     267,   275,   279,   283,   287,   289,   292,   296,   298,   302,
+     308,   315,   319,   323,   329,   332,   337,   338,   344,   346,
+     348,   354,   359,   365,   370,   376,   383,   389,   394,   400,
+     405,   409,   416,   422,   426,   430,   434,   438,   442,   446,
+     450,   454,   458,   462,   466,   470,   474,   478,   481,   484,
+     487,   490,   493,   496,   499,   502,   506,   509,   514,   518,
+     524,   527,   530,   535,   541,   546,   552,   554,   556,   558,
+     560,   566,   569,   571,   574,   578,   581,   583,   585,   587,
+     589,   591,   593,   598,   604,   606,   608,   612,   617,   621,
+     623,   626,   629,   631,   634,   637,   639,   642,   644,   647,
+     649,   653,   655,   659,   664,   669,   671,   673,   677,   680,
+     684,   687,   689,   691,   693,   694,   696,   697,   699,   702,
+     704,   707,   710,   713,   716,   719,   722,   724,   726,   728
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-      91,     0,    -1,    95,    99,    -1,     3,    93,    99,     4,
-      -1,    -1,    -1,    -1,     3,    97,    99,     4,    -1,    -1,
-      -1,    -1,    99,   116,    -1,    99,    98,   100,    -1,   115,
-     103,    -1,   106,    -1,   107,    -1,   115,   104,    -1,   115,
-      14,    -1,   115,   101,    14,    -1,     1,    -1,   133,    -1,
-     133,    32,   133,    -1,   133,    33,   133,    -1,   133,    30,
-     133,    -1,   133,    31,   111,    -1,   133,    37,   133,    -1,
-      -1,    34,    96,    -1,    35,    88,   112,    87,    96,   102,
-      -1,    32,    88,    93,   112,    87,    96,   102,    -1,    33,
-      88,    93,   114,    87,    96,   102,    -1,    39,    88,    93,
-     112,    87,    96,    -1,    40,    92,    -1,    -1,    36,    92,
-      -1,   115,    30,    88,    93,   110,    87,   108,    96,   105,
-      -1,   115,    31,    88,    93,   111,    87,   108,    96,   105,
-      -1,   115,    37,    57,    93,   148,    88,   112,    87,    96,
-     105,    -1,   115,    37,   150,    88,    93,   112,    87,    96,
-     105,    -1,   115,    37,    88,    93,   112,    87,    96,   105,
-      -1,   115,    37,    88,    93,   113,    14,   110,    14,   108,
-     113,    87,    96,    -1,   115,    92,   105,    -1,   115,    38,
-      88,    93,    94,   112,    87,    96,    -1,    -1,    -1,   101,
-      -1,    -1,   133,    -1,   133,    -1,   133,    -1,   109,    -1,
-     111,    -1,    -1,    24,    -1,   118,    -1,   121,    -1,   120,
-      -1,   130,    -1,   131,    -1,   117,    -1,    89,    -1,    25,
-     124,   119,    92,    -1,    15,    -1,    -1,    58,   122,   125,
-     126,   127,   129,    -1,    26,   122,   125,   126,   127,   129,
-      -1,    -1,    -1,    -1,    15,    -1,    -1,    18,    -1,    -1,
-      60,    18,    -1,    60,    -1,    60,    18,    -1,    60,    -1,
-      92,    -1,    14,    -1,    28,    15,    14,    -1,    -1,    29,
-     122,   132,    15,    15,   146,    14,    -1,   133,    64,   133,
-      -1,   133,    63,   133,    -1,   133,    62,   133,    -1,   134,
-      -1,   134,    66,    -1,   134,    66,   143,    -1,   143,    -1,
-      47,   155,   134,    -1,    45,    88,   155,   133,    87,    -1,
-     143,    86,   137,    88,   147,    87,    -1,   143,    86,   137,
-      -1,    16,   155,   146,    -1,    17,   155,    88,   147,    87,
-      -1,    47,   146,    -1,    45,    88,   147,    87,    -1,    -1,
-      23,   123,    92,   136,   146,    -1,    16,    -1,   150,    -1,
-     154,     3,   133,    14,     4,    -1,   150,     5,   133,     6,
-      -1,   143,    86,     5,   133,     6,    -1,   138,     5,   133,
-       6,    -1,   150,     3,   133,    14,     4,    -1,   143,    86,
-       3,   133,    14,     4,    -1,   138,     3,   133,    14,     4,
-      -1,   143,    86,    88,    87,    -1,   143,    86,    88,   133,
-      87,    -1,   138,    88,   133,    87,    -1,   138,    88,    87,
-      -1,    88,   133,    87,     5,   133,     6,    -1,    88,    87,
-       5,   133,     6,    -1,   143,    67,   143,    -1,   143,    81,
-     143,    -1,   143,    50,   143,    -1,   143,    51,   143,    -1,
-     143,    75,   143,    -1,   143,    48,   143,    -1,   143,    49,
-     143,    -1,   143,    74,   143,    -1,   143,    73,   143,    -1,
-     143,    42,   143,    -1,   143,    72,   143,    -1,   143,    71,
-     143,    -1,   143,    70,   143,    -1,   143,    76,   143,    -1,
-       7,   143,    -1,     8,   143,    -1,    77,   143,    -1,    78,
-     143,    -1,   143,    83,    -1,   143,    82,    -1,    85,   143,
-      -1,    84,   143,    -1,     5,   133,     6,    -1,     5,     6,
-      -1,    54,   133,    14,     4,    -1,    54,    14,     4,    -1,
-      27,   123,   126,   127,    92,    -1,    53,   143,    -1,    53,
-      92,    -1,    53,    15,    88,    87,    -1,    53,    15,    88,
-     133,    87,    -1,    53,   150,    88,    87,    -1,    53,   150,
-      88,   133,    87,    -1,   139,    -1,   140,    -1,   141,    -1,
-     142,    -1,   143,    68,   143,    69,   143,    -1,    79,   143,
-      -1,   144,    -1,    56,   143,    -1,    88,   133,    87,    -1,
-      88,    87,    -1,   150,    -1,   154,    -1,   152,    -1,   151,
-      -1,   153,    -1,   138,    -1,   151,     5,   133,     6,    -1,
-     151,     3,   133,    14,     4,    -1,    18,    -1,   149,    -1,
-     149,    88,    87,    -1,   149,    88,   133,    87,    -1,    55,
-      15,   146,    -1,    41,    -1,    41,   143,    -1,    65,   134,
-      -1,    46,    -1,    46,    92,    -1,    46,   143,    -1,    59,
-      -1,    59,   143,    -1,    22,    -1,    22,   143,    -1,    43,
-      -1,    43,    88,    87,    -1,    21,    -1,    44,    88,    87,
-      -1,    44,    88,   133,    87,    -1,    19,    88,   134,    87,
-      -1,    15,    -1,   135,    -1,    57,   145,   128,    -1,    57,
-     145,    -1,    88,   133,    87,    -1,    88,    87,    -1,   150,
-      -1,   152,    -1,   151,    -1,    -1,   134,    -1,    -1,   133,
-      -1,   133,    66,    -1,   150,    -1,    13,   155,    -1,     9,
-     155,    -1,    10,   155,    -1,    11,   155,    -1,    52,   155,
-      -1,    12,   155,    -1,    15,    -1,   150,    -1,    92,    -1,
-      20,    -1
+      91,     0,    -1,    95,    98,    -1,     3,    93,    98,     4,
+      -1,    -1,    -1,    -1,     3,    97,    98,     4,    -1,    -1,
+      -1,    98,   115,    -1,    98,    99,    -1,   114,   102,    -1,
+     105,    -1,   106,    -1,   114,   103,    -1,   114,    14,    -1,
+     114,   100,    14,    -1,     1,    -1,   132,    -1,   132,    32,
+     132,    -1,   132,    33,   132,    -1,   132,    30,   132,    -1,
+     132,    31,   110,    -1,   132,    37,   132,    -1,    -1,    34,
+      96,    -1,    35,    88,   111,    87,    96,   101,    -1,    32,
+      88,    93,   111,    87,    96,   101,    -1,    33,    88,    93,
+     113,    87,    96,   101,    -1,    39,    88,    93,   111,    87,
+      96,    -1,    40,    92,    -1,    -1,    36,    92,    -1,   114,
+      30,    88,    93,   109,    87,   107,    96,   104,    -1,   114,
+      31,    88,    93,   110,    87,   107,    96,   104,    -1,   114,
+      37,    57,    93,   147,    88,   111,    87,    96,   104,    -1,
+     114,    37,   149,    88,    93,   111,    87,    96,   104,    -1,
+     114,    37,    88,    93,   111,    87,    96,   104,    -1,   114,
+      37,    88,    93,   112,    14,   109,    14,   107,   112,    87,
+      96,    -1,   114,    92,   104,    -1,   114,    38,    88,    93,
+      94,   111,    87,    96,    -1,    -1,    -1,   100,    -1,    -1,
+     132,    -1,   132,    -1,   132,    -1,   108,    -1,   110,    -1,
+      -1,    24,    -1,   117,    -1,   120,    -1,   119,    -1,   129,
+      -1,   130,    -1,   116,    -1,    89,    -1,    25,   123,   118,
+      92,    -1,    15,    -1,    -1,    58,   121,   124,   125,   126,
+     128,    -1,    26,   121,   124,   125,   126,   128,    -1,    -1,
+      -1,    -1,    15,    -1,    -1,    18,    -1,    -1,    60,    18,
+      -1,    60,    -1,    60,    18,    -1,    60,    -1,    92,    -1,
+      14,    -1,    28,    15,    14,    -1,    -1,    29,   121,   131,
+      15,    15,   145,    14,    -1,   132,    64,   132,    -1,   132,
+      63,   132,    -1,   132,    62,   132,    -1,   133,    -1,   133,
+      66,    -1,   133,    66,   142,    -1,   142,    -1,    47,   154,
+     133,    -1,    45,    88,   154,   132,    87,    -1,   142,    86,
+     136,    88,   146,    87,    -1,   142,    86,   136,    -1,    16,
+     154,   145,    -1,    17,   154,    88,   146,    87,    -1,    47,
+     145,    -1,    45,    88,   146,    87,    -1,    -1,    23,   122,
+      92,   135,   145,    -1,    16,    -1,   149,    -1,   153,     3,
+     132,    14,     4,    -1,   149,     5,   132,     6,    -1,   142,
+      86,     5,   132,     6,    -1,   137,     5,   132,     6,    -1,
+     149,     3,   132,    14,     4,    -1,   142,    86,     3,   132,
+      14,     4,    -1,   137,     3,   132,    14,     4,    -1,   142,
+      86,    88,    87,    -1,   142,    86,    88,   132,    87,    -1,
+     137,    88,   132,    87,    -1,   137,    88,    87,    -1,    88,
+     132,    87,     5,   132,     6,    -1,    88,    87,     5,   132,
+       6,    -1,   142,    67,   142,    -1,   142,    81,   142,    -1,
+     142,    50,   142,    -1,   142,    51,   142,    -1,   142,    75,
+     142,    -1,   142,    48,   142,    -1,   142,    49,   142,    -1,
+     142,    74,   142,    -1,   142,    73,   142,    -1,   142,    42,
+     142,    -1,   142,    72,   142,    -1,   142,    71,   142,    -1,
+     142,    70,   142,    -1,   142,    76,   142,    -1,     7,   142,
+      -1,     8,   142,    -1,    77,   142,    -1,    78,   142,    -1,
+     142,    83,    -1,   142,    82,    -1,    85,   142,    -1,    84,
+     142,    -1,     5,   132,     6,    -1,     5,     6,    -1,    54,
+     132,    14,     4,    -1,    54,    14,     4,    -1,    27,   122,
+     125,   126,    92,    -1,    53,   142,    -1,    53,    92,    -1,
+      53,    15,    88,    87,    -1,    53,    15,    88,   132,    87,
+      -1,    53,   149,    88,    87,    -1,    53,   149,    88,   132,
+      87,    -1,   138,    -1,   139,    -1,   140,    -1,   141,    -1,
+     142,    68,   142,    69,   142,    -1,    79,   142,    -1,   143,
+      -1,    56,   142,    -1,    88,   132,    87,    -1,    88,    87,
+      -1,   149,    -1,   153,    -1,   151,    -1,   150,    -1,   152,
+      -1,   137,    -1,   150,     5,   132,     6,    -1,   150,     3,
+     132,    14,     4,    -1,    18,    -1,   148,    -1,   148,    88,
+      87,    -1,   148,    88,   132,    87,    -1,    55,    15,   145,
+      -1,    41,    -1,    41,   142,    -1,    65,   133,    -1,    46,
+      -1,    46,    92,    -1,    46,   142,    -1,    59,    -1,    59,
+     142,    -1,    22,    -1,    22,   142,    -1,    43,    -1,    43,
+      88,    87,    -1,    21,    -1,    44,    88,    87,    -1,    44,
+      88,   132,    87,    -1,    19,    88,   133,    87,    -1,    15,
+      -1,   134,    -1,    57,   144,   127,    -1,    57,   144,    -1,
+      88,   132,    87,    -1,    88,    87,    -1,   149,    -1,   151,
+      -1,   150,    -1,    -1,   133,    -1,    -1,   132,    -1,   132,
+      66,    -1,   149,    -1,    13,   154,    -1,     9,   154,    -1,
+      10,   154,    -1,    11,   154,    -1,    52,   154,    -1,    12,
+     154,    -1,    15,    -1,   149,    -1,    92,    -1,    20,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   135,   135,   141,   151,   155,   159,   165,   175,   179,
-     183,   184,   191,   200,   203,   204,   206,   208,   225,   244,
-     246,   248,   252,   256,   260,   264,   273,   274,   278,   289,
-     297,   308,   311,   317,   318,   325,   338,   350,   361,   371,
-     381,   413,   421,   431,   437,   438,   443,   446,   450,   455,
-     459,   463,   469,   478,   482,   484,   486,   488,   490,   495,
-     499,   505,   519,   520,   524,   537,   560,   566,   571,   576,
-     586,   587,   592,   593,   597,   607,   611,   621,   622,   631,
-     645,   644,   663,   667,   671,   675,   679,   689,   698,   702,
-     707,   714,   723,   729,   735,   743,   747,   754,   753,   764,
-     765,   769,   778,   783,   791,   798,   805,   815,   824,   831,
-     840,   847,   853,   860,   870,   874,   878,   884,   888,   892,
-     896,   900,   904,   908,   920,   924,   928,   932,   942,   946,
-     953,   957,   961,   966,   971,   976,   985,   990,   995,  1001,
-    1007,  1018,  1022,  1026,  1038,  1051,  1059,  1071,  1072,  1073,
-    1074,  1075,  1080,  1084,  1086,  1090,  1095,  1100,  1102,  1104,
-    1106,  1108,  1110,  1112,  1121,  1132,  1134,  1136,  1141,  1154,
-    1159,  1164,  1168,  1172,  1176,  1180,  1184,  1188,  1192,  1194,
-    1197,  1201,  1207,  1210,  1219,  1225,  1230,  1231,  1235,  1243,
-    1250,  1255,  1260,  1262,  1264,  1269,  1271,  1276,  1277,  1279,
-    1294,  1298,  1304,  1310,  1316,  1322,  1328,  1335,  1337,  1339,
-    1342
+       0,   135,   135,   141,   151,   155,   159,   165,   175,   180,
+     181,   188,   198,   201,   202,   204,   206,   223,   242,   244,
+     246,   250,   254,   258,   262,   271,   272,   276,   287,   295,
+     306,   309,   315,   316,   323,   336,   348,   359,   369,   379,
+     411,   419,   429,   435,   436,   441,   444,   448,   453,   457,
+     461,   467,   476,   480,   482,   484,   486,   488,   493,   497,
+     503,   517,   518,   522,   535,   558,   564,   569,   574,   584,
+     585,   590,   591,   595,   605,   609,   619,   620,   629,   643,
+     642,   661,   665,   669,   673,   677,   687,   696,   700,   705,
+     712,   721,   727,   733,   741,   745,   752,   751,   762,   763,
+     767,   776,   781,   789,   796,   803,   813,   822,   829,   838,
+     845,   851,   858,   868,   872,   876,   882,   886,   890,   894,
+     898,   902,   906,   918,   922,   926,   930,   940,   944,   951,
+     955,   959,   964,   969,   974,   983,   988,   993,   999,  1005,
+    1016,  1020,  1024,  1036,  1049,  1057,  1069,  1070,  1071,  1072,
+    1073,  1078,  1082,  1084,  1088,  1093,  1098,  1100,  1102,  1104,
+    1106,  1108,  1110,  1119,  1130,  1132,  1134,  1139,  1152,  1157,
+    1162,  1166,  1170,  1174,  1178,  1182,  1186,  1190,  1192,  1195,
+    1199,  1205,  1208,  1217,  1223,  1228,  1229,  1233,  1241,  1248,
+    1253,  1258,  1260,  1262,  1267,  1269,  1274,  1275,  1277,  1292,
+    1296,  1302,  1308,  1314,  1320,  1326,  1333,  1335,  1337,  1340
 };
 #endif
 
@@ -210,15 +207,15 @@ static const char *const yytname[] =
   "MATCHOP", "'!'", "'~'", "REFGEN", "UMINUS", "POWOP", "POSTDEC",
   "POSTINC", "PREDEC", "PREINC", "ARROW", "')'", "'('", "PEG", "$accept",
   "prog", "block", "remember", "mydefsv", "progstart", "mblock",
-  "mremember", "savescope", "lineseq", "line", "sideff", "else", "cond",
-  "case", "cont", "loop", "switch", "mintro", "nexpr", "texpr", "iexpr",
-  "mexpr", "mnexpr", "miexpr", "label", "decl", "peg", "format",
-  "formname", "mysubrout", "subrout", "startsub", "startanonsub",
-  "startformsub", "subname", "proto", "subattrlist", "myattrlist",
-  "subbody", "package", "use", "@1", "expr", "argexpr", "listop", "@2",
-  "method", "subscripted", "termbinop", "termunop", "anonymous", "termdo",
-  "term", "myattrterm", "myterm", "listexpr", "listexprcom", "my_scalar",
-  "amper", "scalar", "ary", "hsh", "arylen", "star", "indirob", 0
+  "mremember", "lineseq", "line", "sideff", "else", "cond", "case", "cont",
+  "loop", "switch", "mintro", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr",
+  "miexpr", "label", "decl", "peg", "format", "formname", "mysubrout",
+  "subrout", "startsub", "startanonsub", "startformsub", "subname",
+  "proto", "subattrlist", "myattrlist", "subbody", "package", "use", "@1",
+  "expr", "argexpr", "listop", "@2", "method", "subscripted", "termbinop",
+  "termunop", "anonymous", "termdo", "term", "myattrterm", "myterm",
+  "listexpr", "listexprcom", "my_scalar", "amper", "scalar", "ary", "hsh",
+  "arylen", "star", "indirob", 0
 };
 #endif
 
@@ -243,54 +240,52 @@ static const yytype_uint16 yytoknum[] =
 static const yytype_uint8 yyr1[] =
 {
        0,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,    99,    99,   100,   100,   100,   100,   100,   100,   101,
-     101,   101,   101,   101,   101,   101,   102,   102,   102,   103,
-     103,   104,   104,   105,   105,   106,   106,   106,   106,   106,
-     106,   106,   107,   108,   109,   109,   110,   110,   111,   112,
-     113,   114,   115,   115,   116,   116,   116,   116,   116,   116,
-     117,   118,   119,   119,   120,   121,   122,   123,   124,   125,
-     126,   126,   127,   127,   127,   128,   128,   129,   129,   130,
-     132,   131,   133,   133,   133,   133,   134,   134,   134,   135,
-     135,   135,   135,   135,   135,   135,   135,   136,   135,   137,
-     137,   138,   138,   138,   138,   138,   138,   138,   138,   138,
-     138,   138,   138,   138,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   139,   140,   140,
-     140,   140,   140,   140,   140,   140,   141,   141,   141,   141,
-     141,   142,   142,   142,   142,   142,   142,   143,   143,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   144,   144,
-     145,   145,   145,   145,   145,   146,   146,   147,   147,   147,
-     148,   149,   150,   151,   152,   153,   154,   155,   155,   155,
-     155
+      98,    98,    99,    99,    99,    99,    99,    99,   100,   100,
+     100,   100,   100,   100,   100,   101,   101,   101,   102,   102,
+     103,   103,   104,   104,   105,   105,   105,   105,   105,   105,
+     105,   106,   107,   108,   108,   109,   109,   110,   111,   112,
+     113,   114,   114,   115,   115,   115,   115,   115,   115,   116,
+     117,   118,   118,   119,   120,   121,   122,   123,   124,   125,
+     125,   126,   126,   126,   127,   127,   128,   128,   129,   131,
+     130,   132,   132,   132,   132,   133,   133,   133,   134,   134,
+     134,   134,   134,   134,   134,   134,   135,   134,   136,   136,
+     137,   137,   137,   137,   137,   137,   137,   137,   137,   137,
+     137,   137,   137,   138,   138,   138,   138,   138,   138,   138,
+     138,   138,   138,   138,   138,   138,   138,   139,   139,   139,
+     139,   139,   139,   139,   139,   140,   140,   140,   140,   140,
+     141,   141,   141,   141,   141,   141,   142,   142,   142,   142,
+     142,   142,   142,   142,   142,   142,   142,   142,   142,   142,
+     142,   142,   142,   142,   142,   142,   142,   142,   142,   142,
+     142,   142,   142,   142,   142,   142,   142,   142,   142,   142,
+     142,   142,   142,   142,   142,   142,   142,   143,   143,   144,
+     144,   144,   144,   144,   145,   145,   146,   146,   146,   147,
+     148,   149,   150,   151,   152,   153,   154,   154,   154,   154
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
        0,     2,     2,     4,     0,     0,     0,     4,     0,     0,
-       0,     2,     3,     2,     1,     1,     2,     2,     3,     1,
-       1,     3,     3,     3,     3,     3,     0,     2,     6,     7,
-       7,     6,     2,     0,     2,     9,     9,    10,     9,     8,
-      12,     3,     8,     0,     0,     1,     0,     1,     1,     1,
-       1,     1,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     4,     1,     0,     6,     6,     0,     0,     0,     1,
-       0,     1,     0,     2,     1,     2,     1,     1,     1,     3,
-       0,     7,     3,     3,     3,     1,     2,     3,     1,     3,
-       5,     6,     3,     3,     5,     2,     4,     0,     5,     1,
-       1,     5,     4,     5,     4,     5,     6,     5,     4,     5,
-       4,     3,     6,     5,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     2,     2,
-       2,     2,     2,     2,     2,     2,     3,     2,     4,     3,
-       5,     2,     2,     4,     5,     4,     5,     1,     1,     1,
-       1,     5,     2,     1,     2,     3,     2,     1,     1,     1,
-       1,     1,     1,     4,     5,     1,     1,     3,     4,     3,
-       1,     2,     2,     1,     2,     2,     1,     2,     1,     2,
-       1,     3,     1,     3,     4,     4,     1,     1,     3,     2,
-       3,     2,     1,     1,     1,     0,     1,     0,     1,     2,
-       1,     2,     2,     2,     2,     2,     2,     1,     1,     1,
-       1
+       2,     2,     2,     1,     1,     2,     2,     3,     1,     1,
+       3,     3,     3,     3,     3,     0,     2,     6,     7,     7,
+       6,     2,     0,     2,     9,     9,    10,     9,     8,    12,
+       3,     8,     0,     0,     1,     0,     1,     1,     1,     1,
+       1,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+       4,     1,     0,     6,     6,     0,     0,     0,     1,     0,
+       1,     0,     2,     1,     2,     1,     1,     1,     3,     0,
+       7,     3,     3,     3,     1,     2,     3,     1,     3,     5,
+       6,     3,     3,     5,     2,     4,     0,     5,     1,     1,
+       5,     4,     5,     4,     5,     6,     5,     4,     5,     4,
+       3,     6,     5,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     2,     2,     2,
+       2,     2,     2,     2,     2,     3,     2,     4,     3,     5,
+       2,     2,     4,     5,     4,     5,     1,     1,     1,     1,
+       5,     2,     1,     2,     3,     2,     1,     1,     1,     1,
+       1,     1,     4,     5,     1,     1,     3,     4,     3,     1,
+       2,     2,     1,     2,     2,     1,     2,     1,     2,     1,
+       3,     1,     3,     4,     4,     1,     1,     3,     2,     3,
+       2,     1,     1,     1,     0,     1,     0,     1,     2,     1,
+       2,     2,     2,     2,     2,     2,     1,     1,     1,     1
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -298,596 +293,592 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       6,     0,    10,     1,     9,    68,    66,     0,    66,    66,
-      60,    52,    11,    59,    54,    56,    55,    57,    58,    63,
-       0,     0,    80,     0,    53,    12,    14,    15,     0,    62,
-       0,    69,    70,    79,     0,    70,    19,     4,     0,     0,
-       0,     0,     0,     0,     0,     0,    17,   186,     0,     0,
-     165,     0,   182,   178,    67,    67,     0,     0,     0,     0,
-       0,     0,     0,     0,   170,   180,     0,     0,   173,   195,
-       0,     0,     0,     0,     0,     0,   176,     0,     0,     0,
-       0,     0,     0,     0,    33,     0,    13,    16,    20,    85,
-     187,   162,   147,   148,   149,   150,    88,   153,   166,   157,
-     160,   159,   161,   158,    61,    71,    72,     0,    72,    10,
-     137,     0,   128,   129,   207,   210,   209,   208,   202,   203,
-     204,   206,   201,   195,     0,     0,   179,     0,    70,     4,
-       4,     4,     4,     4,     4,     0,     4,     4,    32,   171,
-       0,     0,   197,   174,   175,   207,   196,    95,   208,     0,
-     205,   186,   142,   141,   157,     0,     0,   195,   154,     0,
-     189,   192,   194,   193,   177,   172,   130,   131,   152,   135,
-     134,   156,     0,     0,    41,    18,     0,     0,     0,     0,
-       0,     0,     0,     0,    86,     0,     0,     0,     0,     0,
+       6,     0,     9,     1,    51,    52,    67,    65,     0,    65,
+      65,    59,    11,    13,    14,     0,    10,    58,    53,    55,
+      54,    56,    57,    62,     0,     0,    79,     0,    18,     4,
+       0,     0,     0,     0,     0,     0,     0,     0,    16,   185,
+       0,     0,   164,     0,   181,   177,    66,    66,     0,     0,
+       0,     0,     0,     0,     0,     0,   169,   179,     0,     0,
+     172,   194,     0,     0,     0,     0,     0,     0,   175,     0,
+       0,     0,     0,     0,     0,     0,    32,     0,    12,    15,
+      19,    84,   186,   161,   146,   147,   148,   149,    87,   152,
+     165,   156,   159,   158,   160,   157,    61,     0,    68,    69,
+      78,     0,    69,     9,   136,     0,   127,   128,   206,   209,
+     208,   207,   201,   202,   203,   205,   200,   194,     0,     0,
+     178,     0,    69,     4,     4,     4,     4,     4,     4,     0,
+       4,     4,    31,   170,     0,     0,   196,   173,   174,   206,
+     195,    94,   207,     0,   204,   185,   141,   140,   156,     0,
+       0,   194,   153,     0,   188,   191,   193,   192,   176,   171,
+     129,   130,   151,   134,   133,   155,     0,     0,    40,    17,
+       0,     0,     0,     0,     0,     0,     0,     0,    85,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   133,   132,     0,     0,     0,     0,     0,
-       0,     0,    74,     0,   195,     0,     9,   136,    93,   197,
-       0,    97,    72,    46,     0,     0,     0,     0,     0,     4,
-       5,     0,   181,   183,     0,   198,     0,     0,    89,     0,
-       0,   139,     0,   169,   191,     0,    76,   188,     0,   155,
-      34,    23,    24,    48,    21,    22,    25,    84,    83,    82,
-      87,     0,     0,   111,     0,   123,   119,   120,   116,   117,
-     114,     0,   126,   125,   124,   122,   121,   118,   127,   115,
-       0,     0,    99,     0,    92,   100,   167,     0,     0,     0,
-       0,     0,     0,    73,    78,    77,    65,     0,    64,     3,
-       0,   185,   195,     0,     0,    47,     0,     0,    49,    51,
-       0,     0,   200,    45,    50,     0,     0,    20,     0,     0,
-       0,   184,   199,    96,     0,   143,     0,   145,     0,   138,
-     190,    75,     0,     0,     0,   104,   110,     0,     0,     0,
-     108,     0,   197,   168,     0,   102,     0,   163,     0,    81,
-      94,    98,   140,    43,    43,     0,     0,     0,     0,    46,
-       0,     0,     0,    90,   144,   146,   113,     0,   107,   151,
-       0,   103,   109,     0,   105,   164,   101,     0,     0,     8,
-      26,    26,     0,    33,     0,     0,     0,    31,   112,   106,
-      91,    33,    33,    10,     0,     0,    29,    30,     0,    39,
-      43,    33,    42,    35,    36,     9,    27,     0,    33,     0,
-      38,     7,     0,    37,     0,     0,     0,    26,    40,    28
+       0,     0,     0,     0,     0,     0,     0,   132,   131,     0,
+       0,     0,     0,     0,     0,     0,    60,    70,    71,     0,
+      71,    51,   135,    92,   196,     0,    96,    71,    45,     0,
+       0,     0,     0,     0,     4,     5,     0,   180,   182,     0,
+     197,     0,     0,    88,     0,     0,   138,     0,   168,   190,
+       0,    75,   187,     0,   154,    33,    22,    23,    47,    20,
+      21,    24,    83,    82,    81,    86,     0,     0,   110,     0,
+     122,   118,   119,   115,   116,   113,     0,   125,   124,   123,
+     121,   120,   117,   126,   114,     0,     0,    98,     0,    91,
+      99,   166,     0,     0,     0,     0,     0,     0,    73,     0,
+     194,     0,     3,     0,   184,   194,     0,     0,    46,     0,
+       0,    48,    50,     0,     0,   199,    44,    49,     0,     0,
+      19,     0,     0,     0,   183,   198,    95,     0,   142,     0,
+     144,     0,   137,   189,    74,     0,     0,     0,   103,   109,
+       0,     0,     0,   107,     0,   196,   167,     0,   101,     0,
+     162,     0,    72,    77,    76,    64,     0,    63,    93,    97,
+     139,    42,    42,     0,     0,     0,     0,    45,     0,     0,
+       0,    89,   143,   145,   112,     0,   106,   150,     0,   102,
+     108,     0,   104,   163,   100,    80,     0,     0,     8,    25,
+      25,     0,    32,     0,     0,     0,    30,   111,   105,    90,
+      32,    32,     9,     0,     0,    28,    29,     0,    38,    42,
+      32,    41,    34,    35,    51,    26,     0,    32,     0,    37,
+       7,     0,    36,     0,     0,     0,    25,    39,    27
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,   116,   109,   319,     2,   380,   393,    11,     4,
-      25,   313,   396,    86,    87,   174,    26,    27,   377,   314,
-     304,   252,   307,   316,   310,    28,    12,    13,    14,    30,
-      15,    16,    20,   127,    19,    32,   106,   213,   247,   296,
-      17,    18,    34,   308,    89,    90,   302,   284,    91,    92,
-      93,    94,    95,    96,    97,   160,   147,   236,   311,    98,
-      99,   100,   101,   102,   103,   118
+      -1,     1,   110,   103,   312,     2,   379,   392,     4,    12,
+     306,   395,    78,    79,   168,    13,    14,   376,   307,   297,
+     247,   300,   309,   303,    15,    16,    17,    18,    97,    19,
+      20,    24,   121,    23,    99,   208,   289,   242,   345,    21,
+      22,   101,   301,    81,    82,   295,   279,    83,    84,    85,
+      86,    87,    88,    89,   154,   141,   231,   304,    90,    91,
+      92,    93,    94,    95,   112
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -370
+#define YYPACT_NINF -376
 static const yytype_int16 yypact[] =
 {
-    -370,    30,  -370,  -370,    21,  -370,  -370,    36,  -370,  -370,
-    -370,    42,  -370,  -370,  -370,  -370,  -370,  -370,  -370,    59,
-      75,    22,  -370,    75,  -370,  -370,  -370,  -370,   352,  -370,
-      86,  -370,    80,  -370,    96,    80,  -370,  -370,   914,  1750,
-    1750,   336,   336,   336,   336,   336,  -370,  -370,   336,   336,
-    -370,    28,  -370,  1750,  -370,  -370,    40,    55,    78,    89,
-      47,    98,   102,    86,  1750,   106,   109,   111,   686,   602,
-     336,   770,   996,   103,  1750,    76,  1750,  1750,  1750,  1750,
-    1750,  1750,  1750,  1078,   129,   128,  -370,  -370,   139,   126,
-    -370,     4,  -370,  -370,  -370,  -370,  1894,  -370,   117,    54,
-      79,  -370,  -370,   203,  -370,  -370,   147,   199,   147,  -370,
-    -370,    77,   -48,   -48,  -370,  -370,  -370,  -370,  -370,  -370,
-    -370,  -370,  -370,  1750,   127,  1750,   337,    86,    80,  -370,
-    -370,  -370,  -370,  -370,  -370,   131,  -370,  -370,  -370,  1894,
-     160,  1162,   602,  -370,   337,  1810,   126,  -370,   831,  1750,
-    -370,   157,  -370,   337,    12,   246,   240,  1750,   337,  1246,
-     191,  -370,  -370,  -370,   337,   126,   -48,   -48,   -48,    20,
-      20,   251,   211,    86,  -370,  -370,  1750,  1750,  1750,  1750,
-    1750,  1750,  1750,  1750,  1750,  1750,  1750,  1330,  1750,  1750,
-    1750,  1750,  1750,  1750,  1750,  1750,  1750,  1750,  1750,  1750,
-    1750,  1750,  1750,  -370,  -370,   158,  1414,  1750,  1750,  1750,
-    1750,  1750,   250,    15,  1750,    15,    35,  -370,  -370,  1750,
-     -46,  -370,   147,  1750,  1750,  1750,  1750,   258,   434,  -370,
-    -370,  1750,  -370,  -370,   271,   249,   185,  1750,   126,  1498,
-    1582,  -370,   272,  -370,  -370,   338,   263,  -370,  1750,   284,
-    -370,    74,  -370,    74,    74,    74,    74,   232,   232,  -370,
-    1894,   244,    82,  -370,   420,  1978,   802,   671,   718,   464,
-    1894,  1852,   422,   422,   503,   588,   757,   382,   -48,   -48,
-    1750,  1750,  -370,  1666,   230,  -370,  -370,   564,   266,   154,
-     274,   198,   280,  -370,  -370,  -370,  -370,   306,  -370,  -370,
-     238,  -370,  1750,    86,   245,    74,   253,   254,    74,  -370,
-     259,   239,  -370,  -370,  -370,   265,   340,   260,  1750,  1750,
-     285,  -370,  -370,  -370,   578,  -370,   613,  -370,   648,  -370,
-    -370,  -370,   202,  1750,   372,  -370,  -370,  1750,   286,   207,
-    -370,   661,  1750,  -370,   373,  -370,   376,  -370,   390,  -370,
-    -370,  -370,  -370,  -370,  -370,   383,   383,  1750,   383,  1750,
-     316,   323,   383,  -370,  -370,  -370,  -370,   220,  -370,  1936,
-     410,  -370,  -370,   328,  -370,  -370,  -370,   383,   383,  -370,
-     -12,   -12,   329,   129,   407,   383,   383,  -370,  -370,  -370,
-    -370,   129,   129,  -370,   383,   334,  -370,  -370,   383,  -370,
-    -370,   129,  -370,  -370,  -370,   104,  -370,  1750,   129,   516,
-    -370,  -370,   339,  -370,   341,   383,   383,   -12,  -370,  -370
+    -376,    31,  -376,  -376,    89,  -376,  -376,  -376,    28,  -376,
+    -376,  -376,  -376,  -376,  -376,   291,  -376,  -376,  -376,  -376,
+    -376,  -376,  -376,    53,    84,    86,  -376,    84,  -376,  -376,
+     867,  1703,  1703,   650,   650,   650,   650,   650,  -376,  -376,
+     650,   650,  -376,    44,  -376,  1703,  -376,  -376,    49,    57,
+      79,    95,    14,    96,   114,   100,  1703,   128,   139,   145,
+     639,   555,   650,   723,   949,   153,  1703,    35,  1703,  1703,
+    1703,  1703,  1703,  1703,  1703,  1031,   200,   239,  -376,  -376,
+    1029,   188,  -376,    16,  -376,  -376,  -376,  -376,  1879,  -376,
+     171,   131,   202,  -376,  -376,   261,  -376,   100,  -376,   250,
+    -376,   254,   250,  -376,  -376,    10,   132,   132,  -376,  -376,
+    -376,  -376,  -376,  -376,  -376,  -376,  -376,  1703,   187,  1703,
+     898,   100,   250,  -376,  -376,  -376,  -376,  -376,  -376,   191,
+    -376,  -376,  -376,  1879,   198,  1115,   555,  -376,   898,  1763,
+     188,  -376,   784,  1703,  -376,   201,  -376,   898,    19,   284,
+      13,  1703,   898,  1199,   231,  -376,  -376,  -376,   898,   188,
+     132,   132,   132,     9,     9,   288,   107,   100,  -376,  -376,
+    1703,  1703,  1703,  1703,  1703,  1703,  1703,  1703,  1703,  1703,
+    1703,  1283,  1703,  1703,  1703,  1703,  1703,  1703,  1703,  1703,
+    1703,  1703,  1703,  1703,  1703,  1703,  1703,  -376,  -376,    23,
+    1367,  1703,  1703,  1703,  1703,  1703,  -376,  -376,   235,   282,
+     235,   197,  -376,  -376,  1703,    59,  -376,   235,  1703,  1703,
+    1703,  1703,   310,   387,  -376,  -376,  1703,  -376,  -376,   148,
+     319,   252,  1703,   188,  1451,  1535,  -376,   337,  -376,  -376,
+     194,   331,  -376,  1703,   346,  -376,   112,  -376,   112,   112,
+     112,   112,   298,   298,  -376,  1879,    34,    77,  -376,   253,
+    1963,   852,   710,   503,   671,  1879,  1837,   375,   375,   542,
+     625,   755,   457,   132,   132,  1703,  1703,  -376,  1619,   264,
+    -376,  -376,   297,   117,    80,   134,    88,   210,   345,    15,
+    1703,    15,  -376,   280,  -376,  1703,   100,   285,   112,   286,
+     287,   112,  -376,   290,   283,  -376,  -376,  -376,   293,   364,
+     468,  1703,  1703,   303,  -376,  -376,  -376,   302,  -376,   349,
+    -376,   358,  -376,  -376,  -376,   129,  1703,   403,  -376,  -376,
+    1703,   263,   167,  -376,   431,  1703,  -376,   411,  -376,   412,
+    -376,   413,  -376,  -376,  -376,  -376,   377,  -376,  -376,  -376,
+    -376,  -376,  -376,   416,   416,  1703,   416,  1703,   340,   342,
+     416,  -376,  -376,  -376,  -376,   203,  -376,  1921,   433,  -376,
+    -376,   348,  -376,  -376,  -376,  -376,   416,   416,  -376,    21,
+      21,   351,   200,   439,   416,   416,  -376,  -376,  -376,  -376,
+     200,   200,  -376,   416,   366,  -376,  -376,   416,  -376,  -376,
+     200,  -376,  -376,  -376,   329,  -376,  1703,   200,   469,  -376,
+    -376,   368,  -376,   372,   416,   416,    21,  -376,  -376
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -370,  -370,   -26,   -61,  -370,  -370,   -99,  -370,  -370,  -108,
-    -370,   396,  -369,  -370,  -370,   -82,  -370,  -370,  -338,  -370,
-      68,   -51,  -223,    25,  -370,  -370,  -370,  -370,  -370,  -370,
-    -370,  -370,    69,   399,  -370,   415,   -21,   -95,  -370,   247,
-    -370,  -370,  -370,   -28,   -58,  -370,  -370,  -370,  -370,  -370,
-    -370,  -370,  -370,    41,  -370,  -370,  -117,  -216,  -370,  -370,
-     -17,   384,   385,  -370,  -370,   179
+    -376,  -376,   -13,   -61,  -376,  -376,  1487,  -376,  -102,  -376,
+     445,  -375,  -376,  -376,  -120,  -376,  -376,  -319,  -376,   105,
+      63,  -206,    55,  -376,  -376,  -376,  -376,  -376,  -376,  -376,
+    -376,    72,   420,  -376,   441,   -12,  -180,  -376,   178,  -376,
+    -376,  -376,   -15,   -58,  -376,  -376,  -376,  -376,  -376,  -376,
+    -376,  -376,    56,  -376,  -376,  -113,  -202,  -376,  -376,   -27,
+     406,   422,  -376,  -376,    17
 };
 
 /* 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 -187
+#define YYTABLE_NINF -186
 static const yytype_int16 yytable[] =
 {
-      88,   216,    84,   300,   104,   315,   218,   185,   320,   186,
-     111,   146,   397,   215,   108,   207,   378,   208,    37,   165,
-     184,    -2,   394,   395,   117,   117,   117,   117,   117,   294,
-       3,   117,   117,   202,   203,   204,    33,   138,   205,   299,
-     243,   301,   143,   135,   156,   152,     5,     6,   419,     7,
-       8,    21,   148,   117,   154,   172,    41,   207,   161,   208,
-       5,     6,   409,     7,     8,   146,    24,   220,   223,   224,
-     225,   226,   227,   228,    29,   230,   231,    22,    23,     9,
-     112,   113,   209,   217,   210,    41,    42,    43,   335,    37,
-      31,   238,   187,     9,   126,   360,   361,   297,   105,   146,
-     240,   221,  -187,  -187,   133,   139,   205,   222,   411,   144,
-      10,   107,   153,   234,   235,   158,   125,   164,   157,   166,
-     167,   168,   169,   170,    10,   148,   373,   303,   129,     5,
-       6,   245,     7,     8,   382,   134,   181,   182,   183,   181,
-     182,   183,   175,   130,   181,   182,   183,   250,   251,   253,
-     254,   255,   256,   257,   258,   259,   146,   261,   262,   264,
-     345,   280,     9,   281,   159,   173,   131,    41,   318,   176,
-     177,   178,   179,   306,   282,   309,   180,   132,   287,   288,
-     289,   290,   291,   292,   412,   351,   136,   295,   285,   295,
-     137,   235,   184,    10,   140,   305,   253,   141,   253,   142,
-     317,   181,   182,   183,   347,   206,   211,   212,   366,   324,
-     312,   326,   328,   371,   214,   219,   181,   182,   183,   229,
-     332,   119,   120,   121,   122,   260,   388,   123,   124,   265,
-     266,   267,   268,   269,   270,   271,   272,   273,   274,   275,
-     276,   277,   278,   279,   146,   239,   283,   232,   149,   150,
-     241,   246,   338,   339,   242,   341,   248,   381,   334,   383,
-     181,   182,   183,   387,   181,   182,   183,    41,   293,   181,
-     182,   183,   323,   181,   182,   183,   329,   352,   391,   392,
-     344,   331,   181,   182,   183,   405,   401,   402,   346,   333,
-     176,   177,   178,   179,   348,   406,   183,   180,   249,   408,
-     370,   399,   181,   182,   183,   367,   181,   182,   183,   403,
-     404,   181,   182,   183,   235,   322,   417,   418,   342,   410,
-     349,   237,   181,   182,   183,   350,   413,   357,   181,   182,
-     183,   305,   353,   181,   182,   183,   181,   182,   183,    37,
-     354,   355,   181,   182,   183,    41,   356,   -49,   181,   182,
-     183,   114,   358,    36,   359,    37,   115,    38,   321,    39,
-      40,    41,    42,    43,    44,    45,    46,    47,    48,    49,
-      50,    51,   362,    52,    53,    54,   368,   374,   369,    55,
-     375,    88,    56,    57,    58,    59,   379,   191,   192,    60,
-      61,    62,    63,    64,   376,    65,    66,    67,    68,    69,
-     181,   182,   183,   385,    70,    71,    72,    73,    74,    75,
-     386,    76,   200,   201,   389,   390,   398,    77,   202,   203,
-     204,   400,   407,   205,    85,   330,   415,   384,   416,    78,
-      79,    80,   191,   192,   414,    36,    81,    82,    35,    38,
-      83,    39,    40,    41,    42,    43,    44,    45,   -44,    47,
-      48,    49,    50,    51,   128,    52,    53,    54,   201,   162,
-     163,    55,   298,   202,   203,   204,     0,     0,   205,     0,
-     189,   190,   191,   192,     0,    64,     0,    65,    66,    67,
-      68,    69,   181,   182,   183,     0,    70,    71,    72,    73,
-      74,    75,     0,    76,   197,   198,   199,   200,   201,    77,
-       0,     0,     0,   202,   203,   204,     0,   336,   205,     0,
-       0,    78,    79,    80,   191,     0,     0,    36,    81,    82,
-       0,    38,    83,    39,    40,    41,    42,    43,    44,    45,
-       0,    47,    48,    49,    50,    51,     0,    52,    53,    54,
-     201,     0,     0,    55,     0,   202,   203,   204,     0,     0,
-     205,   189,   190,   191,   192,     0,     0,    64,     0,    65,
-      66,    67,    68,    69,     0,     0,     0,     0,    70,    71,
-      72,    73,    74,    75,     0,    76,   198,   199,   200,   201,
-       0,    77,     0,     0,   202,   203,   204,     0,     0,   205,
-       0,     0,     0,    78,    79,    80,     0,     0,     0,     0,
-      81,    82,     0,   -44,    83,    37,     0,    38,     0,    39,
-      40,    41,    42,    43,    44,    45,     0,   145,    48,    49,
-      50,    51,   115,    52,    53,    54,   181,   182,   183,    55,
-       0,     0,     0,     0,     0,     0,   189,   190,   191,   192,
-     181,   182,   183,    64,     0,    65,    66,    67,    68,    69,
-       0,   343,     0,     0,    70,    71,    72,    73,    74,    75,
-       0,    76,   199,   200,   201,   363,     0,    77,     0,   202,
-     203,   204,     0,     0,   205,   181,   182,   183,     0,    78,
-      79,    80,     0,     0,     0,     0,    81,    82,     0,    37,
-      83,    38,     0,    39,    40,    41,    42,    43,    44,    45,
-     364,    47,    48,    49,    50,    51,     0,    52,    53,    54,
-     181,   182,   183,    55,     0,     0,     0,     0,     0,   189,
-    -187,   191,   192,   181,   182,   183,     0,    64,     0,    65,
-      66,    67,    68,    69,     0,   365,     0,     0,    70,    71,
-      72,    73,    74,    75,     0,    76,   200,   201,   372,     0,
-       0,    77,   202,   203,   204,     0,     0,   205,     0,     0,
-       0,     0,     0,    78,    79,    80,     0,     0,     0,     0,
-      81,    82,     0,    37,    83,    38,     0,    39,    40,    41,
-      42,    43,    44,    45,     0,   151,    48,    49,    50,    51,
-       0,    52,    53,    54,   201,     0,     0,    55,     0,   202,
-     203,   204,     0,     0,   205,   189,   190,   191,   192,     0,
-       0,    64,     0,    65,    66,    67,    68,    69,     0,     0,
-       0,     0,    70,    71,    72,    73,    74,    75,     0,    76,
-       0,     0,   200,   201,   207,    77,   208,  -157,   202,   203,
-     204,     0,     0,   205,     0,  -157,     0,    78,    79,    80,
-    -187,     0,   191,   192,    81,    82,     0,     0,    83,     0,
-       0,  -157,  -157,  -157,  -157,     0,     0,     0,  -157,     0,
-       0,     0,     0,  -157,     0,     0,     0,   200,   201,  -157,
-    -157,  -157,  -157,   202,   203,   204,     0,     0,   205,     0,
-       0,     0,     0,  -157,  -157,  -157,     0,  -157,  -157,  -157,
-    -157,  -157,  -157,  -157,  -157,  -157,  -157,  -157,     0,     0,
-       0,     0,  -157,  -157,  -157,     0,     0,  -157,  -157,    38,
-     110,    39,    40,    41,    42,    43,    44,    45,     0,    47,
-      48,    49,    50,    51,     0,    52,    53,    54,     0,     0,
-       0,    55,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    64,     0,    65,    66,    67,
-      68,    69,     0,     0,     0,     0,    70,    71,    72,    73,
-      74,    75,     0,    76,     0,     0,     0,     0,     0,    77,
+      80,   211,    76,   140,   213,   396,   111,   111,   111,   111,
+     111,   159,   293,   111,   111,   105,   212,   308,    29,   179,
+     313,   180,   201,    33,   202,   129,   275,   237,   276,   343,
+     291,     3,    33,   377,   142,   111,   148,   296,   238,   277,
+     155,   418,   132,    25,    33,    34,    35,   137,   327,   150,
+     146,   113,   114,   115,   116,   393,   394,   117,   118,   140,
+     166,   215,   218,   219,   220,   221,   222,   223,    96,   225,
+     226,   127,   175,   176,   177,   175,   176,   177,   143,   144,
+     408,    26,    27,   328,   206,   233,   338,   106,   107,    -2,
+     210,  -186,  -186,   140,   340,   199,   175,   176,   177,    98,
+     100,   120,   128,    29,   181,   358,   359,   235,   216,   142,
+     217,   278,   133,     5,     6,     7,   138,     8,     9,   147,
+     229,   230,   152,   153,   158,   178,   160,   161,   162,   163,
+     164,   337,   119,   371,   201,   364,   202,   123,   240,   175,
+     176,   177,   175,   176,   177,   124,   294,    10,   339,   381,
+     175,   176,   177,   232,   245,   246,   248,   249,   250,   251,
+     252,   253,   254,   311,   256,   257,   259,   125,   151,   175,
+     176,   177,   280,   369,   175,   176,   177,   346,    11,   175,
+     176,   177,   349,   126,   130,   282,   283,   284,   285,   286,
+     287,   175,   176,   177,   244,   305,   175,   176,   177,   230,
+     411,   292,   131,   298,   248,   203,   248,   204,   310,   387,
+     175,   176,   177,   196,   197,   198,   134,   317,   199,   319,
+     321,     5,     6,     7,   341,     8,     9,   135,   325,   175,
+     176,   177,   140,   136,   255,   314,   167,   140,   260,   261,
+     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
+     272,   273,   274,   169,   178,    10,   175,   176,   177,   200,
+     331,   332,   398,   334,   205,   175,   176,   177,   207,   209,
+     402,   403,   175,   176,   177,   214,   344,   368,   344,   224,
+     409,   323,   299,   350,   302,   227,    11,   412,   236,   234,
+     404,   241,    28,   243,    29,   288,    30,   290,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,   365,    44,    45,    46,   175,   176,   177,    47,    33,
+     230,    48,    49,    50,    51,   175,   176,   177,    52,    53,
+      54,    55,    56,   410,    57,    58,    59,    60,    61,   316,
+     329,   322,   298,    62,    63,    64,    65,    66,    67,   324,
+      68,   326,   335,     5,     6,     7,    69,     8,     9,   175,
+     176,   177,   177,   342,   175,   176,   177,   348,    70,    71,
+      72,   355,   351,   352,   353,    73,    74,   354,   357,    75,
+     356,   175,   176,   177,   336,   315,   367,    10,    28,   361,
+     360,   375,    30,    80,    31,    32,    33,    34,    35,    36,
+      37,   -43,    39,    40,    41,    42,    43,   366,    44,    45,
+      46,   175,   176,   177,    47,   372,   373,   374,    11,   378,
+     175,   176,   177,   183,   184,   185,   186,   384,    56,   385,
+      57,    58,    59,    60,    61,   389,   362,   388,   397,    62,
+      63,    64,    65,    66,    67,   363,    68,   191,   192,   193,
+     194,   195,    69,   399,   406,   414,   196,   197,   198,   415,
+      77,   199,   383,   413,    70,    71,    72,   122,   102,   347,
+      28,    73,    74,   156,    30,    75,    31,    32,    33,    34,
+      35,    36,    37,     0,    39,    40,    41,    42,    43,   157,
+      44,    45,    46,   175,   176,   177,    47,     0,   170,   171,
+     172,   173,     0,     0,     0,   174,     0,   185,   186,     0,
+      56,     0,    57,    58,    59,    60,    61,     0,   370,     0,
+       0,    62,    63,    64,    65,    66,    67,     0,    68,     0,
+     175,   176,   177,   195,    69,     0,     0,     0,   196,   197,
+     198,     0,     0,   199,     0,     0,    70,    71,    72,     0,
+       0,     0,     0,    73,    74,   -48,   -43,    75,    29,     0,
+      30,     0,    31,    32,    33,    34,    35,    36,    37,     0,
+     139,    40,    41,    42,    43,   109,    44,    45,    46,   195,
+       0,     0,    47,     0,   196,   197,   198,     0,     0,   199,
+     183,   184,   185,   186,     0,     0,    56,     0,    57,    58,
+      59,    60,    61,     0,     0,     0,     0,    62,    63,    64,
+      65,    66,    67,     0,    68,   192,   193,   194,   195,     0,
+      69,     0,     0,   196,   197,   198,     0,     0,   199,     0,
+       0,     0,    70,    71,    72,     0,     0,     0,     0,    73,
+      74,     0,    29,    75,    30,     0,    31,    32,    33,    34,
+      35,    36,    37,    29,    39,    40,    41,    42,    43,    33,
+      44,    45,    46,     0,     0,   108,    47,     0,     0,     0,
+     109,     0,     0,   183,   184,   185,   186,     0,     0,     0,
+      56,     0,    57,    58,    59,    60,    61,     0,     0,     0,
+       0,    62,    63,    64,    65,    66,    67,     0,    68,   193,
+     194,   195,     0,     0,    69,     0,   196,   197,   198,     0,
+       0,   199,     0,     0,     0,     0,    70,    71,    72,     0,
+       0,   185,     0,    73,    74,     0,    29,    75,    30,     0,
+      31,    32,    33,    34,    35,    36,    37,     0,   145,    40,
+      41,    42,    43,     0,    44,    45,    46,   195,     0,     0,
+      47,     0,   196,   197,   198,     0,     0,   199,   183,  -186,
+     185,   186,     0,     0,    56,     0,    57,    58,    59,    60,
+      61,     0,     0,     0,     0,    62,    63,    64,    65,    66,
+      67,     0,    68,     0,     0,   194,   195,   201,    69,   202,
+    -156,   196,   197,   198,     0,     0,   199,     0,  -156,     0,
+      70,    71,    72,   183,   184,   185,   186,    73,    74,     0,
+       0,    75,     0,     0,  -156,  -156,  -156,  -156,     0,     0,
+       0,  -156,     0,     0,     0,     0,  -156,     0,     0,     0,
+     194,   195,  -156,  -156,  -156,  -156,   196,   197,   198,     0,
+       0,   199,     0,     0,     0,     0,  -156,  -156,  -156,     0,
+    -156,  -156,  -156,  -156,  -156,  -156,  -156,  -156,  -156,  -156,
+    -156,     0,     0,     0,     0,  -156,  -156,  -156,     0,     0,
+    -156,  -156,    30,   104,    31,    32,    33,    34,    35,    36,
+      37,     0,    39,    40,    41,    42,    43,     0,    44,    45,
+      46,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+    -186,     0,   185,   186,     0,     0,     0,     0,    56,     0,
+      57,    58,    59,    60,    61,     0,     0,     0,     0,    62,
+      63,    64,    65,    66,    67,     0,    68,   194,   195,     0,
+       0,     0,    69,   196,   197,   198,     0,     0,   199,     0,
+       0,     0,     0,     0,    70,    71,    72,     0,   185,   186,
+       0,    73,    74,     0,    30,    75,    31,    32,    33,    34,
+      35,    36,    37,   149,    39,    40,    41,    42,    43,     0,
+      44,    45,    46,   194,   195,     0,    47,     0,     0,   196,
+     197,   198,     0,     0,   199,     0,     0,     0,     0,     0,
+      56,     0,    57,    58,    59,    60,    61,     0,     0,     0,
+       0,    62,    63,    64,    65,    66,    67,     0,    68,     0,
+       0,     0,     0,     0,    69,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,    71,    72,     0,
+       0,     0,     0,    73,    74,     0,    30,    75,    31,    32,
+      33,    34,    35,    36,    37,     0,    39,    40,    41,    42,
+      43,     0,    44,    45,    46,     0,     0,     0,    47,   170,
+     171,   172,   173,     0,     0,     0,   174,     0,     0,     0,
+       0,     0,    56,     0,    57,    58,    59,    60,    61,     0,
+       0,     0,     0,    62,    63,    64,    65,    66,    67,     0,
+      68,   175,   176,   177,     0,     0,    69,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    70,    71,
+      72,     0,     0,     0,     0,    73,    74,     0,   165,    75,
+      30,     0,    31,    32,    33,    34,    35,    36,    37,     0,
+      39,    40,    41,    42,    43,     0,    44,    45,    46,     0,
+       0,     0,    47,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    56,     0,    57,    58,
+      59,    60,    61,     0,     0,     0,     0,    62,    63,    64,
+      65,    66,    67,     0,    68,     0,     0,     0,     0,     0,
+      69,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    70,    71,    72,     0,     0,     0,     0,    73,
+      74,     0,   228,    75,    30,     0,    31,    32,    33,    34,
+      35,    36,    37,     0,    39,    40,    41,    42,    43,     0,
+      44,    45,    46,     0,     0,     0,    47,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    78,    79,    80,     0,     0,     0,     0,    81,    82,
-       0,    38,    83,    39,    40,    41,    42,    43,    44,    45,
-     155,    47,    48,    49,    50,    51,     0,    52,    53,    54,
-       0,     0,     0,    55,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    64,     0,    65,
-      66,    67,    68,    69,     0,     0,     0,     0,    70,    71,
-      72,    73,    74,    75,     0,    76,     0,     0,     0,     0,
-       0,    77,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    78,    79,    80,     0,     0,     0,     0,
-      81,    82,     0,    38,    83,    39,    40,    41,    42,    43,
-      44,    45,     0,    47,    48,    49,    50,    51,     0,    52,
-      53,    54,     0,     0,     0,    55,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    64,
-       0,    65,    66,    67,    68,    69,     0,     0,     0,     0,
-      70,    71,    72,    73,    74,    75,     0,    76,     0,     0,
-       0,     0,     0,    77,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    78,    79,    80,     0,     0,
-       0,     0,    81,    82,     0,   171,    83,    38,     0,    39,
-      40,    41,    42,    43,    44,    45,     0,    47,    48,    49,
-      50,    51,     0,    52,    53,    54,     0,     0,     0,    55,
+      56,     0,    57,    58,    59,    60,    61,     0,     0,     0,
+       0,    62,    63,    64,    65,    66,    67,     0,    68,     0,
+       0,     0,     0,     0,    69,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,    71,    72,     0,
+       0,     0,     0,    73,    74,     0,   239,    75,    30,     0,
+      31,    32,    33,    34,    35,    36,    37,     0,    39,    40,
+      41,    42,    43,     0,    44,    45,    46,     0,     0,     0,
+      47,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    56,     0,    57,    58,    59,    60,
+      61,     0,     0,     0,     0,    62,    63,    64,    65,    66,
+      67,     0,    68,     0,     0,     0,     0,     0,    69,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    64,     0,    65,    66,    67,    68,    69,
-       0,     0,     0,     0,    70,    71,    72,    73,    74,    75,
-       0,    76,     0,     0,     0,     0,     0,    77,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    78,
-      79,    80,     0,     0,     0,     0,    81,    82,     0,   233,
-      83,    38,     0,    39,    40,    41,    42,    43,    44,    45,
-       0,    47,    48,    49,    50,    51,     0,    52,    53,    54,
-       0,     0,     0,    55,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    64,     0,    65,
-      66,    67,    68,    69,     0,     0,     0,     0,    70,    71,
-      72,    73,    74,    75,     0,    76,     0,     0,     0,     0,
-       0,    77,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    78,    79,    80,     0,     0,     0,     0,
-      81,    82,     0,   244,    83,    38,     0,    39,    40,    41,
-      42,    43,    44,    45,     0,    47,    48,    49,    50,    51,
-       0,    52,    53,    54,     0,     0,     0,    55,     0,     0,
+      70,    71,    72,     0,     0,     0,     0,    73,    74,     0,
+     258,    75,    30,     0,    31,    32,    33,    34,    35,    36,
+      37,     0,    39,    40,    41,    42,    43,     0,    44,    45,
+      46,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    56,     0,
+      57,    58,    59,    60,    61,     0,     0,     0,     0,    62,
+      63,    64,    65,    66,    67,     0,    68,     0,     0,     0,
+       0,     0,    69,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    70,    71,    72,     0,     0,     0,
+       0,    73,    74,     0,   281,    75,    30,     0,    31,    32,
+      33,    34,    35,    36,    37,     0,    39,    40,    41,    42,
+      43,     0,    44,    45,    46,     0,     0,     0,    47,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    64,     0,    65,    66,    67,    68,    69,     0,     0,
-       0,     0,    70,    71,    72,    73,    74,    75,     0,    76,
-       0,     0,     0,     0,     0,    77,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    78,    79,    80,
-       0,     0,     0,     0,    81,    82,     0,   263,    83,    38,
-       0,    39,    40,    41,    42,    43,    44,    45,     0,    47,
-      48,    49,    50,    51,     0,    52,    53,    54,     0,     0,
-       0,    55,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    64,     0,    65,    66,    67,
-      68,    69,     0,     0,     0,     0,    70,    71,    72,    73,
-      74,    75,     0,    76,     0,     0,     0,     0,     0,    77,
+       0,     0,    56,     0,    57,    58,    59,    60,    61,     0,
+       0,     0,     0,    62,    63,    64,    65,    66,    67,     0,
+      68,     0,     0,     0,     0,     0,    69,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    70,    71,
+      72,     0,     0,     0,     0,    73,    74,     0,   318,    75,
+      30,     0,    31,    32,    33,    34,    35,    36,    37,     0,
+      39,    40,    41,    42,    43,     0,    44,    45,    46,     0,
+       0,     0,    47,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    56,     0,    57,    58,
+      59,    60,    61,     0,     0,     0,     0,    62,    63,    64,
+      65,    66,    67,     0,    68,     0,     0,     0,     0,     0,
+      69,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    70,    71,    72,     0,     0,     0,     0,    73,
+      74,     0,   320,    75,    30,     0,    31,    32,    33,    34,
+      35,    36,    37,     0,    39,    40,    41,    42,    43,     0,
+      44,    45,    46,     0,     0,     0,    47,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    78,    79,    80,     0,     0,     0,     0,    81,    82,
-       0,   286,    83,    38,     0,    39,    40,    41,    42,    43,
-      44,    45,     0,    47,    48,    49,    50,    51,     0,    52,
-      53,    54,     0,     0,     0,    55,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    64,
-       0,    65,    66,    67,    68,    69,     0,     0,     0,     0,
-      70,    71,    72,    73,    74,    75,     0,    76,     0,     0,
-       0,     0,     0,    77,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    78,    79,    80,     0,     0,
-       0,     0,    81,    82,     0,   325,    83,    38,     0,    39,
-      40,    41,    42,    43,    44,    45,     0,    47,    48,    49,
-      50,    51,     0,    52,    53,    54,     0,     0,     0,    55,
+      56,     0,    57,    58,    59,    60,    61,     0,     0,     0,
+       0,    62,    63,    64,    65,    66,    67,     0,    68,     0,
+       0,     0,     0,     0,    69,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    70,    71,    72,     0,
+       0,     0,     0,    73,    74,     0,   333,    75,    30,     0,
+      31,    32,    33,    34,    35,    36,    37,     0,    39,    40,
+      41,    42,    43,     0,    44,    45,    46,     0,     0,     0,
+      47,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    56,     0,    57,    58,    59,    60,
+      61,     0,     0,     0,     0,    62,    63,    64,    65,    66,
+      67,     0,    68,     0,     0,     0,     0,     0,    69,  -185,
+       0,     0,     0,     0,     0,     0,     0,  -185,     0,     0,
+      70,    71,    72,     0,     0,     0,     0,    73,    74,     0,
+       0,    75,     0,  -185,  -185,  -185,  -185,     0,     0,     0,
+    -185,     0,     0,     0,     0,  -185,     0,     0,     0,     0,
+       0,  -185,  -185,  -185,  -185,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  -185,  -185,  -185,     0,  -185,
+    -185,  -185,  -185,  -185,  -185,  -185,  -185,  -185,  -185,  -185,
+       0,   380,     0,   382,  -185,  -185,  -185,   386,     0,  -185,
+    -185,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   390,   391,     0,     0,     0,     0,     0,
+       0,   400,   401,     0,     0,     0,     0,     0,     0,   182,
+     405,     0,     0,     0,   407,   183,   184,   185,   186,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    64,     0,    65,    66,    67,    68,    69,
-       0,     0,     0,     0,    70,    71,    72,    73,    74,    75,
-       0,    76,     0,     0,     0,     0,     0,    77,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    78,
-      79,    80,     0,     0,     0,     0,    81,    82,     0,   327,
-      83,    38,     0,    39,    40,    41,    42,    43,    44,    45,
-       0,    47,    48,    49,    50,    51,     0,    52,    53,    54,
-       0,     0,     0,    55,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    64,     0,    65,
-      66,    67,    68,    69,     0,     0,     0,     0,    70,    71,
-      72,    73,    74,    75,     0,    76,     0,     0,     0,     0,
-       0,    77,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    78,    79,    80,     0,     0,     0,     0,
-      81,    82,     0,   340,    83,    38,     0,    39,    40,    41,
-      42,    43,    44,    45,     0,    47,    48,    49,    50,    51,
-       0,    52,    53,    54,     0,     0,     0,    55,     0,     0,
+       0,   416,   417,     0,   187,   188,   330,   189,   190,   191,
+     192,   193,   194,   195,     0,     0,     0,     0,   196,   197,
+     198,   182,     0,   199,     0,     0,     0,   183,   184,   185,
+     186,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   187,   188,     0,   189,
+     190,   191,   192,   193,   194,   195,     0,     0,     0,     0,
+     196,   197,   198,   182,     0,   199,     0,     0,     0,   183,
+     184,   185,   186,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   188,
+       0,   189,   190,   191,   192,   193,   194,   195,     0,     0,
+       0,     0,   196,   197,   198,  -186,     0,   199,     0,     0,
+       0,   183,   184,   185,   186,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    64,     0,    65,    66,    67,    68,    69,     0,     0,
-       0,     0,    70,    71,    72,    73,    74,    75,     0,    76,
-       0,     0,     0,     0,     0,    77,  -186,     0,     0,     0,
-       0,     0,     0,     0,  -186,     0,     0,    78,    79,    80,
-       0,     0,     0,     0,    81,    82,     0,     0,    83,     0,
-    -186,  -186,  -186,  -186,     0,     0,     0,  -186,     0,     0,
-       0,     0,  -186,     0,     0,     0,     0,     0,  -186,  -186,
-    -186,  -186,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  -186,  -186,  -186,     0,  -186,  -186,  -186,  -186,
-    -186,  -186,  -186,  -186,  -186,  -186,  -186,     0,     0,     0,
-       0,  -186,  -186,  -186,   188,     0,  -186,  -186,     0,     0,
-     189,   190,   191,   192,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   193,
-     194,   337,   195,   196,   197,   198,   199,   200,   201,     0,
-       0,     0,     0,   202,   203,   204,   188,     0,   205,     0,
-       0,     0,   189,   190,   191,   192,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   193,   194,     0,   195,   196,   197,   198,   199,   200,
-     201,     0,     0,     0,     0,   202,   203,   204,   188,     0,
-     205,     0,     0,     0,   189,   190,   191,   192,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   194,     0,   195,   196,   197,   198,
-     199,   200,   201,     0,     0,     0,     0,   202,   203,   204,
-    -187,     0,   205,     0,     0,     0,   189,   190,   191,   192,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   195,   196,
-     197,   198,   199,   200,   201,     0,     0,     0,     0,   202,
-     203,   204,     0,     0,   205
+       0,     0,     0,   189,   190,   191,   192,   193,   194,   195,
+       0,     0,     0,     0,   196,   197,   198,     0,     0,   199
 };
 
 static const yytype_int16 yycheck[] =
 {
-      28,   109,    28,   219,    30,   228,   123,     3,   231,     5,
-      38,    69,   381,   108,    35,     3,   354,     5,     3,    77,
-      66,     0,    34,    35,    41,    42,    43,    44,    45,    14,
-       0,    48,    49,    81,    82,    83,    14,    63,    86,     4,
-     157,    87,    68,    60,    72,    71,    25,    26,   417,    28,
-      29,    15,    69,    70,    71,    83,     9,     3,    75,     5,
-      25,    26,   400,    28,    29,   123,    24,   125,   129,   130,
-     131,   132,   133,   134,    15,   136,   137,     8,     9,    58,
-      39,    40,     3,     6,     5,     9,    10,    11,     6,     3,
-      15,   149,    88,    58,    53,   318,   319,   214,    18,   157,
-      88,   127,    82,    83,    57,    64,    86,   128,     4,    68,
-      89,    15,    71,   141,   142,    74,    88,    76,    15,    78,
-      79,    80,    81,    82,    89,   142,   342,   222,    88,    25,
-      26,   159,    28,    29,   357,    88,    62,    63,    64,    62,
-      63,    64,    14,    88,    62,    63,    64,   173,   176,   177,
-     178,   179,   180,   181,   182,   183,   214,   185,   186,   187,
-       6,     3,    58,     5,    88,    36,    88,     9,   229,    30,
-      31,    32,    33,   224,    16,   226,    37,    88,   206,   207,
-     208,   209,   210,   211,   407,   302,    88,   213,   205,   215,
-      88,   219,    66,    89,    88,   223,   224,    88,   226,    88,
-     228,    62,    63,    64,     6,    88,     3,    60,     6,   237,
-     227,   239,   240,     6,    15,    88,    62,    63,    64,    88,
-     248,    42,    43,    44,    45,   184,     6,    48,    49,   188,
-     189,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,   201,   202,   302,    88,    88,    87,    69,    70,
-       4,    60,   280,   281,    14,   283,     5,   356,    14,   358,
-      62,    63,    64,   362,    62,    63,    64,     9,    18,    62,
-      63,    64,    87,    62,    63,    64,     4,   303,   377,   378,
-      14,    18,    62,    63,    64,   393,   385,   386,    14,     5,
-      30,    31,    32,    33,    14,   394,    64,    37,    87,   398,
-      14,   383,    62,    63,    64,   333,    62,    63,    64,   391,
-     392,    62,    63,    64,   342,    66,   415,   416,    88,   401,
-      14,   142,    62,    63,    64,    87,   408,    88,    62,    63,
-      64,   359,    87,    62,    63,    64,    62,    63,    64,     3,
-      87,    87,    62,    63,    64,     9,    87,    87,    62,    63,
-      64,    15,    87,     1,    14,     3,    20,     5,    87,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    87,    21,    22,    23,     4,     4,   337,    27,
-       4,   409,    30,    31,    32,    33,     3,    50,    51,    37,
-      38,    39,    40,    41,     4,    43,    44,    45,    46,    47,
-      62,    63,    64,    87,    52,    53,    54,    55,    56,    57,
-      87,    59,    75,    76,     4,    87,    87,    65,    81,    82,
-      83,    14,    88,    86,    28,    87,    87,   359,    87,    77,
-      78,    79,    50,    51,   409,     1,    84,    85,    23,     5,
-      88,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    55,    21,    22,    23,    76,    75,
-      75,    27,   215,    81,    82,    83,    -1,    -1,    86,    -1,
-      48,    49,    50,    51,    -1,    41,    -1,    43,    44,    45,
-      46,    47,    62,    63,    64,    -1,    52,    53,    54,    55,
-      56,    57,    -1,    59,    72,    73,    74,    75,    76,    65,
-      -1,    -1,    -1,    81,    82,    83,    -1,    87,    86,    -1,
-      -1,    77,    78,    79,    50,    -1,    -1,     1,    84,    85,
-      -1,     5,    88,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    17,    18,    19,    -1,    21,    22,    23,
-      76,    -1,    -1,    27,    -1,    81,    82,    83,    -1,    -1,
-      86,    48,    49,    50,    51,    -1,    -1,    41,    -1,    43,
-      44,    45,    46,    47,    -1,    -1,    -1,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    59,    73,    74,    75,    76,
-      -1,    65,    -1,    -1,    81,    82,    83,    -1,    -1,    86,
-      -1,    -1,    -1,    77,    78,    79,    -1,    -1,    -1,    -1,
-      84,    85,    -1,    87,    88,     3,    -1,     5,    -1,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    62,    63,    64,    27,
-      -1,    -1,    -1,    -1,    -1,    -1,    48,    49,    50,    51,
-      62,    63,    64,    41,    -1,    43,    44,    45,    46,    47,
-      -1,    87,    -1,    -1,    52,    53,    54,    55,    56,    57,
-      -1,    59,    74,    75,    76,    87,    -1,    65,    -1,    81,
-      82,    83,    -1,    -1,    86,    62,    63,    64,    -1,    77,
-      78,    79,    -1,    -1,    -1,    -1,    84,    85,    -1,     3,
-      88,     5,    -1,     7,     8,     9,    10,    11,    12,    13,
-      87,    15,    16,    17,    18,    19,    -1,    21,    22,    23,
-      62,    63,    64,    27,    -1,    -1,    -1,    -1,    -1,    48,
-      49,    50,    51,    62,    63,    64,    -1,    41,    -1,    43,
-      44,    45,    46,    47,    -1,    87,    -1,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    59,    75,    76,    87,    -1,
-      -1,    65,    81,    82,    83,    -1,    -1,    86,    -1,    -1,
-      -1,    -1,    -1,    77,    78,    79,    -1,    -1,    -1,    -1,
-      84,    85,    -1,     3,    88,     5,    -1,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    76,    -1,    -1,    27,    -1,    81,
-      82,    83,    -1,    -1,    86,    48,    49,    50,    51,    -1,
-      -1,    41,    -1,    43,    44,    45,    46,    47,    -1,    -1,
-      -1,    -1,    52,    53,    54,    55,    56,    57,    -1,    59,
-      -1,    -1,    75,    76,     3,    65,     5,     6,    81,    82,
-      83,    -1,    -1,    86,    -1,    14,    -1,    77,    78,    79,
-      48,    -1,    50,    51,    84,    85,    -1,    -1,    88,    -1,
-      -1,    30,    31,    32,    33,    -1,    -1,    -1,    37,    -1,
-      -1,    -1,    -1,    42,    -1,    -1,    -1,    75,    76,    48,
-      49,    50,    51,    81,    82,    83,    -1,    -1,    86,    -1,
-      -1,    -1,    -1,    62,    63,    64,    -1,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    -1,    -1,
-      -1,    -1,    81,    82,    83,    -1,    -1,    86,    87,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    17,    18,    19,    -1,    21,    22,    23,    -1,    -1,
-      -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    41,    -1,    43,    44,    45,
-      46,    47,    -1,    -1,    -1,    -1,    52,    53,    54,    55,
-      56,    57,    -1,    59,    -1,    -1,    -1,    -1,    -1,    65,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    77,    78,    79,    -1,    -1,    -1,    -1,    84,    85,
-      -1,     5,    88,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    -1,    21,    22,    23,
-      -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,    43,
-      44,    45,    46,    47,    -1,    -1,    -1,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    59,    -1,    -1,    -1,    -1,
-      -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    77,    78,    79,    -1,    -1,    -1,    -1,
-      84,    85,    -1,     5,    88,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    17,    18,    19,    -1,    21,
-      22,    23,    -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,
-      -1,    43,    44,    45,    46,    47,    -1,    -1,    -1,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    59,    -1,    -1,
-      -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    77,    78,    79,    -1,    -1,
-      -1,    -1,    84,    85,    -1,    87,    88,     5,    -1,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    17,
-      18,    19,    -1,    21,    22,    23,    -1,    -1,    -1,    27,
+      15,   103,    15,    61,   117,   380,    33,    34,    35,    36,
+      37,    69,   214,    40,    41,    30,     6,   223,     3,     3,
+     226,     5,     3,     9,     5,    52,     3,    14,     5,    14,
+     210,     0,     9,   352,    61,    62,    63,   217,   151,    16,
+      67,   416,    55,    15,     9,    10,    11,    60,    14,    64,
+      63,    34,    35,    36,    37,    34,    35,    40,    41,   117,
+      75,   119,   123,   124,   125,   126,   127,   128,    15,   130,
+     131,    57,    62,    63,    64,    62,    63,    64,    61,    62,
+     399,     9,    10,     6,    97,   143,     6,    31,    32,     0,
+     102,    82,    83,   151,     6,    86,    62,    63,    64,    15,
+      14,    45,    88,     3,    88,   311,   312,    88,   121,   136,
+     122,    88,    56,    24,    25,    26,    60,    28,    29,    63,
+     135,   136,    66,    88,    68,    66,    70,    71,    72,    73,
+      74,    14,    88,   335,     3,     6,     5,    88,   153,    62,
+      63,    64,    62,    63,    64,    88,    87,    58,    14,   355,
+      62,    63,    64,   136,   167,   170,   171,   172,   173,   174,
+     175,   176,   177,   224,   179,   180,   181,    88,    15,    62,
+      63,    64,   199,     6,    62,    63,    64,   290,    89,    62,
+      63,    64,   295,    88,    88,   200,   201,   202,   203,   204,
+     205,    62,    63,    64,    87,   222,    62,    63,    64,   214,
+     406,     4,    88,   218,   219,     3,   221,     5,   223,     6,
+      62,    63,    64,    81,    82,    83,    88,   232,    86,   234,
+     235,    24,    25,    26,    14,    28,    29,    88,   243,    62,
+      63,    64,   290,    88,   178,    87,    36,   295,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
+     194,   195,   196,    14,    66,    58,    62,    63,    64,    88,
+     275,   276,   382,   278,     3,    62,    63,    64,    18,    15,
+     390,   391,    62,    63,    64,    88,   289,    14,   291,    88,
+     400,    87,   219,   296,   221,    87,    89,   407,     4,    88,
+     392,    60,     1,     5,     3,    60,     5,    15,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,   326,    21,    22,    23,    62,    63,    64,    27,     9,
+     335,    30,    31,    32,    33,    62,    63,    64,    37,    38,
+      39,    40,    41,     4,    43,    44,    45,    46,    47,    87,
+      87,     4,   357,    52,    53,    54,    55,    56,    57,    18,
+      59,     5,    88,    24,    25,    26,    65,    28,    29,    62,
+      63,    64,    64,    18,    62,    63,    64,    87,    77,    78,
+      79,    88,    87,    87,    87,    84,    85,    87,    14,    88,
+      87,    62,    63,    64,    87,    66,   330,    58,     1,    87,
+      87,    14,     5,   408,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,     4,    21,    22,
+      23,    62,    63,    64,    27,     4,     4,     4,    89,     3,
+      62,    63,    64,    48,    49,    50,    51,    87,    41,    87,
+      43,    44,    45,    46,    47,    87,    87,     4,    87,    52,
+      53,    54,    55,    56,    57,    87,    59,    72,    73,    74,
+      75,    76,    65,    14,    88,    87,    81,    82,    83,    87,
+      15,    86,   357,   408,    77,    78,    79,    47,    27,   291,
+       1,    84,    85,    67,     5,    88,     7,     8,     9,    10,
+      11,    12,    13,    -1,    15,    16,    17,    18,    19,    67,
+      21,    22,    23,    62,    63,    64,    27,    -1,    30,    31,
+      32,    33,    -1,    -1,    -1,    37,    -1,    50,    51,    -1,
+      41,    -1,    43,    44,    45,    46,    47,    -1,    87,    -1,
+      -1,    52,    53,    54,    55,    56,    57,    -1,    59,    -1,
+      62,    63,    64,    76,    65,    -1,    -1,    -1,    81,    82,
+      83,    -1,    -1,    86,    -1,    -1,    77,    78,    79,    -1,
+      -1,    -1,    -1,    84,    85,    87,    87,    88,     3,    -1,
+       5,    -1,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    17,    18,    19,    20,    21,    22,    23,    76,
+      -1,    -1,    27,    -1,    81,    82,    83,    -1,    -1,    86,
+      48,    49,    50,    51,    -1,    -1,    41,    -1,    43,    44,
+      45,    46,    47,    -1,    -1,    -1,    -1,    52,    53,    54,
+      55,    56,    57,    -1,    59,    73,    74,    75,    76,    -1,
+      65,    -1,    -1,    81,    82,    83,    -1,    -1,    86,    -1,
+      -1,    -1,    77,    78,    79,    -1,    -1,    -1,    -1,    84,
+      85,    -1,     3,    88,     5,    -1,     7,     8,     9,    10,
+      11,    12,    13,     3,    15,    16,    17,    18,    19,     9,
+      21,    22,    23,    -1,    -1,    15,    27,    -1,    -1,    -1,
+      20,    -1,    -1,    48,    49,    50,    51,    -1,    -1,    -1,
+      41,    -1,    43,    44,    45,    46,    47,    -1,    -1,    -1,
+      -1,    52,    53,    54,    55,    56,    57,    -1,    59,    74,
+      75,    76,    -1,    -1,    65,    -1,    81,    82,    83,    -1,
+      -1,    86,    -1,    -1,    -1,    -1,    77,    78,    79,    -1,
+      -1,    50,    -1,    84,    85,    -1,     3,    88,     5,    -1,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      17,    18,    19,    -1,    21,    22,    23,    76,    -1,    -1,
+      27,    -1,    81,    82,    83,    -1,    -1,    86,    48,    49,
+      50,    51,    -1,    -1,    41,    -1,    43,    44,    45,    46,
+      47,    -1,    -1,    -1,    -1,    52,    53,    54,    55,    56,
+      57,    -1,    59,    -1,    -1,    75,    76,     3,    65,     5,
+       6,    81,    82,    83,    -1,    -1,    86,    -1,    14,    -1,
+      77,    78,    79,    48,    49,    50,    51,    84,    85,    -1,
+      -1,    88,    -1,    -1,    30,    31,    32,    33,    -1,    -1,
+      -1,    37,    -1,    -1,    -1,    -1,    42,    -1,    -1,    -1,
+      75,    76,    48,    49,    50,    51,    81,    82,    83,    -1,
+      -1,    86,    -1,    -1,    -1,    -1,    62,    63,    64,    -1,
+      66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
+      76,    -1,    -1,    -1,    -1,    81,    82,    83,    -1,    -1,
+      86,    87,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    17,    18,    19,    -1,    21,    22,
+      23,    -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,
+      48,    -1,    50,    51,    -1,    -1,    -1,    -1,    41,    -1,
+      43,    44,    45,    46,    47,    -1,    -1,    -1,    -1,    52,
+      53,    54,    55,    56,    57,    -1,    59,    75,    76,    -1,
+      -1,    -1,    65,    81,    82,    83,    -1,    -1,    86,    -1,
+      -1,    -1,    -1,    -1,    77,    78,    79,    -1,    50,    51,
+      -1,    84,    85,    -1,     5,    88,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
+      21,    22,    23,    75,    76,    -1,    27,    -1,    -1,    81,
+      82,    83,    -1,    -1,    86,    -1,    -1,    -1,    -1,    -1,
+      41,    -1,    43,    44,    45,    46,    47,    -1,    -1,    -1,
+      -1,    52,    53,    54,    55,    56,    57,    -1,    59,    -1,
+      -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    77,    78,    79,    -1,
+      -1,    -1,    -1,    84,    85,    -1,     5,    88,     7,     8,
+       9,    10,    11,    12,    13,    -1,    15,    16,    17,    18,
+      19,    -1,    21,    22,    23,    -1,    -1,    -1,    27,    30,
+      31,    32,    33,    -1,    -1,    -1,    37,    -1,    -1,    -1,
+      -1,    -1,    41,    -1,    43,    44,    45,    46,    47,    -1,
+      -1,    -1,    -1,    52,    53,    54,    55,    56,    57,    -1,
+      59,    62,    63,    64,    -1,    -1,    65,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    77,    78,
+      79,    -1,    -1,    -1,    -1,    84,    85,    -1,    87,    88,
+       5,    -1,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    17,    18,    19,    -1,    21,    22,    23,    -1,
+      -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,    43,    44,
+      45,    46,    47,    -1,    -1,    -1,    -1,    52,    53,    54,
+      55,    56,    57,    -1,    59,    -1,    -1,    -1,    -1,    -1,
+      65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    77,    78,    79,    -1,    -1,    -1,    -1,    84,
+      85,    -1,    87,    88,     5,    -1,     7,     8,     9,    10,
+      11,    12,    13,    -1,    15,    16,    17,    18,    19,    -1,
+      21,    22,    23,    -1,    -1,    -1,    27,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    41,    -1,    43,    44,    45,    46,    47,
-      -1,    -1,    -1,    -1,    52,    53,    54,    55,    56,    57,
-      -1,    59,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    77,
-      78,    79,    -1,    -1,    -1,    -1,    84,    85,    -1,    87,
-      88,     5,    -1,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    17,    18,    19,    -1,    21,    22,    23,
-      -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,    43,
-      44,    45,    46,    47,    -1,    -1,    -1,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    59,    -1,    -1,    -1,    -1,
-      -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    77,    78,    79,    -1,    -1,    -1,    -1,
-      84,    85,    -1,    87,    88,     5,    -1,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    -1,    -1,    -1,    27,    -1,    -1,
+      41,    -1,    43,    44,    45,    46,    47,    -1,    -1,    -1,
+      -1,    52,    53,    54,    55,    56,    57,    -1,    59,    -1,
+      -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    77,    78,    79,    -1,
+      -1,    -1,    -1,    84,    85,    -1,    87,    88,     5,    -1,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      17,    18,    19,    -1,    21,    22,    23,    -1,    -1,    -1,
+      27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    41,    -1,    43,    44,    45,    46,
+      47,    -1,    -1,    -1,    -1,    52,    53,    54,    55,    56,
+      57,    -1,    59,    -1,    -1,    -1,    -1,    -1,    65,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    41,    -1,    43,    44,    45,    46,    47,    -1,    -1,
-      -1,    -1,    52,    53,    54,    55,    56,    57,    -1,    59,
-      -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    77,    78,    79,
-      -1,    -1,    -1,    -1,    84,    85,    -1,    87,    88,     5,
-      -1,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    17,    18,    19,    -1,    21,    22,    23,    -1,    -1,
-      -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    41,    -1,    43,    44,    45,
-      46,    47,    -1,    -1,    -1,    -1,    52,    53,    54,    55,
-      56,    57,    -1,    59,    -1,    -1,    -1,    -1,    -1,    65,
+      77,    78,    79,    -1,    -1,    -1,    -1,    84,    85,    -1,
+      87,    88,     5,    -1,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    17,    18,    19,    -1,    21,    22,
+      23,    -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,
+      43,    44,    45,    46,    47,    -1,    -1,    -1,    -1,    52,
+      53,    54,    55,    56,    57,    -1,    59,    -1,    -1,    -1,
+      -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    77,    78,    79,    -1,    -1,    -1,
+      -1,    84,    85,    -1,    87,    88,     5,    -1,     7,     8,
+       9,    10,    11,    12,    13,    -1,    15,    16,    17,    18,
+      19,    -1,    21,    22,    23,    -1,    -1,    -1,    27,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    77,    78,    79,    -1,    -1,    -1,    -1,    84,    85,
-      -1,    87,    88,     5,    -1,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    17,    18,    19,    -1,    21,
-      22,    23,    -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,
-      -1,    43,    44,    45,    46,    47,    -1,    -1,    -1,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    59,    -1,    -1,
-      -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    77,    78,    79,    -1,    -1,
-      -1,    -1,    84,    85,    -1,    87,    88,     5,    -1,     7,
-       8,     9,    10,    11,    12,    13,    -1,    15,    16,    17,
-      18,    19,    -1,    21,    22,    23,    -1,    -1,    -1,    27,
+      -1,    -1,    41,    -1,    43,    44,    45,    46,    47,    -1,
+      -1,    -1,    -1,    52,    53,    54,    55,    56,    57,    -1,
+      59,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    77,    78,
+      79,    -1,    -1,    -1,    -1,    84,    85,    -1,    87,    88,
+       5,    -1,     7,     8,     9,    10,    11,    12,    13,    -1,
+      15,    16,    17,    18,    19,    -1,    21,    22,    23,    -1,
+      -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,    43,    44,
+      45,    46,    47,    -1,    -1,    -1,    -1,    52,    53,    54,
+      55,    56,    57,    -1,    59,    -1,    -1,    -1,    -1,    -1,
+      65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    77,    78,    79,    -1,    -1,    -1,    -1,    84,
+      85,    -1,    87,    88,     5,    -1,     7,     8,     9,    10,
+      11,    12,    13,    -1,    15,    16,    17,    18,    19,    -1,
+      21,    22,    23,    -1,    -1,    -1,    27,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    41,    -1,    43,    44,    45,    46,    47,
-      -1,    -1,    -1,    -1,    52,    53,    54,    55,    56,    57,
-      -1,    59,    -1,    -1,    -1,    -1,    -1,    65,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    77,
-      78,    79,    -1,    -1,    -1,    -1,    84,    85,    -1,    87,
-      88,     5,    -1,     7,     8,     9,    10,    11,    12,    13,
-      -1,    15,    16,    17,    18,    19,    -1,    21,    22,    23,
-      -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,    43,
-      44,    45,    46,    47,    -1,    -1,    -1,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    59,    -1,    -1,    -1,    -1,
-      -1,    65,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    77,    78,    79,    -1,    -1,    -1,    -1,
-      84,    85,    -1,    87,    88,     5,    -1,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    -1,    -1,    -1,    27,    -1,    -1,
+      41,    -1,    43,    44,    45,    46,    47,    -1,    -1,    -1,
+      -1,    52,    53,    54,    55,    56,    57,    -1,    59,    -1,
+      -1,    -1,    -1,    -1,    65,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    77,    78,    79,    -1,
+      -1,    -1,    -1,    84,    85,    -1,    87,    88,     5,    -1,
+       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
+      17,    18,    19,    -1,    21,    22,    23,    -1,    -1,    -1,
+      27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    41,    -1,    43,    44,    45,    46,
+      47,    -1,    -1,    -1,    -1,    52,    53,    54,    55,    56,
+      57,    -1,    59,    -1,    -1,    -1,    -1,    -1,    65,     6,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    14,    -1,    -1,
+      77,    78,    79,    -1,    -1,    -1,    -1,    84,    85,    -1,
+      -1,    88,    -1,    30,    31,    32,    33,    -1,    -1,    -1,
+      37,    -1,    -1,    -1,    -1,    42,    -1,    -1,    -1,    -1,
+      -1,    48,    49,    50,    51,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    62,    63,    64,    -1,    66,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      -1,   354,    -1,   356,    81,    82,    83,   360,    -1,    86,
+      87,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   376,   377,    -1,    -1,    -1,    -1,    -1,
+      -1,   384,   385,    -1,    -1,    -1,    -1,    -1,    -1,    42,
+     393,    -1,    -1,    -1,   397,    48,    49,    50,    51,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    41,    -1,    43,    44,    45,    46,    47,    -1,    -1,
-      -1,    -1,    52,    53,    54,    55,    56,    57,    -1,    59,
-      -1,    -1,    -1,    -1,    -1,    65,     6,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    14,    -1,    -1,    77,    78,    79,
-      -1,    -1,    -1,    -1,    84,    85,    -1,    -1,    88,    -1,
-      30,    31,    32,    33,    -1,    -1,    -1,    37,    -1,    -1,
-      -1,    -1,    42,    -1,    -1,    -1,    -1,    -1,    48,    49,
-      50,    51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    62,    63,    64,    -1,    66,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    -1,    -1,    -1,
-      -1,    81,    82,    83,    42,    -1,    86,    87,    -1,    -1,
-      48,    49,    50,    51,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    -1,
-      -1,    -1,    -1,    81,    82,    83,    42,    -1,    86,    -1,
-      -1,    -1,    48,    49,    50,    51,    -1,    -1,    -1,    -1,
+      -1,   414,   415,    -1,    67,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    -1,    -1,    -1,    -1,    81,    82,
+      83,    42,    -1,    86,    -1,    -1,    -1,    48,    49,    50,
+      51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    67,    68,    -1,    70,
+      71,    72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,
+      81,    82,    83,    42,    -1,    86,    -1,    -1,    -1,    48,
+      49,    50,    51,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    68,
+      -1,    70,    71,    72,    73,    74,    75,    76,    -1,    -1,
+      -1,    -1,    81,    82,    83,    42,    -1,    86,    -1,    -1,
+      -1,    48,    49,    50,    51,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    67,    68,    -1,    70,    71,    72,    73,    74,    75,
-      76,    -1,    -1,    -1,    -1,    81,    82,    83,    42,    -1,
-      86,    -1,    -1,    -1,    48,    49,    50,    51,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    68,    -1,    70,    71,    72,    73,
-      74,    75,    76,    -1,    -1,    -1,    -1,    81,    82,    83,
-      42,    -1,    86,    -1,    -1,    -1,    48,    49,    50,    51,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    70,    71,
-      72,    73,    74,    75,    76,    -1,    -1,    -1,    -1,    81,
-      82,    83,    -1,    -1,    86
+      -1,    -1,    -1,    70,    71,    72,    73,    74,    75,    76,
+      -1,    -1,    -1,    -1,    81,    82,    83,    -1,    -1,    86
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,    91,    95,     0,    99,    25,    26,    28,    29,    58,
-      89,    98,   116,   117,   118,   120,   121,   130,   131,   124,
-     122,    15,   122,   122,    24,   100,   106,   107,   115,    15,
-     119,    15,   125,    14,   132,   125,     1,     3,     5,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    21,    22,    23,    27,    30,    31,    32,    33,
-      37,    38,    39,    40,    41,    43,    44,    45,    46,    47,
-      52,    53,    54,    55,    56,    57,    59,    65,    77,    78,
-      79,    84,    85,    88,    92,   101,   103,   104,   133,   134,
-     135,   138,   139,   140,   141,   142,   143,   144,   149,   150,
-     151,   152,   153,   154,    92,    18,   126,    15,   126,    93,
-       6,   133,   143,   143,    15,    20,    92,   150,   155,   155,
-     155,   155,   155,   155,   155,    88,   143,   123,   123,    88,
-      88,    88,    88,    57,    88,   150,    88,    88,    92,   143,
-      88,    88,    88,    92,   143,    15,   134,   146,   150,   155,
-     155,    15,    92,   143,   150,    14,   133,    15,   143,    88,
-     145,   150,   151,   152,   143,   134,   143,   143,   143,   143,
-     143,    87,   133,    36,   105,    14,    30,    31,    32,    33,
-      37,    62,    63,    64,    66,     3,     5,    88,    42,    48,
-      49,    50,    51,    67,    68,    70,    71,    72,    73,    74,
-      75,    76,    81,    82,    83,    86,    88,     3,     5,     3,
-       5,     3,    60,   127,    15,   127,    99,     6,   146,    88,
-     134,    92,   126,    93,    93,    93,    93,    93,    93,    88,
-      93,    93,    87,    87,   133,   133,   147,   155,   134,    88,
-      88,     4,    14,   146,    87,   133,    60,   128,     5,    87,
-      92,   133,   111,   133,   133,   133,   133,   133,   133,   133,
-     143,   133,   133,    87,   133,   143,   143,   143,   143,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
-       3,     5,    16,    88,   137,   150,    87,   133,   133,   133,
-     133,   133,   133,    18,    14,    92,   129,   146,   129,     4,
-     147,    87,   136,   127,   110,   133,   111,   112,   133,   111,
-     114,   148,   150,   101,   109,   112,   113,   133,    93,    94,
-     112,    87,    66,    87,   133,    87,   133,    87,   133,     4,
-      87,    18,   133,     5,    14,     6,    87,    69,   133,   133,
-      87,   133,    88,    87,    14,     6,    14,     6,    14,    14,
-      87,   146,    92,    87,    87,    87,    87,    88,    87,    14,
-     112,   112,    87,    87,    87,    87,     6,   133,     4,   143,
-      14,     6,    87,   147,     4,     4,     4,   108,   108,     3,
-      96,    96,   112,    96,   110,    87,    87,    96,     6,     4,
-      87,    96,    96,    97,    34,    35,   102,   102,    87,   105,
-      14,    96,    96,   105,   105,    99,    96,    88,    96,   108,
-     105,     4,   112,   105,   113,    87,    87,    96,    96,   102
+       0,    91,    95,     0,    98,    24,    25,    26,    28,    29,
+      58,    89,    99,   105,   106,   114,   115,   116,   117,   119,
+     120,   129,   130,   123,   121,    15,   121,   121,     1,     3,
+       5,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    21,    22,    23,    27,    30,    31,
+      32,    33,    37,    38,    39,    40,    41,    43,    44,    45,
+      46,    47,    52,    53,    54,    55,    56,    57,    59,    65,
+      77,    78,    79,    84,    85,    88,    92,   100,   102,   103,
+     132,   133,   134,   137,   138,   139,   140,   141,   142,   143,
+     148,   149,   150,   151,   152,   153,    15,   118,    15,   124,
+      14,   131,   124,    93,     6,   132,   142,   142,    15,    20,
+      92,   149,   154,   154,   154,   154,   154,   154,   154,    88,
+     142,   122,   122,    88,    88,    88,    88,    57,    88,   149,
+      88,    88,    92,   142,    88,    88,    88,    92,   142,    15,
+     133,   145,   149,   154,   154,    15,    92,   142,   149,    14,
+     132,    15,   142,    88,   144,   149,   150,   151,   142,   133,
+     142,   142,   142,   142,   142,    87,   132,    36,   104,    14,
+      30,    31,    32,    33,    37,    62,    63,    64,    66,     3,
+       5,    88,    42,    48,    49,    50,    51,    67,    68,    70,
+      71,    72,    73,    74,    75,    76,    81,    82,    83,    86,
+      88,     3,     5,     3,     5,     3,    92,    18,   125,    15,
+     125,    98,     6,   145,    88,   133,    92,   125,    93,    93,
+      93,    93,    93,    93,    88,    93,    93,    87,    87,   132,
+     132,   146,   154,   133,    88,    88,     4,    14,   145,    87,
+     132,    60,   127,     5,    87,    92,   132,   110,   132,   132,
+     132,   132,   132,   132,   132,   142,   132,   132,    87,   132,
+     142,   142,   142,   142,   142,   142,   142,   142,   142,   142,
+     142,   142,   142,   142,   142,     3,     5,    16,    88,   136,
+     149,    87,   132,   132,   132,   132,   132,   132,    60,   126,
+      15,   126,     4,   146,    87,   135,   126,   109,   132,   110,
+     111,   132,   110,   113,   147,   149,   100,   108,   111,   112,
+     132,    93,    94,   111,    87,    66,    87,   132,    87,   132,
+      87,   132,     4,    87,    18,   132,     5,    14,     6,    87,
+      69,   132,   132,    87,   132,    88,    87,    14,     6,    14,
+       6,    14,    18,    14,    92,   128,   145,   128,    87,   145,
+      92,    87,    87,    87,    87,    88,    87,    14,   111,   111,
+      87,    87,    87,    87,     6,   132,     4,   142,    14,     6,
+      87,   146,     4,     4,     4,    14,   107,   107,     3,    96,
+      96,   111,    96,   109,    87,    87,    96,     6,     4,    87,
+      96,    96,    97,    34,    35,   101,   101,    87,   104,    14,
+      96,    96,   104,   104,    98,    96,    88,    96,   107,   104,
+       4,   111,   104,   112,    87,    87,    96,    96,   101
 };
 
 typedef enum {
@@ -910,13 +901,13 @@ static const toketypes yy_type_tab[] =
   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_opval, toketype_ival, toketype_ival, toketype_ival, toketype_opval,
-  toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_p_tkval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_ival,
-  toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_ival,
-  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, 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_p_tkval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_opval,
+  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival,
+  toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval
+  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_opval, toketype_opval
 };

diff --git a/perly.y b/perly.y
index 191d587..e649dbc 100644 (file)
--- a/perly.y
+++ b/perly.y
@@ -79,7 +79,7 @@
 %token <i_tkval> LOCAL MY MYSUB REQUIRE
 %token <i_tkval> COLONATTR
 
-%type <ival> prog progstart remember mremember savescope
+%type <ival> prog progstart remember mremember
 %type <ival>  startsub startanonsub startformsub
 /* FIXME for MAD - are these two ival? */
 %type <ival> mydefsv mintro
@@ -175,9 +175,6 @@ mremember:  /* NULL */      /* start a partial lexical scope */
                        { $$ = block_start(FALSE); }
        ;
 
-savescope:     /* NULL */      /* remember stack pos in case of error */
-               { $$ = PL_savestack_ix; }
-
 /* A collection of "lines" in the program */
 lineseq        :       /* NULL */
                        { $$ = Nullop; }
@@ -188,12 +185,13 @@ lineseq   :       /* NULL */
                                    (LISTOP*)$1, (LISTOP*)$2),
                                $1);
                        }
-       |       lineseq savescope line
-                       {   LEAVE_SCOPE($2);
-                           $$ = append_list(OP_LINESEQ,
-                               (LISTOP*)$1, (LISTOP*)$3);
+       |       lineseq line
+                       {   $$ = append_list(OP_LINESEQ,
+                               (LISTOP*)$1, (LISTOP*)$2);
                            PL_pad_reset_pending = TRUE;
-                           if ($1 && $3) PL_hints |= HINT_BLOCK_SCOPE; }
+                           if ($1 && $2)
+                               PL_hints |= HINT_BLOCK_SCOPE;
+                       }
        ;
 
 /* A "line" in the program */

diff --git a/t/op/local.t b/t/op/local.t
index 0fe1b2e..ee250e1 100755 (executable)
--- a/t/op/local.t
+++ b/t/op/local.t
@@ -331,13 +331,10 @@ like($@, qr/Modification of a read-only value attempted/);
 eval { for("a") { for $x (1,2) { local $_="b"; s/(.*)/+$1/ } } };
 is($@, "");
 
-# Special local() behavior for $[
-# (see RT #43425, which contains a potential fix)
+# RT #4342 Special local() behavior for $[
 {
     local $[ = 1;
-    local $TODO = "local() not currently working correctly with \$[";
-    ok(1 == $[);
-    undef $TODO;
+    ok(1 == $[, 'lexcical scope of local $[');
     f();
 }