while (my $x ...) { ...; redo } shouldn't undef $x.

In the presence of 'my' in the conditional of a while(), until(),
or for(;;) loop, add an extra scope to the body so that redo
doesn't undef the lexical

p4raw-id: //depot/perl@24412

diff --git a/embed.fnc b/embed.fnc
index 1b1b811..a410b1a 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -535,8 +535,8 @@ Apd |SV*    |newSVrv        |SV* rv|const char* classname
 Apd    |SV*    |newSVsv        |SV* old
 Ap     |OP*    |newUNOP        |I32 type|I32 flags|OP* first
 Ap     |OP*    |newWHILEOP     |I32 flags|I32 debuggable|LOOP* loop \
-                               |I32 whileline|OP* expr|OP* block|OP* cont
-
+                               |I32 whileline|OP* expr|OP* block|OP* cont \
+                               |I32 has_my
 Ap     |PERL_SI*|new_stackinfo|I32 stitems|I32 cxitems
 Ap     |char*  |scan_vstring   |const char *vstr|SV *sv
 Apd    |char*  |scan_version   |const char *vstr|SV *sv|bool qv

diff --git a/embed.h b/embed.h
index 671734f..8b572db 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -2531,7 +2531,7 @@
 #define newSVrv(a,b)           Perl_newSVrv(aTHX_ a,b)
 #define newSVsv(a)             Perl_newSVsv(aTHX_ a)
 #define newUNOP(a,b,c)         Perl_newUNOP(aTHX_ a,b,c)
-#define newWHILEOP(a,b,c,d,e,f,g)      Perl_newWHILEOP(aTHX_ a,b,c,d,e,f,g)
+#define newWHILEOP(a,b,c,d,e,f,g,h)    Perl_newWHILEOP(aTHX_ a,b,c,d,e,f,g,h)
 #define new_stackinfo(a,b)     Perl_new_stackinfo(aTHX_ a,b)
 #define scan_vstring(a,b)      Perl_scan_vstring(aTHX_ a,b)
 #define scan_version(a,b,c)    Perl_scan_version(aTHX_ a,b,c)

diff --git a/op.c b/op.c
index ef8dfca..f3f7b6a 100644 (file)
--- a/op.c
+++ b/op.c
@@ -3799,7 +3799,8 @@ Perl_newLOOPOP(pTHX_ I32 flags, I32 debuggable, OP *expr, OP *block)
 }
 
 OP *
-Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP *loop, I32 whileline, OP *expr, OP *block, OP *cont)
+Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP *loop, I32
+whileline, OP *expr, OP *block, OP *cont, I32 has_my)
 {
     dVAR;
     OP *redo;
@@ -3836,7 +3837,7 @@ Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP *loop, I32 whileline, OP *
 
     if (!block)
        block = newOP(OP_NULL, 0);
-    else if (cont) {
+    else if (cont || has_my) {
        block = scope(block);
     }
 
@@ -3989,7 +3990,7 @@ Perl_newFOROP(pTHX_ I32 flags,char *label,line_t forline,OP *sv,OP *expr,OP *blo
     Renew(loop, 1, LOOP);
 #endif
     loop->op_targ = padoff;
-    wop = newWHILEOP(flags, 1, loop, forline, newOP(OP_ITER, 0), block, cont);
+    wop = newWHILEOP(flags, 1, loop, forline, newOP(OP_ITER, 0), block, cont, 0);
     PL_copline = forline;
     return newSTATEOP(0, label, wop);
 }

diff --git a/perly.act b/perly.act
index 9adab55..877fa07 100644 (file)
--- a/perly.act
+++ b/perly.act
@@ -1,75 +1,75 @@
 case 2:
 #line 97 "perly.y"
-    { (yyval.ival) = (yyvsp[-1].ival); newPROG(block_end((yyvsp[-1].ival),(yyvsp[0].opval))); ;}
+    { yyval.ival = yyvsp[-1].ival; newPROG(block_end(yyvsp[-1].ival,yyvsp[0].opval)); ;}
     break;
 
   case 3:
 #line 102 "perly.y"
-    { if (PL_copline > (line_t)(yyvsp[-3].ival))
-                             PL_copline = (line_t)(yyvsp[-3].ival);
-                         (yyval.opval) = block_end((yyvsp[-2].ival), (yyvsp[-1].opval)); ;}
+    { if (PL_copline > (line_t)yyvsp[-3].ival)
+                             PL_copline = (line_t)yyvsp[-3].ival;
+                         yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); ;}
     break;
 
   case 4:
 #line 108 "perly.y"
-    { (yyval.ival) = block_start(TRUE); ;}
+    { yyval.ival = block_start(TRUE); ;}
     break;
 
   case 5:
 #line 112 "perly.y"
     {
-                   PL_expect = XSTATE; (yyval.ival) = block_start(TRUE);
+                   PL_expect = XSTATE; yyval.ival = block_start(TRUE);
                ;}
     break;
 
   case 6:
 #line 119 "perly.y"
-    { if (PL_copline > (line_t)(yyvsp[-3].ival))
-                             PL_copline = (line_t)(yyvsp[-3].ival);
-                         (yyval.opval) = block_end((yyvsp[-2].ival), (yyvsp[-1].opval)); ;}
+    { if (PL_copline > (line_t)yyvsp[-3].ival)
+                             PL_copline = (line_t)yyvsp[-3].ival;
+                         yyval.opval = block_end(yyvsp[-2].ival, yyvsp[-1].opval); ;}
     break;
 
   case 7:
 #line 125 "perly.y"
-    { (yyval.ival) = block_start(FALSE); ;}
+    { yyval.ival = block_start(FALSE); ;}
     break;
 
   case 8:
 #line 129 "perly.y"
-    { (yyval.ival) = PL_savestack_ix; ;}
+    { yyval.ival = PL_savestack_ix; ;}
     break;
 
   case 9:
 #line 133 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+    { yyval.opval = Nullop; ;}
     break;
 
   case 10:
 #line 135 "perly.y"
-    { (yyval.opval) = (yyvsp[-1].opval); ;}
+    { yyval.opval = yyvsp[-1].opval; ;}
     break;
 
   case 11:
 #line 137 "perly.y"
-    {   LEAVE_SCOPE((yyvsp[-1].ival));
-                           (yyval.opval) = append_list(OP_LINESEQ,
-                               (LISTOP*)(yyvsp[-2].opval), (LISTOP*)(yyvsp[0].opval));
+    {   LEAVE_SCOPE(yyvsp[-1].ival);
+                           yyval.opval = append_list(OP_LINESEQ,
+                               (LISTOP*)yyvsp[-2].opval, (LISTOP*)yyvsp[0].opval);
                            PL_pad_reset_pending = TRUE;
-                           if ((yyvsp[-2].opval) && (yyvsp[0].opval)) PL_hints |= HINT_BLOCK_SCOPE; ;}
+                           if (yyvsp[-2].opval && yyvsp[0].opval) PL_hints |= HINT_BLOCK_SCOPE; ;}
     break;
 
   case 12:
 #line 146 "perly.y"
-    { (yyval.opval) = newSTATEOP(0, (yyvsp[-1].pval), (yyvsp[0].opval)); ;}
+    { yyval.opval = newSTATEOP(0, yyvsp[-1].pval, yyvsp[0].opval); ;}
     break;
 
   case 14:
 #line 149 "perly.y"
-    { if ((yyvsp[-1].pval) != Nullch) {
-                             (yyval.opval) = newSTATEOP(0, (yyvsp[-1].pval), newOP(OP_NULL, 0));
+    { if (yyvsp[-1].pval != Nullch) {
+                             yyval.opval = newSTATEOP(0, yyvsp[-1].pval, newOP(OP_NULL, 0));
                            }
                            else {
-                             (yyval.opval) = Nullop;
+                             yyval.opval = Nullop;
                              PL_copline = NOLINE;
                            }
                            PL_expect = XSTATE; ;}
@@ -77,968 +77,970 @@ case 2:
 
   case 15:
 #line 158 "perly.y"
-    { (yyval.opval) = newSTATEOP(0, (yyvsp[-2].pval), (yyvsp[-1].opval));
+    { yyval.opval = newSTATEOP(0, yyvsp[-2].pval, yyvsp[-1].opval);
                          PL_expect = XSTATE; ;}
     break;
 
   case 16:
 #line 164 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+    { yyval.opval = Nullop; ;}
     break;
 
   case 17:
 #line 166 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 18:
 #line 168 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[0].opval), (yyvsp[-2].opval)); ;}
+    { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[0].opval, yyvsp[-2].opval); ;}
     break;
 
   case 19:
 #line 170 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[0].opval), (yyvsp[-2].opval)); ;}
+    { yyval.opval = newLOGOP(OP_OR, 0, yyvsp[0].opval, yyvsp[-2].opval); ;}
     break;
 
   case 20:
 #line 172 "perly.y"
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((yyvsp[0].opval)), (yyvsp[-2].opval)); ;}
+    { yyval.opval = newLOOPOP(OPf_PARENS, 1, scalar(yyvsp[0].opval), yyvsp[-2].opval); ;}
     break;
 
   case 21:
 #line 174 "perly.y"
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (yyvsp[0].opval), (yyvsp[-2].opval));;}
+    { yyval.opval = newLOOPOP(OPf_PARENS, 1, yyvsp[0].opval, yyvsp[-2].opval);;}
     break;
 
   case 22:
 #line 176 "perly.y"
-    { (yyval.opval) = newFOROP(0, Nullch, (line_t)(yyvsp[-1].ival),
-                                       Nullop, (yyvsp[0].opval), (yyvsp[-2].opval), Nullop); ;}
+    { yyval.opval = newFOROP(0, Nullch, (line_t)yyvsp[-1].ival,
+                                       Nullop, yyvsp[0].opval, yyvsp[-2].opval, Nullop); ;}
     break;
 
   case 23:
 #line 182 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+    { yyval.opval = Nullop; ;}
     break;
 
   case 24:
 #line 184 "perly.y"
-    { ((yyvsp[0].opval))->op_flags |= OPf_PARENS; (yyval.opval) = scope((yyvsp[0].opval)); ;}
+    { (yyvsp[0].opval)->op_flags |= OPf_PARENS; yyval.opval = scope(yyvsp[0].opval); ;}
     break;
 
   case 25:
 #line 186 "perly.y"
-    { PL_copline = (line_t)(yyvsp[-5].ival);
-                           (yyval.opval) = newCONDOP(0, (yyvsp[-3].opval), scope((yyvsp[-1].opval)), (yyvsp[0].opval));
+    { PL_copline = (line_t)yyvsp[-5].ival;
+                           yyval.opval = newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval);
                            PL_hints |= HINT_BLOCK_SCOPE; ;}
     break;
 
   case 26:
 #line 193 "perly.y"
-    { PL_copline = (line_t)(yyvsp[-6].ival);
-                           (yyval.opval) = block_end((yyvsp[-4].ival),
-                                  newCONDOP(0, (yyvsp[-3].opval), scope((yyvsp[-1].opval)), (yyvsp[0].opval))); ;}
+    { PL_copline = (line_t)yyvsp[-6].ival;
+                           yyval.opval = block_end(yyvsp[-4].ival,
+                                  newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); ;}
     break;
 
   case 27:
 #line 197 "perly.y"
-    { PL_copline = (line_t)(yyvsp[-6].ival);
-                           (yyval.opval) = block_end((yyvsp[-4].ival),
-                                  newCONDOP(0, (yyvsp[-3].opval), scope((yyvsp[-1].opval)), (yyvsp[0].opval))); ;}
+    { PL_copline = (line_t)yyvsp[-6].ival;
+                           yyval.opval = block_end(yyvsp[-4].ival,
+                                  newCONDOP(0, yyvsp[-3].opval, scope(yyvsp[-1].opval), yyvsp[0].opval)); ;}
     break;
 
   case 28:
 #line 204 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+    { yyval.opval = Nullop; ;}
     break;
 
   case 29:
 #line 206 "perly.y"
-    { (yyval.opval) = scope((yyvsp[0].opval)); ;}
+    { yyval.opval = scope(yyvsp[0].opval); ;}
     break;
 
   case 30:
 #line 211 "perly.y"
-    { PL_copline = (line_t)(yyvsp[-6].ival);
-                           (yyval.opval) = block_end((yyvsp[-4].ival),
-                                  newSTATEOP(0, (yyvsp[-7].pval),
+    { PL_copline = (line_t)yyvsp[-7].ival;
+                           yyval.opval = block_end(yyvsp[-5].ival,
+                                  newSTATEOP(0, yyvsp[-8].pval,
                                     newWHILEOP(0, 1, (LOOP*)Nullop,
-                                               (yyvsp[-6].ival), (yyvsp[-3].opval), (yyvsp[-1].opval), (yyvsp[0].opval)))); ;}
+                                               yyvsp[-7].ival, yyvsp[-4].opval, yyvsp[-1].opval, yyvsp[0].opval, yyvsp[-2].ival))); ;}
     break;
 
   case 31:
 #line 217 "perly.y"
-    { PL_copline = (line_t)(yyvsp[-6].ival);
-                           (yyval.opval) = block_end((yyvsp[-4].ival),
-                                  newSTATEOP(0, (yyvsp[-7].pval),
+    { PL_copline = (line_t)yyvsp[-7].ival;
+                           yyval.opval = block_end(yyvsp[-5].ival,
+                                  newSTATEOP(0, yyvsp[-8].pval,
                                     newWHILEOP(0, 1, (LOOP*)Nullop,
-                                               (yyvsp[-6].ival), (yyvsp[-3].opval), (yyvsp[-1].opval), (yyvsp[0].opval)))); ;}
+                                               yyvsp[-7].ival, yyvsp[-4].opval, yyvsp[-1].opval, yyvsp[0].opval, yyvsp[-2].ival))); ;}
     break;
 
   case 32:
 #line 223 "perly.y"
-    { (yyval.opval) = block_end((yyvsp[-6].ival),
-                                newFOROP(0, (yyvsp[-9].pval), (line_t)(yyvsp[-8].ival), (yyvsp[-5].opval), (yyvsp[-3].opval), (yyvsp[-1].opval), (yyvsp[0].opval))); ;}
+    { yyval.opval = block_end(yyvsp[-6].ival,
+                                newFOROP(0, yyvsp[-9].pval, (line_t)yyvsp[-8].ival, yyvsp[-5].opval, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); ;}
     break;
 
   case 33:
 #line 226 "perly.y"
-    { (yyval.opval) = block_end((yyvsp[-4].ival),
-                                newFOROP(0, (yyvsp[-8].pval), (line_t)(yyvsp[-7].ival), mod((yyvsp[-6].opval), OP_ENTERLOOP),
-                                         (yyvsp[-3].opval), (yyvsp[-1].opval), (yyvsp[0].opval))); ;}
+    { yyval.opval = block_end(yyvsp[-4].ival,
+                                newFOROP(0, yyvsp[-8].pval, (line_t)yyvsp[-7].ival, mod(yyvsp[-6].opval, OP_ENTERLOOP),
+                                         yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); ;}
     break;
 
   case 34:
 #line 230 "perly.y"
-    { (yyval.opval) = block_end((yyvsp[-4].ival),
-                                newFOROP(0, (yyvsp[-7].pval), (line_t)(yyvsp[-6].ival), Nullop, (yyvsp[-3].opval), (yyvsp[-1].opval), (yyvsp[0].opval))); ;}
+    { yyval.opval = block_end(yyvsp[-4].ival,
+                                newFOROP(0, yyvsp[-7].pval, (line_t)yyvsp[-6].ival, Nullop, yyvsp[-3].opval, yyvsp[-1].opval, yyvsp[0].opval)); ;}
     break;
 
   case 35:
-#line 234 "perly.y"
+#line 235 "perly.y"
     { OP *forop;
-                         PL_copline = (line_t)(yyvsp[-9].ival);
-                         forop = newSTATEOP(0, (yyvsp[-10].pval),
+                         PL_copline = (line_t)yyvsp[-10].ival;
+                         forop = newSTATEOP(0, yyvsp[-11].pval,
                                            newWHILEOP(0, 1, (LOOP*)Nullop,
-                                               (yyvsp[-9].ival), scalar((yyvsp[-4].opval)),
-                                               (yyvsp[0].opval), (yyvsp[-2].opval)));
-                         if ((yyvsp[-6].opval)) {
+                                               yyvsp[-10].ival, scalar(yyvsp[-5].opval),
+                                               yyvsp[0].opval, yyvsp[-2].opval, yyvsp[-3].ival));
+                         if (yyvsp[-7].opval) {
                                forop = append_elem(OP_LINESEQ,
-                                        newSTATEOP(0, ((yyvsp[-10].pval)?savepv((yyvsp[-10].pval)):Nullch),
-                                                  (yyvsp[-6].opval)),
+                                        newSTATEOP(0, (yyvsp[-11].pval?savepv(yyvsp[-11].pval):Nullch),
+                                                  yyvsp[-7].opval),
                                        forop);
                          }
 
-                         (yyval.opval) = block_end((yyvsp[-7].ival), forop); ;}
+                         yyval.opval = block_end(yyvsp[-8].ival, forop); ;}
     break;
 
   case 36:
-#line 249 "perly.y"
-    { (yyval.opval) = newSTATEOP(0, (yyvsp[-2].pval),
+#line 250 "perly.y"
+    { yyval.opval = newSTATEOP(0, yyvsp[-2].pval,
                                 newWHILEOP(0, 1, (LOOP*)Nullop,
-                                           NOLINE, Nullop, (yyvsp[-1].opval), (yyvsp[0].opval))); ;}
+                                           NOLINE, Nullop, yyvsp[-1].opval, yyvsp[0].opval, 0)); ;}
     break;
 
   case 37:
-#line 256 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 257 "perly.y"
+    { yyval.ival = (PL_min_intro_pending &&
+                           PL_max_intro_pending >=  PL_min_intro_pending);
+                         intro_my(); ;}
     break;
 
-  case 39:
-#line 262 "perly.y"
-    { (void)scan_num("1", &yylval); (yyval.opval) = yylval.opval; ;}
+  case 38:
+#line 263 "perly.y"
+    { yyval.opval = Nullop; ;}
     break;
 
-  case 41:
-#line 268 "perly.y"
-    { (yyval.opval) = invert(scalar((yyvsp[0].opval))); ;}
+  case 40:
+#line 269 "perly.y"
+    { (void)scan_num("1", &yylval); yyval.opval = yylval.opval; ;}
     break;
 
   case 42:
-#line 273 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+#line 275 "perly.y"
+    { yyval.opval = invert(scalar(yyvsp[0].opval)); ;}
     break;
 
   case 43:
-#line 277 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+#line 280 "perly.y"
+    { yyval.opval = yyvsp[0].opval; intro_my(); ;}
     break;
 
   case 44:
-#line 281 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+#line 284 "perly.y"
+    { yyval.opval = yyvsp[0].opval; intro_my(); ;}
     break;
 
   case 45:
-#line 285 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); intro_my(); ;}
+#line 288 "perly.y"
+    { yyval.opval = yyvsp[0].opval; intro_my(); ;}
     break;
 
   case 46:
-#line 290 "perly.y"
-    { (yyval.pval) = Nullch; ;}
+#line 293 "perly.y"
+    { yyval.pval = Nullch; ;}
     break;
 
   case 48:
-#line 296 "perly.y"
-    { (yyval.ival) = 0; ;}
+#line 299 "perly.y"
+    { yyval.ival = 0; ;}
     break;
 
   case 49:
-#line 298 "perly.y"
-    { (yyval.ival) = 0; ;}
+#line 301 "perly.y"
+    { yyval.ival = 0; ;}
     break;
 
   case 50:
-#line 300 "perly.y"
-    { (yyval.ival) = 0; ;}
+#line 303 "perly.y"
+    { yyval.ival = 0; ;}
     break;
 
   case 51:
-#line 302 "perly.y"
-    { (yyval.ival) = 0; ;}
+#line 305 "perly.y"
+    { yyval.ival = 0; ;}
     break;
 
   case 52:
-#line 304 "perly.y"
-    { (yyval.ival) = 0; ;}
+#line 307 "perly.y"
+    { yyval.ival = 0; ;}
     break;
 
   case 53:
-#line 308 "perly.y"
-    { newFORM((yyvsp[-2].ival), (yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+#line 311 "perly.y"
+    { newFORM(yyvsp[-2].ival, yyvsp[-1].opval, yyvsp[0].opval); ;}
     break;
 
   case 54:
-#line 311 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 314 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 55:
-#line 312 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 315 "perly.y"
+    { yyval.opval = Nullop; ;}
     break;
 
   case 56:
-#line 317 "perly.y"
-    { newMYSUB((yyvsp[-4].ival), (yyvsp[-3].opval), (yyvsp[-2].opval), (yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+#line 320 "perly.y"
+    { newMYSUB(yyvsp[-4].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); ;}
     break;
 
   case 57:
-#line 322 "perly.y"
-    { newATTRSUB((yyvsp[-4].ival), (yyvsp[-3].opval), (yyvsp[-2].opval), (yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+#line 325 "perly.y"
+    { newATTRSUB(yyvsp[-4].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); ;}
     break;
 
   case 58:
-#line 326 "perly.y"
-    { (yyval.ival) = start_subparse(FALSE, 0); ;}
+#line 329 "perly.y"
+    { yyval.ival = start_subparse(FALSE, 0); ;}
     break;
 
   case 59:
-#line 330 "perly.y"
-    { (yyval.ival) = start_subparse(FALSE, CVf_ANON); ;}
+#line 333 "perly.y"
+    { yyval.ival = start_subparse(FALSE, CVf_ANON); ;}
     break;
 
   case 60:
-#line 334 "perly.y"
-    { (yyval.ival) = start_subparse(TRUE, 0); ;}
+#line 337 "perly.y"
+    { yyval.ival = start_subparse(TRUE, 0); ;}
     break;
 
   case 61:
-#line 338 "perly.y"
-    { STRLEN n_a; char *name = SvPV(((SVOP*)(yyvsp[0].opval))->op_sv,n_a);
+#line 341 "perly.y"
+    { STRLEN n_a; char *name = SvPV(((SVOP*)yyvsp[0].opval)->op_sv,n_a);
                          if (strEQ(name, "BEGIN") || strEQ(name, "END")
                              || strEQ(name, "INIT") || strEQ(name, "CHECK"))
                              CvSPECIAL_on(PL_compcv);
-                         (yyval.opval) = (yyvsp[0].opval); ;}
+                         yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 62:
-#line 347 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 350 "perly.y"
+    { yyval.opval = Nullop; ;}
     break;
 
   case 64:
-#line 353 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 356 "perly.y"
+    { yyval.opval = Nullop; ;}
     break;
 
   case 65:
-#line 355 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 358 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 66:
-#line 357 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 360 "perly.y"
+    { yyval.opval = Nullop; ;}
     break;
 
   case 67:
-#line 362 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 365 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 68:
-#line 364 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 367 "perly.y"
+    { yyval.opval = Nullop; ;}
     break;
 
   case 69:
-#line 368 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 371 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 70:
-#line 369 "perly.y"
-    { (yyval.opval) = Nullop; PL_expect = XSTATE; ;}
+#line 372 "perly.y"
+    { yyval.opval = Nullop; PL_expect = XSTATE; ;}
     break;
 
   case 71:
-#line 373 "perly.y"
-    { package((yyvsp[-1].opval)); ;}
+#line 376 "perly.y"
+    { package(yyvsp[-1].opval); ;}
     break;
 
   case 72:
-#line 377 "perly.y"
+#line 380 "perly.y"
     { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
     break;
 
   case 73:
-#line 379 "perly.y"
-    { utilize((yyvsp[-6].ival), (yyvsp[-5].ival), (yyvsp[-3].opval), (yyvsp[-2].opval), (yyvsp[-1].opval)); ;}
+#line 382 "perly.y"
+    { utilize(yyvsp[-6].ival, yyvsp[-5].ival, yyvsp[-3].opval, yyvsp[-2].opval, yyvsp[-1].opval); ;}
     break;
 
   case 74:
-#line 384 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 387 "perly.y"
+    { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
     break;
 
   case 75:
-#line 386 "perly.y"
-    { (yyval.opval) = newLOGOP((yyvsp[-1].ival), 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 389 "perly.y"
+    { yyval.opval = newLOGOP(yyvsp[-1].ival, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
     break;
 
   case 76:
-#line 388 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 391 "perly.y"
+    { yyval.opval = newLOGOP(OP_DOR, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
     break;
 
   case 78:
-#line 394 "perly.y"
-    { (yyval.opval) = (yyvsp[-1].opval); ;}
+#line 397 "perly.y"
+    { yyval.opval = yyvsp[-1].opval; ;}
     break;
 
   case 79:
-#line 396 "perly.y"
-    { (yyval.opval) = append_elem(OP_LIST, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 399 "perly.y"
+    { yyval.opval = append_elem(OP_LIST, yyvsp[-2].opval, yyvsp[0].opval); ;}
     break;
 
   case 81:
-#line 402 "perly.y"
-    { (yyval.opval) = convert((yyvsp[-2].ival), OPf_STACKED,
-                               prepend_elem(OP_LIST, newGVREF((yyvsp[-2].ival),(yyvsp[-1].opval)), (yyvsp[0].opval)) ); ;}
+#line 405 "perly.y"
+    { yyval.opval = convert(yyvsp[-2].ival, OPf_STACKED,
+                               prepend_elem(OP_LIST, newGVREF(yyvsp[-2].ival,yyvsp[-1].opval), yyvsp[0].opval) ); ;}
     break;
 
   case 82:
-#line 405 "perly.y"
-    { (yyval.opval) = convert((yyvsp[-4].ival), OPf_STACKED,
-                               prepend_elem(OP_LIST, newGVREF((yyvsp[-4].ival),(yyvsp[-2].opval)), (yyvsp[-1].opval)) ); ;}
+#line 408 "perly.y"
+    { yyval.opval = convert(yyvsp[-4].ival, OPf_STACKED,
+                               prepend_elem(OP_LIST, newGVREF(yyvsp[-4].ival,yyvsp[-2].opval), yyvsp[-1].opval) ); ;}
     break;
 
   case 83:
-#line 408 "perly.y"
-    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+#line 411 "perly.y"
+    { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST,
-                                   prepend_elem(OP_LIST, scalar((yyvsp[-5].opval)), (yyvsp[-1].opval)),
-                                   newUNOP(OP_METHOD, 0, (yyvsp[-3].opval)))); ;}
+                                   prepend_elem(OP_LIST, scalar(yyvsp[-5].opval), yyvsp[-1].opval),
+                                   newUNOP(OP_METHOD, 0, yyvsp[-3].opval))); ;}
     break;
 
   case 84:
-#line 413 "perly.y"
-    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
-                               append_elem(OP_LIST, scalar((yyvsp[-2].opval)),
-                                   newUNOP(OP_METHOD, 0, (yyvsp[0].opval)))); ;}
+#line 416 "perly.y"
+    { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
+                               append_elem(OP_LIST, scalar(yyvsp[-2].opval),
+                                   newUNOP(OP_METHOD, 0, yyvsp[0].opval))); ;}
     break;
 
   case 85:
-#line 417 "perly.y"
-    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+#line 420 "perly.y"
+    { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST,
-                                   prepend_elem(OP_LIST, (yyvsp[-1].opval), (yyvsp[0].opval)),
-                                   newUNOP(OP_METHOD, 0, (yyvsp[-2].opval)))); ;}
+                                   prepend_elem(OP_LIST, yyvsp[-1].opval, yyvsp[0].opval),
+                                   newUNOP(OP_METHOD, 0, yyvsp[-2].opval))); ;}
     break;
 
   case 86:
-#line 422 "perly.y"
-    { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
+#line 425 "perly.y"
+    { yyval.opval = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST,
-                                   prepend_elem(OP_LIST, (yyvsp[-3].opval), (yyvsp[-1].opval)),
-                                   newUNOP(OP_METHOD, 0, (yyvsp[-4].opval)))); ;}
+                                   prepend_elem(OP_LIST, yyvsp[-3].opval, yyvsp[-1].opval),
+                                   newUNOP(OP_METHOD, 0, yyvsp[-4].opval))); ;}
     break;
 
   case 87:
-#line 427 "perly.y"
-    { (yyval.opval) = convert((yyvsp[-1].ival), 0, (yyvsp[0].opval)); ;}
+#line 430 "perly.y"
+    { yyval.opval = convert(yyvsp[-1].ival, 0, yyvsp[0].opval); ;}
     break;
 
   case 88:
-#line 429 "perly.y"
-    { (yyval.opval) = convert((yyvsp[-3].ival), 0, (yyvsp[-1].opval)); ;}
+#line 432 "perly.y"
+    { yyval.opval = convert(yyvsp[-3].ival, 0, yyvsp[-1].opval); ;}
     break;
 
   case 89:
-#line 431 "perly.y"
-    { (yyvsp[0].opval) = newANONATTRSUB((yyvsp[-1].ival), 0, Nullop, (yyvsp[0].opval)); ;}
+#line 434 "perly.y"
+    { yyvsp[0].opval = newANONATTRSUB(yyvsp[-1].ival, 0, Nullop, yyvsp[0].opval); ;}
     break;
 
   case 90:
-#line 433 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+#line 436 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                 append_elem(OP_LIST,
-                                  prepend_elem(OP_LIST, (yyvsp[-2].opval), (yyvsp[0].opval)), (yyvsp[-4].opval))); ;}
+                                  prepend_elem(OP_LIST, yyvsp[-2].opval, yyvsp[0].opval), yyvsp[-4].opval)); ;}
     break;
 
   case 93:
-#line 447 "perly.y"
-    { (yyval.opval) = newBINOP(OP_GELEM, 0, (yyvsp[-4].opval), scalar((yyvsp[-2].opval)));
+#line 450 "perly.y"
+    { yyval.opval = newBINOP(OP_GELEM, 0, yyvsp[-4].opval, scalar(yyvsp[-2].opval));
                            PL_expect = XOPERATOR; ;}
     break;
 
   case 94:
-#line 450 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((yyvsp[-3].opval)), scalar((yyvsp[-1].opval))); ;}
+#line 453 "perly.y"
+    { yyval.opval = newBINOP(OP_AELEM, 0, oopsAV(yyvsp[-3].opval), scalar(yyvsp[-1].opval)); ;}
     break;
 
   case 95:
-#line 452 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0,
-                                       ref(newAVREF((yyvsp[-4].opval)),OP_RV2AV),
-                                       scalar((yyvsp[-1].opval)));;}
+#line 455 "perly.y"
+    { yyval.opval = newBINOP(OP_AELEM, 0,
+                                       ref(newAVREF(yyvsp[-4].opval),OP_RV2AV),
+                                       scalar(yyvsp[-1].opval));;}
     break;
 
   case 96:
-#line 456 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0,
-                                       ref(newAVREF((yyvsp[-3].opval)),OP_RV2AV),
-                                       scalar((yyvsp[-1].opval)));;}
+#line 459 "perly.y"
+    { yyval.opval = newBINOP(OP_AELEM, 0,
+                                       ref(newAVREF(yyvsp[-3].opval),OP_RV2AV),
+                                       scalar(yyvsp[-1].opval));;}
     break;
 
   case 97:
-#line 460 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((yyvsp[-4].opval)), jmaybe((yyvsp[-2].opval)));
+#line 463 "perly.y"
+    { yyval.opval = newBINOP(OP_HELEM, 0, oopsHV(yyvsp[-4].opval), jmaybe(yyvsp[-2].opval));
                            PL_expect = XOPERATOR; ;}
     break;
 
   case 98:
-#line 463 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0,
-                                       ref(newHVREF((yyvsp[-5].opval)),OP_RV2HV),
-                                       jmaybe((yyvsp[-2].opval)));
+#line 466 "perly.y"
+    { yyval.opval = newBINOP(OP_HELEM, 0,
+                                       ref(newHVREF(yyvsp[-5].opval),OP_RV2HV),
+                                       jmaybe(yyvsp[-2].opval));
                            PL_expect = XOPERATOR; ;}
     break;
 
   case 99:
-#line 468 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0,
-                                       ref(newHVREF((yyvsp[-4].opval)),OP_RV2HV),
-                                       jmaybe((yyvsp[-2].opval)));
+#line 471 "perly.y"
+    { yyval.opval = newBINOP(OP_HELEM, 0,
+                                       ref(newHVREF(yyvsp[-4].opval),OP_RV2HV),
+                                       jmaybe(yyvsp[-2].opval));
                            PL_expect = XOPERATOR; ;}
     break;
 
   case 100:
-#line 473 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                                  newCVREF(0, scalar((yyvsp[-3].opval)))); ;}
+#line 476 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                                  newCVREF(0, scalar(yyvsp[-3].opval))); ;}
     break;
 
   case 101:
-#line 476 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                                  append_elem(OP_LIST, (yyvsp[-1].opval),
-                                      newCVREF(0, scalar((yyvsp[-4].opval))))); ;}
+#line 479 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                                  append_elem(OP_LIST, yyvsp[-1].opval,
+                                      newCVREF(0, scalar(yyvsp[-4].opval)))); ;}
     break;
 
   case 102:
-#line 481 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                                  append_elem(OP_LIST, (yyvsp[-1].opval),
-                                              newCVREF(0, scalar((yyvsp[-3].opval))))); ;}
+#line 484 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                                  append_elem(OP_LIST, yyvsp[-1].opval,
+                                              newCVREF(0, scalar(yyvsp[-3].opval)))); ;}
     break;
 
   case 103:
-#line 485 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                                  newCVREF(0, scalar((yyvsp[-2].opval)))); ;}
+#line 488 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                                  newCVREF(0, scalar(yyvsp[-2].opval))); ;}
     break;
 
   case 104:
-#line 491 "perly.y"
-    { (yyval.opval) = newASSIGNOP(OPf_STACKED, (yyvsp[-2].opval), (yyvsp[-1].ival), (yyvsp[0].opval)); ;}
+#line 494 "perly.y"
+    { yyval.opval = newASSIGNOP(OPf_STACKED, yyvsp[-2].opval, yyvsp[-1].ival, yyvsp[0].opval); ;}
     break;
 
   case 105:
-#line 493 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 496 "perly.y"
+    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
     break;
 
   case 106:
-#line 495 "perly.y"
-    {   if ((yyvsp[-1].ival) != OP_REPEAT)
-                               scalar((yyvsp[-2].opval));
-                           (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, (yyvsp[-2].opval), scalar((yyvsp[0].opval))); ;}
+#line 498 "perly.y"
+    {   if (yyvsp[-1].ival != OP_REPEAT)
+                               scalar(yyvsp[-2].opval);
+                           yyval.opval = newBINOP(yyvsp[-1].ival, 0, yyvsp[-2].opval, scalar(yyvsp[0].opval)); ;}
     break;
 
   case 107:
-#line 499 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 502 "perly.y"
+    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
     break;
 
   case 108:
-#line 501 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 504 "perly.y"
+    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
     break;
 
   case 109:
-#line 503 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 506 "perly.y"
+    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
     break;
 
   case 110:
-#line 505 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 508 "perly.y"
+    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
     break;
 
   case 111:
-#line 507 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 510 "perly.y"
+    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
     break;
 
   case 112:
-#line 509 "perly.y"
-    { (yyval.opval) = newBINOP((yyvsp[-1].ival), 0, scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval))); ;}
+#line 512 "perly.y"
+    { yyval.opval = newBINOP(yyvsp[-1].ival, 0, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval)); ;}
     break;
 
   case 113:
-#line 511 "perly.y"
-    { (yyval.opval) = newRANGE((yyvsp[-1].ival), scalar((yyvsp[-2].opval)), scalar((yyvsp[0].opval)));;}
+#line 514 "perly.y"
+    { yyval.opval = newRANGE(yyvsp[-1].ival, scalar(yyvsp[-2].opval), scalar(yyvsp[0].opval));;}
     break;
 
   case 114:
-#line 513 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 516 "perly.y"
+    { yyval.opval = newLOGOP(OP_AND, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
     break;
 
   case 115:
-#line 515 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 518 "perly.y"
+    { yyval.opval = newLOGOP(OP_OR, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
     break;
 
   case 116:
-#line 517 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 520 "perly.y"
+    { yyval.opval = newLOGOP(OP_DOR, 0, yyvsp[-2].opval, yyvsp[0].opval); ;}
     break;
 
   case 117:
-#line 519 "perly.y"
-    { (yyval.opval) = bind_match((yyvsp[-1].ival), (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 522 "perly.y"
+    { yyval.opval = bind_match(yyvsp[-1].ival, yyvsp[-2].opval, yyvsp[0].opval); ;}
     break;
 
   case 118:
-#line 524 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((yyvsp[0].opval))); ;}
+#line 527 "perly.y"
+    { yyval.opval = newUNOP(OP_NEGATE, 0, scalar(yyvsp[0].opval)); ;}
     break;
 
   case 119:
-#line 526 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 529 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 120:
-#line 528 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[0].opval))); ;}
+#line 531 "perly.y"
+    { yyval.opval = newUNOP(OP_NOT, 0, scalar(yyvsp[0].opval)); ;}
     break;
 
   case 121:
-#line 530 "perly.y"
-    { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((yyvsp[0].opval)));;}
+#line 533 "perly.y"
+    { yyval.opval = newUNOP(OP_COMPLEMENT, 0, scalar(yyvsp[0].opval));;}
     break;
 
   case 122:
-#line 532 "perly.y"
-    { (yyval.opval) = newUNOP(OP_POSTINC, 0,
-                                       mod(scalar((yyvsp[-1].opval)), OP_POSTINC)); ;}
+#line 535 "perly.y"
+    { yyval.opval = newUNOP(OP_POSTINC, 0,
+                                       mod(scalar(yyvsp[-1].opval), OP_POSTINC)); ;}
     break;
 
   case 123:
-#line 535 "perly.y"
-    { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
-                                       mod(scalar((yyvsp[-1].opval)), OP_POSTDEC)); ;}
+#line 538 "perly.y"
+    { yyval.opval = newUNOP(OP_POSTDEC, 0,
+                                       mod(scalar(yyvsp[-1].opval), OP_POSTDEC)); ;}
     break;
 
   case 124:
-#line 538 "perly.y"
-    { (yyval.opval) = newUNOP(OP_PREINC, 0,
-                                       mod(scalar((yyvsp[0].opval)), OP_PREINC)); ;}
+#line 541 "perly.y"
+    { yyval.opval = newUNOP(OP_PREINC, 0,
+                                       mod(scalar(yyvsp[0].opval), OP_PREINC)); ;}
     break;
 
   case 125:
-#line 541 "perly.y"
-    { (yyval.opval) = newUNOP(OP_PREDEC, 0,
-                                       mod(scalar((yyvsp[0].opval)), OP_PREDEC)); ;}
+#line 544 "perly.y"
+    { yyval.opval = newUNOP(OP_PREDEC, 0,
+                                       mod(scalar(yyvsp[0].opval), OP_PREDEC)); ;}
     break;
 
   case 126:
-#line 548 "perly.y"
-    { (yyval.opval) = newANONLIST((yyvsp[-1].opval)); ;}
+#line 551 "perly.y"
+    { yyval.opval = newANONLIST(yyvsp[-1].opval); ;}
     break;
 
   case 127:
-#line 550 "perly.y"
-    { (yyval.opval) = newANONLIST(Nullop); ;}
+#line 553 "perly.y"
+    { yyval.opval = newANONLIST(Nullop); ;}
     break;
 
   case 128:
-#line 552 "perly.y"
-    { (yyval.opval) = newANONHASH((yyvsp[-2].opval)); ;}
+#line 555 "perly.y"
+    { yyval.opval = newANONHASH(yyvsp[-2].opval); ;}
     break;
 
   case 129:
-#line 554 "perly.y"
-    { (yyval.opval) = newANONHASH(Nullop); ;}
+#line 557 "perly.y"
+    { yyval.opval = newANONHASH(Nullop); ;}
     break;
 
   case 130:
-#line 556 "perly.y"
-    { (yyval.opval) = newANONATTRSUB((yyvsp[-3].ival), (yyvsp[-2].opval), (yyvsp[-1].opval), (yyvsp[0].opval)); ;}
+#line 559 "perly.y"
+    { yyval.opval = newANONATTRSUB(yyvsp[-3].ival, yyvsp[-2].opval, yyvsp[-1].opval, yyvsp[0].opval); ;}
     break;
 
   case 131:
-#line 562 "perly.y"
-    { (yyval.opval) = dofile((yyvsp[0].opval)); ;}
+#line 565 "perly.y"
+    { yyval.opval = dofile(yyvsp[0].opval); ;}
     break;
 
   case 132:
-#line 564 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((yyvsp[0].opval))); ;}
+#line 567 "perly.y"
+    { yyval.opval = newUNOP(OP_NULL, OPf_SPECIAL, scope(yyvsp[0].opval)); ;}
     break;
 
   case 133:
-#line 566 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB,
+#line 569 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB,
                            OPf_SPECIAL|OPf_STACKED,
                            prepend_elem(OP_LIST,
                                scalar(newCVREF(
                                    (OPpENTERSUB_AMPER<<8),
-                                   scalar((yyvsp[-2].opval))
+                                   scalar(yyvsp[-2].opval)
                                )),Nullop)); dep();;}
     break;
 
   case 134:
-#line 574 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB,
+#line 577 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB,
                            OPf_SPECIAL|OPf_STACKED,
                            append_elem(OP_LIST,
-                               (yyvsp[-1].opval),
+                               yyvsp[-1].opval,
                                scalar(newCVREF(
                                    (OPpENTERSUB_AMPER<<8),
-                                   scalar((yyvsp[-3].opval))
+                                   scalar(yyvsp[-3].opval)
                                )))); dep();;}
     break;
 
   case 135:
-#line 583 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
+#line 586 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
                            prepend_elem(OP_LIST,
-                               scalar(newCVREF(0,scalar((yyvsp[-2].opval)))), Nullop)); dep();;}
+                               scalar(newCVREF(0,scalar(yyvsp[-2].opval))), Nullop)); dep();;}
     break;
 
   case 136:
-#line 587 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
+#line 590 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
                            prepend_elem(OP_LIST,
-                               (yyvsp[-1].opval),
-                               scalar(newCVREF(0,scalar((yyvsp[-3].opval)))))); dep();;}
+                               yyvsp[-1].opval,
+                               scalar(newCVREF(0,scalar(yyvsp[-3].opval))))); dep();;}
     break;
 
   case 141:
-#line 599 "perly.y"
-    { (yyval.opval) = newCONDOP(0, (yyvsp[-4].opval), (yyvsp[-2].opval), (yyvsp[0].opval)); ;}
+#line 602 "perly.y"
+    { yyval.opval = newCONDOP(0, yyvsp[-4].opval, yyvsp[-2].opval, yyvsp[0].opval); ;}
     break;
 
   case 142:
-#line 601 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((yyvsp[0].opval),OP_REFGEN)); ;}
+#line 604 "perly.y"
+    { yyval.opval = newUNOP(OP_REFGEN, 0, mod(yyvsp[0].opval,OP_REFGEN)); ;}
     break;
 
   case 143:
-#line 603 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 606 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 144:
-#line 605 "perly.y"
-    { (yyval.opval) = localize((yyvsp[0].opval),(yyvsp[-1].ival)); ;}
+#line 608 "perly.y"
+    { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); ;}
     break;
 
   case 145:
-#line 607 "perly.y"
-    { (yyval.opval) = sawparens((yyvsp[-1].opval)); ;}
+#line 610 "perly.y"
+    { yyval.opval = sawparens(yyvsp[-1].opval); ;}
     break;
 
   case 146:
-#line 609 "perly.y"
-    { (yyval.opval) = sawparens(newNULLLIST()); ;}
+#line 612 "perly.y"
+    { yyval.opval = sawparens(newNULLLIST()); ;}
     break;
 
   case 147:
-#line 611 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 614 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 148:
-#line 613 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 616 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 149:
-#line 615 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 618 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 150:
-#line 617 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 620 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 151:
-#line 619 "perly.y"
-    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((yyvsp[0].opval), OP_AV2ARYLEN));;}
+#line 622 "perly.y"
+    { yyval.opval = newUNOP(OP_AV2ARYLEN, 0, ref(yyvsp[0].opval, OP_AV2ARYLEN));;}
     break;
 
   case 152:
-#line 621 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 624 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 153:
-#line 623 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (yyvsp[-1].opval), (yyvsp[-4].opval)); ;}
+#line 626 "perly.y"
+    { yyval.opval = newSLICEOP(0, yyvsp[-1].opval, yyvsp[-4].opval); ;}
     break;
 
   case 154:
-#line 625 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (yyvsp[-1].opval), Nullop); ;}
+#line 628 "perly.y"
+    { yyval.opval = newSLICEOP(0, yyvsp[-1].opval, Nullop); ;}
     break;
 
   case 155:
-#line 627 "perly.y"
-    { (yyval.opval) = prepend_elem(OP_ASLICE,
+#line 630 "perly.y"
+    { yyval.opval = prepend_elem(OP_ASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_ASLICE, 0,
-                                       list((yyvsp[-1].opval)),
-                                       ref((yyvsp[-3].opval), OP_ASLICE))); ;}
+                                       list(yyvsp[-1].opval),
+                                       ref(yyvsp[-3].opval, OP_ASLICE))); ;}
     break;
 
   case 156:
-#line 633 "perly.y"
-    { (yyval.opval) = prepend_elem(OP_HSLICE,
+#line 636 "perly.y"
+    { yyval.opval = prepend_elem(OP_HSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_HSLICE, 0,
-                                       list((yyvsp[-2].opval)),
-                                       ref(oopsHV((yyvsp[-4].opval)), OP_HSLICE)));
+                                       list(yyvsp[-2].opval),
+                                       ref(oopsHV(yyvsp[-4].opval), OP_HSLICE)));
                            PL_expect = XOPERATOR; ;}
     break;
 
   case 157:
-#line 640 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 643 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 158:
-#line 642 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((yyvsp[0].opval))); ;}
+#line 645 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, 0, scalar(yyvsp[0].opval)); ;}
     break;
 
   case 159:
-#line 644 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((yyvsp[-2].opval))); ;}
+#line 647 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar(yyvsp[-2].opval)); ;}
     break;
 
   case 160:
-#line 646 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                           append_elem(OP_LIST, (yyvsp[-1].opval), scalar((yyvsp[-3].opval)))); ;}
+#line 649 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                           append_elem(OP_LIST, yyvsp[-1].opval, scalar(yyvsp[-3].opval))); ;}
     break;
 
   case 161:
-#line 649 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                           append_elem(OP_LIST, (yyvsp[0].opval), scalar((yyvsp[-1].opval)))); ;}
+#line 652 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                           append_elem(OP_LIST, yyvsp[0].opval, scalar(yyvsp[-1].opval))); ;}
     break;
 
   case 162:
-#line 652 "perly.y"
-    { (yyval.opval) = newOP((yyvsp[0].ival), OPf_SPECIAL);
+#line 655 "perly.y"
+    { yyval.opval = newOP(yyvsp[0].ival, OPf_SPECIAL);
                            PL_hints |= HINT_BLOCK_SCOPE; ;}
     break;
 
   case 163:
-#line 655 "perly.y"
-    { (yyval.opval) = newLOOPEX((yyvsp[-1].ival),(yyvsp[0].opval)); ;}
+#line 658 "perly.y"
+    { yyval.opval = newLOOPEX(yyvsp[-1].ival,yyvsp[0].opval); ;}
     break;
 
   case 164:
-#line 657 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((yyvsp[0].opval))); ;}
+#line 660 "perly.y"
+    { yyval.opval = newUNOP(OP_NOT, 0, scalar(yyvsp[0].opval)); ;}
     break;
 
   case 165:
-#line 659 "perly.y"
-    { (yyval.opval) = newOP((yyvsp[0].ival), 0); ;}
+#line 662 "perly.y"
+    { yyval.opval = newOP(yyvsp[0].ival, 0); ;}
     break;
 
   case 166:
-#line 661 "perly.y"
-    { (yyval.opval) = newUNOP((yyvsp[-1].ival), 0, (yyvsp[0].opval)); ;}
+#line 664 "perly.y"
+    { yyval.opval = newUNOP(yyvsp[-1].ival, 0, yyvsp[0].opval); ;}
     break;
 
   case 167:
-#line 663 "perly.y"
-    { (yyval.opval) = newUNOP((yyvsp[-1].ival), 0, (yyvsp[0].opval)); ;}
+#line 666 "perly.y"
+    { yyval.opval = newUNOP(yyvsp[-1].ival, 0, yyvsp[0].opval); ;}
     break;
 
   case 168:
-#line 665 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                           append_elem(OP_LIST, (yyvsp[0].opval), scalar((yyvsp[-1].opval)))); ;}
+#line 668 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                           append_elem(OP_LIST, yyvsp[0].opval, scalar(yyvsp[-1].opval))); ;}
     break;
 
   case 169:
-#line 668 "perly.y"
-    { (yyval.opval) = newOP((yyvsp[0].ival), 0); ;}
+#line 671 "perly.y"
+    { yyval.opval = newOP(yyvsp[0].ival, 0); ;}
     break;
 
   case 170:
-#line 670 "perly.y"
-    { (yyval.opval) = newOP((yyvsp[-2].ival), 0); ;}
+#line 673 "perly.y"
+    { yyval.opval = newOP(yyvsp[-2].ival, 0); ;}
     break;
 
   case 171:
-#line 672 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                               scalar((yyvsp[0].opval))); ;}
+#line 675 "perly.y"
+    { yyval.opval = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                               scalar(yyvsp[0].opval)); ;}
     break;
 
   case 172:
-#line 675 "perly.y"
-    { (yyval.opval) = (yyvsp[-2].ival) == OP_NOT ? newUNOP((yyvsp[-2].ival), 0, newSVOP(OP_CONST, 0, newSViv(0)))
-                                           : newOP((yyvsp[-2].ival), OPf_SPECIAL); ;}
+#line 678 "perly.y"
+    { yyval.opval = yyvsp[-2].ival == OP_NOT ? newUNOP(yyvsp[-2].ival, 0, newSVOP(OP_CONST, 0, newSViv(0)))
+                                           : newOP(yyvsp[-2].ival, OPf_SPECIAL); ;}
     break;
 
   case 173:
-#line 678 "perly.y"
-    { (yyval.opval) = newUNOP((yyvsp[-3].ival), 0, (yyvsp[-1].opval)); ;}
+#line 681 "perly.y"
+    { yyval.opval = newUNOP(yyvsp[-3].ival, 0, yyvsp[-1].opval); ;}
     break;
 
   case 174:
-#line 680 "perly.y"
-    { (yyval.opval) = pmruntime((yyvsp[-3].opval), (yyvsp[-1].opval), 1); ;}
+#line 683 "perly.y"
+    { yyval.opval = pmruntime(yyvsp[-3].opval, yyvsp[-1].opval, 1); ;}
     break;
 
   case 177:
-#line 687 "perly.y"
-    { (yyval.opval) = my_attrs((yyvsp[-1].opval),(yyvsp[0].opval)); ;}
+#line 690 "perly.y"
+    { yyval.opval = my_attrs(yyvsp[-1].opval,yyvsp[0].opval); ;}
     break;
 
   case 178:
-#line 689 "perly.y"
-    { (yyval.opval) = localize((yyvsp[0].opval),(yyvsp[-1].ival)); ;}
+#line 692 "perly.y"
+    { yyval.opval = localize(yyvsp[0].opval,yyvsp[-1].ival); ;}
     break;
 
   case 179:
-#line 694 "perly.y"
-    { (yyval.opval) = sawparens((yyvsp[-1].opval)); ;}
+#line 697 "perly.y"
+    { yyval.opval = sawparens(yyvsp[-1].opval); ;}
     break;
 
   case 180:
-#line 696 "perly.y"
-    { (yyval.opval) = sawparens(newNULLLIST()); ;}
+#line 699 "perly.y"
+    { yyval.opval = sawparens(newNULLLIST()); ;}
     break;
 
   case 181:
-#line 698 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 701 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 182:
-#line 700 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 703 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 183:
-#line 702 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 705 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 184:
-#line 707 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 710 "perly.y"
+    { yyval.opval = Nullop; ;}
     break;
 
   case 185:
-#line 709 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 712 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 186:
-#line 713 "perly.y"
-    { (yyval.opval) = Nullop; ;}
+#line 716 "perly.y"
+    { yyval.opval = Nullop; ;}
     break;
 
   case 187:
-#line 715 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 718 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
   case 188:
-#line 717 "perly.y"
-    { (yyval.opval) = (yyvsp[-1].opval); ;}
+#line 720 "perly.y"
+    { yyval.opval = yyvsp[-1].opval; ;}
     break;
 
   case 189:
-#line 723 "perly.y"
-    { PL_in_my = 0; (yyval.opval) = my((yyvsp[0].opval)); ;}
+#line 726 "perly.y"
+    { PL_in_my = 0; yyval.opval = my(yyvsp[0].opval); ;}
     break;
 
   case 190:
-#line 727 "perly.y"
-    { (yyval.opval) = newCVREF((yyvsp[-1].ival),(yyvsp[0].opval)); ;}
+#line 730 "perly.y"
+    { yyval.opval = newCVREF(yyvsp[-1].ival,yyvsp[0].opval); ;}
     break;
 
   case 191:
-#line 731 "perly.y"
-    { (yyval.opval) = newSVREF((yyvsp[0].opval)); ;}
+#line 734 "perly.y"
+    { yyval.opval = newSVREF(yyvsp[0].opval); ;}
     break;
 
   case 192:
-#line 735 "perly.y"
-    { (yyval.opval) = newAVREF((yyvsp[0].opval)); ;}
+#line 738 "perly.y"
+    { yyval.opval = newAVREF(yyvsp[0].opval); ;}
     break;
 
   case 193:
-#line 739 "perly.y"
-    { (yyval.opval) = newHVREF((yyvsp[0].opval)); ;}
+#line 742 "perly.y"
+    { yyval.opval = newHVREF(yyvsp[0].opval); ;}
     break;
 
   case 194:
-#line 743 "perly.y"
-    { (yyval.opval) = newAVREF((yyvsp[0].opval)); ;}
+#line 746 "perly.y"
+    { yyval.opval = newAVREF(yyvsp[0].opval); ;}
     break;
 
   case 195:
-#line 747 "perly.y"
-    { (yyval.opval) = newGVREF(0,(yyvsp[0].opval)); ;}
+#line 750 "perly.y"
+    { yyval.opval = newGVREF(0,yyvsp[0].opval); ;}
     break;
 
   case 196:
-#line 752 "perly.y"
-    { (yyval.opval) = scalar((yyvsp[0].opval)); ;}
+#line 755 "perly.y"
+    { yyval.opval = scalar(yyvsp[0].opval); ;}
     break;
 
   case 197:
-#line 754 "perly.y"
-    { (yyval.opval) = scalar((yyvsp[0].opval));  ;}
+#line 757 "perly.y"
+    { yyval.opval = scalar(yyvsp[0].opval);  ;}
     break;
 
   case 198:
-#line 756 "perly.y"
-    { (yyval.opval) = scope((yyvsp[0].opval)); ;}
+#line 759 "perly.y"
+    { yyval.opval = scope(yyvsp[0].opval); ;}
     break;
 
   case 199:
-#line 759 "perly.y"
-    { (yyval.opval) = (yyvsp[0].opval); ;}
+#line 762 "perly.y"
+    { yyval.opval = yyvsp[0].opval; ;}
     break;
 
 

diff --git a/perly.h b/perly.h
index 32c0f32..466c9cc 100644 (file)
--- a/perly.h
+++ b/perly.h
@@ -1,8 +1,8 @@
 #ifdef PERL_CORE
-/* A Bison parser, made by GNU Bison 2.0.  */
+/* A Bison parser, made by GNU Bison 1.875c.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -171,7 +171,7 @@ typedef union YYSTYPE {
     OP *opval;
     GV *gvval;
 } YYSTYPE;
-/* Line 1318 of yacc.c.  */
+/* Line 1275 of yacc.c.  */
 #line 174 "perly.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

diff --git a/perly.tab b/perly.tab
index 5e98358..f4e4c6f 100644 (file)
--- a/perly.tab
+++ b/perly.tab
@@ -1,6 +1,6 @@
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1948
+#define YYLAST   1966
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  85
@@ -9,7 +9,7 @@
 /* YYNRULES -- Number of rules. */
 #define YYNRULES  199
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  397
+#define YYNSTATES  399
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -59,128 +59,128 @@ static const unsigned char yytranslate[] =
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short int yyprhs[] =
+static const unsigned short yyprhs[] =
 {
        0,     0,     3,     6,    11,    12,    13,    18,    19,    20,
       21,    24,    28,    31,    33,    36,    40,    42,    44,    48,
       52,    56,    60,    64,    65,    68,    75,    83,    91,    92,
-      95,   104,   113,   124,   134,   143,   155,   159,   160,   162,
-     163,   165,   167,   169,   171,   173,   175,   176,   178,   180,
-     182,   184,   186,   188,   193,   195,   196,   203,   210,   211,
-     212,   213,   215,   216,   218,   219,   222,   224,   227,   229,
-     231,   233,   237,   238,   246,   250,   254,   258,   260,   263,
-     267,   269,   273,   279,   286,   290,   294,   300,   303,   308,
-     309,   315,   317,   319,   325,   330,   336,   341,   347,   354,
-     360,   365,   371,   376,   380,   384,   388,   392,   396,   400,
-     404,   408,   412,   416,   420,   424,   428,   432,   436,   439,
-     442,   445,   448,   451,   454,   457,   460,   464,   467,   472,
-     476,   482,   485,   488,   493,   499,   504,   510,   512,   514,
-     516,   518,   524,   527,   529,   532,   536,   539,   541,   543,
-     545,   547,   549,   551,   558,   564,   569,   575,   577,   579,
-     583,   588,   592,   594,   597,   600,   602,   605,   608,   611,
-     613,   617,   619,   623,   628,   633,   635,   637,   641,   644,
-     648,   651,   653,   655,   657,   658,   660,   661,   663,   666,
-     668,   671,   674,   677,   680,   683,   686,   688,   690,   692
+      95,   105,   115,   126,   136,   145,   158,   162,   163,   164,
+     166,   167,   169,   171,   173,   175,   177,   178,   180,   182,
+     184,   186,   188,   190,   195,   197,   198,   205,   212,   213,
+     214,   215,   217,   218,   220,   221,   224,   226,   229,   231,
+     233,   235,   239,   240,   248,   252,   256,   260,   262,   265,
+     269,   271,   275,   281,   288,   292,   296,   302,   305,   310,
+     311,   317,   319,   321,   327,   332,   338,   343,   349,   356,
+     362,   367,   373,   378,   382,   386,   390,   394,   398,   402,
+     406,   410,   414,   418,   422,   426,   430,   434,   438,   441,
+     444,   447,   450,   453,   456,   459,   462,   466,   469,   474,
+     478,   484,   487,   490,   495,   501,   506,   512,   514,   516,
+     518,   520,   526,   529,   531,   534,   538,   541,   543,   545,
+     547,   549,   551,   553,   560,   566,   571,   577,   579,   581,
+     585,   590,   594,   596,   599,   602,   604,   607,   610,   613,
+     615,   619,   621,   625,   630,   635,   637,   639,   643,   646,
+     650,   653,   655,   657,   659,   660,   662,   663,   665,   668,
+     670,   673,   676,   679,   682,   685,   688,   690,   692,   694
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short int yyrhs[] =
+static const short yyrhs[] =
 {
       86,     0,    -1,    89,    93,    -1,     3,    88,    93,    76,
       -1,    -1,    -1,     3,    91,    93,    76,    -1,    -1,    -1,
       -1,    93,   108,    -1,    93,    92,    94,    -1,   107,    97,
       -1,    99,    -1,   107,    77,    -1,   107,    95,    77,    -1,
        1,    -1,   124,    -1,   124,    21,   124,    -1,   124,    22,
-     124,    -1,   124,    19,   124,    -1,   124,    20,   102,    -1,
+     124,    -1,   124,    19,   124,    -1,   124,    20,   103,    -1,
      124,    26,   124,    -1,    -1,    23,    90,    -1,    24,    74,
-     103,    73,    90,    96,    -1,    21,    74,    88,   103,    73,
+     104,    73,    90,    96,    -1,    21,    74,    88,   104,    73,
       90,    96,    -1,    22,    74,    88,   106,    73,    90,    96,
-      -1,    -1,    25,    87,    -1,   107,    19,    74,    88,   105,
-      73,    90,    98,    -1,   107,    20,    74,    88,   106,    73,
-      90,    98,    -1,   107,    26,    43,    88,   139,    74,   103,
-      73,    90,    98,    -1,   107,    26,   141,    74,    88,   103,
-      73,    90,    98,    -1,   107,    26,    74,    88,   103,    73,
-      90,    98,    -1,   107,    26,    74,    88,   104,    77,   105,
-      77,   104,    73,    90,    -1,   107,    87,    98,    -1,    -1,
-      95,    -1,    -1,   124,    -1,   124,    -1,   124,    -1,   100,
-      -1,   101,    -1,   102,    -1,    -1,    13,    -1,   109,    -1,
-     112,    -1,   111,    -1,   121,    -1,   122,    -1,    14,   115,
-     110,    87,    -1,     4,    -1,    -1,    44,   113,   116,   117,
-     118,   120,    -1,    15,   113,   116,   117,   118,   120,    -1,
-      -1,    -1,    -1,     4,    -1,    -1,     7,    -1,    -1,    45,
-       7,    -1,    45,    -1,    45,     7,    -1,    45,    -1,    87,
-      -1,    77,    -1,    17,     4,    77,    -1,    -1,    18,   113,
-     123,     4,     4,   137,    77,    -1,   124,    50,   124,    -1,
-     124,    49,   124,    -1,   124,    48,   124,    -1,   125,    -1,
-     125,    52,    -1,   125,    52,   134,    -1,   134,    -1,    33,
-     146,   125,    -1,    31,    74,   146,   124,    73,    -1,   134,
-      72,   128,    74,   138,    73,    -1,   134,    72,   128,    -1,
-       5,   146,   137,    -1,     6,   146,    74,   138,    73,    -1,
-      33,   137,    -1,    31,    74,   138,    73,    -1,    -1,    12,
-     114,    87,   127,   137,    -1,     5,    -1,   141,    -1,   145,
-       3,   124,    77,    76,    -1,   141,    75,   124,    78,    -1,
-     134,    72,    75,   124,    78,    -1,   129,    75,   124,    78,
-      -1,   141,     3,   124,    77,    76,    -1,   134,    72,     3,
-     124,    77,    76,    -1,   129,     3,   124,    77,    76,    -1,
-     134,    72,    74,    73,    -1,   134,    72,    74,   124,    73,
-      -1,   129,    74,   124,    73,    -1,   129,    74,    73,    -1,
-     134,    53,   134,    -1,   134,    67,   134,    -1,   134,    36,
-     134,    -1,   134,    37,   134,    -1,   134,    61,   134,    -1,
-     134,    34,   134,    -1,   134,    35,   134,    -1,   134,    60,
-     134,    -1,   134,    59,   134,    -1,   134,    28,   134,    -1,
-     134,    58,   134,    -1,   134,    57,   134,    -1,   134,    56,
-     134,    -1,   134,    62,   134,    -1,    79,   134,    -1,    80,
-     134,    -1,    63,   134,    -1,    64,   134,    -1,   134,    69,
-      -1,   134,    68,    -1,    71,   134,    -1,    70,   134,    -1,
-      75,   124,    78,    -1,    75,    78,    -1,    40,   124,    77,
-      76,    -1,    40,    77,    76,    -1,    16,   114,   117,   118,
-      87,    -1,    39,   134,    -1,    39,    87,    -1,    39,     4,
-      74,    73,    -1,    39,     4,    74,   124,    73,    -1,    39,
-     141,    74,    73,    -1,    39,   141,    74,   124,    73,    -1,
-     130,    -1,   131,    -1,   132,    -1,   133,    -1,   134,    54,
-     134,    55,   134,    -1,    65,   134,    -1,   135,    -1,    42,
-     134,    -1,    74,   124,    73,    -1,    74,    73,    -1,   141,
-      -1,   145,    -1,   143,    -1,   142,    -1,   144,    -1,   129,
-      -1,    74,   124,    73,    75,   124,    78,    -1,    74,    73,
-      75,   124,    78,    -1,   142,    75,   124,    78,    -1,   142,
-       3,   124,    77,    76,    -1,     7,    -1,   140,    -1,   140,
-      74,    73,    -1,   140,    74,   124,    73,    -1,    41,     4,
-     137,    -1,    27,    -1,    27,   134,    -1,    51,   125,    -1,
-      32,    -1,    32,    87,    -1,    32,   134,    -1,    11,   134,
-      -1,    29,    -1,    29,    74,    73,    -1,    10,    -1,    30,
-      74,    73,    -1,    30,    74,   124,    73,    -1,     8,    74,
-     125,    73,    -1,     4,    -1,   126,    -1,    43,   136,   119,
-      -1,    43,   136,    -1,    74,   124,    73,    -1,    74,    73,
-      -1,   141,    -1,   143,    -1,   142,    -1,    -1,   125,    -1,
-      -1,   124,    -1,   124,    52,    -1,   141,    -1,    46,   146,
-      -1,    81,   146,    -1,    82,   146,    -1,    83,   146,    -1,
-      38,   146,    -1,    84,   146,    -1,     4,    -1,   141,    -1,
-      87,    -1,     9,    -1
+      -1,    -1,    25,    87,    -1,   107,    19,    74,    88,   102,
+      73,   100,    90,    98,    -1,   107,    20,    74,    88,   103,
+      73,   100,    90,    98,    -1,   107,    26,    43,    88,   139,
+      74,   104,    73,    90,    98,    -1,   107,    26,   141,    74,
+      88,   104,    73,    90,    98,    -1,   107,    26,    74,    88,
+     104,    73,    90,    98,    -1,   107,    26,    74,    88,   105,
+      77,   102,    77,   100,   105,    73,    90,    -1,   107,    87,
+      98,    -1,    -1,    -1,    95,    -1,    -1,   124,    -1,   124,
+      -1,   124,    -1,   101,    -1,   103,    -1,    -1,    13,    -1,
+     109,    -1,   112,    -1,   111,    -1,   121,    -1,   122,    -1,
+      14,   115,   110,    87,    -1,     4,    -1,    -1,    44,   113,
+     116,   117,   118,   120,    -1,    15,   113,   116,   117,   118,
+     120,    -1,    -1,    -1,    -1,     4,    -1,    -1,     7,    -1,
+      -1,    45,     7,    -1,    45,    -1,    45,     7,    -1,    45,
+      -1,    87,    -1,    77,    -1,    17,     4,    77,    -1,    -1,
+      18,   113,   123,     4,     4,   137,    77,    -1,   124,    50,
+     124,    -1,   124,    49,   124,    -1,   124,    48,   124,    -1,
+     125,    -1,   125,    52,    -1,   125,    52,   134,    -1,   134,
+      -1,    33,   146,   125,    -1,    31,    74,   146,   124,    73,
+      -1,   134,    72,   128,    74,   138,    73,    -1,   134,    72,
+     128,    -1,     5,   146,   137,    -1,     6,   146,    74,   138,
+      73,    -1,    33,   137,    -1,    31,    74,   138,    73,    -1,
+      -1,    12,   114,    87,   127,   137,    -1,     5,    -1,   141,
+      -1,   145,     3,   124,    77,    76,    -1,   141,    75,   124,
+      78,    -1,   134,    72,    75,   124,    78,    -1,   129,    75,
+     124,    78,    -1,   141,     3,   124,    77,    76,    -1,   134,
+      72,     3,   124,    77,    76,    -1,   129,     3,   124,    77,
+      76,    -1,   134,    72,    74,    73,    -1,   134,    72,    74,
+     124,    73,    -1,   129,    74,   124,    73,    -1,   129,    74,
+      73,    -1,   134,    53,   134,    -1,   134,    67,   134,    -1,
+     134,    36,   134,    -1,   134,    37,   134,    -1,   134,    61,
+     134,    -1,   134,    34,   134,    -1,   134,    35,   134,    -1,
+     134,    60,   134,    -1,   134,    59,   134,    -1,   134,    28,
+     134,    -1,   134,    58,   134,    -1,   134,    57,   134,    -1,
+     134,    56,   134,    -1,   134,    62,   134,    -1,    79,   134,
+      -1,    80,   134,    -1,    63,   134,    -1,    64,   134,    -1,
+     134,    69,    -1,   134,    68,    -1,    71,   134,    -1,    70,
+     134,    -1,    75,   124,    78,    -1,    75,    78,    -1,    40,
+     124,    77,    76,    -1,    40,    77,    76,    -1,    16,   114,
+     117,   118,    87,    -1,    39,   134,    -1,    39,    87,    -1,
+      39,     4,    74,    73,    -1,    39,     4,    74,   124,    73,
+      -1,    39,   141,    74,    73,    -1,    39,   141,    74,   124,
+      73,    -1,   130,    -1,   131,    -1,   132,    -1,   133,    -1,
+     134,    54,   134,    55,   134,    -1,    65,   134,    -1,   135,
+      -1,    42,   134,    -1,    74,   124,    73,    -1,    74,    73,
+      -1,   141,    -1,   145,    -1,   143,    -1,   142,    -1,   144,
+      -1,   129,    -1,    74,   124,    73,    75,   124,    78,    -1,
+      74,    73,    75,   124,    78,    -1,   142,    75,   124,    78,
+      -1,   142,     3,   124,    77,    76,    -1,     7,    -1,   140,
+      -1,   140,    74,    73,    -1,   140,    74,   124,    73,    -1,
+      41,     4,   137,    -1,    27,    -1,    27,   134,    -1,    51,
+     125,    -1,    32,    -1,    32,    87,    -1,    32,   134,    -1,
+      11,   134,    -1,    29,    -1,    29,    74,    73,    -1,    10,
+      -1,    30,    74,    73,    -1,    30,    74,   124,    73,    -1,
+       8,    74,   125,    73,    -1,     4,    -1,   126,    -1,    43,
+     136,   119,    -1,    43,   136,    -1,    74,   124,    73,    -1,
+      74,    73,    -1,   141,    -1,   143,    -1,   142,    -1,    -1,
+     125,    -1,    -1,   124,    -1,   124,    52,    -1,   141,    -1,
+      46,   146,    -1,    81,   146,    -1,    82,   146,    -1,    83,
+     146,    -1,    38,   146,    -1,    84,   146,    -1,     4,    -1,
+     141,    -1,    87,    -1,     9,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const unsigned short yyrline[] =
 {
        0,    95,    95,   101,   108,   112,   118,   125,   129,   133,
      134,   136,   145,   147,   148,   157,   163,   165,   167,   169,
      171,   173,   175,   182,   183,   185,   192,   196,   204,   205,
-     210,   216,   222,   225,   229,   232,   248,   256,   257,   262,
-     263,   267,   272,   276,   280,   284,   290,   291,   295,   297,
-     299,   301,   303,   307,   311,   312,   316,   321,   326,   330,
-     334,   338,   347,   348,   353,   354,   356,   361,   363,   368,
-     369,   372,   377,   376,   383,   385,   387,   389,   393,   395,
-     397,   401,   404,   407,   412,   416,   421,   426,   428,   431,
-     430,   439,   440,   444,   449,   451,   455,   459,   462,   467,
-     472,   475,   480,   484,   490,   492,   494,   498,   500,   502,
-     504,   506,   508,   510,   512,   514,   516,   518,   523,   525,
-     527,   529,   531,   534,   537,   540,   547,   549,   551,   553,
-     555,   561,   563,   565,   573,   582,   586,   594,   595,   596,
-     597,   598,   600,   602,   604,   606,   608,   610,   612,   614,
-     616,   618,   620,   622,   624,   626,   632,   639,   641,   643,
-     645,   648,   651,   654,   656,   658,   660,   662,   664,   667,
-     669,   671,   674,   677,   679,   681,   682,   686,   688,   693,
-     695,   697,   699,   701,   706,   708,   713,   714,   716,   722,
-     726,   730,   734,   738,   742,   746,   751,   753,   755,   758
+     210,   216,   222,   225,   229,   232,   249,   257,   263,   264,
+     269,   270,   274,   279,   283,   287,   293,   294,   298,   300,
+     302,   304,   306,   310,   314,   315,   319,   324,   329,   333,
+     337,   341,   350,   351,   356,   357,   359,   364,   366,   371,
+     372,   375,   380,   379,   386,   388,   390,   392,   396,   398,
+     400,   404,   407,   410,   415,   419,   424,   429,   431,   434,
+     433,   442,   443,   447,   452,   454,   458,   462,   465,   470,
+     475,   478,   483,   487,   493,   495,   497,   501,   503,   505,
+     507,   509,   511,   513,   515,   517,   519,   521,   526,   528,
+     530,   532,   534,   537,   540,   543,   550,   552,   554,   556,
+     558,   564,   566,   568,   576,   585,   589,   597,   598,   599,
+     600,   601,   603,   605,   607,   609,   611,   613,   615,   617,
+     619,   621,   623,   625,   627,   629,   635,   642,   644,   646,
+     648,   651,   654,   657,   659,   661,   663,   665,   667,   670,
+     672,   674,   677,   680,   682,   684,   685,   689,   691,   696,
+     698,   700,   702,   704,   709,   711,   716,   717,   719,   725,
+     729,   733,   737,   741,   745,   749,   754,   756,   758,   761
 };
 #endif
 
@@ -202,7 +202,7 @@ static const char *const yytname[] =
   "'['", "'}'", "';'", "']'", "'-'", "'+'", "'$'", "'@'", "'%'", "'*'",
   "$accept", "prog", "block", "remember", "progstart", "mblock",
   "mremember", "savescope", "lineseq", "line", "sideff", "else", "cond",
-  "cont", "loop", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "mtexpr",
+  "cont", "loop", "mintro", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr",
   "miexpr", "label", "decl", "format", "formname", "mysubrout", "subrout",
   "startsub", "startanonsub", "startformsub", "subname", "proto",
   "subattrlist", "myattrlist", "subbody", "package", "use", "@1", "expr",
@@ -216,7 +216,7 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+static const unsigned short yytoknum[] =
 {
        0,   256,   257,   123,   258,   259,   260,   261,   262,   263,
      264,   265,   266,   267,   268,   269,   270,   271,   272,   273,
@@ -236,8 +236,8 @@ static const unsigned char yyr1[] =
        0,    85,    86,    87,    88,    89,    90,    91,    92,    93,
       93,    93,    94,    94,    94,    94,    95,    95,    95,    95,
       95,    95,    95,    96,    96,    96,    97,    97,    98,    98,
-      99,    99,    99,    99,    99,    99,    99,   100,   100,   101,
-     101,   102,   103,   104,   105,   106,   107,   107,   108,   108,
+      99,    99,    99,    99,    99,    99,    99,   100,   101,   101,
+     102,   102,   103,   104,   105,   106,   107,   107,   108,   108,
      108,   108,   108,   109,   110,   110,   111,   112,   113,   114,
      115,   116,   117,   117,   118,   118,   118,   119,   119,   120,
      120,   121,   123,   122,   124,   124,   124,   124,   125,   125,
@@ -261,8 +261,8 @@ static const unsigned char yyr2[] =
        0,     2,     2,     4,     0,     0,     4,     0,     0,     0,
        2,     3,     2,     1,     2,     3,     1,     1,     3,     3,
        3,     3,     3,     0,     2,     6,     7,     7,     0,     2,
-       8,     8,    10,     9,     8,    11,     3,     0,     1,     0,
-       1,     1,     1,     1,     1,     1,     0,     1,     1,     1,
+       9,     9,    10,     9,     8,    12,     3,     0,     0,     1,
+       0,     1,     1,     1,     1,     1,     0,     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,
@@ -306,96 +306,96 @@ static const unsigned char yydefact[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,   123,   122,     0,     0,     0,     0,     0,     0,     0,
       66,     0,   184,     0,     8,    85,   186,     0,    89,    64,
-      39,     0,     0,     0,     0,     0,     4,   170,   172,     0,
+      40,     0,     0,     0,     0,     0,     4,   170,   172,     0,
      187,     0,     0,    81,     0,     0,   129,     0,   161,   180,
-       0,    68,   177,     0,   145,   126,    29,    20,    21,    41,
+       0,    68,   177,     0,   145,   126,    29,    20,    21,    42,
       18,    19,    22,    76,    75,    74,    79,     0,   103,     0,
        0,   113,   109,   110,   106,   107,   104,     0,   116,   115,
      114,   112,   111,   108,   117,   105,     0,    91,     0,     0,
       84,    92,   159,     0,     0,     0,     0,     0,     0,    65,
       70,    69,    57,     0,    56,     3,     0,   174,   184,     0,
-      44,     0,    40,    45,     0,     0,    42,     0,     0,   189,
-      38,    43,     0,     0,    17,     0,   173,   188,    88,     0,
-     133,     0,   135,     0,   128,   179,    67,     0,     0,     0,
-     102,    96,     0,     0,   100,     0,     0,   186,   160,     0,
-      94,     0,   155,     0,    73,    86,    90,   130,     0,     0,
-       0,     0,     0,     0,    39,     0,    82,   134,   136,   154,
-       0,    99,   141,     0,   101,    95,     0,    97,   156,    93,
-       7,    28,    28,    23,    23,     0,    28,     0,     0,   153,
-      98,    83,     9,    30,    31,     0,     0,    26,    27,     0,
-      34,     0,    28,     8,    24,     0,    28,     0,    33,     6,
-       0,    32,     0,     0,    35,    23,    25
+       0,    41,     0,     0,    43,    45,     0,     0,   189,    39,
+      44,     0,     0,    17,     0,   173,   188,    88,     0,   133,
+       0,   135,     0,   128,   179,    67,     0,     0,     0,   102,
+      96,     0,     0,   100,     0,     0,   186,   160,     0,    94,
+       0,   155,     0,    73,    86,    90,   130,    37,    37,     0,
+       0,     0,     0,    40,     0,    82,   134,   136,   154,     0,
+      99,   141,     0,   101,    95,     0,    97,   156,    93,     0,
+       0,     7,    23,    23,     0,    28,     0,     0,   153,    98,
+      83,    28,    28,     9,     0,     0,    26,    27,     0,    34,
+      37,    28,    30,    31,     8,    24,     0,    28,     0,    33,
+       6,     0,    32,     0,     0,     0,    23,    35,    25
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
+static const short yydefgoto[] =
 {
-      -1,     1,   104,   101,     2,   361,   372,    10,     4,    23,
-     300,   377,    79,   162,    24,   301,   290,   293,   295,   303,
-     291,   294,    25,    11,    12,    27,    13,    14,    18,   110,
-      17,    29,    98,   201,   232,   282,    15,    16,    31,   296,
+      -1,     1,   104,   101,     2,   362,   373,    10,     4,    23,
+     299,   376,    79,   162,    24,   359,   300,   290,   238,   293,
+     302,   296,    25,    11,    12,    27,    13,    14,    18,   110,
+      17,    29,    98,   201,   232,   282,    15,    16,    31,   294,
       81,    82,   288,   270,    83,    84,    85,    86,    87,    88,
-      89,   140,   127,   221,   298,    90,    91,    92,    93,    94,
+      89,   140,   127,   221,   297,    90,    91,    92,    93,    94,
       95,   106
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -343
-static const short int yypact[] =
+#define YYPACT_NINF -344
+static const short yypact[] =
 {
-    -343,     9,  -343,  -343,   147,  -343,  -343,     8,  -343,  -343,
-       7,  -343,  -343,  -343,  -343,  -343,  -343,    19,    52,    -8,
-    -343,    52,  -343,  -343,  -343,   257,  -343,    51,  -343,    63,
-    -343,    86,    63,  -343,  -343,  -343,    31,    31,  -343,    30,
-    -343,  1563,  -343,  -343,    36,    37,    42,    45,    -6,  1563,
-      80,    82,    83,   590,   508,    31,   672,   753,   154,  1563,
-      41,    31,  1563,  1563,  1563,  1563,  1563,  1563,   834,   915,
-    -343,  1563,  1563,    31,    31,    31,    31,    57,    99,  -343,
-     555,   125,  -343,    18,  -343,  -343,  -343,  -343,  1777,  -343,
-      89,    10,    33,  -343,  -343,   176,  -343,  -343,   137,   179,
-     137,  -343,  -343,  -343,  -343,  -343,  1563,   119,  1563,   245,
-      51,    63,  -343,  -343,  -343,  -343,  -343,  -343,   120,  1777,
-     122,   996,   508,  -343,   245,  1689,   125,  -343,  1629,  1563,
-    -343,   124,  -343,   245,    46,   128,   608,  1563,   245,  1077,
-     161,  -343,  -343,  -343,  -343,   125,     5,     5,     5,   -43,
-     -43,   134,   186,  -343,   118,     5,     5,  -343,  -343,  -343,
-    -343,    51,  -343,  -343,  1563,  1563,  1563,  1563,  1563,  1563,
-    1563,  1563,  1563,  1563,  1158,  1563,  1563,  1563,  1563,  1563,
-    1563,  1563,  1563,  1563,  1563,  1563,  1563,  1563,  1563,  1563,
-    1563,  -343,  -343,    78,  1239,  1563,  1563,  1563,  1563,  1563,
-     203,    28,  1563,    28,   111,  -343,  1563,    -2,  -343,   137,
-    1563,  1563,  1563,  1563,   149,   342,  -343,  -343,  -343,   329,
-     190,   159,  1563,   125,  1320,  1401,  -343,   172,  -343,  -343,
-     397,   244,  -343,  1563,   177,  -343,  -343,    87,  -343,    87,
-      87,    87,    87,   221,   221,  -343,  1777,   690,  -343,   412,
-     153,  1861,   739,   576,   901,   819,  1777,  1735,  1876,  1876,
-     414,   495,   658,   785,     5,     5,  1563,  -343,  1482,  1563,
-     211,  -343,  -343,   430,   700,   197,   852,   318,   862,  -343,
-    -343,  -343,  -343,   214,  -343,  -343,   180,  -343,  1563,    51,
-    -343,   219,    87,  -343,   228,   231,    87,   232,   220,  -343,
-    -343,  -343,   236,   233,   207,  1563,  -343,  -343,  -343,   536,
-    -343,   566,  -343,   577,  -343,  -343,  -343,   350,  1563,   235,
-    -343,  -343,  1563,   885,  -343,   618,   361,  1563,  -343,   239,
-    -343,   240,  -343,   242,  -343,  -343,  -343,  -343,   320,   320,
-     320,   320,  1563,   320,  1563,   251,  -343,  -343,  -343,  -343,
-     444,  -343,  1819,   249,  -343,  -343,   253,  -343,  -343,  -343,
-    -343,    57,    57,    56,    56,   256,    57,   258,   320,  -343,
-    -343,  -343,  -343,  -343,  -343,   320,   259,  -343,  -343,   320,
-    -343,   426,    57,   116,  -343,  1563,    57,   269,  -343,  -343,
-     271,  -343,   320,   320,  -343,    56,  -343
+    -344,    25,  -344,  -344,   238,  -344,  -344,    55,  -344,  -344,
+      66,  -344,  -344,  -344,  -344,  -344,  -344,    86,   107,    38,
+    -344,   107,  -344,  -344,  -344,   264,  -344,   113,  -344,   112,
+    -344,   122,   112,  -344,  -344,  -344,    31,    31,  -344,    59,
+    -344,  1575,  -344,  -344,    73,    79,    80,   101,    -6,  1575,
+     105,   117,   119,   602,   520,    31,   684,   765,   125,  1575,
+     177,    31,  1575,  1575,  1575,  1575,  1575,  1575,   846,   927,
+    -344,  1575,  1575,    31,    31,    31,    31,   170,   124,  -344,
+     567,   144,  -344,    18,  -344,  -344,  -344,  -344,  1795,  -344,
+     132,    10,    33,  -344,  -344,   206,  -344,  -344,   165,   225,
+     165,  -344,  -344,  -344,  -344,  -344,  1575,   168,  1575,    94,
+     113,   112,  -344,  -344,  -344,  -344,  -344,  -344,   171,  1795,
+     166,  1008,   520,  -344,    94,  1701,   144,  -344,  1641,  1575,
+    -344,   172,  -344,    94,    46,   174,   263,  1575,    94,  1089,
+     209,  -344,  -344,  -344,  -344,   144,     5,     5,     5,   -46,
+     -46,   186,    87,  -344,    32,     5,     5,  -344,  -344,  -344,
+    -344,   113,  -344,  -344,  1575,  1575,  1575,  1575,  1575,  1575,
+    1575,  1575,  1575,  1575,  1170,  1575,  1575,  1575,  1575,  1575,
+    1575,  1575,  1575,  1575,  1575,  1575,  1575,  1575,  1575,  1575,
+    1575,  -344,  -344,    53,  1251,  1575,  1575,  1575,  1575,  1575,
+     271,     6,  1575,     6,   150,  -344,  1575,    -2,  -344,   165,
+    1575,  1575,  1575,  1575,   198,   354,  -344,  -344,  -344,   250,
+     319,   208,  1575,   144,  1332,  1413,  -344,   232,  -344,  -344,
+     325,   309,  -344,  1575,   234,  -344,  -344,   282,  -344,   282,
+     282,   282,   282,   267,   267,  -344,  1795,   456,  -344,   340,
+      74,  1879,   670,   506,   753,   252,  1795,  1753,  1894,  1894,
+     342,   425,   588,   716,     5,     5,  1575,  -344,  1494,  1575,
+     248,  -344,  -344,   466,   620,   109,   712,   154,   764,  -344,
+    -344,  -344,  -344,   249,  -344,  -344,   260,  -344,  1575,   113,
+     269,   282,   276,   280,   282,  -344,   281,   251,  -344,  -344,
+    -344,   284,   259,   214,  1575,  -344,  -344,  -344,   496,  -344,
+     507,  -344,   548,  -344,  -344,  -344,   199,  1575,   261,  -344,
+    -344,  1575,   783,  -344,   578,   302,  1575,  -344,   296,  -344,
+     306,  -344,   315,  -344,  -344,  -344,  -344,  -344,  -344,   396,
+     396,  1575,   396,  1575,   333,  -344,  -344,  -344,  -344,   373,
+    -344,  1837,   331,  -344,  -344,   335,  -344,  -344,  -344,   396,
+     396,  -344,    81,    81,   339,   170,   338,   396,  -344,  -344,
+    -344,   170,   170,  -344,   396,   346,  -344,  -344,   396,  -344,
+    -344,   170,  -344,  -344,   213,  -344,  1575,   170,   438,  -344,
+    -344,   343,  -344,   353,   396,   396,    81,  -344,  -344
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
+static const short yypgoto[] =
 {
-    -343,  -343,   -23,   -98,  -343,    22,  -343,  -343,  -100,  -343,
-     305,  -342,  -343,  -112,  -343,  -343,  -343,   194,  -210,   -36,
-      11,   138,  -343,  -343,  -343,  -343,  -343,  -343,    50,   317,
-    -343,   343,   -22,   -92,  -343,   167,  -343,  -343,  -343,   -25,
-     -51,  -343,  -343,  -343,  -343,  -343,  -343,  -343,  -343,    35,
-    -343,  -343,   -99,  -200,  -343,  -343,    -9,   316,   326,  -343,
-    -343,   -13
+    -344,  -344,   -23,   -98,  -344,  1424,  -344,  -344,  -100,  -344,
+     402,  -343,  -344,  -189,  -344,  -326,  -344,    89,  -182,  -209,
+      42,  -344,  -344,  -344,  -344,  -344,  -344,  -344,    61,   397,
+    -344,   420,   -22,   -92,  -344,   244,  -344,  -344,  -344,   -25,
+     -51,  -344,  -344,  -344,  -344,  -344,  -344,  -344,  -344,    35,
+    -344,  -344,   -99,  -201,  -344,  -344,    -9,   392,   393,  -344,
+    -344,   -13
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -403,115 +403,100 @@ static const short int yypgoto[] =
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -176
-static const short int yytable[] =
+static const short yytable[] =
 {
-      80,   204,    77,   126,    96,   302,   286,   205,   203,     3,
-     100,   145,    19,   195,   210,   211,   212,   213,   214,   215,
-      22,   173,   378,    26,   107,  -176,  -176,   105,   105,   193,
-     123,    34,   136,   132,    34,   102,   197,   116,   228,   118,
+      80,   204,    77,   126,    96,   286,   301,   205,   203,    34,
+     100,   145,   360,   195,   210,   211,   212,   213,   214,   215,
+     377,   173,  -176,  -176,   107,     3,   193,   105,   105,   292,
+     123,   295,   136,   132,    34,   102,   197,   116,   228,   118,
      103,   129,   130,   152,   154,   128,   105,   134,   144,   195,
-     172,   141,   105,   396,    34,   126,    28,   207,    20,    21,
-     157,   158,   159,   160,   105,   105,   105,   105,   117,    30,
-      97,   287,   190,   191,   192,    73,   109,   193,   223,   375,
-     376,   266,   161,   267,   119,   196,   126,   208,   124,   209,
-      99,   133,   174,   175,   138,   345,   219,   220,   146,   147,
-     148,   149,   150,   283,   108,   280,   155,   156,   198,   222,
-     112,   113,    73,   128,   230,   139,   114,   289,   305,   115,
-     225,   196,    73,    74,    75,     5,     6,   356,     7,     8,
-       5,     6,   365,     7,     8,   169,   170,   171,   236,   237,
-     239,   240,   241,   242,   243,   244,   245,    -2,   247,   249,
-     250,   126,   268,   269,   120,     9,   121,   122,   137,    73,
-       9,     5,     6,   194,     7,     8,   169,   170,   171,   273,
-     274,   275,   276,   277,   278,   390,   163,   172,   281,   199,
-     281,   220,   200,   202,   271,   292,   239,   285,   239,   336,
-     304,     9,   389,   206,   216,   217,   235,   309,   224,   311,
-     313,   169,   170,   171,   226,   299,   231,   246,   317,   233,
-     279,   251,   252,   253,   254,   255,   256,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,   164,   165,   166,   167,
-      73,   321,   308,   168,   169,   170,   171,   126,   169,   170,
-     171,   323,   307,   325,   326,   169,   170,   171,   314,   373,
-     374,   316,   318,   335,   380,   169,   170,   171,    33,   234,
-      34,    35,    36,    37,    38,    39,   337,    40,    41,    42,
-     388,   171,   383,    43,   391,   330,    44,    45,    46,    47,
-     -42,   179,   180,    48,    49,   327,    50,    51,    52,    53,
-      54,   334,   338,   350,   342,    55,    56,    57,    58,    59,
-      60,   339,   220,    61,   340,   341,   188,   189,    62,   343,
-     344,   351,   190,   191,   192,   357,   358,   193,   359,   292,
-      63,    64,    65,   360,   368,   370,   371,    66,    67,   379,
-      78,    68,    69,   385,    70,   381,    71,    72,    73,    74,
-      75,    76,   392,    33,   393,   387,    35,    36,    37,    38,
-      39,   297,    40,    41,    42,   367,    80,   352,    43,   238,
-     111,   362,   363,   364,    32,   366,   169,   170,   171,    49,
-     284,    50,    51,    52,    53,    54,   142,   169,   170,   171,
-      55,    56,    57,    58,    59,    60,   143,     0,    61,     0,
-     382,     0,     0,    62,     0,     0,   332,   384,   169,   170,
-     171,   386,   306,     0,     0,    63,    64,    65,     0,   169,
-     170,   171,    66,    67,   394,   395,    68,    69,     0,   -37,
-       0,    71,    72,    73,    74,    75,    76,    33,   349,     0,
-      35,    36,    37,    38,    39,     0,    40,    41,    42,   355,
-       0,     0,    43,     0,     0,   169,   170,   171,   177,   178,
-     179,   180,     0,    49,     0,    50,    51,    52,    53,    54,
-     169,   170,   171,     0,    55,    56,    57,    58,    59,    60,
-     315,     0,    61,   186,   187,   188,   189,    62,   169,   170,
-     171,   190,   191,   192,     0,   320,   193,     0,     0,    63,
-      64,    65,   169,   170,   171,     0,    66,    67,     0,   -37,
-      68,    69,     0,   328,     0,    71,    72,    73,    74,    75,
-      76,    34,   125,    36,    37,    38,    39,   103,    40,    41,
-      42,     0,   369,     0,    43,     0,     0,     0,     0,   177,
+     172,   141,   105,   398,   388,   126,   266,   207,   267,    19,
+     157,   158,   159,   160,   105,   105,   105,   105,   117,    20,
+      21,   287,   190,   191,   192,    73,   109,   193,   223,    22,
+     169,   170,   171,   280,   119,   196,   126,   208,   124,   209,
+      26,   133,   174,   175,   138,   344,   219,   220,   146,   147,
+     148,   149,   150,   283,   374,   375,   155,   156,   198,   222,
+     235,    28,    73,   128,   230,    30,    34,   289,   304,    97,
+     225,   196,   169,   170,   171,   355,    99,   268,   269,   137,
+     179,   180,   364,   108,    73,   169,   170,   171,   236,   237,
+     239,   240,   241,   242,   243,   244,   245,   112,   247,   249,
+     250,   126,   320,   113,   114,   188,   189,   169,   170,   171,
+     234,   190,   191,   192,     5,     6,   193,     7,     8,   273,
+     274,   275,   276,   277,   278,   115,   379,   391,   281,   120,
+     281,   220,   382,   383,   271,   291,   239,   329,   239,   335,
+     303,   121,   389,   122,     9,   161,   172,   308,   392,   310,
+     312,   163,   169,   170,   171,   298,   194,   246,   316,   199,
+     200,   251,   252,   253,   254,   255,   256,   257,   258,   259,
+     260,   261,   262,   263,   264,   265,   285,     5,     6,   202,
+       7,     8,   331,   164,   165,   166,   167,   126,    -2,   217,
+     168,   322,   206,   324,   325,   216,   224,   169,   170,   171,
+     226,   139,     5,     6,   231,     7,     8,     9,    73,    74,
+      75,   233,   169,   170,   171,    33,   336,    34,    35,    36,
+      37,    38,    39,   384,    40,    41,    42,   348,   279,    73,
+      43,   307,     9,    44,    45,    46,    47,   -43,   179,   390,
+      48,    49,   349,    50,    51,    52,    53,    54,   169,   170,
+     171,   220,    55,    56,    57,    58,    59,    60,   313,   317,
+      61,   169,   170,   171,   189,    62,   315,   171,   291,   190,
+     191,   192,   326,   305,   193,   341,   333,    63,    64,    65,
+     169,   170,   171,   334,    66,    67,   343,   350,    68,    69,
+     227,    70,   337,    71,    72,    73,    74,    75,    76,   338,
+     169,   170,   171,   339,   340,    33,   351,   342,    35,    36,
+      37,    38,    39,    80,    40,    41,    42,   169,   170,   171,
+      43,   306,   356,   169,   170,   171,   177,   178,   179,   180,
+     354,    49,   357,    50,    51,    52,    53,    54,   169,   170,
+     171,   358,    55,    56,    57,    58,    59,    60,   314,   361,
+      61,   186,   187,   188,   189,    62,   367,   369,   370,   190,
+     191,   192,   378,   319,   193,   380,   394,    63,    64,    65,
+     386,   169,   170,   171,    66,    67,   395,    78,    68,    69,
+     393,   -38,   366,    71,    72,    73,    74,    75,    76,    33,
+     111,    32,    35,    36,    37,    38,    39,   284,    40,    41,
+      42,   368,   142,   143,    43,     0,     0,     0,     0,   177,
      178,   179,   180,     0,     0,    49,     0,    50,    51,    52,
       53,    54,     0,     0,     0,     0,    55,    56,    57,    58,
       59,    60,     0,     0,    61,   187,   188,   189,     0,    62,
        0,     0,   190,   191,   192,     0,     0,   193,     0,     0,
-       0,    63,    64,    65,   164,   165,   166,   167,    66,    67,
-       0,   168,    68,    69,   169,   170,   171,    71,    72,    73,
-      74,    75,    76,    34,    35,    36,    37,    38,    39,     0,
-      40,    41,    42,   169,   170,   171,    43,     0,     0,   346,
+       0,    63,    64,    65,   169,   170,   171,     0,    66,    67,
+       0,   -38,    68,    69,   169,   170,   171,    71,    72,    73,
+      74,    75,    76,    34,   125,    36,    37,    38,    39,   103,
+      40,    41,    42,   318,     0,     0,    43,     0,     0,   327,
      177,  -176,   179,   180,   169,   170,   171,    49,     0,    50,
       51,    52,    53,    54,     0,   169,   170,   171,    55,    56,
-      57,    58,    59,    60,     0,     0,    61,   188,   189,   347,
+      57,    58,    59,    60,     0,     0,    61,   188,   189,   345,
        0,    62,     0,   190,   191,   192,     0,     0,   193,     0,
-     348,     0,     0,    63,    64,    65,   169,   170,   171,     0,
-      66,    67,     0,     0,    68,    69,   169,   170,   171,    71,
-      72,    73,    74,    75,    76,    34,   131,    36,    37,    38,
-      39,     0,    40,    41,    42,   227,     0,     0,    43,     0,
-       0,   354,   177,   178,   179,   180,     0,     0,     0,    49,
+     346,     0,     0,    63,    64,    65,   164,   165,   166,   167,
+      66,    67,     0,   168,    68,    69,   169,   170,   171,    71,
+      72,    73,    74,    75,    76,    34,    35,    36,    37,    38,
+      39,     0,    40,    41,    42,   169,   170,   171,    43,     0,
+       0,   347,   177,   178,   179,   180,   169,   170,   171,    49,
        0,    50,    51,    52,    53,    54,     0,     0,     0,     0,
       55,    56,    57,    58,    59,    60,     0,     0,    61,   188,
-     189,     0,     0,    62,     0,   190,   191,   192,     0,     0,
+     189,   353,     0,    62,     0,   190,   191,   192,     0,     0,
      193,     0,     0,     0,     0,    63,    64,    65,   169,   170,
-     171,     0,    66,    67,     0,     0,    68,    69,   169,   170,
-     171,    71,    72,    73,    74,    75,    76,    35,    36,    37,
-      38,    39,     0,    40,    41,    42,     0,   319,     0,    43,
-       0,     0,     0,  -176,     0,   179,   180,   329,     0,     0,
-      49,     0,    50,    51,    52,    53,    54,     0,     0,     0,
-       0,    55,    56,    57,    58,    59,    60,     0,     0,    61,
-     188,   189,     0,     0,    62,     0,   190,   191,   192,     0,
-       0,   193,     0,     0,     0,     0,    63,    64,    65,     0,
-       0,   179,   180,    66,    67,     0,     0,    68,    69,     0,
-     135,     0,    71,    72,    73,    74,    75,    76,    35,    36,
-      37,    38,    39,     0,    40,    41,    42,   189,     0,     0,
-      43,     0,   190,   191,   192,   179,     0,   193,     0,     0,
+     171,     0,    66,    67,     0,     0,    68,    69,     0,     0,
+       0,    71,    72,    73,    74,    75,    76,    34,   131,    36,
+      37,    38,    39,     0,    40,    41,    42,   328,     0,     0,
+      43,     0,     0,     0,  -176,     0,   179,   180,     0,     0,
        0,    49,     0,    50,    51,    52,    53,    54,     0,     0,
        0,     0,    55,    56,    57,    58,    59,    60,     0,     0,
-      61,   189,     0,     0,     0,    62,   190,   191,   192,     0,
-       0,   193,     0,     0,     0,     0,     0,    63,    64,    65,
-     169,   170,   171,     0,    66,    67,     0,   151,    68,    69,
+      61,   188,   189,     0,     0,    62,     0,   190,   191,   192,
+       0,     0,   193,     0,     0,     0,     0,    63,    64,    65,
+       0,     0,   179,   180,    66,    67,     0,     0,    68,    69,
      169,   170,   171,    71,    72,    73,    74,    75,    76,    35,
-      36,    37,    38,    39,     0,    40,    41,    42,     0,   331,
-       0,    43,     0,   169,   170,   171,     0,     0,     0,   333,
+      36,    37,    38,    39,     0,    40,    41,    42,   189,     0,
+       0,    43,     0,   190,   191,   192,     0,     0,   193,   330,
        0,     0,    49,     0,    50,    51,    52,    53,    54,     0,
        0,     0,     0,    55,    56,    57,    58,    59,    60,     0,
-       0,    61,   353,   189,     0,     0,    62,     0,   190,   191,
-     192,     0,     0,   193,     0,     0,     0,     0,    63,    64,
-      65,     0,     0,     0,     0,    66,    67,     0,     0,    68,
-      69,     0,     0,   153,    71,    72,    73,    74,    75,    76,
+       0,    61,   169,   170,   171,   189,    62,     0,     0,     0,
+     190,   191,   192,     0,     0,   193,     0,     0,    63,    64,
+      65,   169,   170,   171,     0,    66,    67,     0,     0,    68,
+      69,   332,   135,     0,    71,    72,    73,    74,    75,    76,
       35,    36,    37,    38,    39,     0,    40,    41,    42,     0,
-       0,     0,    43,     0,     0,     0,     0,     0,     0,     0,
+     352,     0,    43,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    49,     0,    50,    51,    52,    53,    54,
        0,     0,     0,     0,    55,    56,    57,    58,    59,    60,
        0,     0,    61,     0,     0,     0,     0,    62,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    63,
-      64,    65,     0,     0,     0,     0,    66,    67,     0,   218,
+      64,    65,     0,     0,     0,     0,    66,    67,     0,   151,
       68,    69,     0,     0,     0,    71,    72,    73,    74,    75,
       76,    35,    36,    37,    38,    39,     0,    40,    41,    42,
        0,     0,     0,    43,     0,     0,     0,     0,     0,     0,
@@ -520,7 +505,7 @@ static const short int yytable[] =
       60,     0,     0,    61,     0,     0,     0,     0,    62,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       63,    64,    65,     0,     0,     0,     0,    66,    67,     0,
-     229,    68,    69,     0,     0,     0,    71,    72,    73,    74,
+       0,    68,    69,     0,     0,   153,    71,    72,    73,    74,
       75,    76,    35,    36,    37,    38,    39,     0,    40,    41,
       42,     0,     0,     0,    43,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    49,     0,    50,    51,    52,
@@ -528,7 +513,7 @@ static const short int yytable[] =
       59,    60,     0,     0,    61,     0,     0,     0,     0,    62,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,    63,    64,    65,     0,     0,     0,     0,    66,    67,
-       0,   248,    68,    69,     0,     0,     0,    71,    72,    73,
+       0,   218,    68,    69,     0,     0,     0,    71,    72,    73,
       74,    75,    76,    35,    36,    37,    38,    39,     0,    40,
       41,    42,     0,     0,     0,    43,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    49,     0,    50,    51,
@@ -536,7 +521,7 @@ static const short int yytable[] =
       58,    59,    60,     0,     0,    61,     0,     0,     0,     0,
       62,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    63,    64,    65,     0,     0,     0,     0,    66,
-      67,     0,   272,    68,    69,     0,     0,     0,    71,    72,
+      67,     0,   229,    68,    69,     0,     0,     0,    71,    72,
       73,    74,    75,    76,    35,    36,    37,    38,    39,     0,
       40,    41,    42,     0,     0,     0,    43,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    49,     0,    50,
@@ -544,7 +529,7 @@ static const short int yytable[] =
       57,    58,    59,    60,     0,     0,    61,     0,     0,     0,
        0,    62,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    63,    64,    65,     0,     0,     0,     0,
-      66,    67,     0,   310,    68,    69,     0,     0,     0,    71,
+      66,    67,     0,   248,    68,    69,     0,     0,     0,    71,
       72,    73,    74,    75,    76,    35,    36,    37,    38,    39,
        0,    40,    41,    42,     0,     0,     0,    43,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    49,     0,
@@ -552,7 +537,7 @@ static const short int yytable[] =
       56,    57,    58,    59,    60,     0,     0,    61,     0,     0,
        0,     0,    62,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    63,    64,    65,     0,     0,     0,
-       0,    66,    67,     0,   312,    68,    69,     0,     0,     0,
+       0,    66,    67,     0,   272,    68,    69,     0,     0,     0,
       71,    72,    73,    74,    75,    76,    35,    36,    37,    38,
       39,     0,    40,    41,    42,     0,     0,     0,    43,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    49,
@@ -560,7 +545,7 @@ static const short int yytable[] =
       55,    56,    57,    58,    59,    60,     0,     0,    61,     0,
        0,     0,     0,    62,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    63,    64,    65,     0,     0,
-       0,     0,    66,    67,     0,   324,    68,    69,     0,     0,
+       0,     0,    66,    67,     0,   309,    68,    69,     0,     0,
        0,    71,    72,    73,    74,    75,    76,    35,    36,    37,
       38,    39,     0,    40,    41,    42,     0,     0,     0,    43,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -568,144 +553,146 @@ static const short int yytable[] =
        0,    55,    56,    57,    58,    59,    60,     0,     0,    61,
        0,     0,     0,     0,    62,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    63,    64,    65,     0,
-       0,     0,   195,    66,    67,     0,     0,    68,    69,     0,
-       0,     0,    71,    72,    73,    74,    75,    76,  -147,  -147,
-    -147,  -147,     0,     0,     0,  -147,     0,  -147,     0,     0,
-       0,     0,     0,  -147,  -147,  -147,  -147,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  -147,  -147,  -147,
-       0,  -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,  -147,
-    -147,  -147,     0,     0,     0,     0,  -147,  -147,  -147,     0,
-       0,  -147,  -147,     0,   196,     0,  -147,  -147,  -175,  -175,
-    -175,  -175,     0,     0,     0,  -175,     0,  -175,     0,     0,
-       0,     0,     0,  -175,  -175,  -175,  -175,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,  -175,  -175,  -175,
-       0,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,  -175,
-    -175,  -175,     0,     0,     0,     0,  -175,  -175,  -175,     0,
-       0,  -175,  -175,   176,     0,     0,  -175,  -175,     0,   177,
+       0,     0,     0,    66,    67,     0,   311,    68,    69,     0,
+       0,     0,    71,    72,    73,    74,    75,    76,    35,    36,
+      37,    38,    39,     0,    40,    41,    42,     0,     0,     0,
+      43,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    49,     0,    50,    51,    52,    53,    54,     0,     0,
+       0,     0,    55,    56,    57,    58,    59,    60,     0,     0,
+      61,     0,     0,     0,     0,    62,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    63,    64,    65,
+       0,     0,     0,     0,    66,    67,     0,   323,    68,    69,
+       0,     0,     0,    71,    72,    73,    74,    75,    76,    35,
+      36,    37,    38,    39,     0,    40,    41,    42,     0,     0,
+       0,    43,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    49,     0,    50,    51,    52,    53,    54,     0,
+       0,     0,     0,    55,    56,    57,    58,    59,    60,     0,
+       0,    61,     0,     0,     0,     0,    62,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    63,    64,
+      65,     0,     0,     0,   195,    66,    67,     0,     0,    68,
+      69,     0,     0,     0,    71,    72,    73,    74,    75,    76,
+    -147,  -147,  -147,  -147,     0,     0,     0,  -147,     0,  -147,
+       0,     0,     0,     0,     0,  -147,  -147,  -147,  -147,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  -147,
+    -147,  -147,     0,  -147,  -147,  -147,  -147,  -147,  -147,  -147,
+    -147,  -147,  -147,  -147,     0,     0,     0,     0,  -147,  -147,
+    -147,     0,     0,  -147,  -147,     0,   196,     0,  -147,  -147,
+    -175,  -175,  -175,  -175,     0,     0,     0,  -175,     0,  -175,
+       0,     0,     0,     0,     0,  -175,  -175,  -175,  -175,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,  -175,
+    -175,  -175,     0,  -175,  -175,  -175,  -175,  -175,  -175,  -175,
+    -175,  -175,  -175,  -175,   363,     0,   365,     0,  -175,  -175,
+    -175,     0,     0,  -175,  -175,     0,     0,     0,  -175,  -175,
+       0,   176,     0,   371,   372,     0,     0,   177,   178,   179,
+     180,   381,     0,     0,     0,     0,     0,     0,   385,     0,
+       0,     0,   387,     0,     0,     0,   181,   182,   321,   183,
+     184,   185,   186,   187,   188,   189,     0,     0,   396,   397,
+     190,   191,   192,   176,     0,   193,     0,     0,     0,   177,
      178,   179,   180,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,   181,   182,
-     322,   183,   184,   185,   186,   187,   188,   189,     0,     0,
+       0,   183,   184,   185,   186,   187,   188,   189,     0,     0,
        0,     0,   190,   191,   192,   176,     0,   193,     0,     0,
        0,   177,   178,   179,   180,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     181,   182,     0,   183,   184,   185,   186,   187,   188,   189,
-       0,     0,     0,     0,   190,   191,   192,   176,     0,   193,
+       0,   182,     0,   183,   184,   185,   186,   187,   188,   189,
+       0,     0,     0,     0,   190,   191,   192,  -176,     0,   193,
        0,     0,     0,   177,   178,   179,   180,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   182,     0,   183,   184,   185,   186,   187,
-     188,   189,     0,     0,     0,     0,   190,   191,   192,  -176,
-       0,   193,     0,     0,     0,   177,   178,   179,   180,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     177,   178,   179,   180,     0,     0,     0,   183,   184,   185,
-     186,   187,   188,   189,     0,     0,     0,     0,   190,   191,
-     192,     0,     0,   193,   185,   186,   187,   188,   189,     0,
-       0,     0,     0,   190,   191,   192,     0,     0,   193
+       0,     0,     0,     0,     0,     0,     0,     0,   177,   178,
+     179,   180,     0,     0,     0,   183,   184,   185,   186,   187,
+     188,   189,     0,     0,     0,     0,   190,   191,   192,     0,
+       0,   193,   185,   186,   187,   188,   189,     0,     0,     0,
+       0,   190,   191,   192,     0,     0,   193
 };
 
-static const short int yycheck[] =
+static const short yycheck[] =
 {
-      25,   101,    25,    54,    27,   215,   206,   106,   100,     0,
-      32,    62,     4,     3,   112,   113,   114,   115,   116,   117,
-      13,     3,   364,     4,    37,    68,    69,    36,    37,    72,
-      53,     3,    57,    56,     3,     4,     3,    43,   137,    48,
+      25,   101,    25,    54,    27,   206,   215,   106,   100,     3,
+      32,    62,   338,     3,   112,   113,   114,   115,   116,   117,
+     363,     3,    68,    69,    37,     0,    72,    36,    37,   211,
+      53,   213,    57,    56,     3,     4,     3,    43,   137,    48,
        9,    54,    55,    68,    69,    54,    55,    56,    61,     3,
-      52,    60,    61,   395,     3,   106,     4,   108,     8,     9,
-      73,    74,    75,    76,    73,    74,    75,    76,    74,    77,
-       7,    73,    67,    68,    69,    81,    41,    72,   129,    23,
-      24,     3,    25,     5,    49,    75,   137,   110,    53,   111,
-       4,    56,    74,    75,    59,   305,   121,   122,    63,    64,
-      65,    66,    67,   202,    74,    77,    71,    72,    75,   122,
-      74,    74,    81,   122,   139,    74,    74,   209,   216,    74,
-      74,    75,    81,    82,    83,    14,    15,   327,    17,    18,
-      14,    15,   342,    17,    18,    48,    49,    50,   161,   164,
-     165,   166,   167,   168,   169,   170,   171,     0,   173,   174,
-     175,   202,    74,    75,    74,    44,    74,    74,     4,    81,
-      44,    14,    15,    74,    17,    18,    48,    49,    50,   194,
-     195,   196,   197,   198,   199,   385,    77,    52,   201,     3,
-     203,   206,    45,     4,   193,   210,   211,    76,   213,   288,
-     215,    44,    76,    74,    74,    73,    78,   222,    74,   224,
-     225,    48,    49,    50,    76,   214,    45,   172,   233,    75,
-       7,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,    19,    20,    21,    22,
-      81,    78,    73,    26,    48,    49,    50,   288,    48,    49,
-      50,   266,    52,   268,   269,    48,    49,    50,    76,   361,
-     362,     7,    75,    73,   366,    48,    49,    50,     1,    73,
-       3,     4,     5,     6,     7,     8,   289,    10,    11,    12,
-     382,    50,   372,    16,   386,    78,    19,    20,    21,    22,
-      73,    36,    37,    26,    27,    74,    29,    30,    31,    32,
-      33,    77,    73,   318,    74,    38,    39,    40,    41,    42,
-      43,    73,   327,    46,    73,    73,    61,    62,    51,    73,
-      77,    76,    67,    68,    69,    76,    76,    72,    76,   344,
-      63,    64,    65,     3,    73,    76,    73,    70,    71,    73,
-      25,    74,    75,    74,    77,    77,    79,    80,    81,    82,
-      83,    84,    73,     1,    73,   381,     4,     5,     6,     7,
-       8,   213,    10,    11,    12,   344,   381,   322,    16,   165,
-      43,   339,   340,   341,    21,   343,    48,    49,    50,    27,
-     203,    29,    30,    31,    32,    33,    60,    48,    49,    50,
-      38,    39,    40,    41,    42,    43,    60,    -1,    46,    -1,
-     368,    -1,    -1,    51,    -1,    -1,    78,   375,    48,    49,
-      50,   379,    73,    -1,    -1,    63,    64,    65,    -1,    48,
-      49,    50,    70,    71,   392,   393,    74,    75,    -1,    77,
-      -1,    79,    80,    81,    82,    83,    84,     1,    78,    -1,
-       4,     5,     6,     7,     8,    -1,    10,    11,    12,    78,
-      -1,    -1,    16,    -1,    -1,    48,    49,    50,    34,    35,
-      36,    37,    -1,    27,    -1,    29,    30,    31,    32,    33,
-      48,    49,    50,    -1,    38,    39,    40,    41,    42,    43,
-      73,    -1,    46,    59,    60,    61,    62,    51,    48,    49,
-      50,    67,    68,    69,    -1,    73,    72,    -1,    -1,    63,
-      64,    65,    48,    49,    50,    -1,    70,    71,    -1,    73,
-      74,    75,    -1,    73,    -1,    79,    80,    81,    82,    83,
-      84,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    -1,    78,    -1,    16,    -1,    -1,    -1,    -1,    34,
+      52,    60,    61,   396,   380,   106,     3,   108,     5,     4,
+      73,    74,    75,    76,    73,    74,    75,    76,    74,     8,
+       9,    73,    67,    68,    69,    81,    41,    72,   129,    13,
+      48,    49,    50,    77,    49,    75,   137,   110,    53,   111,
+       4,    56,    74,    75,    59,   304,   121,   122,    63,    64,
+      65,    66,    67,   202,    23,    24,    71,    72,    75,   122,
+      78,     4,    81,   122,   139,    77,     3,   209,   216,     7,
+      74,    75,    48,    49,    50,   326,     4,    74,    75,     4,
+      36,    37,   341,    74,    81,    48,    49,    50,   161,   164,
+     165,   166,   167,   168,   169,   170,   171,    74,   173,   174,
+     175,   202,    78,    74,    74,    61,    62,    48,    49,    50,
+      73,    67,    68,    69,    14,    15,    72,    17,    18,   194,
+     195,   196,   197,   198,   199,    74,   365,   386,   201,    74,
+     203,   206,   371,   372,   193,   210,   211,    78,   213,   288,
+     215,    74,   381,    74,    44,    25,    52,   222,   387,   224,
+     225,    77,    48,    49,    50,   214,    74,   172,   233,     3,
+      45,   176,   177,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,    76,    14,    15,     4,
+      17,    18,    78,    19,    20,    21,    22,   288,     0,    73,
+      26,   266,    74,   268,   269,    74,    74,    48,    49,    50,
+      76,    74,    14,    15,    45,    17,    18,    44,    81,    82,
+      83,    75,    48,    49,    50,     1,   289,     3,     4,     5,
+       6,     7,     8,   373,    10,    11,    12,    78,     7,    81,
+      16,    73,    44,    19,    20,    21,    22,    73,    36,    76,
+      26,    27,   317,    29,    30,    31,    32,    33,    48,    49,
+      50,   326,    38,    39,    40,    41,    42,    43,    76,    75,
+      46,    48,    49,    50,    62,    51,     7,    50,   343,    67,
+      68,    69,    74,    73,    72,    74,    77,    63,    64,    65,
+      48,    49,    50,    73,    70,    71,    77,    76,    74,    75,
+      77,    77,    73,    79,    80,    81,    82,    83,    84,    73,
+      48,    49,    50,    73,    73,     1,   321,    73,     4,     5,
+       6,     7,     8,   388,    10,    11,    12,    48,    49,    50,
+      16,    52,    76,    48,    49,    50,    34,    35,    36,    37,
+      78,    27,    76,    29,    30,    31,    32,    33,    48,    49,
+      50,    76,    38,    39,    40,    41,    42,    43,    73,     3,
+      46,    59,    60,    61,    62,    51,    73,    76,    73,    67,
+      68,    69,    73,    73,    72,    77,    73,    63,    64,    65,
+      74,    48,    49,    50,    70,    71,    73,    25,    74,    75,
+     388,    77,   343,    79,    80,    81,    82,    83,    84,     1,
+      43,    21,     4,     5,     6,     7,     8,   203,    10,    11,
+      12,    78,    60,    60,    16,    -1,    -1,    -1,    -1,    34,
       35,    36,    37,    -1,    -1,    27,    -1,    29,    30,    31,
       32,    33,    -1,    -1,    -1,    -1,    38,    39,    40,    41,
       42,    43,    -1,    -1,    46,    60,    61,    62,    -1,    51,
       -1,    -1,    67,    68,    69,    -1,    -1,    72,    -1,    -1,
-      -1,    63,    64,    65,    19,    20,    21,    22,    70,    71,
-      -1,    26,    74,    75,    48,    49,    50,    79,    80,    81,
-      82,    83,    84,     3,     4,     5,     6,     7,     8,    -1,
-      10,    11,    12,    48,    49,    50,    16,    -1,    -1,    73,
+      -1,    63,    64,    65,    48,    49,    50,    -1,    70,    71,
+      -1,    73,    74,    75,    48,    49,    50,    79,    80,    81,
+      82,    83,    84,     3,     4,     5,     6,     7,     8,     9,
+      10,    11,    12,    77,    -1,    -1,    16,    -1,    -1,    73,
       34,    35,    36,    37,    48,    49,    50,    27,    -1,    29,
       30,    31,    32,    33,    -1,    48,    49,    50,    38,    39,
       40,    41,    42,    43,    -1,    -1,    46,    61,    62,    73,
       -1,    51,    -1,    67,    68,    69,    -1,    -1,    72,    -1,
-      73,    -1,    -1,    63,    64,    65,    48,    49,    50,    -1,
-      70,    71,    -1,    -1,    74,    75,    48,    49,    50,    79,
+      73,    -1,    -1,    63,    64,    65,    19,    20,    21,    22,
+      70,    71,    -1,    26,    74,    75,    48,    49,    50,    79,
       80,    81,    82,    83,    84,     3,     4,     5,     6,     7,
-       8,    -1,    10,    11,    12,    77,    -1,    -1,    16,    -1,
-      -1,    73,    34,    35,    36,    37,    -1,    -1,    -1,    27,
+       8,    -1,    10,    11,    12,    48,    49,    50,    16,    -1,
+      -1,    73,    34,    35,    36,    37,    48,    49,    50,    27,
       -1,    29,    30,    31,    32,    33,    -1,    -1,    -1,    -1,
       38,    39,    40,    41,    42,    43,    -1,    -1,    46,    61,
-      62,    -1,    -1,    51,    -1,    67,    68,    69,    -1,    -1,
+      62,    73,    -1,    51,    -1,    67,    68,    69,    -1,    -1,
       72,    -1,    -1,    -1,    -1,    63,    64,    65,    48,    49,
-      50,    -1,    70,    71,    -1,    -1,    74,    75,    48,    49,
-      50,    79,    80,    81,    82,    83,    84,     4,     5,     6,
-       7,     8,    -1,    10,    11,    12,    -1,    77,    -1,    16,
-      -1,    -1,    -1,    34,    -1,    36,    37,    77,    -1,    -1,
-      27,    -1,    29,    30,    31,    32,    33,    -1,    -1,    -1,
-      -1,    38,    39,    40,    41,    42,    43,    -1,    -1,    46,
-      61,    62,    -1,    -1,    51,    -1,    67,    68,    69,    -1,
-      -1,    72,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,
-      -1,    36,    37,    70,    71,    -1,    -1,    74,    75,    -1,
-      77,    -1,    79,    80,    81,    82,    83,    84,     4,     5,
-       6,     7,     8,    -1,    10,    11,    12,    62,    -1,    -1,
-      16,    -1,    67,    68,    69,    36,    -1,    72,    -1,    -1,
+      50,    -1,    70,    71,    -1,    -1,    74,    75,    -1,    -1,
+      -1,    79,    80,    81,    82,    83,    84,     3,     4,     5,
+       6,     7,     8,    -1,    10,    11,    12,    77,    -1,    -1,
+      16,    -1,    -1,    -1,    34,    -1,    36,    37,    -1,    -1,
       -1,    27,    -1,    29,    30,    31,    32,    33,    -1,    -1,
       -1,    -1,    38,    39,    40,    41,    42,    43,    -1,    -1,
-      46,    62,    -1,    -1,    -1,    51,    67,    68,    69,    -1,
-      -1,    72,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,
-      48,    49,    50,    -1,    70,    71,    -1,    73,    74,    75,
+      46,    61,    62,    -1,    -1,    51,    -1,    67,    68,    69,
+      -1,    -1,    72,    -1,    -1,    -1,    -1,    63,    64,    65,
+      -1,    -1,    36,    37,    70,    71,    -1,    -1,    74,    75,
       48,    49,    50,    79,    80,    81,    82,    83,    84,     4,
-       5,     6,     7,     8,    -1,    10,    11,    12,    -1,    77,
-      -1,    16,    -1,    48,    49,    50,    -1,    -1,    -1,    77,
+       5,     6,     7,     8,    -1,    10,    11,    12,    62,    -1,
+      -1,    16,    -1,    67,    68,    69,    -1,    -1,    72,    77,
       -1,    -1,    27,    -1,    29,    30,    31,    32,    33,    -1,
       -1,    -1,    -1,    38,    39,    40,    41,    42,    43,    -1,
-      -1,    46,    77,    62,    -1,    -1,    51,    -1,    67,    68,
-      69,    -1,    -1,    72,    -1,    -1,    -1,    -1,    63,    64,
-      65,    -1,    -1,    -1,    -1,    70,    71,    -1,    -1,    74,
-      75,    -1,    -1,    78,    79,    80,    81,    82,    83,    84,
+      -1,    46,    48,    49,    50,    62,    51,    -1,    -1,    -1,
+      67,    68,    69,    -1,    -1,    72,    -1,    -1,    63,    64,
+      65,    48,    49,    50,    -1,    70,    71,    -1,    -1,    74,
+      75,    77,    77,    -1,    79,    80,    81,    82,    83,    84,
        4,     5,     6,     7,     8,    -1,    10,    11,    12,    -1,
-      -1,    -1,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      77,    -1,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    27,    -1,    29,    30,    31,    32,    33,
       -1,    -1,    -1,    -1,    38,    39,    40,    41,    42,    43,
       -1,    -1,    46,    -1,    -1,    -1,    -1,    51,    -1,    -1,
@@ -719,7 +706,7 @@ static const short int yycheck[] =
       43,    -1,    -1,    46,    -1,    -1,    -1,    -1,    51,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       63,    64,    65,    -1,    -1,    -1,    -1,    70,    71,    -1,
-      73,    74,    75,    -1,    -1,    -1,    79,    80,    81,    82,
+      -1,    74,    75,    -1,    -1,    78,    79,    80,    81,    82,
       83,    84,     4,     5,     6,     7,     8,    -1,    10,    11,
       12,    -1,    -1,    -1,    16,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    27,    -1,    29,    30,    31,
@@ -767,38 +754,55 @@ static const short int yycheck[] =
       -1,    38,    39,    40,    41,    42,    43,    -1,    -1,    46,
       -1,    -1,    -1,    -1,    51,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,
-      -1,    -1,     3,    70,    71,    -1,    -1,    74,    75,    -1,
-      -1,    -1,    79,    80,    81,    82,    83,    84,    19,    20,
-      21,    22,    -1,    -1,    -1,    26,    -1,    28,    -1,    -1,
-      -1,    -1,    -1,    34,    35,    36,    37,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,    49,    50,
-      -1,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    -1,    -1,    -1,    -1,    67,    68,    69,    -1,
-      -1,    72,    73,    -1,    75,    -1,    77,    78,    19,    20,
-      21,    22,    -1,    -1,    -1,    26,    -1,    28,    -1,    -1,
-      -1,    -1,    -1,    34,    35,    36,    37,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,    49,    50,
-      -1,    52,    53,    54,    55,    56,    57,    58,    59,    60,
-      61,    62,    -1,    -1,    -1,    -1,    67,    68,    69,    -1,
-      -1,    72,    73,    28,    -1,    -1,    77,    78,    -1,    34,
+      -1,    -1,    -1,    70,    71,    -1,    73,    74,    75,    -1,
+      -1,    -1,    79,    80,    81,    82,    83,    84,     4,     5,
+       6,     7,     8,    -1,    10,    11,    12,    -1,    -1,    -1,
+      16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    27,    -1,    29,    30,    31,    32,    33,    -1,    -1,
+      -1,    -1,    38,    39,    40,    41,    42,    43,    -1,    -1,
+      46,    -1,    -1,    -1,    -1,    51,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,
+      -1,    -1,    -1,    -1,    70,    71,    -1,    73,    74,    75,
+      -1,    -1,    -1,    79,    80,    81,    82,    83,    84,     4,
+       5,     6,     7,     8,    -1,    10,    11,    12,    -1,    -1,
+      -1,    16,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    27,    -1,    29,    30,    31,    32,    33,    -1,
+      -1,    -1,    -1,    38,    39,    40,    41,    42,    43,    -1,
+      -1,    46,    -1,    -1,    -1,    -1,    51,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,
+      65,    -1,    -1,    -1,     3,    70,    71,    -1,    -1,    74,
+      75,    -1,    -1,    -1,    79,    80,    81,    82,    83,    84,
+      19,    20,    21,    22,    -1,    -1,    -1,    26,    -1,    28,
+      -1,    -1,    -1,    -1,    -1,    34,    35,    36,    37,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,
+      49,    50,    -1,    52,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    -1,    -1,    -1,    -1,    67,    68,
+      69,    -1,    -1,    72,    73,    -1,    75,    -1,    77,    78,
+      19,    20,    21,    22,    -1,    -1,    -1,    26,    -1,    28,
+      -1,    -1,    -1,    -1,    -1,    34,    35,    36,    37,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,
+      49,    50,    -1,    52,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,   340,    -1,   342,    -1,    67,    68,
+      69,    -1,    -1,    72,    73,    -1,    -1,    -1,    77,    78,
+      -1,    28,    -1,   359,   360,    -1,    -1,    34,    35,    36,
+      37,   367,    -1,    -1,    -1,    -1,    -1,    -1,   374,    -1,
+      -1,    -1,   378,    -1,    -1,    -1,    53,    54,    55,    56,
+      57,    58,    59,    60,    61,    62,    -1,    -1,   394,   395,
+      67,    68,    69,    28,    -1,    72,    -1,    -1,    -1,    34,
       35,    36,    37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    54,
-      55,    56,    57,    58,    59,    60,    61,    62,    -1,    -1,
+      -1,    56,    57,    58,    59,    60,    61,    62,    -1,    -1,
       -1,    -1,    67,    68,    69,    28,    -1,    72,    -1,    -1,
       -1,    34,    35,    36,    37,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      53,    54,    -1,    56,    57,    58,    59,    60,    61,    62,
+      -1,    54,    -1,    56,    57,    58,    59,    60,    61,    62,
       -1,    -1,    -1,    -1,    67,    68,    69,    28,    -1,    72,
       -1,    -1,    -1,    34,    35,    36,    37,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    54,    -1,    56,    57,    58,    59,    60,
-      61,    62,    -1,    -1,    -1,    -1,    67,    68,    69,    28,
-      -1,    72,    -1,    -1,    -1,    34,    35,    36,    37,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      34,    35,    36,    37,    -1,    -1,    -1,    56,    57,    58,
-      59,    60,    61,    62,    -1,    -1,    -1,    -1,    67,    68,
-      69,    -1,    -1,    72,    58,    59,    60,    61,    62,    -1,
-      -1,    -1,    -1,    67,    68,    69,    -1,    -1,    72
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    34,    35,
+      36,    37,    -1,    -1,    -1,    56,    57,    58,    59,    60,
+      61,    62,    -1,    -1,    -1,    -1,    67,    68,    69,    -1,
+      -1,    72,    58,    59,    60,    61,    62,    -1,    -1,    -1,
+      -1,    67,    68,    69,    -1,    -1,    72
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -828,21 +832,21 @@ static const unsigned char yystos[] =
       45,   118,     4,   118,    93,   137,    74,   125,    87,   117,
       88,    88,    88,    88,    88,    88,    74,    73,    73,   124,
      124,   138,   146,   125,    74,    74,    76,    77,   137,    73,
-     124,    45,   119,    75,    73,    78,    87,   124,   102,   124,
+     124,    45,   119,    75,    73,    78,    87,   124,   103,   124,
      124,   124,   124,   124,   124,   124,   134,   124,    73,   124,
      124,   134,   134,   134,   134,   134,   134,   134,   134,   134,
      134,   134,   134,   134,   134,   134,     3,     5,    74,    75,
      128,   141,    73,   124,   124,   124,   124,   124,   124,     7,
       77,    87,   120,   137,   120,    76,   138,    73,   127,   118,
-     101,   105,   124,   102,   106,   103,   124,   106,   139,   141,
-      95,   100,   103,   104,   124,    88,    73,    52,    73,   124,
-      73,   124,    73,   124,    76,    73,     7,   124,    75,    77,
-      73,    78,    55,   124,    73,   124,   124,    74,    73,    77,
-      78,    77,    78,    77,    77,    73,   137,    87,    73,    73,
-      73,    73,    74,    73,    77,   103,    73,    73,    73,    78,
-     124,    76,   134,    77,    73,    78,   138,    76,    76,    76,
-       3,    90,    90,    90,    90,   103,    90,   105,    73,    78,
-      76,    73,    91,    98,    98,    23,    24,    96,    96,    73,
-      98,    77,    90,    93,    90,    74,    90,   104,    98,    76,
-     103,    98,    73,    73,    90,    90,    96
+     102,   124,   103,   104,   124,   103,   106,   139,   141,    95,
+     101,   104,   105,   124,    88,    73,    52,    73,   124,    73,
+     124,    73,   124,    76,    73,     7,   124,    75,    77,    73,
+      78,    55,   124,    73,   124,   124,    74,    73,    77,    78,
+      77,    78,    77,    77,    73,   137,    87,    73,    73,    73,
+      73,    74,    73,    77,   104,    73,    73,    73,    78,   124,
+      76,   134,    77,    73,    78,   138,    76,    76,    76,   100,
+     100,     3,    90,    90,   104,    90,   102,    73,    78,    76,
+      73,    90,    90,    91,    23,    24,    96,    96,    73,    98,
+      77,    90,    98,    98,    93,    90,    74,    90,   100,    98,
+      76,   104,    98,   105,    73,    73,    90,    90,    96
 };

diff --git a/perly.y b/perly.y
index 2d989b3..308176f 100644 (file)
--- a/perly.y
+++ b/perly.y
@@ -48,11 +48,11 @@
 %token <ival> LOCAL MY MYSUB
 %token COLONATTR
 
-%type <ival> prog decl format startsub startanonsub startformsub
+%type <ival> prog decl format startsub startanonsub startformsub mintro
 %type <ival> progstart remember mremember '&' savescope
 %type <opval> block mblock lineseq line loop cond else
 %type <opval> expr term subscripted scalar ary hsh arylen star amper sideff
-%type <opval> argexpr nexpr texpr iexpr mexpr mnexpr mtexpr miexpr
+%type <opval> argexpr nexpr texpr iexpr mexpr mnexpr miexpr
 %type <opval> listexpr listexprcom indirob listop method
 %type <opval> formname subname proto subbody cont my_scalar
 %type <opval> subattrlist myattrlist mysubrout myattrterm myterm
@@ -207,18 +207,18 @@ cont      :       /* NULL */
        ;
 
 /* Loops: while, until, for, and a bare block */
-loop   :       label WHILE '(' remember mtexpr ')' mblock cont
+loop   :       label WHILE '(' remember texpr ')' mintro mblock cont
                        { PL_copline = (line_t)$2;
                            $$ = block_end($4,
                                   newSTATEOP(0, $1,
                                     newWHILEOP(0, 1, (LOOP*)Nullop,
-                                               $2, $5, $7, $8))); }
-       |       label UNTIL '(' remember miexpr ')' mblock cont
+                                               $2, $5, $8, $9, $7))); }
+       |       label UNTIL '(' remember iexpr ')' mintro mblock cont
                        { PL_copline = (line_t)$2;
                            $$ = block_end($4,
                                   newSTATEOP(0, $1,
                                     newWHILEOP(0, 1, (LOOP*)Nullop,
-                                               $2, $5, $7, $8))); }
+                                               $2, $5, $8, $9, $7))); }
        |       label FOR MY remember my_scalar '(' mexpr ')' mblock cont
                        { $$ = block_end($4,
                                 newFOROP(0, $1, (line_t)$2, $5, $7, $9, $10)); }
@@ -229,14 +229,15 @@ loop      :       label WHILE '(' remember mtexpr ')' mblock cont
        |       label FOR '(' remember mexpr ')' mblock cont
                        { $$ = block_end($4,
                                 newFOROP(0, $1, (line_t)$2, Nullop, $5, $7, $8)); }
-       |       label FOR '(' remember mnexpr ';' mtexpr ';' mnexpr ')' mblock
+       |       label FOR '(' remember mnexpr ';' texpr ';' mintro mnexpr ')'
+                   mblock
                        /* basically fake up an initialize-while lineseq */
                        { OP *forop;
                          PL_copline = (line_t)$2;
                          forop = newSTATEOP(0, $1,
                                            newWHILEOP(0, 1, (LOOP*)Nullop,
                                                $2, scalar($7),
-                                               $11, $9));
+                                               $12, $10, $9));
                          if ($5) {
                                forop = append_elem(OP_LINESEQ,
                                         newSTATEOP(0, ($1?savepv($1):Nullch),
@@ -248,9 +249,15 @@ loop       :       label WHILE '(' remember mtexpr ')' mblock cont
        |       label block cont  /* a block is a loop that happens once */
                        { $$ = newSTATEOP(0, $1,
                                 newWHILEOP(0, 1, (LOOP*)Nullop,
-                                           NOLINE, Nullop, $2, $3)); }
+                                           NOLINE, Nullop, $2, $3, 0)); }
        ;
 
+/* determine whether there are any new my declarations */
+mintro :       /* NULL */
+                       { $$ = (PL_min_intro_pending &&
+                           PL_max_intro_pending >=  PL_min_intro_pending);
+                         intro_my(); }
+
 /* Normal expression */
 nexpr  :       /* NULL */
                        { $$ = Nullop; }
@@ -277,10 +284,6 @@ mnexpr     :       nexpr
                        { $$ = $1; intro_my(); }
        ;
 
-mtexpr :       texpr
-                       { $$ = $1; intro_my(); }
-       ;
-
 miexpr :       iexpr
                        { $$ = $1; intro_my(); }
        ;

diff --git a/pp_ctl.c b/pp_ctl.c
index 03a4171..b61769a 100644 (file)
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -2160,6 +2160,7 @@ PP(pp_redo)
     I32 cxix;
     register PERL_CONTEXT *cx;
     I32 oldsave;
+    OP* redo_op;
 
     if (PL_op->op_flags & OPf_SPECIAL) {
        cxix = dopoptoloop(cxstack_ix);
@@ -2174,12 +2175,20 @@ PP(pp_redo)
     if (cxix < cxstack_ix)
        dounwind(cxix);
 
+    redo_op = cxstack[cxix].blk_loop.redo_op;
+    if (redo_op->op_type == OP_ENTER) {
+       /* pop one less context to avoid $x being freed in while (my $x..) */
+       cxstack_ix++;
+       assert(CxTYPE(&cxstack[cxstack_ix]) == CXt_BLOCK);
+       redo_op = redo_op->op_next;
+    }
+
     TOPBLOCK(cx);
     oldsave = PL_scopestack[PL_scopestack_ix - 1];
     LEAVE_SCOPE(oldsave);
     FREETMPS;
     PL_curcop = cx->blk_oldcop;
-    return cx->blk_loop.redo_op;
+    return redo_op;
 }
 
 STATIC OP *

diff --git a/proto.h b/proto.h
index b18ec81..bd6401c 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -512,8 +512,7 @@ PERL_CALLCONV SV*   Perl_vnewSVpvf(pTHX_ const char* pat, va_list* args);
 PERL_CALLCONV SV*      Perl_newSVrv(pTHX_ SV* rv, const char* classname);
 PERL_CALLCONV SV*      Perl_newSVsv(pTHX_ SV* old);
 PERL_CALLCONV OP*      Perl_newUNOP(pTHX_ I32 type, I32 flags, OP* first);
-PERL_CALLCONV OP*      Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP* loop, I32 whileline, OP* expr, OP* block, OP* cont);
-
+PERL_CALLCONV OP*      Perl_newWHILEOP(pTHX_ I32 flags, I32 debuggable, LOOP* loop, I32 whileline, OP* expr, OP* block, OP* cont, I32 has_my);
 PERL_CALLCONV PERL_SI* Perl_new_stackinfo(pTHX_ I32 stitems, I32 cxitems);
 PERL_CALLCONV char*    Perl_scan_vstring(pTHX_ const char *vstr, SV *sv);
 PERL_CALLCONV char*    Perl_scan_version(pTHX_ const char *vstr, SV *sv, bool qv);

diff --git a/t/op/loopctl.t b/t/op/loopctl.t
index bc326c7..11fb7c8 100644 (file)
--- a/t/op/loopctl.t
+++ b/t/op/loopctl.t
@@ -31,7 +31,7 @@
 #
 #  -- .robin. <robin@kitsite.com>  2001-03-13
 
-print "1..43\n";
+print "1..46\n";
 
 my $ok;
 
@@ -967,3 +967,28 @@ print ($ok ? "ok 41\n" : "not ok 41\n");
 }
 
 
+# ensure that redo doesn't clear a lexical delcared in the condition
+
+{
+    my $i = 1;
+    while (my $x = $i) {
+       $i++;
+       redo if $i == 2;
+       print $x == 1 ? "" : "not ", "ok 44 - while/redo lexical life\n";
+       last;
+    }
+    $i = 1;
+    until (! (my $x = $i)) {
+       $i++;
+       redo if $i == 2;
+       print $x == 1 ? "" : "not ", "ok 45 - until/redo lexical life\n";
+       last;
+    }
+    for ($i = 1; my $x = $i; ) {
+       $i++;
+       redo if $i == 2;
+       print $x == 1 ? "" : "not ", "ok 46 - for/redo lexical life\n";
+       last;
+    }
+
+}