From bdc377e5e0c60dfb539423e956843489501ca2bd Mon Sep 17 00:00:00 2001
From: Father Chrysostomos <sprout@cpan.org>
Date: Sun, 4 Sep 2016 14:22:37 -0700
Subject: [PATCH] [perl #129073] Assert failure: ${p{};sub p}()

When parsing the special ${var{subscript}} syntax, the lexer notes
that the } matching the ${ will be a fake bracket, and should
be ignored.

In the case of ${p{};sub p}() the first syntax error causes tokens to
be popped, such that the } following the sub declaration ends up being
the one treated as a fake bracket and ignored.

The part of the lexer that deals with sub declarations treats a ( fol-
lowing the sub name as a prototype (which is a single term) if signa-
tures are disabled, but ignores it and allows the rest of the lexer to
treat it as a parenthesis if signatures are enabled.

Hence, the part of the parser (perly.y) that parses signatures knows
that a parenthesis token can only come after a sub if signatures are
enabled, and asserts as much.

In the case of an error and tokens being discarded, a parenthesis may
come after a sub name as far as the parser is concerned, even though
there was a } in between that got discarded.  The sub part of the
lexer, of course did not see the parenthesis because of the interven-
ing brace, and did not treat it as a prototype.  So we get an asser-
tion failure.

The simplest fix is to loosen up the assertion and allow for anomalies
after errors.  It does not hurt to go ahead and parse a signature at
this point, even though the feature is disabled, because there has
been a syntax error already, so the parsed code will never run, and
the parsed sub will not be installed.
---
 perly.act       | 1557 +++++++++++++++++++++++--------------------------------
 perly.h         |  297 +++++++----
 perly.tab       | 1482 ++++++++++++++++++++++++++++------------------------
 perly.y         |    4 +-
 t/comp/parser.t |    3 +
 5 files changed, 1655 insertions(+), 1688 deletions(-)

diff --git a/perly.act b/perly.act
index 56285e9..2b71fe4 100644
--- a/perly.act
+++ b/perly.act
@@ -5,246 +5,219 @@
  */
 
 case 2:
-#line 118 "perly.y" /* yacc.c:1646  */
+#line 118 "perly.y"
     {
 			  parser->expect = XSTATE;
-			}
-
+			;}
     break;
 
   case 3:
-#line 122 "perly.y" /* yacc.c:1646  */
+#line 122 "perly.y"
     {
-			  newPROG(block_end((ps[-1].val.ival),(ps[0].val.opval)));
+			  newPROG(block_end((ps[(3) - (4)].val.ival),(ps[(4) - (4)].val.opval)));
 			  PL_compiling.cop_seq = 0;
 			  (yyval.ival) = 0;
-			}
-
+			;}
     break;
 
   case 4:
-#line 128 "perly.y" /* yacc.c:1646  */
+#line 128 "perly.y"
     {
 			  parser->expect = XTERM;
-			}
-
+			;}
     break;
 
   case 5:
-#line 132 "perly.y" /* yacc.c:1646  */
+#line 132 "perly.y"
     {
-			  PL_eval_root = (ps[0].val.opval);
+			  PL_eval_root = (ps[(3) - (3)].val.opval);
 			  (yyval.ival) = 0;
-			}
-
+			;}
     break;
 
   case 6:
-#line 137 "perly.y" /* yacc.c:1646  */
+#line 137 "perly.y"
     {
 			  parser->expect = XBLOCK;
-			}
-
+			;}
     break;
 
   case 7:
-#line 141 "perly.y" /* yacc.c:1646  */
+#line 141 "perly.y"
     {
 			  PL_pad_reset_pending = TRUE;
-			  PL_eval_root = (ps[0].val.opval);
+			  PL_eval_root = (ps[(3) - (3)].val.opval);
 			  (yyval.ival) = 0;
 			  yyunlex();
 			  parser->yychar = YYEOF;
-			}
-
+			;}
     break;
 
   case 8:
-#line 149 "perly.y" /* yacc.c:1646  */
+#line 149 "perly.y"
     {
 			  parser->expect = XSTATE;
-			}
-
+			;}
     break;
 
   case 9:
-#line 153 "perly.y" /* yacc.c:1646  */
+#line 153 "perly.y"
     {
 			  PL_pad_reset_pending = TRUE;
-			  PL_eval_root = (ps[0].val.opval);
+			  PL_eval_root = (ps[(3) - (3)].val.opval);
 			  (yyval.ival) = 0;
 			  yyunlex();
 			  parser->yychar = YYEOF;
-			}
-
+			;}
     break;
 
   case 10:
-#line 161 "perly.y" /* yacc.c:1646  */
+#line 161 "perly.y"
     {
 			  parser->expect = XSTATE;
-			}
-
+			;}
     break;
 
   case 11:
-#line 165 "perly.y" /* yacc.c:1646  */
+#line 165 "perly.y"
     {
 			  PL_pad_reset_pending = TRUE;
-			  PL_eval_root = (ps[0].val.opval);
+			  PL_eval_root = (ps[(3) - (3)].val.opval);
 			  (yyval.ival) = 0;
 			  yyunlex();
 			  parser->yychar = YYEOF;
-			}
-
+			;}
     break;
 
   case 12:
-#line 173 "perly.y" /* yacc.c:1646  */
+#line 173 "perly.y"
     {
 			  parser->expect = XSTATE;
-			}
-
+			;}
     break;
 
   case 13:
-#line 177 "perly.y" /* yacc.c:1646  */
+#line 177 "perly.y"
     {
-			  PL_eval_root = (ps[0].val.opval);
+			  PL_eval_root = (ps[(3) - (3)].val.opval);
 			  (yyval.ival) = 0;
-			}
-
+			;}
     break;
 
   case 14:
-#line 185 "perly.y" /* yacc.c:1646  */
-    { if (parser->copline > (line_t)(ps[-3].val.ival))
-			      parser->copline = (line_t)(ps[-3].val.ival);
-			  (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval));
-			}
-
+#line 185 "perly.y"
+    { if (parser->copline > (line_t)(ps[(1) - (4)].val.ival))
+			      parser->copline = (line_t)(ps[(1) - (4)].val.ival);
+			  (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
+			;}
     break;
 
   case 15:
-#line 193 "perly.y" /* yacc.c:1646  */
-    { if (parser->copline > (line_t)(ps[-6].val.ival))
-			      parser->copline = (line_t)(ps[-6].val.ival);
-			  (yyval.opval) = block_end((ps[-5].val.ival), (ps[-2].val.opval));
-			}
-
+#line 193 "perly.y"
+    { if (parser->copline > (line_t)(ps[(1) - (7)].val.ival))
+			      parser->copline = (line_t)(ps[(1) - (7)].val.ival);
+			  (yyval.opval) = block_end((ps[(2) - (7)].val.ival), (ps[(5) - (7)].val.opval));
+			;}
     break;
 
   case 16:
-#line 200 "perly.y" /* yacc.c:1646  */
+#line 200 "perly.y"
     { (yyval.ival) = block_start(TRUE);
-			  parser->parsed_sub = 0; }
-
+			  parser->parsed_sub = 0; ;}
     break;
 
   case 17:
-#line 205 "perly.y" /* yacc.c:1646  */
-    { if (parser->copline > (line_t)(ps[-3].val.ival))
-			      parser->copline = (line_t)(ps[-3].val.ival);
-			  (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval));
-			}
-
+#line 205 "perly.y"
+    { if (parser->copline > (line_t)(ps[(1) - (4)].val.ival))
+			      parser->copline = (line_t)(ps[(1) - (4)].val.ival);
+			  (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
+			;}
     break;
 
   case 18:
-#line 212 "perly.y" /* yacc.c:1646  */
+#line 212 "perly.y"
     { (yyval.ival) = block_start(FALSE);
-			  parser->parsed_sub = 0; }
-
+			  parser->parsed_sub = 0; ;}
     break;
 
   case 19:
-#line 218 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 218 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 20:
-#line 220 "perly.y" /* yacc.c:1646  */
-    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval));
+#line 220 "perly.y"
+    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval));
 			    PL_pad_reset_pending = TRUE;
-			    if ((ps[-1].val.opval) && (ps[0].val.opval))
+			    if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
 				PL_hints |= HINT_BLOCK_SCOPE;
-			}
-
+			;}
     break;
 
   case 21:
-#line 229 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 229 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 22:
-#line 231 "perly.y" /* yacc.c:1646  */
-    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval));
+#line 231 "perly.y"
+    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval));
 			    PL_pad_reset_pending = TRUE;
-			    if ((ps[-1].val.opval) && (ps[0].val.opval))
+			    if ((ps[(1) - (2)].val.opval) && (ps[(2) - (2)].val.opval))
 				PL_hints |= HINT_BLOCK_SCOPE;
-			}
-
+			;}
     break;
 
   case 23:
-#line 240 "perly.y" /* yacc.c:1646  */
+#line 240 "perly.y"
     {
-			  (yyval.opval) = (ps[0].val.opval) ? newSTATEOP(0, NULL, (ps[0].val.opval)) : NULL;
-			}
-
+			  (yyval.opval) = (ps[(1) - (1)].val.opval) ? newSTATEOP(0, NULL, (ps[(1) - (1)].val.opval)) : NULL;
+			;}
     break;
 
   case 24:
-#line 244 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 244 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 25:
-#line 248 "perly.y" /* yacc.c:1646  */
+#line 248 "perly.y"
     {
-			  (yyval.opval) = newSTATEOP(SVf_UTF8 * (ps[-1].val.pval)[strlen((ps[-1].val.pval))+1], (ps[-1].val.pval), (ps[0].val.opval));
-			}
-
+			  (yyval.opval) = newSTATEOP(SVf_UTF8 * (ps[(1) - (2)].val.pval)[strlen((ps[(1) - (2)].val.pval))+1], (ps[(1) - (2)].val.pval), (ps[(2) - (2)].val.opval));
+			;}
     break;
 
   case 26:
-#line 252 "perly.y" /* yacc.c:1646  */
+#line 252 "perly.y"
     {
-			  (yyval.opval) = newSTATEOP(SVf_UTF8 * (ps[-1].val.pval)[strlen((ps[-1].val.pval))+1], (ps[-1].val.pval), (ps[0].val.opval));
-			}
-
+			  (yyval.opval) = newSTATEOP(SVf_UTF8 * (ps[(1) - (2)].val.pval)[strlen((ps[(1) - (2)].val.pval))+1], (ps[(1) - (2)].val.pval), (ps[(2) - (2)].val.opval));
+			;}
     break;
 
   case 27:
-#line 259 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 259 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 28:
-#line 261 "perly.y" /* yacc.c:1646  */
+#line 261 "perly.y"
     {
 			  CV *fmtcv = PL_compcv;
-			  newFORM((ps[-2].val.ival), (ps[-1].val.opval), (ps[0].val.opval));
+			  newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval));
 			  (yyval.opval) = (OP*)NULL;
 			  if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
 			      pad_add_weakref(fmtcv);
 			  }
 			  parser->parsed_sub = 1;
-			}
-
+			;}
     break;
 
   case 29:
-#line 271 "perly.y" /* yacc.c:1646  */
+#line 271 "perly.y"
     {
-			  if ((ps[-1].val.opval)->op_type == OP_CONST) {
+			  if ((ps[(2) - (3)].val.opval)->op_type == OP_CONST) {
 			    const char *const name =
-				SvPV_nolen_const(((SVOP*)(ps[-1].val.opval))->op_sv);
+				SvPV_nolen_const(((SVOP*)(ps[(2) - (3)].val.opval))->op_sv);
 			    if (strEQ(name, "BEGIN") || strEQ(name, "END")
 			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
 			      || strEQ(name, "UNITCHECK"))
@@ -257,35 +230,33 @@ case 2:
 			   || CvCLONE(CvOUTSIDE(PL_compcv))
 			   || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST(
 						CvOUTSIDE(PL_compcv)
-					     ))[(ps[-1].val.opval)->op_targ]))
+					     ))[(ps[(2) - (3)].val.opval)->op_targ]))
 			      CvCLONE_on(PL_compcv);
 			  parser->in_my = 0;
 			  parser->in_my_stash = NULL;
-			}
-
+			;}
     break;
 
   case 30:
-#line 293 "perly.y" /* yacc.c:1646  */
+#line 293 "perly.y"
     {
 			  SvREFCNT_inc_simple_void(PL_compcv);
-			  (ps[-5].val.opval)->op_type == OP_CONST
-			      ? newATTRSUB((ps[-4].val.ival), (ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval))
-			      : newMYSUB((ps[-4].val.ival), (ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval))
+			  (ps[(2) - (7)].val.opval)->op_type == OP_CONST
+			      ? newATTRSUB((ps[(3) - (7)].val.ival), (ps[(2) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval))
+			      : newMYSUB((ps[(3) - (7)].val.ival), (ps[(2) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval))
 			  ;
 			  (yyval.opval) = (OP*)NULL;
 			  intro_my();
 			  parser->parsed_sub = 1;
-			}
-
+			;}
     break;
 
   case 31:
-#line 304 "perly.y" /* yacc.c:1646  */
+#line 304 "perly.y"
     {
-			  if ((ps[-1].val.opval)->op_type == OP_CONST) {
+			  if ((ps[(2) - (3)].val.opval)->op_type == OP_CONST) {
 			    const char *const name =
-				SvPV_nolen_const(((SVOP*)(ps[-1].val.opval))->op_sv);
+				SvPV_nolen_const(((SVOP*)(ps[(2) - (3)].val.opval))->op_sv);
 			    if (strEQ(name, "BEGIN") || strEQ(name, "END")
 			      || strEQ(name, "INIT") || strEQ(name, "CHECK")
 			      || strEQ(name, "UNITCHECK"))
@@ -298,144 +269,130 @@ case 2:
 			   || CvCLONE(CvOUTSIDE(PL_compcv))
 			   || !PadnameIsSTATE(PadlistNAMESARRAY(CvPADLIST(
 						CvOUTSIDE(PL_compcv)
-					     ))[(ps[-1].val.opval)->op_targ]))
+					     ))[(ps[(2) - (3)].val.opval)->op_targ]))
 			      CvCLONE_on(PL_compcv);
 			  parser->in_my = 0;
 			  parser->in_my_stash = NULL;
-			}
-
+			;}
     break;
 
   case 32:
-#line 326 "perly.y" /* yacc.c:1646  */
+#line 326 "perly.y"
     {
 			  OP *body;
-			  if (parser->copline > (line_t)(ps[-2].val.ival))
-			      parser->copline = (line_t)(ps[-2].val.ival);
-			  body = block_end((ps[-5].val.ival),
-				op_append_list(OP_LINESEQ, (ps[-4].val.opval), (ps[-1].val.opval)));
+			  if (parser->copline > (line_t)(ps[(8) - (10)].val.ival))
+			      parser->copline = (line_t)(ps[(8) - (10)].val.ival);
+			  body = block_end((ps[(5) - (10)].val.ival),
+				op_append_list(OP_LINESEQ, (ps[(6) - (10)].val.opval), (ps[(9) - (10)].val.opval)));
 
 			  SvREFCNT_inc_simple_void(PL_compcv);
-			  (ps[-8].val.opval)->op_type == OP_CONST
-			      ? newATTRSUB((ps[-7].val.ival), (ps[-8].val.opval), NULL, (ps[-3].val.opval), body)
-			      : newMYSUB((ps[-7].val.ival), (ps[-8].val.opval), NULL, (ps[-3].val.opval), body)
+			  (ps[(2) - (10)].val.opval)->op_type == OP_CONST
+			      ? newATTRSUB((ps[(3) - (10)].val.ival), (ps[(2) - (10)].val.opval), NULL, (ps[(7) - (10)].val.opval), body)
+			      : newMYSUB((ps[(3) - (10)].val.ival), (ps[(2) - (10)].val.opval), NULL, (ps[(7) - (10)].val.opval), body)
 			  ;
 			  (yyval.opval) = (OP*)NULL;
 			  intro_my();
 			  parser->parsed_sub = 1;
-			}
-
+			;}
     break;
 
   case 33:
-#line 343 "perly.y" /* yacc.c:1646  */
+#line 343 "perly.y"
     {
-			  package((ps[-1].val.opval));
-			  if ((ps[-2].val.opval))
-			      package_version((ps[-2].val.opval));
+			  package((ps[(3) - (4)].val.opval));
+			  if ((ps[(2) - (4)].val.opval))
+			      package_version((ps[(2) - (4)].val.opval));
 			  (yyval.opval) = (OP*)NULL;
-			}
-
+			;}
     break;
 
   case 34:
-#line 350 "perly.y" /* yacc.c:1646  */
-    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
-
+#line 350 "perly.y"
+    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
     break;
 
   case 35:
-#line 352 "perly.y" /* yacc.c:1646  */
+#line 352 "perly.y"
     {
 			  SvREFCNT_inc_simple_void(PL_compcv);
-			  utilize((ps[-6].val.ival), (ps[-5].val.ival), (ps[-3].val.opval), (ps[-2].val.opval), (ps[-1].val.opval));
+			  utilize((ps[(1) - (7)].val.ival), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval));
 			  parser->parsed_sub = 1;
 			  (yyval.opval) = (OP*)NULL;
-			}
-
+			;}
     break;
 
   case 36:
-#line 359 "perly.y" /* yacc.c:1646  */
+#line 359 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[-4].val.ival),
-			      newCONDOP(0, (ps[-3].val.opval), op_scope((ps[-1].val.opval)), (ps[0].val.opval)));
-			  parser->copline = (line_t)(ps[-6].val.ival);
-			}
-
+			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
+			      newCONDOP(0, (ps[(4) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
+			  parser->copline = (line_t)(ps[(1) - (7)].val.ival);
+			;}
     break;
 
   case 37:
-#line 365 "perly.y" /* yacc.c:1646  */
+#line 365 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[-4].val.ival),
-                              newCONDOP(0, (ps[-3].val.opval), (ps[0].val.opval), op_scope((ps[-1].val.opval))));
-			  parser->copline = (line_t)(ps[-6].val.ival);
-			}
-
+			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
+                              newCONDOP(0, (ps[(4) - (7)].val.opval), (ps[(7) - (7)].val.opval), op_scope((ps[(6) - (7)].val.opval))));
+			  parser->copline = (line_t)(ps[(1) - (7)].val.ival);
+			;}
     break;
 
   case 38:
-#line 371 "perly.y" /* yacc.c:1646  */
+#line 371 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[-3].val.ival), newGIVENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)), 0));
-			  parser->copline = (line_t)(ps[-5].val.ival);
-			}
-
+			  (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newGIVENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)), 0));
+			  parser->copline = (line_t)(ps[(1) - (6)].val.ival);
+			;}
     break;
 
   case 39:
-#line 376 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = block_end((ps[-3].val.ival), newWHENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)))); }
-
+#line 376 "perly.y"
+    { (yyval.opval) = block_end((ps[(3) - (6)].val.ival), newWHENOP((ps[(4) - (6)].val.opval), op_scope((ps[(6) - (6)].val.opval)))); ;}
     break;
 
   case 40:
-#line 378 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newWHENOP(0, op_scope((ps[0].val.opval))); }
-
+#line 378 "perly.y"
+    { (yyval.opval) = newWHENOP(0, op_scope((ps[(2) - (2)].val.opval))); ;}
     break;
 
   case 41:
-#line 380 "perly.y" /* yacc.c:1646  */
+#line 380 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[-5].val.ival),
+			  (yyval.opval) = block_end((ps[(3) - (8)].val.ival),
 				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-				      (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival)));
-			  parser->copline = (line_t)(ps[-7].val.ival);
-			}
-
+				      (ps[(4) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval), (ps[(6) - (8)].val.ival)));
+			  parser->copline = (line_t)(ps[(1) - (8)].val.ival);
+			;}
     break;
 
   case 42:
-#line 387 "perly.y" /* yacc.c:1646  */
+#line 387 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[-5].val.ival),
+			  (yyval.opval) = block_end((ps[(3) - (8)].val.ival),
 				  newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-				      (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival)));
-			  parser->copline = (line_t)(ps[-7].val.ival);
-			}
-
+				      (ps[(4) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval), (ps[(6) - (8)].val.ival)));
+			  parser->copline = (line_t)(ps[(1) - (8)].val.ival);
+			;}
     break;
 
   case 43:
-#line 394 "perly.y" /* yacc.c:1646  */
-    { parser->expect = XTERM; }
-
+#line 394 "perly.y"
+    { parser->expect = XTERM; ;}
     break;
 
   case 44:
-#line 396 "perly.y" /* yacc.c:1646  */
-    { parser->expect = XTERM; }
-
+#line 396 "perly.y"
+    { parser->expect = XTERM; ;}
     break;
 
   case 45:
-#line 399 "perly.y" /* yacc.c:1646  */
+#line 399 "perly.y"
     {
-			  OP *initop = (ps[-9].val.opval);
+			  OP *initop = (ps[(4) - (13)].val.opval);
 			  OP *forop = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-				      scalar((ps[-6].val.opval)), (ps[0].val.opval), (ps[-2].val.opval), (ps[-3].val.ival));
+				      scalar((ps[(7) - (13)].val.opval)), (ps[(13) - (13)].val.opval), (ps[(11) - (13)].val.opval), (ps[(10) - (13)].val.ival));
 			  if (initop) {
 			      forop = op_prepend_elem(OP_LINESEQ, initop,
 				  op_append_elem(OP_LINESEQ,
@@ -443,383 +400,334 @@ case 2:
 				      forop));
 			  }
 			  PL_hints |= HINT_BLOCK_SCOPE;
-			  (yyval.opval) = block_end((ps[-10].val.ival), forop);
-			  parser->copline = (line_t)(ps[-12].val.ival);
-			}
-
+			  (yyval.opval) = block_end((ps[(3) - (13)].val.ival), forop);
+			  parser->copline = (line_t)(ps[(1) - (13)].val.ival);
+			;}
     break;
 
   case 46:
-#line 414 "perly.y" /* yacc.c:1646  */
+#line 414 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[-6].val.ival), newFOROP(0, (ps[-5].val.opval), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
-			  parser->copline = (line_t)(ps[-8].val.ival);
-			}
-
+			  (yyval.opval) = block_end((ps[(3) - (9)].val.ival), newFOROP(0, (ps[(4) - (9)].val.opval), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval)));
+			  parser->copline = (line_t)(ps[(1) - (9)].val.ival);
+			;}
     break;
 
   case 47:
-#line 419 "perly.y" /* yacc.c:1646  */
+#line 419 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(0,
-				      op_lvalue((ps[-6].val.opval), OP_ENTERLOOP), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
-			  parser->copline = (line_t)(ps[-7].val.ival);
-			}
-
+			  (yyval.opval) = block_end((ps[(4) - (8)].val.ival), newFOROP(0,
+				      op_lvalue((ps[(2) - (8)].val.opval), OP_ENTERLOOP), (ps[(5) - (8)].val.opval), (ps[(7) - (8)].val.opval), (ps[(8) - (8)].val.opval)));
+			  parser->copline = (line_t)(ps[(1) - (8)].val.ival);
+			;}
     break;
 
   case 48:
-#line 425 "perly.y" /* yacc.c:1646  */
-    { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
-
+#line 425 "perly.y"
+    { parser->in_my = 0; (yyval.opval) = my((ps[(4) - (4)].val.opval)); ;}
     break;
 
   case 49:
-#line 427 "perly.y" /* yacc.c:1646  */
+#line 427 "perly.y"
     {
 			  (yyval.opval) = block_end(
-				(ps[-7].val.ival),
+				(ps[(3) - (10)].val.ival),
 				newFOROP(0,
 					 op_lvalue(
 					    newUNOP(OP_REFGEN, 0,
-						    (ps[-5].val.opval)),
+						    (ps[(5) - (10)].val.opval)),
 					    OP_ENTERLOOP),
-					 (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval))
+					 (ps[(7) - (10)].val.opval), (ps[(9) - (10)].val.opval), (ps[(10) - (10)].val.opval))
 			  );
-			  parser->copline = (line_t)(ps[-9].val.ival);
-			}
-
+			  parser->copline = (line_t)(ps[(1) - (10)].val.ival);
+			;}
     break;
 
   case 50:
-#line 440 "perly.y" /* yacc.c:1646  */
+#line 440 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(
+			  (yyval.opval) = block_end((ps[(5) - (9)].val.ival), newFOROP(
 				0, op_lvalue(newUNOP(OP_REFGEN, 0,
-						     (ps[-6].val.opval)),
-					     OP_ENTERLOOP), (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
-			  parser->copline = (line_t)(ps[-8].val.ival);
-			}
-
+						     (ps[(3) - (9)].val.opval)),
+					     OP_ENTERLOOP), (ps[(6) - (9)].val.opval), (ps[(8) - (9)].val.opval), (ps[(9) - (9)].val.opval)));
+			  parser->copline = (line_t)(ps[(1) - (9)].val.ival);
+			;}
     break;
 
   case 51:
-#line 448 "perly.y" /* yacc.c:1646  */
+#line 448 "perly.y"
     {
-			  (yyval.opval) = block_end((ps[-4].val.ival),
-				  newFOROP(0, (OP*)NULL, (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
-			  parser->copline = (line_t)(ps[-6].val.ival);
-			}
-
+			  (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
+				  newFOROP(0, (OP*)NULL, (ps[(4) - (7)].val.opval), (ps[(6) - (7)].val.opval), (ps[(7) - (7)].val.opval)));
+			  parser->copline = (line_t)(ps[(1) - (7)].val.ival);
+			;}
     break;
 
   case 52:
-#line 454 "perly.y" /* yacc.c:1646  */
+#line 454 "perly.y"
     {
 			  /* a block is a loop that happens once */
 			  (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-				  (OP*)NULL, (ps[-1].val.opval), (ps[0].val.opval), 0);
-			}
-
+				  (OP*)NULL, (ps[(1) - (2)].val.opval), (ps[(2) - (2)].val.opval), 0);
+			;}
     break;
 
   case 53:
-#line 460 "perly.y" /* yacc.c:1646  */
+#line 460 "perly.y"
     {
-			  package((ps[-2].val.opval));
-			  if ((ps[-3].val.opval)) {
-			      package_version((ps[-3].val.opval));
+			  package((ps[(3) - (5)].val.opval));
+			  if ((ps[(2) - (5)].val.opval)) {
+			      package_version((ps[(2) - (5)].val.opval));
 			  }
-			}
-
+			;}
     break;
 
   case 54:
-#line 467 "perly.y" /* yacc.c:1646  */
+#line 467 "perly.y"
     {
 			  /* a block is a loop that happens once */
 			  (yyval.opval) = newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
-				  (OP*)NULL, block_end((ps[-3].val.ival), (ps[-1].val.opval)), (OP*)NULL, 0);
-			  if (parser->copline > (line_t)(ps[-4].val.ival))
-			      parser->copline = (line_t)(ps[-4].val.ival);
-			}
-
+				  (OP*)NULL, block_end((ps[(5) - (8)].val.ival), (ps[(7) - (8)].val.opval)), (OP*)NULL, 0);
+			  if (parser->copline > (line_t)(ps[(4) - (8)].val.ival))
+			      parser->copline = (line_t)(ps[(4) - (8)].val.ival);
+			;}
     break;
 
   case 55:
-#line 475 "perly.y" /* yacc.c:1646  */
+#line 475 "perly.y"
     {
-			  (yyval.opval) = (ps[-1].val.opval);
-			}
-
+			  (yyval.opval) = (ps[(1) - (2)].val.opval);
+			;}
     break;
 
   case 56:
-#line 479 "perly.y" /* yacc.c:1646  */
+#line 479 "perly.y"
     {
 			  (yyval.opval) = (OP*)NULL;
 			  parser->copline = NOLINE;
-			}
-
+			;}
     break;
 
   case 57:
-#line 487 "perly.y" /* yacc.c:1646  */
+#line 487 "perly.y"
     { OP *list;
-			  if ((ps[0].val.opval)) {
-			      OP *term = (ps[0].val.opval);
-			      list = op_append_elem(OP_LIST, (ps[-1].val.opval), term);
+			  if ((ps[(2) - (2)].val.opval)) {
+			      OP *term = (ps[(2) - (2)].val.opval);
+			      list = op_append_elem(OP_LIST, (ps[(1) - (2)].val.opval), term);
 			  }
 			  else {
-			      list = (ps[-1].val.opval);
+			      list = (ps[(1) - (2)].val.opval);
 			  }
 			  if (parser->copline == NOLINE)
 			       parser->copline = CopLINE(PL_curcop)-1;
 			  else parser->copline--;
 			  (yyval.opval) = newSTATEOP(0, NULL,
 					  op_convert_list(OP_FORMLINE, 0, list));
-			}
-
+			;}
     break;
 
   case 58:
-#line 504 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = NULL; }
-
+#line 504 "perly.y"
+    { (yyval.opval) = NULL; ;}
     break;
 
   case 59:
-#line 506 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = op_unscope((ps[-1].val.opval)); }
-
+#line 506 "perly.y"
+    { (yyval.opval) = op_unscope((ps[(2) - (3)].val.opval)); ;}
     break;
 
   case 60:
-#line 511 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 511 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 61:
-#line 513 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 513 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 62:
-#line 515 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
-
+#line 515 "perly.y"
+    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); ;}
     break;
 
   case 63:
-#line 517 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
-
+#line 517 "perly.y"
+    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); ;}
     break;
 
   case 64:
-#line 519 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[0].val.opval)), (ps[-2].val.opval)); }
-
+#line 519 "perly.y"
+    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval)); ;}
     break;
 
   case 65:
-#line 521 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[0].val.opval), (ps[-2].val.opval)); }
-
+#line 521 "perly.y"
+    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval)); ;}
     break;
 
   case 66:
-#line 523 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[0].val.opval), (ps[-2].val.opval), (OP*)NULL);
-			  parser->copline = (line_t)(ps[-1].val.ival); }
-
+#line 523 "perly.y"
+    { (yyval.opval) = newFOROP(0, (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL);
+			  parser->copline = (line_t)(ps[(2) - (3)].val.ival); ;}
     break;
 
   case 67:
-#line 526 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newWHENOP((ps[0].val.opval), op_scope((ps[-2].val.opval))); }
-
+#line 526 "perly.y"
+    { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), op_scope((ps[(1) - (3)].val.opval))); ;}
     break;
 
   case 68:
-#line 531 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 531 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 69:
-#line 533 "perly.y" /* yacc.c:1646  */
+#line 533 "perly.y"
     {
-			  ((ps[0].val.opval))->op_flags |= OPf_PARENS;
-			  (yyval.opval) = op_scope((ps[0].val.opval));
-			}
-
+			  ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS;
+			  (yyval.opval) = op_scope((ps[(2) - (2)].val.opval));
+			;}
     break;
 
   case 70:
-#line 538 "perly.y" /* yacc.c:1646  */
-    { parser->copline = (line_t)(ps[-5].val.ival);
+#line 538 "perly.y"
+    { parser->copline = (line_t)(ps[(1) - (6)].val.ival);
 			    (yyval.opval) = newCONDOP(0,
-				newSTATEOP(OPf_SPECIAL,NULL,(ps[-3].val.opval)),
-				op_scope((ps[-1].val.opval)), (ps[0].val.opval));
+				newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)),
+				op_scope((ps[(5) - (6)].val.opval)), (ps[(6) - (6)].val.opval));
 			  PL_hints |= HINT_BLOCK_SCOPE;
-			}
-
+			;}
     break;
 
   case 71:
-#line 548 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 548 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 72:
-#line 550 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = op_scope((ps[0].val.opval)); }
-
+#line 550 "perly.y"
+    { (yyval.opval) = op_scope((ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 73:
-#line 555 "perly.y" /* yacc.c:1646  */
+#line 555 "perly.y"
     { (yyval.ival) = (PL_min_intro_pending &&
 			    PL_max_intro_pending >=  PL_min_intro_pending);
-			  intro_my(); }
-
+			  intro_my(); ;}
     break;
 
   case 74:
-#line 561 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 561 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 76:
-#line 567 "perly.y" /* yacc.c:1646  */
+#line 567 "perly.y"
     { YYSTYPE tmplval;
 			  (void)scan_num("1", &tmplval);
-			  (yyval.opval) = tmplval.opval; }
-
+			  (yyval.opval) = tmplval.opval; ;}
     break;
 
   case 78:
-#line 575 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = invert(scalar((ps[0].val.opval))); }
-
+#line 575 "perly.y"
+    { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 79:
-#line 580 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); intro_my(); }
-
+#line 580 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
   case 80:
-#line 584 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); intro_my(); }
-
+#line 584 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
   case 81:
-#line 587 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 587 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 82:
-#line 588 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 588 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 83:
-#line 592 "perly.y" /* yacc.c:1646  */
+#line 592 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, 0);
-			    SAVEFREESV(PL_compcv); }
-
+			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 84:
-#line 598 "perly.y" /* yacc.c:1646  */
+#line 598 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
-			    SAVEFREESV(PL_compcv); }
-
+			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 85:
-#line 603 "perly.y" /* yacc.c:1646  */
+#line 603 "perly.y"
     { (yyval.ival) = start_subparse(TRUE, 0);
-			    SAVEFREESV(PL_compcv); }
-
+			    SAVEFREESV(PL_compcv); ;}
     break;
 
   case 88:
-#line 614 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 614 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 90:
-#line 620 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 620 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 91:
-#line 622 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 622 "perly.y"
+    { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
     break;
 
   case 92:
-#line 624 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 624 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 93:
-#line 629 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 629 "perly.y"
+    { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
     break;
 
   case 94:
-#line 631 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 631 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 95:
-#line 642 "perly.y" /* yacc.c:1646  */
-    { parser->in_my = 0; (yyval.opval) = (OP*)NULL; }
-
+#line 642 "perly.y"
+    { parser->in_my = 0; (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 96:
-#line 644 "perly.y" /* yacc.c:1646  */
-    { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }
-
+#line 644 "perly.y"
+    { parser->in_my = 0; (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 97:
-#line 649 "perly.y" /* yacc.c:1646  */
-    { (yyval.ival) = '@'; }
-
+#line 649 "perly.y"
+    { (yyval.ival) = '@'; ;}
     break;
 
   case 98:
-#line 651 "perly.y" /* yacc.c:1646  */
-    { (yyval.ival) = '%'; }
-
+#line 651 "perly.y"
+    { (yyval.ival) = '%'; ;}
     break;
 
   case 99:
-#line 655 "perly.y" /* yacc.c:1646  */
+#line 655 "perly.y"
     {
-                            I32 sigil   = (ps[-2].val.ival);
-                            OP *var     = (ps[-1].val.opval);
-                            OP *defexpr = (ps[0].val.opval);
+                            I32 sigil   = (ps[(1) - (3)].val.ival);
+                            OP *var     = (ps[(2) - (3)].val.opval);
+                            OP *defexpr = (ps[(3) - (3)].val.opval);
 
                             if (parser->sig_slurpy)
                                 yyerror("Multiple slurpy parameters not allowed");
@@ -830,33 +738,29 @@ case 2:
                                         "a default value");
 
                             (yyval.opval) = var ? newSTATEOP(0, NULL, var) : (OP*)NULL;
-                        }
-
+                        ;}
     break;
 
   case 100:
-#line 674 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 674 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 101:
-#line 676 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newOP(OP_NULL, 0); }
-
+#line 676 "perly.y"
+    { (yyval.opval) = newOP(OP_NULL, 0); ;}
     break;
 
   case 102:
-#line 678 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 678 "perly.y"
+    { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
     break;
 
   case 103:
-#line 684 "perly.y" /* yacc.c:1646  */
+#line 684 "perly.y"
     {
-                            OP *var     = (ps[-1].val.opval);
-                            OP *defexpr = (ps[0].val.opval);
+                            OP *var     = (ps[(2) - (3)].val.opval);
+                            OP *defexpr = (ps[(3) - (3)].val.opval);
 
                             if (parser->sig_slurpy)
                                 yyerror("Slurpy parameter not last");
@@ -913,56 +817,48 @@ case 2:
                             }
 
                             (yyval.opval) = var ? newSTATEOP(0, NULL, var) : (OP*)NULL;
-                        }
-
+                        ;}
     break;
 
   case 104:
-#line 749 "perly.y" /* yacc.c:1646  */
-    { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
-
+#line 749 "perly.y"
+    { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 105:
-#line 751 "perly.y" /* yacc.c:1646  */
-    { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
-
+#line 751 "perly.y"
+    { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 106:
-#line 757 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[-1].val.opval); }
-
+#line 757 "perly.y"
+    { (yyval.opval) = (ps[(1) - (2)].val.opval); ;}
     break;
 
   case 107:
-#line 759 "perly.y" /* yacc.c:1646  */
+#line 759 "perly.y"
     {
-			  (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-2].val.opval), (ps[0].val.opval));
-			}
-
+			  (yyval.opval) = op_append_list(OP_LINESEQ, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
+			;}
     break;
 
   case 108:
-#line 763 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 763 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 109:
-#line 768 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 768 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 110:
-#line 770 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 770 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 111:
-#line 774 "perly.y" /* yacc.c:1646  */
+#line 774 "perly.y"
     {
                             ENTER;
                             SAVEIV(parser->sig_elems);
@@ -972,18 +868,19 @@ case 2:
                             parser->sig_optelems = 0;
                             parser->sig_slurpy   = 0;
                             parser->in_my        = KEY_sigvar;
-                        }
-
+                        ;}
     break;
 
   case 112:
-#line 786 "perly.y" /* yacc.c:1646  */
+#line 786 "perly.y"
     {
-                            OP            *sigops = (ps[-1].val.opval);
+                            OP            *sigops = (ps[(3) - (4)].val.opval);
                             UNOP_AUX_item *aux;
                             OP            *check;
 
-                            assert(FEATURE_SIGNATURES_IS_ENABLED);
+                            if (!parser->error_count) {
+                                assert(FEATURE_SIGNATURES_IS_ENABLED);
+                            }
 
                             /* We shouldn't get here otherwise */
                             Perl_ck_warner_d(aTHX_
@@ -1009,361 +906,310 @@ case 2:
                             parser->in_my = 0;
                             parser->expect = XATTRBLOCK;
                             LEAVE;
-			}
-
+			;}
     break;
 
   case 114:
-#line 824 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 826 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 115:
-#line 829 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
-
+#line 831 "perly.y"
+    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 116:
-#line 831 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); }
-
+#line 833 "perly.y"
+    { (yyval.opval) = newLOGOP((ps[(2) - (3)].val.ival), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 117:
-#line 833 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
-
+#line 835 "perly.y"
+    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 119:
-#line 839 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[-1].val.opval); }
-
+#line 841 "perly.y"
+    { (yyval.opval) = (ps[(1) - (2)].val.opval); ;}
     break;
 
   case 120:
-#line 841 "perly.y" /* yacc.c:1646  */
+#line 843 "perly.y"
     {
-			  OP* term = (ps[0].val.opval);
-			  (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term);
-			}
-
+			  OP* term = (ps[(3) - (3)].val.opval);
+			  (yyval.opval) = op_append_elem(OP_LIST, (ps[(1) - (3)].val.opval), term);
+			;}
     break;
 
   case 122:
-#line 850 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = op_convert_list((ps[-2].val.ival), OPf_STACKED,
-				op_prepend_elem(OP_LIST, newGVREF((ps[-2].val.ival),(ps[-1].val.opval)), (ps[0].val.opval)) );
-			}
-
+#line 852 "perly.y"
+    { (yyval.opval) = op_convert_list((ps[(1) - (3)].val.ival), OPf_STACKED,
+				op_prepend_elem(OP_LIST, newGVREF((ps[(1) - (3)].val.ival),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) );
+			;}
     break;
 
   case 123:
-#line 854 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = op_convert_list((ps[-4].val.ival), OPf_STACKED,
-				op_prepend_elem(OP_LIST, newGVREF((ps[-4].val.ival),(ps[-2].val.opval)), (ps[-1].val.opval)) );
-			}
-
+#line 856 "perly.y"
+    { (yyval.opval) = op_convert_list((ps[(1) - (5)].val.ival), OPf_STACKED,
+				op_prepend_elem(OP_LIST, newGVREF((ps[(1) - (5)].val.ival),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) );
+			;}
     break;
 
   case 124:
-#line 858 "perly.y" /* yacc.c:1646  */
+#line 860 "perly.y"
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
-				    op_prepend_elem(OP_LIST, scalar((ps[-5].val.opval)), (ps[-1].val.opval)),
-				    newMETHOP(OP_METHOD, 0, (ps[-3].val.opval))));
-			}
-
+				    op_prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)),
+				    newMETHOP(OP_METHOD, 0, (ps[(3) - (6)].val.opval))));
+			;}
     break;
 
   case 125:
-#line 864 "perly.y" /* yacc.c:1646  */
+#line 866 "perly.y"
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
-				op_append_elem(OP_LIST, scalar((ps[-2].val.opval)),
-				    newMETHOP(OP_METHOD, 0, (ps[0].val.opval))));
-			}
-
+				op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)),
+				    newMETHOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval))));
+			;}
     break;
 
   case 126:
-#line 869 "perly.y" /* yacc.c:1646  */
+#line 871 "perly.y"
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
-				    op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)),
-				    newMETHOP(OP_METHOD, 0, (ps[-2].val.opval))));
-			}
-
+				    op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)),
+				    newMETHOP(OP_METHOD, 0, (ps[(1) - (3)].val.opval))));
+			;}
     break;
 
   case 127:
-#line 875 "perly.y" /* yacc.c:1646  */
+#line 877 "perly.y"
     { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
 				op_append_elem(OP_LIST,
-				    op_prepend_elem(OP_LIST, (ps[-3].val.opval), (ps[-1].val.opval)),
-				    newMETHOP(OP_METHOD, 0, (ps[-4].val.opval))));
-			}
-
+				    op_prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)),
+				    newMETHOP(OP_METHOD, 0, (ps[(1) - (5)].val.opval))));
+			;}
     break;
 
   case 128:
-#line 881 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); }
-
+#line 883 "perly.y"
+    { (yyval.opval) = op_convert_list((ps[(1) - (2)].val.ival), 0, (ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 129:
-#line 883 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
-
+#line 885 "perly.y"
+    { (yyval.opval) = op_convert_list((ps[(1) - (4)].val.ival), 0, (ps[(3) - (4)].val.opval)); ;}
     break;
 
   case 130:
-#line 885 "perly.y" /* yacc.c:1646  */
+#line 887 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
-			  (yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, (OP*)NULL, (ps[0].val.opval)); }
-
+			  (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 131:
-#line 888 "perly.y" /* yacc.c:1646  */
+#line 890 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
 				 op_append_elem(OP_LIST,
-				   op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)), (ps[-4].val.opval)));
-			}
-
+				   op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval)));
+			;}
     break;
 
   case 134:
-#line 903 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); }
-
+#line 905 "perly.y"
+    { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), scalar((ps[(3) - (5)].val.opval))); ;}
     break;
 
   case 135:
-#line 905 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval)));
-			}
-
+#line 907 "perly.y"
+    { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval)));
+			;}
     break;
 
   case 136:
-#line 908 "perly.y" /* yacc.c:1646  */
+#line 910 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
-					ref(newAVREF((ps[-4].val.opval)),OP_RV2AV),
-					scalar((ps[-1].val.opval)));
-			}
-
+					ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV),
+					scalar((ps[(4) - (5)].val.opval)));
+			;}
     break;
 
   case 137:
-#line 913 "perly.y" /* yacc.c:1646  */
+#line 915 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
-					ref(newAVREF((ps[-3].val.opval)),OP_RV2AV),
-					scalar((ps[-1].val.opval)));
-			}
-
+					ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV),
+					scalar((ps[(3) - (4)].val.opval)));
+			;}
     break;
 
   case 138:
-#line 918 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval)));
-			}
-
+#line 920 "perly.y"
+    { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), jmaybe((ps[(3) - (5)].val.opval)));
+			;}
     break;
 
   case 139:
-#line 921 "perly.y" /* yacc.c:1646  */
+#line 923 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
-					ref(newHVREF((ps[-5].val.opval)),OP_RV2HV),
-					jmaybe((ps[-2].val.opval))); }
-
+					ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV),
+					jmaybe((ps[(4) - (6)].val.opval))); ;}
     break;
 
   case 140:
-#line 925 "perly.y" /* yacc.c:1646  */
+#line 927 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
-					ref(newHVREF((ps[-4].val.opval)),OP_RV2HV),
-					jmaybe((ps[-2].val.opval))); }
-
+					ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV),
+					jmaybe((ps[(3) - (5)].val.opval))); ;}
     break;
 
   case 141:
-#line 929 "perly.y" /* yacc.c:1646  */
+#line 931 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   newCVREF(0, scalar((ps[-3].val.opval)))); }
-
+				   newCVREF(0, scalar((ps[(1) - (4)].val.opval)))); ;}
     break;
 
   case 142:
-#line 932 "perly.y" /* yacc.c:1646  */
+#line 934 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   op_append_elem(OP_LIST, (ps[-1].val.opval),
-				       newCVREF(0, scalar((ps[-4].val.opval))))); }
-
+				   op_append_elem(OP_LIST, (ps[(4) - (5)].val.opval),
+				       newCVREF(0, scalar((ps[(1) - (5)].val.opval))))); ;}
     break;
 
   case 143:
-#line 937 "perly.y" /* yacc.c:1646  */
+#line 939 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   op_append_elem(OP_LIST, (ps[-1].val.opval),
-					       newCVREF(0, scalar((ps[-3].val.opval))))); }
-
+				   op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval),
+					       newCVREF(0, scalar((ps[(1) - (4)].val.opval))))); ;}
     break;
 
   case 144:
-#line 941 "perly.y" /* yacc.c:1646  */
+#line 943 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				   newCVREF(0, scalar((ps[-2].val.opval)))); }
-
+				   newCVREF(0, scalar((ps[(1) - (3)].val.opval)))); ;}
     break;
 
   case 145:
-#line 944 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); }
-
+#line 946 "perly.y"
+    { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - (6)].val.opval)); ;}
     break;
 
   case 146:
-#line 946 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); }
-
+#line 948 "perly.y"
+    { (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - (4)].val.opval)); ;}
     break;
 
   case 147:
-#line 948 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (OP*)NULL); }
-
+#line 950 "perly.y"
+    { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL); ;}
     break;
 
   case 148:
-#line 953 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); }
-
+#line 955 "perly.y"
+    { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), (ps[(2) - (3)].val.ival), (ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 149:
-#line 955 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
-
+#line 957 "perly.y"
+    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
     break;
 
   case 150:
-#line 957 "perly.y" /* yacc.c:1646  */
-    {   if ((ps[-1].val.ival) != OP_REPEAT)
-				scalar((ps[-2].val.opval));
-			    (yyval.opval) = newBINOP((ps[-1].val.ival), 0, (ps[-2].val.opval), scalar((ps[0].val.opval)));
-			}
-
+#line 959 "perly.y"
+    {   if ((ps[(2) - (3)].val.ival) != OP_REPEAT)
+				scalar((ps[(1) - (3)].val.opval));
+			    (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, (ps[(1) - (3)].val.opval), scalar((ps[(3) - (3)].val.opval)));
+			;}
     break;
 
   case 151:
-#line 962 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
-
+#line 964 "perly.y"
+    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
     break;
 
   case 152:
-#line 964 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
-
+#line 966 "perly.y"
+    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
     break;
 
   case 153:
-#line 966 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
-
+#line 968 "perly.y"
+    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
     break;
 
   case 154:
-#line 968 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
-
+#line 970 "perly.y"
+    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
     break;
 
   case 155:
-#line 970 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
-
+#line 972 "perly.y"
+    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
     break;
 
   case 156:
-#line 972 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
-
+#line 974 "perly.y"
+    { (yyval.opval) = newBINOP((ps[(2) - (3)].val.ival), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
     break;
 
   case 157:
-#line 974 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
-
+#line 976 "perly.y"
+    { (yyval.opval) = newRANGE((ps[(2) - (3)].val.ival), scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval))); ;}
     break;
 
   case 158:
-#line 976 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
-
+#line 978 "perly.y"
+    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 159:
-#line 978 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
-
+#line 980 "perly.y"
+    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 160:
-#line 980 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
-
+#line 982 "perly.y"
+    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 161:
-#line 982 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
-
+#line 984 "perly.y"
+    { (yyval.opval) = bind_match((ps[(2) - (3)].val.ival), (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 162:
-#line 987 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); }
-
+#line 989 "perly.y"
+    { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval))); ;}
     break;
 
   case 163:
-#line 989 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 991 "perly.y"
+    { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
     break;
 
   case 164:
-#line 992 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
-
+#line 994 "perly.y"
+    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); ;}
     break;
 
   case 165:
-#line 994 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); }
-
+#line 996 "perly.y"
+    { (yyval.opval) = newUNOP((ps[(1) - (2)].val.ival), 0, scalar((ps[(2) - (2)].val.opval))); ;}
     break;
 
   case 166:
-#line 996 "perly.y" /* yacc.c:1646  */
+#line 998 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
-					op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); }
-
+					op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC)); ;}
     break;
 
   case 167:
-#line 999 "perly.y" /* yacc.c:1646  */
+#line 1001 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
-					op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));}
-
+					op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC));;}
     break;
 
   case 168:
-#line 1002 "perly.y" /* yacc.c:1646  */
+#line 1004 "perly.y"
     { (yyval.opval) = op_convert_list(OP_JOIN, 0,
 				       op_append_elem(
 					OP_LIST,
@@ -1371,610 +1217,523 @@ case 2:
 					    newSVOP(OP_CONST,0,
 						    newSVpvs("\""))
 					)),
-					(ps[-1].val.opval)
+					(ps[(1) - (2)].val.opval)
 				       ));
-			}
-
+			;}
     break;
 
   case 169:
-#line 1013 "perly.y" /* yacc.c:1646  */
+#line 1015 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
-					op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); }
-
+					op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREINC)); ;}
     break;
 
   case 170:
-#line 1016 "perly.y" /* yacc.c:1646  */
+#line 1018 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
-					op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); }
-
+					op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC)); ;}
     break;
 
   case 171:
-#line 1023 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newANONLIST((ps[-1].val.opval)); }
-
+#line 1025 "perly.y"
+    { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval)); ;}
     break;
 
   case 172:
-#line 1025 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newANONLIST((OP*)NULL);}
-
+#line 1027 "perly.y"
+    { (yyval.opval) = newANONLIST((OP*)NULL);;}
     break;
 
   case 173:
-#line 1027 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newANONHASH((ps[-2].val.opval)); }
-
+#line 1029 "perly.y"
+    { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval)); ;}
     break;
 
   case 174:
-#line 1029 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newANONHASH((OP*)NULL); }
-
+#line 1031 "perly.y"
+    { (yyval.opval) = newANONHASH((OP*)NULL); ;}
     break;
 
   case 175:
-#line 1031 "perly.y" /* yacc.c:1646  */
+#line 1033 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
-			  (yyval.opval) = newANONATTRSUB((ps[-3].val.ival), (ps[-2].val.opval), (ps[-1].val.opval), (ps[0].val.opval)); }
-
+			  (yyval.opval) = newANONATTRSUB((ps[(2) - (5)].val.ival), (ps[(3) - (5)].val.opval), (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)); ;}
     break;
 
   case 176:
-#line 1034 "perly.y" /* yacc.c:1646  */
+#line 1036 "perly.y"
     {
 			  OP *body;
-			  if (parser->copline > (line_t)(ps[-2].val.ival))
-			      parser->copline = (line_t)(ps[-2].val.ival);
-			  body = block_end((ps[-5].val.ival),
-				op_append_list(OP_LINESEQ, (ps[-4].val.opval), (ps[-1].val.opval)));
+			  if (parser->copline > (line_t)(ps[(6) - (8)].val.ival))
+			      parser->copline = (line_t)(ps[(6) - (8)].val.ival);
+			  body = block_end((ps[(3) - (8)].val.ival),
+				op_append_list(OP_LINESEQ, (ps[(4) - (8)].val.opval), (ps[(7) - (8)].val.opval)));
 			  SvREFCNT_inc_simple_void(PL_compcv);
-			  (yyval.opval) = newANONATTRSUB((ps[-6].val.ival), NULL, (ps[-3].val.opval), body);
-			}
-
+			  (yyval.opval) = newANONATTRSUB((ps[(2) - (8)].val.ival), NULL, (ps[(5) - (8)].val.opval), body);
+			;}
     break;
 
   case 177:
-#line 1048 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}
-
+#line 1050 "perly.y"
+    { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), (ps[(1) - (2)].val.ival));;}
     break;
 
   case 178:
-#line 1050 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));}
-
+#line 1052 "perly.y"
+    { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - (2)].val.opval)));;}
     break;
 
   case 183:
-#line 1058 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); }
-
+#line 1060 "perly.y"
+    { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval)); ;}
     break;
 
   case 184:
-#line 1060 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }
-
+#line 1062 "perly.y"
+    { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 185:
-#line 1062 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }
-
+#line 1064 "perly.y"
+    { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[(3) - (3)].val.opval),1)); ;}
     break;
 
   case 186:
-#line 1064 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1066 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 187:
-#line 1066 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = localize((ps[0].val.opval),0); }
-
+#line 1068 "perly.y"
+    { (yyval.opval) = localize((ps[(2) - (2)].val.opval),0); ;}
     break;
 
   case 188:
-#line 1068 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = sawparens((ps[-1].val.opval)); }
-
+#line 1070 "perly.y"
+    { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); ;}
     break;
 
   case 189:
-#line 1070 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1072 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 190:
-#line 1072 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = sawparens(newNULLLIST()); }
-
+#line 1074 "perly.y"
+    { (yyval.opval) = sawparens(newNULLLIST()); ;}
     break;
 
   case 191:
-#line 1074 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1076 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 192:
-#line 1076 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1078 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 193:
-#line 1078 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1080 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 194:
-#line 1080 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1082 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 195:
-#line 1082 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));}
-
+#line 1084 "perly.y"
+    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
     break;
 
   case 196:
-#line 1084 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1086 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 197:
-#line 1086 "perly.y" /* yacc.c:1646  */
+#line 1088 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_ASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_ASLICE, 0,
-					list((ps[-1].val.opval)),
-					ref((ps[-3].val.opval), OP_ASLICE)));
-			  if ((yyval.opval) && (ps[-3].val.opval))
+					list((ps[(3) - (4)].val.opval)),
+					ref((ps[(1) - (4)].val.opval), OP_ASLICE)));
+			  if ((yyval.opval) && (ps[(1) - (4)].val.opval))
 			      (yyval.opval)->op_private |=
-				  (ps[-3].val.opval)->op_private & OPpSLICEWARNING;
-			}
-
+				  (ps[(1) - (4)].val.opval)->op_private & OPpSLICEWARNING;
+			;}
     break;
 
   case 198:
-#line 1096 "perly.y" /* yacc.c:1646  */
+#line 1098 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_KVASLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_KVASLICE, 0,
-					list((ps[-1].val.opval)),
-					ref(oopsAV((ps[-3].val.opval)), OP_KVASLICE)));
-			  if ((yyval.opval) && (ps[-3].val.opval))
+					list((ps[(3) - (4)].val.opval)),
+					ref(oopsAV((ps[(1) - (4)].val.opval)), OP_KVASLICE)));
+			  if ((yyval.opval) && (ps[(1) - (4)].val.opval))
 			      (yyval.opval)->op_private |=
-				  (ps[-3].val.opval)->op_private & OPpSLICEWARNING;
-			}
-
+				  (ps[(1) - (4)].val.opval)->op_private & OPpSLICEWARNING;
+			;}
     break;
 
   case 199:
-#line 1106 "perly.y" /* yacc.c:1646  */
+#line 1108 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_HSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_HSLICE, 0,
-					list((ps[-2].val.opval)),
-					ref(oopsHV((ps[-4].val.opval)), OP_HSLICE)));
-			  if ((yyval.opval) && (ps[-4].val.opval))
+					list((ps[(3) - (5)].val.opval)),
+					ref(oopsHV((ps[(1) - (5)].val.opval)), OP_HSLICE)));
+			  if ((yyval.opval) && (ps[(1) - (5)].val.opval))
 			      (yyval.opval)->op_private |=
-				  (ps[-4].val.opval)->op_private & OPpSLICEWARNING;
-			}
-
+				  (ps[(1) - (5)].val.opval)->op_private & OPpSLICEWARNING;
+			;}
     break;
 
   case 200:
-#line 1116 "perly.y" /* yacc.c:1646  */
+#line 1118 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_KVHSLICE,
 				newOP(OP_PUSHMARK, 0),
 				    newLISTOP(OP_KVHSLICE, 0,
-					list((ps[-2].val.opval)),
-					ref((ps[-4].val.opval), OP_KVHSLICE)));
-			  if ((yyval.opval) && (ps[-4].val.opval))
+					list((ps[(3) - (5)].val.opval)),
+					ref((ps[(1) - (5)].val.opval), OP_KVHSLICE)));
+			  if ((yyval.opval) && (ps[(1) - (5)].val.opval))
 			      (yyval.opval)->op_private |=
-				  (ps[-4].val.opval)->op_private & OPpSLICEWARNING;
-			}
-
+				  (ps[(1) - (5)].val.opval)->op_private & OPpSLICEWARNING;
+			;}
     break;
 
   case 201:
-#line 1126 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1128 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 202:
-#line 1128 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); }
-
+#line 1130 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 203:
-#line 1130 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval)));
-			}
-
+#line 1132 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval)));
+			;}
     break;
 
   case 204:
-#line 1133 "perly.y" /* yacc.c:1646  */
+#line 1135 "perly.y"
     {
 			  (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-				op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval))));
-			}
-
+				op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval))));
+			;}
     break;
 
   case 205:
-#line 1138 "perly.y" /* yacc.c:1646  */
+#line 1140 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-			    op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval))));
-			}
-
+			    op_append_elem(OP_LIST, (ps[(3) - (3)].val.opval), scalar((ps[(2) - (3)].val.opval))));
+			;}
     break;
 
   case 206:
-#line 1142 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newSVREF((ps[-3].val.opval)); }
-
+#line 1144 "perly.y"
+    { (yyval.opval) = newSVREF((ps[(1) - (4)].val.opval)); ;}
     break;
 
   case 207:
-#line 1144 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
-
+#line 1146 "perly.y"
+    { (yyval.opval) = newAVREF((ps[(1) - (4)].val.opval)); ;}
     break;
 
   case 208:
-#line 1146 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newHVREF((ps[-3].val.opval)); }
-
+#line 1148 "perly.y"
+    { (yyval.opval) = newHVREF((ps[(1) - (4)].val.opval)); ;}
     break;
 
   case 209:
-#line 1148 "perly.y" /* yacc.c:1646  */
+#line 1150 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
-				       scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); }
-
+				       scalar(newCVREF((ps[(3) - (4)].val.ival),(ps[(1) - (4)].val.opval)))); ;}
     break;
 
   case 210:
-#line 1151 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); }
-
+#line 1153 "perly.y"
+    { (yyval.opval) = newGVREF(0,(ps[(1) - (4)].val.opval)); ;}
     break;
 
   case 211:
-#line 1153 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL);
-			    PL_hints |= HINT_BLOCK_SCOPE; }
-
+#line 1155 "perly.y"
+    { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), OPf_SPECIAL);
+			    PL_hints |= HINT_BLOCK_SCOPE; ;}
     break;
 
   case 212:
-#line 1156 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); }
-
+#line 1158 "perly.y"
+    { (yyval.opval) = newLOOPEX((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 213:
-#line 1158 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
-
+#line 1160 "perly.y"
+    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval))); ;}
     break;
 
   case 214:
-#line 1160 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newOP((ps[0].val.ival), 0); }
-
+#line 1162 "perly.y"
+    { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), 0); ;}
     break;
 
   case 215:
-#line 1162 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
-
+#line 1164 "perly.y"
+    { (yyval.opval) = newUNOP((ps[(1) - (2)].val.ival), 0, (ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 216:
-#line 1164 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
-
+#line 1166 "perly.y"
+    { (yyval.opval) = newUNOP((ps[(1) - (2)].val.ival), 0, (ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 217:
-#line 1166 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); }
-
+#line 1168 "perly.y"
+    { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.ival) ? OPf_SPECIAL : 0); ;}
     break;
 
   case 218:
-#line 1168 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); }
-
+#line 1170 "perly.y"
+    { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.ival) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 219:
-#line 1170 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
-
+#line 1172 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 220:
-#line 1172 "perly.y" /* yacc.c:1646  */
+#line 1174 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-			    op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); }
-
+			    op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
     break;
 
   case 221:
-#line 1175 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newOP((ps[0].val.ival), 0); }
-
+#line 1177 "perly.y"
+    { (yyval.opval) = newOP((ps[(1) - (1)].val.ival), 0); ;}
     break;
 
   case 222:
-#line 1177 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newOP((ps[-2].val.ival), 0);}
-
+#line 1179 "perly.y"
+    { (yyval.opval) = newOP((ps[(1) - (3)].val.ival), 0);;}
     break;
 
   case 223:
-#line 1179 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1181 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 224:
-#line 1181 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[-2].val.opval); }
-
+#line 1183 "perly.y"
+    { (yyval.opval) = (ps[(1) - (3)].val.opval); ;}
     break;
 
   case 225:
-#line 1183 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
-
+#line 1185 "perly.y"
+    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 226:
-#line 1185 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = ((ps[-2].val.ival) == OP_NOT)
-                          ? newUNOP((ps[-2].val.ival), 0, newSVOP(OP_CONST, 0, newSViv(0)))
-                          : newOP((ps[-2].val.ival), OPf_SPECIAL); }
-
+#line 1187 "perly.y"
+    { (yyval.opval) = ((ps[(1) - (3)].val.ival) == OP_NOT)
+                          ? newUNOP((ps[(1) - (3)].val.ival), 0, newSVOP(OP_CONST, 0, newSViv(0)))
+                          : newOP((ps[(1) - (3)].val.ival), OPf_SPECIAL); ;}
     break;
 
   case 227:
-#line 1189 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
-
+#line 1191 "perly.y"
+    { (yyval.opval) = newUNOP((ps[(1) - (4)].val.ival), 0, (ps[(3) - (4)].val.opval)); ;}
     break;
 
   case 228:
-#line 1191 "perly.y" /* yacc.c:1646  */
+#line 1193 "perly.y"
     {
-			    if (   (ps[0].val.opval)->op_type != OP_TRANS
-			        && (ps[0].val.opval)->op_type != OP_TRANSR
-				&& (((PMOP*)(ps[0].val.opval))->op_pmflags & PMf_HAS_CV))
+			    if (   (ps[(1) - (1)].val.opval)->op_type != OP_TRANS
+			        && (ps[(1) - (1)].val.opval)->op_type != OP_TRANSR
+				&& (((PMOP*)(ps[(1) - (1)].val.opval))->op_pmflags & PMf_HAS_CV))
 			    {
 				(yyval.ival) = start_subparse(FALSE, CVf_ANON);
 				SAVEFREESV(PL_compcv);
 			    } else
 				(yyval.ival) = 0;
-			}
-
+			;}
     break;
 
   case 229:
-#line 1202 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); }
-
+#line 1204 "perly.y"
+    { (yyval.opval) = pmruntime((ps[(1) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), 1, (ps[(2) - (6)].val.ival)); ;}
     break;
 
   case 232:
-#line 1206 "perly.y" /* yacc.c:1646  */
+#line 1208 "perly.y"
     {
 			  (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
 				newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
-			}
-
+			;}
     break;
 
   case 234:
-#line 1215 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); }
-
+#line 1217 "perly.y"
+    { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval)); ;}
     break;
 
   case 235:
-#line 1217 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = localize((ps[0].val.opval),1); }
-
+#line 1219 "perly.y"
+    { (yyval.opval) = localize((ps[(2) - (2)].val.opval),1); ;}
     break;
 
   case 236:
-#line 1219 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); }
-
+#line 1221 "perly.y"
+    { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[(3) - (4)].val.opval),(ps[(4) - (4)].val.opval))); ;}
     break;
 
   case 237:
-#line 1224 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = sawparens((ps[-1].val.opval)); }
-
+#line 1226 "perly.y"
+    { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval)); ;}
     break;
 
   case 238:
-#line 1226 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = sawparens(newNULLLIST()); }
-
+#line 1228 "perly.y"
+    { (yyval.opval) = sawparens(newNULLLIST()); ;}
     break;
 
   case 239:
-#line 1229 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1231 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 240:
-#line 1231 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1233 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 241:
-#line 1233 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1235 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 242:
-#line 1238 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 1240 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 243:
-#line 1240 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1242 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 244:
-#line 1244 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 1246 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 245:
-#line 1246 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1248 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 246:
-#line 1250 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (OP*)NULL; }
-
+#line 1252 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 247:
-#line 1252 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1254 "perly.y"
+    { (yyval.opval) = (ps[(2) - (2)].val.opval); ;}
     break;
 
   case 248:
-#line 1258 "perly.y" /* yacc.c:1646  */
-    { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
-
+#line 1260 "perly.y"
+    { parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
     break;
 
   case 256:
-#line 1275 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); }
-
+#line 1277 "perly.y"
+    { (yyval.opval) = newCVREF((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 257:
-#line 1279 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newSVREF((ps[0].val.opval)); }
-
+#line 1281 "perly.y"
+    { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 258:
-#line 1283 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newAVREF((ps[0].val.opval));
-			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
-			}
-
+#line 1285 "perly.y"
+    { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
+			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[(1) - (2)].val.ival);
+			;}
     break;
 
   case 259:
-#line 1289 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newHVREF((ps[0].val.opval));
-			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
-			}
-
+#line 1291 "perly.y"
+    { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
+			  if ((yyval.opval)) (yyval.opval)->op_private |= (ps[(1) - (2)].val.ival);
+			;}
     break;
 
   case 260:
-#line 1295 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newAVREF((ps[0].val.opval)); }
-
+#line 1297 "perly.y"
+    { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 261:
-#line 1297 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
-
+#line 1299 "perly.y"
+    { (yyval.opval) = newAVREF((ps[(1) - (4)].val.opval)); ;}
     break;
 
   case 262:
-#line 1301 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); }
-
+#line 1303 "perly.y"
+    { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 264:
-#line 1306 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newAVREF((ps[-2].val.opval)); }
-
+#line 1308 "perly.y"
+    { (yyval.opval) = newAVREF((ps[(1) - (3)].val.opval)); ;}
     break;
 
   case 266:
-#line 1311 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newHVREF((ps[-2].val.opval)); }
-
+#line 1313 "perly.y"
+    { (yyval.opval) = newHVREF((ps[(1) - (3)].val.opval)); ;}
     break;
 
   case 268:
-#line 1316 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); }
-
+#line 1318 "perly.y"
+    { (yyval.opval) = newGVREF(0,(ps[(1) - (3)].val.opval)); ;}
     break;
 
   case 269:
-#line 1321 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = scalar((ps[0].val.opval)); }
-
+#line 1323 "perly.y"
+    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
     break;
 
   case 270:
-#line 1323 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = scalar((ps[0].val.opval)); }
-
+#line 1325 "perly.y"
+    { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
     break;
 
   case 271:
-#line 1325 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = op_scope((ps[0].val.opval)); }
-
+#line 1327 "perly.y"
+    { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;}
     break;
 
   case 272:
-#line 1328 "perly.y" /* yacc.c:1646  */
-    { (yyval.opval) = (ps[0].val.opval); }
-
+#line 1330 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
 
+/* Line 1267 of yacc.c.  */
 
       default: break;
     
 
 /* Generated from:
- * 1a8fc0f841dee6e563463a6b91bf9c410b47437c760f485a16d87ade3d66bf1d perly.y
+ * b1f32b9f6f7c53d22517de00b5b5bfe4dd9d657c8573b9ea9eab7a43e852850a perly.y
  * 3e1dff60f26df8933d7aed0c0e87177a0f022c14800c0707eb62a7db4196ac98 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.h b/perly.h
index b6d3a3d..daab1f9 100644
--- a/perly.h
+++ b/perly.h
@@ -4,19 +4,20 @@
    Any changes made here will be lost!
  */
 
-#define PERL_BISON_VERSION  30000
+#define PERL_BISON_VERSION  20003
 
 #ifdef PERL_CORE
-/* A Bison parser, made by GNU Bison 3.0.2.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Bison interface for Yacc-like parsers in C
+/* Skeleton interface for Bison's Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
 
-   This program is free software: you can redistribute it and/or modify
+   This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -24,7 +25,9 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -39,103 +42,179 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
+/* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-  enum yytokentype
-  {
-    GRAMPROG = 258,
-    GRAMEXPR = 259,
-    GRAMBLOCK = 260,
-    GRAMBARESTMT = 261,
-    GRAMFULLSTMT = 262,
-    GRAMSTMTSEQ = 263,
-    BAREWORD = 264,
-    METHOD = 265,
-    FUNCMETH = 266,
-    THING = 267,
-    PMFUNC = 268,
-    PRIVATEREF = 269,
-    QWLIST = 270,
-    FUNC0OP = 271,
-    FUNC0SUB = 272,
-    UNIOPSUB = 273,
-    LSTOPSUB = 274,
-    PLUGEXPR = 275,
-    PLUGSTMT = 276,
-    LABEL = 277,
-    FORMAT = 278,
-    SUB = 279,
-    ANONSUB = 280,
-    PACKAGE = 281,
-    USE = 282,
-    WHILE = 283,
-    UNTIL = 284,
-    IF = 285,
-    UNLESS = 286,
-    ELSE = 287,
-    ELSIF = 288,
-    CONTINUE = 289,
-    FOR = 290,
-    GIVEN = 291,
-    WHEN = 292,
-    DEFAULT = 293,
-    LOOPEX = 294,
-    DOTDOT = 295,
-    YADAYADA = 296,
-    FUNC0 = 297,
-    FUNC1 = 298,
-    FUNC = 299,
-    UNIOP = 300,
-    LSTOP = 301,
-    RELOP = 302,
-    EQOP = 303,
-    MULOP = 304,
-    ADDOP = 305,
-    DOLSHARP = 306,
-    DO = 307,
-    HASHBRACK = 308,
-    NOAMP = 309,
-    LOCAL = 310,
-    MY = 311,
-    REQUIRE = 312,
-    COLONATTR = 313,
-    FORMLBRACK = 314,
-    FORMRBRACK = 315,
-    PREC_LOW = 316,
-    OROP = 317,
-    DOROP = 318,
-    ANDOP = 319,
-    NOTOP = 320,
-    ASSIGNOP = 321,
-    OROR = 322,
-    DORDOR = 323,
-    ANDAND = 324,
-    BITOROP = 325,
-    BITANDOP = 326,
-    SHIFTOP = 327,
-    MATCHOP = 328,
-    UMINUS = 329,
-    REFGEN = 330,
-    POWOP = 331,
-    PREINC = 332,
-    PREDEC = 333,
-    POSTINC = 334,
-    POSTDEC = 335,
-    POSTJOIN = 336,
-    ARROW = 337
-  };
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     GRAMPROG = 258,
+     GRAMEXPR = 259,
+     GRAMBLOCK = 260,
+     GRAMBARESTMT = 261,
+     GRAMFULLSTMT = 262,
+     GRAMSTMTSEQ = 263,
+     BAREWORD = 264,
+     METHOD = 265,
+     FUNCMETH = 266,
+     THING = 267,
+     PMFUNC = 268,
+     PRIVATEREF = 269,
+     QWLIST = 270,
+     FUNC0OP = 271,
+     FUNC0SUB = 272,
+     UNIOPSUB = 273,
+     LSTOPSUB = 274,
+     PLUGEXPR = 275,
+     PLUGSTMT = 276,
+     LABEL = 277,
+     FORMAT = 278,
+     SUB = 279,
+     ANONSUB = 280,
+     PACKAGE = 281,
+     USE = 282,
+     WHILE = 283,
+     UNTIL = 284,
+     IF = 285,
+     UNLESS = 286,
+     ELSE = 287,
+     ELSIF = 288,
+     CONTINUE = 289,
+     FOR = 290,
+     GIVEN = 291,
+     WHEN = 292,
+     DEFAULT = 293,
+     LOOPEX = 294,
+     DOTDOT = 295,
+     YADAYADA = 296,
+     FUNC0 = 297,
+     FUNC1 = 298,
+     FUNC = 299,
+     UNIOP = 300,
+     LSTOP = 301,
+     RELOP = 302,
+     EQOP = 303,
+     MULOP = 304,
+     ADDOP = 305,
+     DOLSHARP = 306,
+     DO = 307,
+     HASHBRACK = 308,
+     NOAMP = 309,
+     LOCAL = 310,
+     MY = 311,
+     REQUIRE = 312,
+     COLONATTR = 313,
+     FORMLBRACK = 314,
+     FORMRBRACK = 315,
+     PREC_LOW = 316,
+     DOROP = 317,
+     OROP = 318,
+     ANDOP = 319,
+     NOTOP = 320,
+     ASSIGNOP = 321,
+     DORDOR = 322,
+     OROR = 323,
+     ANDAND = 324,
+     BITOROP = 325,
+     BITANDOP = 326,
+     SHIFTOP = 327,
+     MATCHOP = 328,
+     REFGEN = 329,
+     UMINUS = 330,
+     POWOP = 331,
+     POSTJOIN = 332,
+     POSTDEC = 333,
+     POSTINC = 334,
+     PREDEC = 335,
+     PREINC = 336,
+     ARROW = 337
+   };
 #endif
+/* Tokens.  */
+#define GRAMPROG 258
+#define GRAMEXPR 259
+#define GRAMBLOCK 260
+#define GRAMBARESTMT 261
+#define GRAMFULLSTMT 262
+#define GRAMSTMTSEQ 263
+#define BAREWORD 264
+#define METHOD 265
+#define FUNCMETH 266
+#define THING 267
+#define PMFUNC 268
+#define PRIVATEREF 269
+#define QWLIST 270
+#define FUNC0OP 271
+#define FUNC0SUB 272
+#define UNIOPSUB 273
+#define LSTOPSUB 274
+#define PLUGEXPR 275
+#define PLUGSTMT 276
+#define LABEL 277
+#define FORMAT 278
+#define SUB 279
+#define ANONSUB 280
+#define PACKAGE 281
+#define USE 282
+#define WHILE 283
+#define UNTIL 284
+#define IF 285
+#define UNLESS 286
+#define ELSE 287
+#define ELSIF 288
+#define CONTINUE 289
+#define FOR 290
+#define GIVEN 291
+#define WHEN 292
+#define DEFAULT 293
+#define LOOPEX 294
+#define DOTDOT 295
+#define YADAYADA 296
+#define FUNC0 297
+#define FUNC1 298
+#define FUNC 299
+#define UNIOP 300
+#define LSTOP 301
+#define RELOP 302
+#define EQOP 303
+#define MULOP 304
+#define ADDOP 305
+#define DOLSHARP 306
+#define DO 307
+#define HASHBRACK 308
+#define NOAMP 309
+#define LOCAL 310
+#define MY 311
+#define REQUIRE 312
+#define COLONATTR 313
+#define FORMLBRACK 314
+#define FORMRBRACK 315
+#define PREC_LOW 316
+#define DOROP 317
+#define OROP 318
+#define ANDOP 319
+#define NOTOP 320
+#define ASSIGNOP 321
+#define DORDOR 322
+#define OROR 323
+#define ANDAND 324
+#define BITOROP 325
+#define BITANDOP 326
+#define SHIFTOP 327
+#define MATCHOP 328
+#define REFGEN 329
+#define UMINUS 330
+#define POWOP 331
+#define POSTJOIN 332
+#define POSTDEC 333
+#define POSTINC 334
+#define PREDEC 335
+#define PREINC 336
+#define ARROW 337
+
+
+
 
-/* Value type.  */
 #ifdef PERL_IN_TOKE_C
 static bool
 S_is_opval_token(int type) {
@@ -160,27 +239,25 @@ S_is_opval_token(int type) {
 #endif /* PERL_IN_TOKE_C */
 #endif /* PERL_CORE */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE YYSTYPE;
-union YYSTYPE
+typedef union YYSTYPE
 {
-
     I32	ival; /* __DEFAULT__ (marker for regen_perly.pl;
 				must always be 1st union member) */
     char *pval;
     OP *opval;
     GV *gvval;
-
-};
-# define YYSTYPE_IS_TRIVIAL 1
+}
+/* Line 1529 of yacc.c.  */
+	YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
-int yyparse (void);
-
 
 /* Generated from:
- * 1a8fc0f841dee6e563463a6b91bf9c410b47437c760f485a16d87ade3d66bf1d perly.y
+ * b1f32b9f6f7c53d22517de00b5b5bfe4dd9d657c8573b9ea9eab7a43e852850a perly.y
  * 3e1dff60f26df8933d7aed0c0e87177a0f022c14800c0707eb62a7db4196ac98 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.tab b/perly.tab
index ed00142..43b6e0e 100644
--- a/perly.tab
+++ b/perly.tab
@@ -6,7 +6,7 @@
 
 #define YYFINAL  14
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   3085
+#define YYLAST   3099
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  105
@@ -14,19 +14,17 @@
 #define YYNNTS  86
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  272
-/* YYNSTATES -- Number of states.  */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  539
 
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   337
 
-#define YYTRANSLATE(YYX)                                                \
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -66,7 +64,140 @@ static const yytype_uint8 yytranslate[] =
 };
 
 #if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint16 yyprhs[] =
+{
+       0,     0,     3,     4,     9,    10,    14,    15,    19,    20,
+      24,    25,    29,    30,    34,    39,    47,    48,    53,    54,
+      55,    58,    59,    62,    64,    66,    69,    72,    74,    79,
+      80,    88,    89,   100,   105,   106,   114,   122,   130,   137,
+     144,   147,   156,   165,   166,   167,   181,   191,   200,   201,
+     212,   222,   230,   233,   234,   243,   246,   248,   251,   252,
+     256,   258,   260,   264,   268,   272,   276,   280,   284,   285,
+     288,   295,   296,   299,   300,   301,   303,   304,   306,   308,
+     310,   312,   314,   315,   316,   317,   318,   320,   322,   323,
+     325,   326,   329,   331,   334,   336,   337,   339,   341,   343,
+     347,   348,   350,   353,   357,   359,   361,   364,   368,   370,
+     371,   373,   374,   379,   381,   383,   387,   391,   395,   397,
+     400,   404,   406,   410,   416,   423,   427,   431,   437,   440,
+     445,   446,   452,   454,   456,   462,   467,   473,   478,   484,
+     491,   497,   502,   508,   513,   517,   524,   529,   535,   539,
+     543,   547,   551,   555,   559,   563,   567,   571,   575,   579,
+     583,   587,   591,   594,   597,   600,   603,   606,   609,   612,
+     615,   618,   622,   625,   630,   634,   640,   649,   652,   655,
+     657,   659,   661,   663,   669,   672,   676,   678,   681,   685,
+     687,   690,   692,   694,   696,   698,   700,   702,   707,   712,
+     718,   724,   726,   728,   732,   737,   741,   746,   751,   756,
+     761,   766,   768,   771,   774,   776,   779,   782,   784,   787,
+     789,   792,   794,   798,   800,   804,   806,   810,   815,   816,
+     823,   825,   827,   829,   831,   835,   838,   843,   847,   850,
+     852,   854,   856,   857,   859,   860,   862,   863,   866,   868,
+     870,   872,   874,   876,   878,   881,   884,   887,   890,   893,
+     896,   899,   904,   907,   909,   913,   915,   919,   921,   925,
+     927,   929,   931
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
+{
+     106,     0,    -1,    -1,     3,   107,   115,   118,    -1,    -1,
+       4,   108,   175,    -1,    -1,     5,   109,   113,    -1,    -1,
+       6,   110,   122,    -1,    -1,     7,   111,   120,    -1,    -1,
+       8,   112,   118,    -1,     9,   115,   118,    10,    -1,    18,
+     115,   101,    71,   119,   101,    19,    -1,    -1,     9,   117,
+     118,    10,    -1,    -1,    -1,   118,   120,    -1,    -1,   119,
+     130,    -1,   122,    -1,   121,    -1,    33,   122,    -1,    33,
+     121,    -1,    32,    -1,    34,   144,   141,   114,    -1,    -1,
+      35,   145,   142,   123,   146,   147,   159,    -1,    -1,    35,
+     145,   142,   124,   115,   157,   147,     9,   118,    10,    -1,
+      37,    20,    20,   101,    -1,    -1,    38,   142,   125,    20,
+      20,   174,   101,    -1,    41,   100,   115,   139,    99,   116,
+     133,    -1,    42,   100,   115,   139,    99,   116,   133,    -1,
+      47,   100,   115,   139,    99,   116,    -1,    48,   100,   115,
+     139,    99,   116,    -1,    49,   113,    -1,    39,   100,   115,
+     137,    99,   135,   116,   134,    -1,    40,   100,   115,   138,
+      99,   135,   116,   134,    -1,    -1,    -1,    46,   100,   115,
+     140,   101,   126,   137,   101,   127,   135,   140,    99,   116,
+      -1,    46,    67,   115,   177,   100,   139,    99,   116,   134,
+      -1,    46,   182,   100,   115,   139,    99,   116,   134,    -1,
+      -1,    46,   180,   115,   178,   128,   100,   139,    99,   116,
+     134,    -1,    46,    90,   179,   100,   115,   139,    99,   116,
+     134,    -1,    46,   100,   115,   139,    99,   116,   134,    -1,
+     113,   134,    -1,    -1,    37,    20,    20,     9,   115,   129,
+     118,    10,    -1,   132,   101,    -1,   101,    -1,    23,   131,
+      -1,    -1,    70,   118,    71,    -1,     1,    -1,   160,    -1,
+     160,    41,   160,    -1,   160,    42,   160,    -1,   160,    39,
+     160,    -1,   160,    40,   138,    -1,   160,    46,   160,    -1,
+     160,    48,   160,    -1,    -1,    43,   116,    -1,    44,   100,
+     139,    99,   116,   133,    -1,    -1,    45,   113,    -1,    -1,
+      -1,   132,    -1,    -1,   160,    -1,   160,    -1,   160,    -1,
+     136,    -1,    20,    -1,    -1,    -1,    -1,    -1,    20,    -1,
+      25,    -1,    -1,    23,    -1,    -1,    69,    23,    -1,    69,
+      -1,    69,    23,    -1,    69,    -1,    -1,    25,    -1,    15,
+      -1,    16,    -1,   150,   149,   152,    -1,    -1,    78,    -1,
+      78,   170,    -1,   102,   149,   152,    -1,   153,    -1,   151,
+      -1,   155,    77,    -1,   155,    77,   154,    -1,   154,    -1,
+      -1,   155,    -1,    -1,   100,   158,   156,    99,    -1,   113,
+      -1,   101,    -1,   160,    75,   160,    -1,   160,    74,   160,
+      -1,   160,    73,   160,    -1,   161,    -1,   161,    77,    -1,
+     161,    77,   170,    -1,   170,    -1,    57,   190,   161,    -1,
+      55,   100,   190,   160,    99,    -1,   170,    98,   164,   100,
+     175,    99,    -1,   170,    98,   164,    -1,    21,   190,   174,
+      -1,    22,   190,   100,   175,    99,    -1,    57,   174,    -1,
+      55,   100,   175,    99,    -1,    -1,    30,   143,   113,   163,
+     174,    -1,    21,    -1,   182,    -1,   189,     9,   160,   101,
+      10,    -1,   182,    11,   160,    12,    -1,   170,    98,    11,
+     160,    12,    -1,   165,    11,   160,    12,    -1,   182,     9,
+     160,   101,    10,    -1,   170,    98,     9,   160,   101,    10,
+      -1,   165,     9,   160,   101,    10,    -1,   170,    98,   100,
+      99,    -1,   170,    98,   100,   160,    99,    -1,   165,   100,
+     160,    99,    -1,   165,   100,    99,    -1,   100,   160,    99,
+      11,   160,    12,    -1,    26,    11,   160,    12,    -1,   100,
+      99,    11,   160,    12,    -1,   170,    78,   170,    -1,   170,
+      92,   170,    -1,   170,    60,   170,    -1,   170,    61,   170,
+      -1,   170,    86,   170,    -1,   170,    58,   170,    -1,   170,
+      59,   170,    -1,   170,    85,   170,    -1,   170,    84,   170,
+      -1,   170,    51,   170,    -1,   170,    83,   170,    -1,   170,
+      82,   170,    -1,   170,    81,   170,    -1,   170,    87,   170,
+      -1,    13,   170,    -1,    14,   170,    -1,    88,   170,    -1,
+      89,   170,    -1,   170,    95,    -1,   170,    94,    -1,   170,
+      93,    -1,    97,   170,    -1,    96,   170,    -1,    11,   160,
+      12,    -1,    11,    12,    -1,    64,   160,   101,    10,    -1,
+      64,   101,    10,    -1,    36,   143,   146,   147,   113,    -1,
+      36,   143,   115,   157,   147,     9,   118,    10,    -1,    63,
+     170,    -1,    63,   113,    -1,   166,    -1,   167,    -1,   168,
+      -1,   169,    -1,   170,    79,   170,    80,   170,    -1,    90,
+     170,    -1,    67,    90,   170,    -1,   172,    -1,    66,   170,
+      -1,   100,   160,    99,    -1,    26,    -1,   100,    99,    -1,
+     182,    -1,   186,    -1,   184,    -1,   183,    -1,   185,    -1,
+     165,    -1,   187,    11,   160,    12,    -1,   188,    11,   160,
+      12,    -1,   187,     9,   160,   101,    10,    -1,   188,     9,
+     160,   101,    10,    -1,    23,    -1,   181,    -1,   181,   100,
+      99,    -1,   181,   100,   160,    99,    -1,    65,   145,   174,
+      -1,   170,    98,   102,   103,    -1,   170,    98,    15,   103,
+      -1,   170,    98,    16,   103,    -1,   170,    98,    17,   103,
+      -1,   170,    98,   103,   103,    -1,    50,    -1,    50,   170,
+      -1,    76,   161,    -1,    56,    -1,    56,   113,    -1,    56,
+     170,    -1,    68,    -1,    68,   170,    -1,    29,    -1,    29,
+     170,    -1,    53,    -1,    53,   100,    99,    -1,    27,    -1,
+      27,   100,    99,    -1,    28,    -1,    54,   100,    99,    -1,
+      54,   100,   160,    99,    -1,    -1,    24,   171,   100,   161,
+     176,    99,    -1,    20,    -1,   162,    -1,    52,    -1,    31,
+      -1,    67,   173,   148,    -1,    67,   173,    -1,    67,    90,
+     173,   148,    -1,   100,   160,    99,    -1,   100,    99,    -1,
+     182,    -1,   184,    -1,   183,    -1,    -1,   161,    -1,    -1,
+     160,    -1,    -1,   104,   160,    -1,   182,    -1,   182,    -1,
+     183,    -1,   184,    -1,   178,    -1,   181,    -1,    67,    90,
+      -1,    90,    67,    -1,    17,   190,    -1,   102,   190,    -1,
+      15,   190,    -1,    16,   190,    -1,    62,   190,    -1,   170,
+      98,    62,   103,    -1,   103,   190,    -1,   183,    -1,   170,
+      98,    15,    -1,   184,    -1,   170,    98,    16,    -1,   186,
+      -1,   170,    98,   103,    -1,    20,    -1,   182,    -1,   113,
+      -1,    25,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,   118,   118,   117,   128,   127,   137,   136,   149,   148,
@@ -80,27 +211,27 @@ static const yytype_uint16 yyrline[] =
      583,   587,   588,   592,   598,   603,   608,   609,   614,   615,
      620,   621,   623,   628,   630,   642,   643,   648,   650,   654,
      674,   675,   677,   683,   748,   750,   756,   758,   762,   768,
-     769,   774,   773,   823,   824,   828,   830,   832,   834,   838,
-     840,   845,   849,   853,   857,   863,   868,   874,   880,   882,
-     885,   884,   895,   896,   900,   904,   907,   912,   917,   920,
-     924,   928,   931,   936,   940,   943,   945,   947,   952,   954,
-     956,   961,   963,   965,   967,   969,   971,   973,   975,   977,
-     979,   981,   986,   988,   991,   993,   995,   998,  1001,  1012,
-    1015,  1022,  1024,  1026,  1028,  1030,  1033,  1047,  1049,  1053,
-    1054,  1055,  1056,  1057,  1059,  1061,  1063,  1065,  1067,  1069,
-    1071,  1073,  1075,  1077,  1079,  1081,  1083,  1085,  1095,  1105,
-    1115,  1125,  1127,  1129,  1132,  1137,  1141,  1143,  1145,  1147,
-    1150,  1152,  1155,  1157,  1159,  1161,  1163,  1165,  1167,  1169,
-    1171,  1174,  1176,  1178,  1180,  1182,  1184,  1188,  1191,  1190,
-    1203,  1204,  1205,  1210,  1214,  1216,  1218,  1223,  1225,  1228,
-    1230,  1232,  1237,  1239,  1244,  1245,  1250,  1251,  1257,  1261,
-    1262,  1263,  1266,  1267,  1270,  1271,  1274,  1278,  1282,  1288,
-    1294,  1296,  1300,  1304,  1305,  1309,  1310,  1314,  1315,  1320,
-    1322,  1324,  1327
+     769,   774,   773,   825,   826,   830,   832,   834,   836,   840,
+     842,   847,   851,   855,   859,   865,   870,   876,   882,   884,
+     887,   886,   897,   898,   902,   906,   909,   914,   919,   922,
+     926,   930,   933,   938,   942,   945,   947,   949,   954,   956,
+     958,   963,   965,   967,   969,   971,   973,   975,   977,   979,
+     981,   983,   988,   990,   993,   995,   997,  1000,  1003,  1014,
+    1017,  1024,  1026,  1028,  1030,  1032,  1035,  1049,  1051,  1055,
+    1056,  1057,  1058,  1059,  1061,  1063,  1065,  1067,  1069,  1071,
+    1073,  1075,  1077,  1079,  1081,  1083,  1085,  1087,  1097,  1107,
+    1117,  1127,  1129,  1131,  1134,  1139,  1143,  1145,  1147,  1149,
+    1152,  1154,  1157,  1159,  1161,  1163,  1165,  1167,  1169,  1171,
+    1173,  1176,  1178,  1180,  1182,  1184,  1186,  1190,  1193,  1192,
+    1205,  1206,  1207,  1212,  1216,  1218,  1220,  1225,  1227,  1230,
+    1232,  1234,  1239,  1241,  1246,  1247,  1252,  1253,  1259,  1263,
+    1264,  1265,  1268,  1269,  1272,  1273,  1276,  1280,  1284,  1290,
+    1296,  1298,  1302,  1306,  1307,  1311,  1312,  1316,  1317,  1322,
+    1324,  1326,  1329
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || 0
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -115,31 +246,31 @@ static const char *const yytname[] =
   "DEFAULT", "LOOPEX", "DOTDOT", "YADAYADA", "FUNC0", "FUNC1", "FUNC",
   "UNIOP", "LSTOP", "RELOP", "EQOP", "MULOP", "ADDOP", "DOLSHARP", "DO",
   "HASHBRACK", "NOAMP", "LOCAL", "MY", "REQUIRE", "COLONATTR",
-  "FORMLBRACK", "FORMRBRACK", "PREC_LOW", "OROP", "DOROP", "ANDOP",
-  "NOTOP", "','", "ASSIGNOP", "'?'", "':'", "OROR", "DORDOR", "ANDAND",
-  "BITOROP", "BITANDOP", "SHIFTOP", "MATCHOP", "'!'", "'~'", "UMINUS",
-  "REFGEN", "POWOP", "PREINC", "PREDEC", "POSTINC", "POSTDEC", "POSTJOIN",
+  "FORMLBRACK", "FORMRBRACK", "PREC_LOW", "DOROP", "OROP", "ANDOP",
+  "NOTOP", "','", "ASSIGNOP", "'?'", "':'", "DORDOR", "OROR", "ANDAND",
+  "BITOROP", "BITANDOP", "SHIFTOP", "MATCHOP", "'!'", "'~'", "REFGEN",
+  "UMINUS", "POWOP", "POSTJOIN", "POSTDEC", "POSTINC", "PREDEC", "PREINC",
   "ARROW", "')'", "'('", "';'", "'$'", "'*'", "'/'", "$accept", "grammar",
-  "$@1", "$@2", "$@3", "$@4", "$@5", "$@6", "block", "formblock",
-  "remember", "mblock", "mremember", "stmtseq", "formstmtseq", "fullstmt",
-  "labfullstmt", "barestmt", "$@7", "$@8", "$@9", "$@10", "$@11", "@12",
-  "$@13", "formline", "formarg", "sideff", "else", "cont", "mintro",
-  "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "formname", "startsub",
+  "@1", "@2", "@3", "@4", "@5", "@6", "block", "formblock", "remember",
+  "mblock", "mremember", "stmtseq", "formstmtseq", "fullstmt",
+  "labfullstmt", "barestmt", "@7", "@8", "@9", "@10", "@11", "@12", "@13",
+  "formline", "formarg", "sideff", "else", "cont", "mintro", "nexpr",
+  "texpr", "iexpr", "mexpr", "mnexpr", "formname", "startsub",
   "startanonsub", "startformsub", "subname", "proto", "subattrlist",
   "myattrlist", "sigvarname", "sigslurpsigil", "sigslurpelem",
   "sigdefault", "sigscalarelem", "sigelem", "siglist", "siglistornull",
-  "subsignature", "$@14", "optsubbody", "expr", "listexpr", "listop",
-  "@15", "method", "subscripted", "termbinop", "termunop", "anonymous",
-  "termdo", "term", "@16", "myattrterm", "myterm", "optlistexpr",
-  "optexpr", "optrepl", "my_scalar", "my_var", "refgen_topic", "my_refgen",
-  "amper", "scalar", "ary", "hsh", "arylen", "star", "sliceme", "kvslice",
-  "gelem", "indirob", YY_NULLPTR
+  "subsignature", "@14", "optsubbody", "expr", "listexpr", "listop", "@15",
+  "method", "subscripted", "termbinop", "termunop", "anonymous", "termdo",
+  "term", "@16", "myattrterm", "myterm", "optlistexpr", "optexpr",
+  "optrepl", "my_scalar", "my_var", "refgen_topic", "my_refgen", "amper",
+  "scalar", "ary", "hsh", "arylen", "star", "sliceme", "kvslice", "gelem",
+  "indirob", 0
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   123,
@@ -156,79 +287,75 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
-#define YYPACT_NINF -440
-
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-440)))
-
-#define YYTABLE_NINF -268
-
-#define yytable_value_is_error(Yytable_value) \
-  (!!((Yytable_value) == (-268)))
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,   105,   107,   106,   108,   106,   109,   106,   110,   106,
+     111,   106,   112,   106,   113,   114,   115,   116,   117,   118,
+     118,   119,   119,   120,   120,   121,   121,   122,   122,   123,
+     122,   124,   122,   122,   125,   122,   122,   122,   122,   122,
+     122,   122,   122,   126,   127,   122,   122,   122,   128,   122,
+     122,   122,   122,   129,   122,   122,   122,   130,   131,   131,
+     132,   132,   132,   132,   132,   132,   132,   132,   133,   133,
+     133,   134,   134,   135,   136,   136,   137,   137,   138,   139,
+     140,   141,   141,   142,   143,   144,   145,   145,   146,   146,
+     147,   147,   147,   148,   148,   149,   149,   150,   150,   151,
+     152,   152,   152,   153,   154,   154,   155,   155,   155,   156,
+     156,   158,   157,   159,   159,   160,   160,   160,   160,   161,
+     161,   161,   162,   162,   162,   162,   162,   162,   162,   162,
+     163,   162,   164,   164,   165,   165,   165,   165,   165,   165,
+     165,   165,   165,   165,   165,   165,   165,   165,   166,   166,
+     166,   166,   166,   166,   166,   166,   166,   166,   166,   166,
+     166,   166,   167,   167,   167,   167,   167,   167,   167,   167,
+     167,   168,   168,   168,   168,   168,   168,   169,   169,   170,
+     170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
+     170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
+     170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
+     170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
+     170,   170,   170,   170,   170,   170,   170,   170,   171,   170,
+     170,   170,   170,   170,   172,   172,   172,   173,   173,   173,
+     173,   173,   174,   174,   175,   175,   176,   176,   177,   178,
+     178,   178,   179,   179,   180,   180,   181,   182,   183,   184,
+     185,   185,   186,   187,   187,   188,   188,   189,   189,   190,
+     190,   190,   190
+};
 
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int16 yypact[] =
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
 {
-     824,  -440,  -440,  -440,  -440,  -440,  -440,    21,  -440,  2826,
-      44,  1518,  1423,  -440,  -440,  -440,  1989,  2826,  2826,    60,
-      60,    60,  -440,    60,    60,  -440,  -440,     8,   -68,  -440,
-    2826,  -440,  -440,  -440,  2826,  -440,   -46,   -29,   -18,  1896,
-    1801,    60,  1896,  2082,    16,  2826,   137,  2826,  2826,  2826,
-    2826,  2826,  2826,  2826,  2175,    60,    60,   170,    36,  -440,
-       7,  -440,  -440,  -440,  -440,  2945,  -440,  -440,    17,   126,
-     209,   221,  -440,    89,   239,   266,   113,  -440,  -440,  -440,
-    -440,  -440,    16,   106,  -440,    29,    32,    57,    61,   149,
-      66,    70,    44,  -440,   102,  -440,   116,   325,  1423,  -440,
-    -440,  -440,   663,   758,  -440,   195,   442,   442,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  2826,    73,   122,  2826,   127,
-     318,    44,    -8,  2945,   142,  2268,  1801,  -440,   318,   561,
-      36,  -440,   485,  2826,  -440,  -440,   318,   215,    90,  -440,
-    -440,  2826,   318,  2919,  2361,   186,  -440,  -440,  -440,   318,
-      36,   442,   442,   442,   535,   535,   252,   256,  -440,  -440,
-    2826,  2826,  2826,  2826,  2826,  2826,  2454,  2826,  2826,  2826,
-    2826,  2826,  2826,  2826,  2826,  2826,  2826,  2826,  2826,  2826,
-    2826,  2826,  -440,  -440,  -440,    72,  2547,  2826,  2826,  2826,
-    2826,  2826,  2826,  2826,  -440,   244,  -440,   260,  -440,  -440,
-    -440,  -440,  -440,   190,    23,  -440,  -440,   184,  -440,  -440,
-    -440,    44,  -440,  -440,  2826,  2826,  2826,  2826,  2826,  2826,
-    -440,  -440,  -440,  -440,  -440,  2826,  2826,   217,  -440,  -440,
-    -440,   194,   227,  -440,  -440,   295,   187,  2826,    36,  -440,
-     296,  -440,  2640,   442,   186,    47,    52,    75,  -440,   309,
-     284,  -440,  2826,   301,   251,   251,  -440,  2945,   160,   230,
-    -440,   455,  1600,   518,  1879,   498,   646,  2945,   369,  1692,
-    1692,   419,  1786,  1972,   531,   442,   442,  2826,  2826,   224,
-     229,   231,  -440,   232,  2733,    48,   243,   274,  -440,  -440,
-     475,   192,   235,   370,   246,   399,   250,   408,   853,  -440,
-     338,   290,    -2,   355,  2826,  2826,  2826,  2826,  -440,   299,
-    -440,  -440,   297,  -440,  -440,  -440,  -440,  1612,    31,  -440,
-    2826,  2826,  -440,   170,  -440,   170,   170,   170,   170,   170,
-     303,    19,  -440,  2826,  -440,   227,   380,    44,  -440,  -440,
-     576,  -440,    98,   648,  -440,  -440,  -440,   264,  2826,   402,
-    -440,  -440,  2826,   418,   270,  -440,  -440,  -440,  -440,  -440,
-     661,  -440,  -440,  2826,  -440,   409,  -440,   412,  -440,   415,
-    -440,   416,  -440,  -440,  -440,   386,  -440,  -440,  -440,   411,
-     333,   170,   336,   337,   170,   339,   341,  -440,  -440,  -440,
-    -440,   340,   345,   312,  -440,  2826,   358,   359,  -440,  2826,
-     363,  -440,   112,   459,  -440,  -440,  -440,   107,  -440,   275,
-    -440,  2987,   465,  -440,  -440,   377,  -440,  -440,  -440,  -440,
-     368,   227,   194,  -440,  2826,  -440,  -440,   477,   477,  2826,
-    2826,   477,  -440,   384,   389,   477,   477,   170,  -440,  -440,
-    -440,   464,   464,  -440,  -440,  -440,   413,   396,  -440,  -440,
-    -440,  -440,   427,     5,   227,  -440,   398,   477,   477,  -440,
-     134,   134,   414,   421,   102,  2826,  2826,   477,  -440,  -440,
-    -440,   423,   423,   112,  -440,   948,  -440,  -440,  -440,  -440,
-     499,  1043,  -440,   102,   102,  -440,   477,   407,  -440,  -440,
-     477,   477,  -440,   422,   433,   102,  2826,  -440,  -440,  -440,
-    -440,     3,  -440,  -440,  -440,  -440,  1138,  -440,  2826,   102,
-     102,  -440,   477,  -440,  2945,   452,   493,  -440,  1233,  -440,
-     436,  -440,  -440,  -440,   102,  -440,  -440,  -440,  -440,   477,
-    1706,  -440,  1328,   134,   448,  -440,  -440,   477,  -440
+       0,     2,     0,     4,     0,     3,     0,     3,     0,     3,
+       0,     3,     0,     3,     4,     7,     0,     4,     0,     0,
+       2,     0,     2,     1,     1,     2,     2,     1,     4,     0,
+       7,     0,    10,     4,     0,     7,     7,     7,     6,     6,
+       2,     8,     8,     0,     0,    13,     9,     8,     0,    10,
+       9,     7,     2,     0,     8,     2,     1,     2,     0,     3,
+       1,     1,     3,     3,     3,     3,     3,     3,     0,     2,
+       6,     0,     2,     0,     0,     1,     0,     1,     1,     1,
+       1,     1,     0,     0,     0,     0,     1,     1,     0,     1,
+       0,     2,     1,     2,     1,     0,     1,     1,     1,     3,
+       0,     1,     2,     3,     1,     1,     2,     3,     1,     0,
+       1,     0,     4,     1,     1,     3,     3,     3,     1,     2,
+       3,     1,     3,     5,     6,     3,     3,     5,     2,     4,
+       0,     5,     1,     1,     5,     4,     5,     4,     5,     6,
+       5,     4,     5,     4,     3,     6,     4,     5,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       3,     3,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     3,     2,     4,     3,     5,     8,     2,     2,     1,
+       1,     1,     1,     5,     2,     3,     1,     2,     3,     1,
+       2,     1,     1,     1,     1,     1,     1,     4,     4,     5,
+       5,     1,     1,     3,     4,     3,     4,     4,     4,     4,
+       4,     1,     2,     2,     1,     2,     2,     1,     2,     1,
+       2,     1,     3,     1,     3,     1,     3,     4,     0,     6,
+       1,     1,     1,     1,     3,     2,     4,     3,     2,     1,
+       1,     1,     0,     1,     0,     1,     0,     2,     1,     1,
+       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
+       2,     4,     2,     1,     3,     1,     3,     1,     3,     1,
+       1,     1,     1
 };
 
-  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-     Performed when YYTABLE does not specify something else to do.  Zero
-     means the default is an error.  */
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
        0,     2,     4,     6,     8,    10,    12,     0,    16,   244,
@@ -246,19 +373,19 @@ static const yytype_uint16 yydefact[] =
      220,     0,    88,   212,     0,     0,   244,   215,   216,   269,
      243,   128,   270,     0,   260,   178,   177,     0,     0,    86,
       87,   242,   187,     0,     0,   235,   239,   241,   240,   218,
-     213,   164,   165,   184,   169,   170,   190,     0,   257,   262,
+     213,   164,   165,   184,   170,   169,   190,     0,   257,   262,
        0,     0,     0,   119,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   166,   167,   168,     0,     0,     0,     0,     0,
+       0,     0,   168,   167,   166,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    19,    82,    83,     0,    34,    16,
       16,    16,    16,    16,     0,    16,    16,     0,    16,    16,
       40,     0,    52,    55,     0,     0,     0,     0,     0,     0,
       26,    25,    20,   171,   126,   244,     0,     0,   224,   130,
       89,     0,    90,   222,   226,     0,     0,     0,   122,   174,
        0,   205,     0,   185,     0,   191,   194,   193,   238,     0,
-      94,   234,     0,   188,   116,   117,   115,   120,     0,     0,
-     144,     0,   157,   153,   154,   150,   151,   148,     0,   159,
-     160,   158,   156,   155,   152,   161,   149,     0,     0,   264,
+      94,   234,     0,   188,   117,   116,   115,   120,     0,     0,
+     144,     0,   157,   153,   154,   150,   151,   148,     0,   160,
+     159,   158,   156,   155,   152,   161,   149,     0,     0,   264,
      266,     0,   132,     0,     0,     0,   268,   125,   133,   203,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    81,
        0,    29,     0,     0,    76,     0,     0,     0,   254,     0,
@@ -287,21 +414,7 @@ static const yytype_uint16 yydefact[] =
        0,    49,     0,    68,     0,    59,    70,     0,    45
 };
 
-  /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,    10,  -440,
-     -60,   -95,  -440,   -15,  -440,   529,   454,    -3,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -315,  -439,  -103,
-    -420,  -440,    88,   282,  -206,    26,  -440,   361,   522,  -440,
-     506,   200,  -330,   353,   156,  -440,  -440,   136,  -440,   133,
-    -440,  -440,   177,  -440,  -440,    -6,   -36,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,    25,  -440,  -440,   468,  -106,
-    -125,  -440,  -440,   306,  -440,  -440,   450,   233,   -35,   -33,
-    -440,  -440,  -440,  -440,  -440,     4
-};
-
-  /* YYDEFGOTO[NTERM-NUM].  */
+/* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,     7,     8,     9,    10,    11,    12,    13,    94,   374,
@@ -315,117 +428,204 @@ static const yytype_int16 yydefgoto[] =
       72,    73,    74,    75,    76,   158
 };
 
-  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -440
+static const yytype_int16 yypact[] =
+{
+     724,  -440,  -440,  -440,  -440,  -440,  -440,    19,  -440,  2837,
+      12,  1531,  1434,  -440,  -440,  -440,  2000,  2837,  2837,    60,
+      60,    60,  -440,    60,    60,  -440,  -440,    42,   -46,  -440,
+    2837,  -440,  -440,  -440,  2837,  -440,   -29,   -18,    -4,  1907,
+    1812,    60,  1907,  2093,    16,  2837,    23,  2837,  2837,  2837,
+    2837,  2837,  2837,  2837,  2186,    60,    60,   464,    32,  -440,
+       7,  -440,  -440,  -440,  -440,  2956,  -440,  -440,    22,   126,
+     152,   209,  -440,   120,   255,   266,   123,  -440,  -440,  -440,
+    -440,  -440,    16,   127,  -440,    57,    70,    73,    76,   165,
+      77,    91,    12,  -440,   107,  -440,   116,   474,  1434,  -440,
+    -440,  -440,   657,   755,  -440,   155,   198,   198,  -440,  -440,
+    -440,  -440,  -440,  -440,  -440,  2837,   122,   125,  2837,   138,
+     531,    12,    -8,  2956,   151,  2279,  1812,  -440,   531,   561,
+      32,  -440,   485,  2837,  -440,  -440,   531,   216,   160,  -440,
+    -440,  2837,   531,  2930,  2372,   180,  -440,  -440,  -440,   531,
+      32,   198,   198,   198,   150,   150,   252,   256,  -440,  -440,
+    2837,  2837,  2837,  2837,  2837,  2837,  2465,  2837,  2837,  2837,
+    2837,  2837,  2837,  2837,  2837,  2837,  2837,  2837,  2837,  2837,
+    2837,  2837,  -440,  -440,  -440,    72,  2558,  2837,  2837,  2837,
+    2837,  2837,  2837,  2837,  -440,   260,  -440,   261,  -440,  -440,
+    -440,  -440,  -440,   194,   149,  -440,  -440,   186,  -440,  -440,
+    -440,    12,  -440,  -440,  2837,  2837,  2837,  2837,  2837,  2837,
+    -440,  -440,  -440,  -440,  -440,  2837,  2837,   166,  -440,  -440,
+    -440,   187,   225,  -440,  -440,   293,   207,  2837,    32,  -440,
+     297,  -440,  2651,   198,   180,    47,    52,    75,  -440,   332,
+     289,  -440,  2837,   315,   257,   257,  -440,  2956,   296,   195,
+    -440,   354,  1612,  1985,   352,   501,   327,  2956,   397,  1703,
+    1703,  1797,   413,  1892,  1662,   198,   198,  2837,  2837,   224,
+     232,   243,  -440,   245,  2744,    48,   258,   278,  -440,  -440,
+     576,   300,   230,   325,   235,   329,   246,   392,   852,  -440,
+     342,   281,    -2,   344,  2837,  2837,  2837,  2837,  -440,   280,
+    -440,  -440,   286,  -440,  -440,  -440,  -440,  1624,    31,  -440,
+    2837,  2837,  -440,   464,  -440,   464,   464,   464,   464,   464,
+     291,    49,  -440,  2837,  -440,   225,   385,    12,  -440,  -440,
+     627,  -440,    21,   642,  -440,  -440,  -440,   250,  2837,   405,
+    -440,  -440,  2837,   455,   264,  -440,  -440,  -440,  -440,  -440,
+     662,  -440,  -440,  2837,  -440,   406,  -440,   422,  -440,   425,
+    -440,   426,  -440,  -440,  -440,   418,  -440,  -440,  -440,   423,
+     350,   464,   353,   355,   464,   362,   351,  -440,  -440,  -440,
+    -440,   363,   367,   310,  -440,  2837,   365,   370,  -440,  2837,
+     387,  -440,   112,   479,  -440,  -440,  -440,    29,  -440,   270,
+    -440,  3001,   491,  -440,  -440,   404,  -440,  -440,  -440,  -440,
+     403,   225,   187,  -440,  2837,  -440,  -440,   500,   500,  2837,
+    2837,   500,  -440,   412,   420,   500,   500,   464,  -440,  -440,
+    -440,   492,   492,  -440,  -440,  -440,   446,   433,  -440,  -440,
+    -440,  -440,   463,     5,   225,  -440,   434,   500,   500,  -440,
+      74,    74,   441,   442,   107,  2837,  2837,   500,  -440,  -440,
+    -440,   472,   472,   112,  -440,   949,  -440,  -440,  -440,  -440,
+     543,  1046,  -440,   107,   107,  -440,   500,   453,  -440,  -440,
+     500,   500,  -440,   454,   458,   107,  2837,  -440,  -440,  -440,
+    -440,     3,  -440,  -440,  -440,  -440,  1143,  -440,  2837,   107,
+     107,  -440,   500,  -440,  2956,   484,   555,  -440,  1240,  -440,
+     476,  -440,  -440,  -440,   107,  -440,  -440,  -440,  -440,   500,
+    1717,  -440,  1337,    74,   477,  -440,  -440,   500,  -440
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,    10,  -440,
+     -60,   -95,  -440,   -15,  -440,   569,   487,    -3,  -440,  -440,
+    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -315,  -439,  -130,
+    -420,  -440,   117,   282,  -206,    67,  -440,   394,   565,  -440,
+     522,   231,  -330,   361,   168,  -440,  -440,   136,  -440,   140,
+    -440,  -440,   189,  -440,  -440,    -6,   -36,  -440,  -440,  -440,
+    -440,  -440,  -440,  -440,  -440,    25,  -440,  -440,   471,  -106,
+    -125,  -440,  -440,   298,  -440,  -440,   411,   233,   -35,   -33,
+    -440,  -440,  -440,  -440,  -440,     4
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -268
 static const yytype_int16 yytable[] =
 {
      103,   236,   389,    57,   130,   403,   458,   377,    95,   224,
-     105,   147,   150,   148,    77,   230,   164,   194,   165,   118,
-      78,    14,   489,   112,   113,   114,   515,   115,   116,   110,
-     110,   110,   119,   110,   110,   241,   139,   138,    19,    20,
-      21,   140,   106,   107,   133,   134,    19,    20,   157,   127,
-     110,   110,   135,    77,   124,   120,   187,    77,   188,   123,
+     105,   147,   150,   148,    77,   230,   164,   194,   165,    14,
+      78,    77,   489,   112,   113,   114,   515,   115,   116,   110,
+     110,   110,   252,   110,   110,   241,   139,   138,    19,    20,
+     348,   140,   106,   107,   133,   134,    19,    20,   157,   127,
+     110,   110,   135,   118,   119,   120,   187,    77,   188,   123,
      159,  -263,   231,  -263,   128,   110,   110,   136,   108,    77,
-     142,   125,   149,   109,   151,   152,   153,   154,   155,   130,
-     108,   277,   126,   278,  -265,   109,  -265,   279,   280,   281,
-     310,   453,   -16,   282,   536,   221,   163,   238,  -267,   378,
-     330,   385,   210,   530,   516,   130,   477,   166,   246,   252,
-     247,   391,   227,   163,   396,   397,  -239,   186,   348,   235,
-      57,  -241,   193,   399,   480,    55,   197,   439,   440,   199,
-     237,   229,   200,    55,   283,   187,   110,   188,   249,   304,
-     305,   306,   307,   309,  -240,   317,   318,   211,   320,   321,
-      55,   361,    19,    20,   254,   255,   256,   201,   258,   259,
-     261,   202,    55,   160,   161,   162,   208,  -238,   243,   315,
-     209,   316,   284,   225,   285,   286,  -237,   486,   487,   298,
+     142,   124,   149,   109,   151,   152,   153,   154,   155,   130,
+     108,   277,   125,   278,  -265,   109,  -265,   279,   280,   281,
+    -238,   453,   -16,   282,   536,   221,   126,   238,  -237,   378,
+     330,   385,   210,   530,   516,   130,   477,   166,   246,   163,
+     247,   391,   227,   143,   396,   397,  -239,   486,   487,   235,
+      57,  -241,   186,   144,   480,    55,   163,   439,   440,  -267,
+     237,   229,   193,    55,   283,   187,   110,   188,   249,   304,
+     305,   306,   307,   309,  -240,   317,   318,   197,   320,   321,
+      55,   361,   211,   399,   254,   255,   256,   199,   258,   259,
+     261,  -263,    55,  -263,    19,    20,    21,   223,   243,   315,
+     200,   316,   284,   201,   285,   286,   202,   208,   332,   298,
      290,   291,   292,   293,   294,   295,   296,   297,   257,   434,
-     331,   240,   262,   263,   264,   265,   266,   267,   268,   269,
-     270,   271,   272,   273,   274,   275,   276,   223,   323,   325,
-     326,   327,   328,   329,   441,   389,   203,   213,  -263,    57,
-    -263,   322,   226,   462,   463,   239,   228,   401,   143,   332,
-    -265,   340,  -265,   160,   161,   162,   343,   144,   415,    55,
-     204,   233,   350,   160,   161,   162,   347,   366,   189,   205,
-     190,    55,   111,   111,   111,   250,   111,   111,   368,   395,
-     494,   349,   370,   252,   299,   160,   161,   162,   160,   161,
-     162,   353,   354,   132,   111,   191,   408,   192,   360,   146,
-     302,   308,   413,   315,   319,   316,   339,   449,   111,   111,
-     160,   161,   162,   365,   334,   110,   336,   130,   381,   325,
-     384,   384,   520,   160,   161,   162,   341,   346,   160,   161,
-     162,   393,   348,   420,   384,   384,   422,   423,   456,   160,
-     161,   162,   207,   160,   161,   162,   162,   355,   430,   160,
-     161,   162,   356,   461,   357,   358,   464,   160,   161,   162,
-     468,   469,   409,   160,   161,   162,   362,   405,   160,   161,
-     162,   214,   215,   216,   217,   253,   373,    57,   218,   132,
-     219,   492,   483,   484,   214,   215,   216,   217,   160,   161,
-     162,   218,   495,   219,   363,   379,   245,   411,   170,   171,
-     504,   505,   160,   161,   162,   160,   161,   162,   130,   384,
-     -31,   507,   513,   437,   338,   509,   510,   388,   160,   161,
-     162,    55,   398,   404,   179,   180,   521,   522,   345,   230,
-     181,   -79,   410,   182,   183,   184,   185,   524,   288,   416,
-     167,   531,   417,   384,   384,   418,   419,   168,   169,   170,
-     171,   424,   425,   475,   533,   426,   427,   314,   428,   431,
-     481,   429,   538,   160,   161,   162,   432,   172,   173,   352,
-     174,   175,   176,   177,   178,   179,   180,   435,   436,   381,
-     384,   181,   438,   478,   182,   183,   184,   185,   448,   452,
-     506,   367,   160,   161,   162,   450,   451,   168,   169,   170,
-     171,   160,   161,   162,   466,  -191,   459,   518,   467,   470,
-     473,   160,   161,   162,   187,   474,   188,  -191,   476,   482,
-     369,   496,   384,   177,   178,   179,   180,   508,   502,   371,
-     532,   181,   527,   490,   182,   183,   184,   185,   111,   412,
-     491,   514,   525,   511,  -191,  -191,  -191,  -191,   160,   161,
-     162,  -191,   512,  -191,   181,   529,  -191,   182,   183,   184,
-     185,    99,   387,  -191,  -191,  -191,  -191,   537,   160,   161,
-     162,   314,   220,   493,   351,   122,   534,   301,  -191,  -191,
+     331,   209,   262,   263,   264,   265,   266,   267,   268,   269,
+     270,   271,   272,   273,   274,   275,   276,   350,   323,   325,
+     326,   327,   328,   329,   441,   389,   310,   213,  -265,    57,
+    -265,   322,   225,   462,   463,   226,   239,   401,   160,   161,
+     162,   340,   203,   160,   161,   162,   343,   228,   415,   160,
+     161,   162,   366,  -268,  -268,  -268,   347,   368,   185,   250,
+     233,    55,   111,   111,   111,   204,   111,   111,   370,   395,
+     494,   240,   408,   252,   189,   205,   190,    55,   160,   161,
+     162,   353,   354,   132,   111,   191,   413,   192,   360,   146,
+     299,   302,   449,   315,   308,   316,   319,   334,   111,   111,
+     181,   182,   183,   184,   336,   110,   185,   130,   381,   325,
+     384,   384,   520,   160,   161,   162,   339,   341,   160,   161,
+     162,   393,   346,   420,   384,   384,   422,   423,   456,   160,
+     161,   162,   207,   160,   161,   162,   348,   355,   430,   160,
+     161,   162,   162,   461,   492,   356,   464,   160,   161,   162,
+     468,   469,   409,   160,   161,   162,   357,   405,   358,   214,
+     215,   216,   217,   504,   505,   253,   218,    57,   219,   132,
+     373,   362,   483,   484,   379,   513,   160,   161,   162,   160,
+     161,   162,   495,   160,   161,   162,   245,   411,   363,   521,
+     522,   -31,    55,   160,   161,   162,   388,   170,   130,   384,
+     398,   507,   338,   437,   531,   509,   510,   349,   160,   161,
+     162,   365,   160,   161,   162,   160,   161,   162,   404,   -79,
+     168,  -268,   170,   171,   180,   410,   416,   524,   288,   181,
+     182,   183,   184,   384,   384,   185,   367,   160,   161,   162,
+     369,   345,   417,   475,   533,   418,   419,   314,   179,   180,
+     481,   230,   538,   424,   181,   182,   183,   184,   167,   425,
+     185,   429,   426,   351,   427,   168,   169,   170,   171,   381,
+     384,   428,   431,   478,   435,   160,   161,   162,   432,   436,
+     506,   168,   169,   170,   171,   172,   173,   352,   174,   175,
+     176,   177,   178,   179,   180,  -191,   438,   518,   448,   181,
+     182,   183,   184,   371,   187,   185,   188,  -191,   178,   179,
+     180,   450,   384,   451,   452,   181,   182,   183,   184,   459,
+     532,   185,   466,   214,   215,   216,   217,   470,   111,   467,
+     218,   514,   219,   473,  -191,  -191,  -191,  -191,   160,   161,
+     162,  -191,   474,  -191,   476,   482,  -191,   160,   161,   162,
+     490,   491,   387,  -191,  -191,  -191,  -191,   160,   161,   162,
+     496,   314,   502,   508,   525,   511,   412,   512,  -191,  -191,
     -191,  -230,  -191,  -191,  -191,  -191,  -191,  -191,  -191,  -191,
-    -191,  -191,  -191,  -230,   364,   421,  -268,  -191,   170,   171,
-    -191,  -191,  -191,  -191,  -191,   180,  -191,   382,   196,  -191,
-     181,   170,   171,   182,   183,   184,   185,   344,   472,   454,
-    -230,  -230,  -230,  -230,   179,   180,   499,  -230,   498,  -230,
-     181,   244,  -230,   182,   183,   184,   185,     0,   180,  -230,
-    -230,  -230,  -230,   181,   394,     0,   182,   183,   184,   185,
-    -268,  -268,  -268,   185,  -230,  -230,  -230,     0,  -230,  -230,
+    -191,  -191,  -191,  -230,   527,   529,   537,  -191,  -191,  -191,
+    -191,    99,   493,  -191,  -191,   220,  -191,   382,   180,  -191,
+     301,   170,   171,   181,   182,   183,   184,   534,   122,   185,
+    -230,  -230,  -230,  -230,   196,   344,   421,  -230,   498,  -230,
+     472,   454,  -230,   499,   244,   313,   394,   179,   180,  -230,
+    -230,  -230,  -230,   181,   182,   183,   184,     0,     0,   185,
+       0,     0,     0,     0,  -230,  -230,  -230,     0,  -230,  -230,
     -230,  -230,  -230,  -230,  -230,  -230,  -230,  -230,  -230,   160,
-     161,   162,     0,  -230,   313,     0,  -230,  -230,  -230,  -230,
-    -230,     0,  -230,   -13,    79,  -230,     0,     0,     0,     0,
-       0,     0,    77,     0,    16,   406,    17,    18,    19,    20,
-      21,     0,     0,    22,    23,    24,    25,    26,     0,    27,
-      28,    29,    30,    31,    32,    80,    98,    81,    82,    33,
-      83,    84,    85,    86,    87,    88,   170,     0,     0,    89,
-      90,    91,    92,    34,     0,    35,    36,    37,    38,    39,
-      40,   160,   161,   162,     0,    41,    42,    43,    44,    45,
-      46,    47,     0,   180,   160,   161,   162,     0,   181,    48,
-       0,   182,   183,   184,   185,     0,     0,   407,     0,     0,
-       0,    49,    50,     0,    51,     0,    52,    53,    -3,    79,
-     414,     0,     0,    54,    93,    55,    56,    77,     0,    16,
-       0,    17,    18,    19,    20,    21,     0,     0,    22,    23,
-      24,    25,    26,     0,    27,    28,    29,    30,    31,    32,
-      80,    98,    81,    82,    33,    83,    84,    85,    86,    87,
-      88,     0,     0,     0,    89,    90,    91,    92,    34,     0,
-      35,    36,    37,    38,    39,    40,     0,     0,     0,     0,
-      41,    42,    43,    44,    45,    46,    47,     1,     2,     3,
-       4,     5,     6,     0,    48,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    49,    50,     0,    51,
-       0,    52,    53,     0,    79,     0,     0,     0,    54,    93,
-      55,    56,    77,   372,    16,     0,    17,    18,    19,    20,
-      21,     0,     0,    22,    23,    24,    25,    26,     0,    27,
-      28,    29,    30,    31,    32,    80,    98,    81,    82,    33,
-      83,    84,    85,    86,    87,    88,     0,     0,     0,    89,
-      90,    91,    92,    34,     0,    35,    36,    37,    38,    39,
-      40,     0,     0,     0,     0,    41,    42,    43,    44,    45,
-      46,    47,     0,     0,     0,     0,     0,     0,     0,    48,
+     161,   162,     0,  -230,  -230,  -230,  -230,   -13,    79,  -230,
+    -230,     0,  -230,     0,     0,  -230,    77,     0,    16,     0,
+      17,    18,    19,    20,    21,   364,     0,    22,    23,    24,
+      25,    26,     0,    27,    28,    29,    30,    31,    32,    80,
+      98,    81,    82,    33,    83,    84,    85,    86,    87,    88,
+     160,   161,   162,    89,    90,    91,    92,    34,     0,    35,
+      36,    37,    38,    39,    40,   160,   161,   162,     0,    41,
+      42,    43,    44,    45,    46,    47,   406,     1,     2,     3,
+       4,     5,     6,    48,     0,   160,   161,   162,     0,     0,
+       0,   407,     0,     0,     0,    49,    50,    51,     0,     0,
+       0,     0,     0,    52,    53,    -3,    79,    54,    93,    55,
+      56,   414,     0,     0,    77,     0,    16,     0,    17,    18,
+      19,    20,    21,     0,     0,    22,    23,    24,    25,    26,
+       0,    27,    28,    29,    30,    31,    32,    80,    98,    81,
+      82,    33,    83,    84,    85,    86,    87,    88,     0,     0,
+       0,    89,    90,    91,    92,    34,     0,    35,    36,    37,
+      38,    39,    40,     0,     0,     0,     0,    41,    42,    43,
+      44,    45,    46,    47,     0,     0,     0,     0,     0,     0,
+       0,    48,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    49,    50,    51,     0,     0,     0,     0,
+       0,    52,    53,    79,     0,    54,    93,    55,    56,     0,
+       0,    77,   372,    16,     0,    17,    18,    19,    20,    21,
+       0,     0,    22,    23,    24,    25,    26,     0,    27,    28,
+      29,    30,    31,    32,    80,    98,    81,    82,    33,    83,
+      84,    85,    86,    87,    88,     0,     0,     0,    89,    90,
+      91,    92,    34,     0,    35,    36,    37,    38,    39,    40,
+       0,     0,     0,     0,    41,    42,    43,    44,    45,    46,
+      47,     0,     0,     0,     0,     0,     0,     0,    48,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    49,    50,     0,    51,     0,    52,    53,     0,    79,
-       0,     0,     0,    54,    93,    55,    56,    77,   500,    16,
-       0,    17,    18,    19,    20,    21,     0,     0,    22,    23,
-      24,    25,    26,     0,    27,    28,    29,    30,    31,    32,
-      80,    98,    81,    82,    33,    83,    84,    85,    86,    87,
-      88,     0,     0,     0,    89,    90,    91,    92,    34,     0,
-      35,    36,    37,    38,    39,    40,     0,     0,     0,     0,
-      41,    42,    43,    44,    45,    46,    47,     0,     0,     0,
-       0,     0,     0,     0,    48,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    49,    50,     0,    51,
-       0,    52,    53,     0,    79,     0,     0,     0,    54,    93,
-      55,    56,    77,   503,    16,     0,    17,    18,    19,    20,
+      49,    50,    51,     0,     0,     0,     0,     0,    52,    53,
+      79,     0,    54,    93,    55,    56,     0,     0,    77,   500,
+      16,     0,    17,    18,    19,    20,    21,     0,     0,    22,
+      23,    24,    25,    26,     0,    27,    28,    29,    30,    31,
+      32,    80,    98,    81,    82,    33,    83,    84,    85,    86,
+      87,    88,     0,     0,     0,    89,    90,    91,    92,    34,
+       0,    35,    36,    37,    38,    39,    40,     0,     0,     0,
+       0,    41,    42,    43,    44,    45,    46,    47,     0,     0,
+       0,     0,     0,     0,     0,    48,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    49,    50,    51,
+       0,     0,     0,     0,     0,    52,    53,    79,     0,    54,
+      93,    55,    56,     0,     0,    77,   503,    16,     0,    17,
+      18,    19,    20,    21,     0,     0,    22,    23,    24,    25,
+      26,     0,    27,    28,    29,    30,    31,    32,    80,    98,
+      81,    82,    33,    83,    84,    85,    86,    87,    88,     0,
+       0,     0,    89,    90,    91,    92,    34,     0,    35,    36,
+      37,    38,    39,    40,     0,     0,     0,     0,    41,    42,
+      43,    44,    45,    46,    47,     0,     0,     0,     0,     0,
+       0,     0,    48,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    49,    50,    51,     0,     0,     0,
+       0,     0,    52,    53,    79,     0,    54,    93,    55,    56,
+       0,     0,    77,   519,    16,     0,    17,    18,    19,    20,
       21,     0,     0,    22,    23,    24,    25,    26,     0,    27,
       28,    29,    30,    31,    32,    80,    98,    81,    82,    33,
       83,    84,    85,    86,    87,    88,     0,     0,     0,    89,
@@ -433,102 +633,121 @@ static const yytype_int16 yytable[] =
       40,     0,     0,     0,     0,    41,    42,    43,    44,    45,
       46,    47,     0,     0,     0,     0,     0,     0,     0,    48,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    49,    50,     0,    51,     0,    52,    53,     0,    79,
-       0,     0,     0,    54,    93,    55,    56,    77,   519,    16,
-       0,    17,    18,    19,    20,    21,     0,     0,    22,    23,
-      24,    25,    26,     0,    27,    28,    29,    30,    31,    32,
-      80,    98,    81,    82,    33,    83,    84,    85,    86,    87,
-      88,     0,     0,     0,    89,    90,    91,    92,    34,     0,
-      35,    36,    37,    38,    39,    40,     0,     0,     0,     0,
-      41,    42,    43,    44,    45,    46,    47,     0,     0,     0,
-       0,     0,     0,     0,    48,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    49,    50,     0,    51,
-       0,    52,    53,     0,    79,     0,     0,     0,    54,    93,
-      55,    56,    77,   528,    16,     0,    17,    18,    19,    20,
+       0,    49,    50,    51,     0,     0,     0,     0,     0,    52,
+      53,    79,     0,    54,    93,    55,    56,     0,     0,    77,
+     528,    16,     0,    17,    18,    19,    20,    21,     0,     0,
+      22,    23,    24,    25,    26,     0,    27,    28,    29,    30,
+      31,    32,    80,    98,    81,    82,    33,    83,    84,    85,
+      86,    87,    88,     0,     0,     0,    89,    90,    91,    92,
+      34,     0,    35,    36,    37,    38,    39,    40,     0,     0,
+       0,     0,    41,    42,    43,    44,    45,    46,    47,     0,
+       0,     0,     0,     0,     0,     0,    48,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    49,    50,
+      51,     0,     0,     0,     0,     0,    52,    53,    79,     0,
+      54,    93,    55,    56,     0,     0,    77,     0,    16,     0,
+      17,    18,    19,    20,    21,     0,     0,    22,    23,    24,
+      25,    26,     0,    27,    28,    29,    30,    31,    32,    80,
+      98,    81,    82,    33,    83,    84,    85,    86,    87,    88,
+       0,     0,     0,    89,    90,    91,    92,    34,     0,    35,
+      36,    37,    38,    39,    40,     0,     0,     0,     0,    41,
+      42,    43,    44,    45,    46,    47,     0,     0,   535,     0,
+       0,     0,     0,    48,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    49,    50,    51,     0,     0,
+       0,     0,     0,    52,    53,    79,     0,    54,    93,    55,
+      56,     0,     0,    77,     0,    16,     0,    17,    18,    19,
+      20,    21,     0,     0,    22,    23,    24,    25,    26,     0,
+      27,    28,    29,    30,    31,    32,    80,    98,    81,    82,
+      33,    83,    84,    85,    86,    87,    88,     0,     0,     0,
+      89,    90,    91,    92,    34,     0,    35,    36,    37,    38,
+      39,    40,     0,     0,     0,     0,    41,    42,    43,    44,
+      45,    46,    47,     0,     0,     0,     0,     0,     0,     0,
+      48,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    49,    50,    51,     0,     0,     0,     0,     0,
+      52,    53,    79,     0,    54,    93,    55,    56,     0,     0,
+      77,     0,    16,     0,    17,    18,    19,    20,    21,     0,
+       0,    22,    23,    24,    25,    26,     0,    27,    28,    29,
+      30,    31,    32,    80,     0,    81,    82,    33,    83,    84,
+      85,    86,    87,    88,     0,     0,     0,    89,    90,    91,
+      92,    34,     0,    35,    36,    37,    38,    39,    40,     0,
+       0,     0,     0,    41,    42,    43,    44,    45,    46,    47,
+       0,     0,     0,     0,     0,     0,     0,    48,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    49,
+      50,    51,     0,     0,     0,    79,     0,    52,    53,     0,
+       0,    54,    93,    55,    56,    16,     0,    17,    18,    19,
+      20,    21,     0,     0,    22,    23,    24,    25,    26,     0,
+      27,    28,    29,    30,    31,    32,     0,     0,     0,     0,
+      33,     0,     0,  -268,     0,     0,     0,     0,     0,     0,
+     168,   169,   170,   171,    34,     0,    35,    36,    37,    38,
+      39,    40,     0,     0,     0,     0,    41,    42,    43,    44,
+      45,    46,    47,   174,   175,   176,   177,   178,   179,   180,
+      48,     0,     0,     0,   181,   182,   183,   184,     0,     0,
+     185,     0,    49,    50,    51,     0,     0,     0,    79,     0,
+      52,    53,   170,   171,    54,   -74,    55,    56,    16,     0,
+      17,    18,    19,    20,    21,     0,     0,    22,    23,    24,
+      25,    26,     0,    27,    28,    29,    30,    31,    32,   180,
+       0,     0,     0,    33,   181,   182,   183,   184,     0,     0,
+     185,   168,   169,   170,   171,     0,     0,    34,     0,    35,
+      36,    37,    38,    39,    40,     0,     0,     0,     0,    41,
+      42,    43,    44,    45,    46,    47,   176,   177,   178,   179,
+     180,     0,     0,    48,     0,   181,   182,   183,   184,     0,
+       0,   185,     0,     0,     0,    49,    50,    51,     0,     0,
+       0,     0,     0,    52,    53,     0,   -74,    54,     0,    55,
+      56,    77,     0,    16,     0,    17,    18,    19,    20,    21,
+       0,     0,   129,    23,    24,    25,    26,   109,    27,    28,
+      29,    30,    31,    32,     0,     0,     0,     0,    33,     0,
+       0,     0,     0,     0,     0,   168,   169,   170,   171,     0,
+       0,     0,    34,     0,    35,    36,    37,    38,    39,    40,
+       0,     0,     0,     0,    41,    42,    43,    44,    45,    46,
+      47,   177,   178,   179,   180,     0,     0,     0,    48,   181,
+     182,   183,   184,     0,     0,   185,     0,     0,     0,     0,
+      49,    50,    51,     0,     0,     0,     0,     0,    52,    53,
+       0,     0,    54,     0,    55,    56,    77,     0,    16,     0,
+      17,    18,    19,    20,    21,     0,     0,    22,    23,    24,
+      25,    26,     0,    27,    28,    29,    30,    31,    32,     0,
+       0,     0,     0,    33,     0,     0,     0,     0,     0,     0,
+     168,   169,   170,   171,     0,     0,     0,    34,     0,    35,
+      36,    37,    38,    39,    40,     0,     0,     0,     0,    41,
+      42,    43,    44,    45,    46,    47,     0,     0,   179,   180,
+       0,     0,     0,    48,   181,   182,   183,   184,     0,     0,
+     185,     0,     0,     0,     0,    49,    50,    51,     0,     0,
+       0,     0,     0,    52,    53,     0,     0,    54,     0,    55,
+      56,    16,   104,    17,    18,    19,    20,    21,     0,     0,
+      22,    23,    24,    25,    26,     0,    27,    28,    29,    30,
+      31,    32,     0,     0,     0,     0,    33,     0,     0,     0,
+       0,     0,     0,  -268,     0,   170,   171,     0,     0,     0,
+      34,     0,    35,    36,    37,    38,    39,    40,     0,     0,
+       0,     0,    41,    42,    43,    44,    45,    46,    47,     0,
+       0,   179,   180,     0,     0,     0,    48,   181,   182,   183,
+     184,     0,     0,   185,     0,     0,     0,     0,    49,    50,
+      51,     0,     0,     0,     0,     0,    52,    53,     0,     0,
+      54,     0,    55,    56,    16,     0,    17,    18,    19,    20,
       21,     0,     0,    22,    23,    24,    25,    26,     0,    27,
-      28,    29,    30,    31,    32,    80,    98,    81,    82,    33,
-      83,    84,    85,    86,    87,    88,     0,     0,     0,    89,
-      90,    91,    92,    34,     0,    35,    36,    37,    38,    39,
-      40,     0,     0,     0,     0,    41,    42,    43,    44,    45,
-      46,    47,     0,     0,     0,     0,     0,     0,     0,    48,
+      28,    29,    30,    31,    32,     0,     0,     0,     0,    33,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    49,    50,     0,    51,     0,    52,    53,     0,    79,
-       0,     0,     0,    54,    93,    55,    56,    77,     0,    16,
-       0,    17,    18,    19,    20,    21,     0,     0,    22,    23,
-      24,    25,    26,     0,    27,    28,    29,    30,    31,    32,
-      80,    98,    81,    82,    33,    83,    84,    85,    86,    87,
-      88,     0,     0,     0,    89,    90,    91,    92,    34,     0,
-      35,    36,    37,    38,    39,    40,     0,     0,     0,     0,
-      41,    42,    43,    44,    45,    46,    47,     0,     0,   535,
-       0,     0,     0,     0,    48,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    49,    50,     0,    51,
-       0,    52,    53,     0,    79,     0,     0,     0,    54,    93,
-      55,    56,    77,     0,    16,     0,    17,    18,    19,    20,
-      21,     0,     0,    22,    23,    24,    25,    26,     0,    27,
-      28,    29,    30,    31,    32,    80,    98,    81,    82,    33,
-      83,    84,    85,    86,    87,    88,     0,     0,     0,    89,
-      90,    91,    92,    34,     0,    35,    36,    37,    38,    39,
+       0,     0,     0,    34,     0,    35,    36,    37,    38,    39,
       40,     0,     0,     0,     0,    41,    42,    43,    44,    45,
       46,    47,     0,     0,     0,     0,     0,     0,     0,    48,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    49,    50,     0,    51,     0,    52,    53,     0,    79,
-       0,     0,     0,    54,    93,    55,    56,    77,     0,    16,
-       0,    17,    18,    19,    20,    21,     0,     0,    22,    23,
-      24,    25,    26,     0,    27,    28,    29,    30,    31,    32,
-      80,     0,    81,    82,    33,    83,    84,    85,    86,    87,
-      88,     0,     0,     0,    89,    90,    91,    92,    34,     0,
-      35,    36,    37,    38,    39,    40,     0,     0,     0,     0,
-      41,    42,    43,    44,    45,    46,    47,     0,     0,     0,
-       0,     0,     0,     0,    48,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    49,    50,     0,    51,
-       0,    52,    53,    79,     0,     0,     0,     0,    54,    93,
-      55,    56,     0,    16,     0,    17,    18,    19,    20,    21,
-       0,     0,    22,    23,    24,    25,    26,     0,    27,    28,
-      29,    30,    31,    32,     0,     0,     0,     0,    33,     0,
-       0,  -268,     0,     0,     0,     0,     0,     0,   168,   169,
-     170,   171,    34,     0,    35,    36,    37,    38,    39,    40,
-       0,     0,     0,     0,    41,    42,    43,    44,    45,    46,
-      47,   174,   175,   176,   177,   178,   179,   180,    48,     0,
-       0,     0,   181,     0,     0,   182,   183,   184,   185,     0,
-      49,    50,     0,    51,     0,    52,    53,    79,     0,     0,
-       0,     0,    54,   -74,    55,    56,     0,    16,     0,    17,
+       0,    49,    50,    51,     0,     0,     0,     0,     0,    52,
+      53,     0,     0,    54,   137,    55,    56,    16,     0,    17,
       18,    19,    20,    21,     0,     0,    22,    23,    24,    25,
       26,     0,    27,    28,    29,    30,    31,    32,     0,     0,
        0,     0,    33,     0,     0,     0,     0,     0,     0,     0,
-     168,   169,   170,   171,     0,     0,    34,     0,    35,    36,
-      37,    38,    39,    40,     0,     0,     0,     0,    41,    42,
-      43,    44,    45,    46,    47,   176,   177,   178,   179,   180,
-       0,     0,    48,     0,   181,     0,     0,   182,   183,   184,
-     185,     0,     0,     0,    49,    50,     0,    51,     0,    52,
-      53,     0,     0,     0,     0,   -74,    54,     0,    55,    56,
-      77,     0,    16,     0,    17,    18,    19,    20,    21,     0,
-       0,   129,    23,    24,    25,    26,   109,    27,    28,    29,
-      30,    31,    32,     0,     0,     0,     0,    33,     0,     0,
-       0,     0,     0,     0,   168,   169,   170,   171,     0,     0,
-       0,    34,     0,    35,    36,    37,    38,    39,    40,     0,
-       0,     0,     0,    41,    42,    43,    44,    45,    46,    47,
-       0,   178,   179,   180,     0,     0,     0,    48,   181,     0,
-       0,   182,   183,   184,   185,     0,     0,     0,     0,    49,
-      50,     0,    51,     0,    52,    53,     0,     0,     0,     0,
-       0,    54,     0,    55,    56,    77,     0,    16,     0,    17,
-      18,    19,    20,    21,     0,     0,    22,    23,    24,    25,
-      26,     0,    27,    28,    29,    30,    31,    32,     0,     0,
-       0,     0,    33,     0,     0,     0,     0,   168,  -268,   170,
-     171,     0,     0,     0,     0,     0,    34,     0,    35,    36,
+       0,     0,     0,     0,     0,     0,    34,     0,    35,    36,
       37,    38,    39,    40,     0,     0,     0,     0,    41,    42,
-      43,    44,    45,    46,    47,   179,   180,     0,     0,     0,
-       0,   181,    48,     0,   182,   183,   184,   185,     0,     0,
-       0,     0,     0,     0,    49,    50,     0,    51,     0,    52,
-      53,     0,     0,     0,     0,     0,    54,     0,    55,    56,
-      16,   104,    17,    18,    19,    20,    21,     0,     0,    22,
+      43,    44,    45,    46,    47,     0,     0,     0,     0,     0,
+       0,     0,    48,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    49,    50,    51,     0,     0,     0,
+       0,     0,    52,    53,     0,   156,    54,     0,    55,    56,
+      16,     0,    17,    18,    19,    20,    21,     0,     0,    22,
       23,    24,    25,    26,     0,    27,    28,    29,    30,    31,
       32,     0,     0,     0,     0,    33,     0,     0,     0,     0,
-     168,   169,   170,   171,     0,     0,     0,     0,     0,    34,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    34,
        0,    35,    36,    37,    38,    39,    40,     0,     0,     0,
-       0,    41,    42,    43,    44,    45,    46,    47,   179,   180,
-       0,     0,     0,     0,   181,    48,     0,   182,   183,   184,
-     185,     0,     0,     0,     0,     0,     0,    49,    50,     0,
-      51,     0,    52,    53,     0,     0,     0,     0,     0,    54,
+       0,    41,    42,    43,    44,    45,    46,    47,     0,     0,
+       0,     0,     0,     0,     0,    48,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    49,    50,    51,
+       0,     0,     0,     0,     0,    52,    53,     0,   234,    54,
        0,    55,    56,    16,     0,    17,    18,    19,    20,    21,
        0,     0,    22,    23,    24,    25,    26,     0,    27,    28,
       29,    30,    31,    32,     0,     0,     0,     0,    33,     0,
@@ -537,8 +756,8 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,    41,    42,    43,    44,    45,    46,
       47,     0,     0,     0,     0,     0,     0,     0,    48,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      49,    50,     0,    51,     0,    52,    53,     0,     0,     0,
-       0,     0,    54,   137,    55,    56,    16,     0,    17,    18,
+      49,    50,    51,     0,     0,     0,     0,     0,    52,    53,
+       0,   248,    54,     0,    55,    56,    16,     0,    17,    18,
       19,    20,    21,     0,     0,    22,    23,    24,    25,    26,
        0,    27,    28,    29,    30,    31,    32,     0,     0,     0,
        0,    33,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -546,8 +765,8 @@ static const yytype_int16 yytable[] =
       38,    39,    40,     0,     0,     0,     0,    41,    42,    43,
       44,    45,    46,    47,     0,     0,     0,     0,     0,     0,
        0,    48,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    49,    50,     0,    51,     0,    52,    53,
-       0,     0,     0,     0,   156,    54,     0,    55,    56,    16,
+       0,     0,     0,    49,    50,    51,     0,     0,     0,     0,
+       0,    52,    53,     0,   260,    54,     0,    55,    56,    16,
        0,    17,    18,    19,    20,    21,     0,     0,    22,    23,
       24,    25,    26,     0,    27,    28,    29,    30,    31,    32,
        0,     0,     0,     0,    33,     0,     0,     0,     0,     0,
@@ -555,8 +774,8 @@ static const yytype_int16 yytable[] =
       35,    36,    37,    38,    39,    40,     0,     0,     0,     0,
       41,    42,    43,    44,    45,    46,    47,     0,     0,     0,
        0,     0,     0,     0,    48,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    49,    50,     0,    51,
-       0,    52,    53,     0,     0,     0,     0,   234,    54,     0,
+       0,     0,     0,     0,     0,     0,    49,    50,    51,     0,
+       0,     0,     0,     0,    52,    53,     0,   289,    54,     0,
       55,    56,    16,     0,    17,    18,    19,    20,    21,     0,
        0,    22,    23,    24,    25,    26,     0,    27,    28,    29,
       30,    31,    32,     0,     0,     0,     0,    33,     0,     0,
@@ -565,8 +784,8 @@ static const yytype_int16 yytable[] =
        0,     0,     0,    41,    42,    43,    44,    45,    46,    47,
        0,     0,     0,     0,     0,     0,     0,    48,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    49,
-      50,     0,    51,     0,    52,    53,     0,     0,     0,     0,
-     248,    54,     0,    55,    56,    16,     0,    17,    18,    19,
+      50,    51,     0,     0,     0,     0,     0,    52,    53,     0,
+     342,    54,     0,    55,    56,    16,     0,    17,    18,    19,
       20,    21,     0,     0,    22,    23,    24,    25,    26,     0,
       27,    28,    29,    30,    31,    32,     0,     0,     0,     0,
       33,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -574,8 +793,8 @@ static const yytype_int16 yytable[] =
       39,    40,     0,     0,     0,     0,    41,    42,    43,    44,
       45,    46,    47,     0,     0,     0,     0,     0,     0,     0,
       48,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    49,    50,     0,    51,     0,    52,    53,     0,
-       0,     0,     0,   260,    54,     0,    55,    56,    16,     0,
+       0,     0,    49,    50,    51,     0,     0,     0,     0,     0,
+      52,    53,     0,   359,    54,     0,    55,    56,    16,     0,
       17,    18,    19,    20,    21,     0,     0,    22,    23,    24,
       25,    26,     0,    27,    28,    29,    30,    31,    32,     0,
        0,     0,     0,    33,     0,     0,     0,     0,     0,     0,
@@ -583,162 +802,144 @@ static const yytype_int16 yytable[] =
       36,    37,    38,    39,    40,     0,     0,     0,     0,    41,
       42,    43,    44,    45,    46,    47,     0,     0,     0,     0,
        0,     0,     0,    48,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    49,    50,     0,    51,     0,
-      52,    53,     0,     0,     0,     0,   289,    54,     0,    55,
+       0,     0,     0,     0,     0,    49,    50,    51,     0,     0,
+       0,     0,     0,    52,    53,     0,     0,    54,     0,    55,
       56,    16,     0,    17,    18,    19,    20,    21,     0,     0,
       22,    23,    24,    25,    26,     0,    27,    28,    29,    30,
       31,    32,     0,     0,     0,     0,    33,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       34,     0,    35,    36,    37,    38,    39,    40,     0,     0,
        0,     0,    41,    42,    43,    44,    45,    46,    47,     0,
-       0,     0,     0,     0,     0,     0,    48,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    49,    50,
-       0,    51,     0,    52,    53,     0,     0,     0,     0,   342,
-      54,     0,    55,    56,    16,     0,    17,    18,    19,    20,
-      21,     0,     0,    22,    23,    24,    25,    26,     0,    27,
-      28,    29,    30,    31,    32,     0,     0,     0,     0,    33,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    34,     0,    35,    36,    37,    38,    39,
-      40,     0,     0,     0,     0,    41,    42,    43,    44,    45,
-      46,    47,     0,     0,     0,     0,     0,     0,     0,    48,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    49,    50,     0,    51,     0,    52,    53,     0,     0,
-       0,     0,   359,    54,     0,    55,    56,    16,     0,    17,
-      18,    19,    20,    21,     0,     0,    22,    23,    24,    25,
-      26,     0,    27,    28,    29,    30,    31,    32,     0,     0,
-       0,     0,    33,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    34,     0,    35,    36,
-      37,    38,    39,    40,     0,     0,     0,     0,    41,    42,
-      43,    44,    45,    46,    47,     0,     0,     0,     0,     0,
-       0,     0,    48,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    49,    50,     0,    51,     0,    52,
-      53,     0,     0,     0,     0,     0,    54,     0,    55,    56,
-      16,     0,    17,    18,    19,    20,    21,     0,     0,    22,
-      23,    24,    25,    26,     0,    27,    28,    29,    30,    31,
-      32,     0,     0,     0,     0,    33,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    34,
-       0,    35,    36,    37,    38,    39,    40,     0,     0,     0,
-       0,    41,    42,    43,    44,    45,    46,    47,     0,     0,
-       0,     0,     0,     0,     0,    48,   167,     0,     0,     0,
-       0,     0,     0,   168,   169,   170,   171,    49,    50,     0,
-      51,     0,    52,    53,     0,     0,     0,     0,     0,   242,
-       0,    55,    56,   172,   173,     0,   174,   175,   176,   177,
-     178,   179,   180,     0,     0,     0,     0,   181,   167,     0,
-     182,   183,   184,   185,     0,   168,   169,   170,   171,     0,
+       0,     0,     0,     0,     0,     0,    48,   167,     0,     0,
+       0,     0,     0,     0,   168,   169,   170,   171,    49,    50,
+      51,     0,     0,     0,     0,     0,    52,    53,     0,     0,
+     242,     0,    55,    56,   172,   173,     0,   174,   175,   176,
+     177,   178,   179,   180,     0,     0,     0,     0,   181,   182,
+     183,   184,   167,     0,   185,     0,     0,     0,     0,   168,
+     169,   170,   171,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   173,     0,   174,   175,
-     176,   177,   178,   179,   180,     0,     0,     0,     0,   181,
-       0,     0,   182,   183,   184,   185
+     173,     0,   174,   175,   176,   177,   178,   179,   180,     0,
+       0,     0,     0,   181,   182,   183,   184,     0,     0,   185
 };
 
 static const yytype_int16 yycheck[] =
 {
       15,   126,   317,     9,    40,   335,   426,     9,    11,   115,
-      16,    46,    48,    46,     9,    23,     9,    77,    11,    11,
-      10,     0,   461,    19,    20,    21,    23,    23,    24,    19,
-      20,    21,   100,    23,    24,   141,    20,    43,    15,    16,
-      17,    25,    17,    18,    40,    41,    15,    16,    54,    39,
-      40,    41,    42,     9,   100,    30,     9,     9,    11,    34,
+      16,    46,    48,    46,     9,    23,     9,    77,    11,     0,
+      10,     9,   461,    19,    20,    21,    23,    23,    24,    19,
+      20,    21,    11,    23,    24,   141,    20,    43,    15,    16,
+      11,    25,    17,    18,    40,    41,    15,    16,    54,    39,
+      40,    41,    42,    11,   100,    30,     9,     9,    11,    34,
       56,     9,   122,    11,    39,    55,    56,    42,    20,     9,
       45,   100,    47,    25,    49,    50,    51,    52,    53,   115,
       20,     9,   100,    11,     9,    25,    11,    15,    16,    17,
-      67,   421,   100,    21,   533,    98,    77,   133,     9,   101,
-     225,   307,    92,   523,   101,   141,   101,   100,   143,    11,
-     143,   317,   118,    77,   320,   321,    69,   100,    11,   125,
-     126,    69,     9,   104,   454,   102,    20,    15,    16,   100,
-     126,   121,   100,   102,    62,     9,   126,    11,   144,   199,
-     200,   201,   202,   203,    69,   205,   206,    45,   208,   209,
-     102,   103,    15,    16,   160,   161,   162,   100,   164,   165,
-     166,   100,   102,    73,    74,    75,   100,    69,   143,   204,
-     100,   204,   100,   100,   102,   103,    69,    43,    44,   194,
+      69,   421,   100,    21,   533,    98,   100,   133,    69,   101,
+     225,   307,    92,   523,   101,   141,   101,   100,   143,    77,
+     143,   317,   118,    90,   320,   321,    69,    43,    44,   125,
+     126,    69,   100,   100,   454,   102,    77,    15,    16,     9,
+     126,   121,     9,   102,    62,     9,   126,    11,   144,   199,
+     200,   201,   202,   203,    69,   205,   206,    20,   208,   209,
+     102,   103,    45,   104,   160,   161,   162,   100,   164,   165,
+     166,     9,   102,    11,    15,    16,    17,    12,   143,   204,
+     100,   204,   100,   100,   102,   103,   100,   100,    12,   194,
      186,   187,   188,   189,   190,   191,   192,   193,   163,   395,
-     226,   101,   167,   168,   169,   170,   171,   172,   173,   174,
+     226,   100,   167,   168,   169,   170,   171,   172,   173,   174,
      175,   176,   177,   178,   179,   180,   181,    12,   214,   215,
      216,   217,   218,   219,   102,   530,    67,   101,     9,   225,
-      11,   211,   100,   429,   430,    10,    99,   333,    91,    12,
-       9,   237,    11,    73,    74,    75,   242,   100,   363,   102,
-      91,    99,    12,    73,    74,    75,   252,    12,     9,   100,
-      11,   102,    19,    20,    21,    69,    23,    24,    12,   319,
-     466,   101,    12,    11,    20,    73,    74,    75,    73,    74,
+      11,   211,   100,   429,   430,   100,    10,   333,    73,    74,
+      75,   237,    67,    73,    74,    75,   242,    99,   363,    73,
+      74,    75,    12,    93,    94,    95,   252,    12,    98,    69,
+      99,   102,    19,    20,    21,    90,    23,    24,    12,   319,
+     466,   101,    12,    11,     9,   100,    11,   102,    73,    74,
       75,   277,   278,    40,    41,     9,    12,    11,   284,    46,
-      20,    91,    12,   318,   100,   318,    99,    12,    55,    56,
-      73,    74,    75,   101,   100,   285,    69,   333,   304,   305,
-     306,   307,   508,    73,    74,    75,    10,    23,    73,    74,
-      75,   317,    11,   373,   320,   321,   376,   377,   424,    73,
-      74,    75,    89,    73,    74,    75,    75,   103,   388,    73,
-      74,    75,   103,   428,   103,   103,   431,    73,    74,    75,
-     435,   436,   348,    73,    74,    75,   103,   337,    73,    74,
-      75,    39,    40,    41,    42,    99,    18,   363,    46,   126,
-      48,   464,   457,   458,    39,    40,    41,    42,    73,    74,
-      75,    46,   467,    48,   100,    20,   143,   352,    60,    61,
-     483,   484,    73,    74,    75,    73,    74,    75,   424,   395,
-     100,   486,   495,   399,    99,   490,   491,   100,    73,    74,
-      75,   102,    99,    23,    86,    87,   509,   510,    99,    23,
-      92,    99,    10,    95,    96,    97,    98,   512,   185,    10,
-      51,   524,    10,   429,   430,    10,    10,    58,    59,    60,
-      61,    20,    99,   448,   529,    99,    99,   204,    99,    99,
-     455,   100,   537,    73,    74,    75,   101,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    99,    99,   465,
-     466,    92,    99,   453,    95,    96,    97,    98,     9,   101,
-     485,   101,    73,    74,    75,    10,    99,    58,    59,    60,
-      61,    73,    74,    75,   100,     0,     9,   502,    99,    25,
-      77,    73,    74,    75,     9,    99,    11,    12,    71,   101,
-     101,    78,   508,    84,    85,    86,    87,   100,     9,   101,
-     525,    92,    19,    99,    95,    96,    97,    98,   285,   101,
-      99,   496,    70,   101,    39,    40,    41,    42,    73,    74,
-      75,    46,    99,    48,    92,    99,    51,    95,    96,    97,
-      98,    12,   309,    58,    59,    60,    61,    99,    73,    74,
-      75,   318,    98,   465,    99,    33,   530,   196,    73,    74,
+      20,    20,    12,   318,    90,   318,   100,   100,    55,    56,
+      92,    93,    94,    95,    69,   285,    98,   333,   304,   305,
+     306,   307,   508,    73,    74,    75,    99,    10,    73,    74,
+      75,   317,    23,   373,   320,   321,   376,   377,   424,    73,
+      74,    75,    89,    73,    74,    75,    11,   103,   388,    73,
+      74,    75,    75,   428,   464,   103,   431,    73,    74,    75,
+     435,   436,   348,    73,    74,    75,   103,   337,   103,    39,
+      40,    41,    42,   483,   484,    99,    46,   363,    48,   126,
+      18,   103,   457,   458,    20,   495,    73,    74,    75,    73,
+      74,    75,   467,    73,    74,    75,   143,   352,   100,   509,
+     510,   100,   102,    73,    74,    75,   100,    60,   424,   395,
+      99,   486,    99,   399,   524,   490,   491,   101,    73,    74,
+      75,   101,    73,    74,    75,    73,    74,    75,    23,    99,
+      58,    59,    60,    61,    87,    10,    10,   512,   185,    92,
+      93,    94,    95,   429,   430,    98,   101,    73,    74,    75,
+     101,    99,    10,   448,   529,    10,    10,   204,    86,    87,
+     455,    23,   537,    20,    92,    93,    94,    95,    51,    99,
+      98,   100,    99,    99,    99,    58,    59,    60,    61,   465,
+     466,    99,    99,   453,    99,    73,    74,    75,   101,    99,
+     485,    58,    59,    60,    61,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,     0,    99,   502,     9,    92,
+      93,    94,    95,   101,     9,    98,    11,    12,    85,    86,
+      87,    10,   508,    99,   101,    92,    93,    94,    95,     9,
+     525,    98,   100,    39,    40,    41,    42,    25,   285,    99,
+      46,   496,    48,    77,    39,    40,    41,    42,    73,    74,
+      75,    46,    99,    48,    71,   101,    51,    73,    74,    75,
+      99,    99,   309,    58,    59,    60,    61,    73,    74,    75,
+      78,   318,     9,   100,    70,   101,   101,    99,    73,    74,
       75,     0,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    12,    99,   375,    58,    92,    60,    61,
-      95,    96,    97,    98,    99,    87,   101,   305,    82,   104,
-      92,    60,    61,    95,    96,    97,    98,   244,   442,   422,
-      39,    40,    41,    42,    86,    87,   473,    46,   472,    48,
-      92,   143,    51,    95,    96,    97,    98,    -1,    87,    58,
-      59,    60,    61,    92,   318,    -1,    95,    96,    97,    98,
-      95,    96,    97,    98,    73,    74,    75,    -1,    77,    78,
+      85,    86,    87,    12,    19,    99,    99,    92,    93,    94,
+      95,    12,   465,    98,    99,    98,   101,   305,    87,   104,
+     196,    60,    61,    92,    93,    94,    95,   530,    33,    98,
+      39,    40,    41,    42,    82,   244,   375,    46,   472,    48,
+     442,   422,    51,   473,   143,   204,   318,    86,    87,    58,
+      59,    60,    61,    92,    93,    94,    95,    -1,    -1,    98,
+      -1,    -1,    -1,    -1,    73,    74,    75,    -1,    77,    78,
       79,    80,    81,    82,    83,    84,    85,    86,    87,    73,
-      74,    75,    -1,    92,   204,    -1,    95,    96,    97,    98,
-      99,    -1,   101,     0,     1,   104,    -1,    -1,    -1,    -1,
-      -1,    -1,     9,    -1,    11,    99,    13,    14,    15,    16,
-      17,    -1,    -1,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    60,    -1,    -1,    46,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      57,    73,    74,    75,    -1,    62,    63,    64,    65,    66,
-      67,    68,    -1,    87,    73,    74,    75,    -1,    92,    76,
-      -1,    95,    96,    97,    98,    -1,    -1,    99,    -1,    -1,
-      -1,    88,    89,    -1,    91,    -1,    93,    94,     0,     1,
-      99,    -1,    -1,   100,   101,   102,   103,     9,    -1,    11,
-      -1,    13,    14,    15,    16,    17,    -1,    -1,    20,    21,
-      22,    23,    24,    -1,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    -1,    -1,    -1,    46,    47,    48,    49,    50,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,
-      62,    63,    64,    65,    66,    67,    68,     3,     4,     5,
-       6,     7,     8,    -1,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    91,
-      -1,    93,    94,    -1,     1,    -1,    -1,    -1,   100,   101,
-     102,   103,     9,    10,    11,    -1,    13,    14,    15,    16,
-      17,    -1,    -1,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    -1,    -1,    -1,    46,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,
-      67,    68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,
+      74,    75,    -1,    92,    93,    94,    95,     0,     1,    98,
+      99,    -1,   101,    -1,    -1,   104,     9,    -1,    11,    -1,
+      13,    14,    15,    16,    17,    99,    -1,    20,    21,    22,
+      23,    24,    -1,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      73,    74,    75,    46,    47,    48,    49,    50,    -1,    52,
+      53,    54,    55,    56,    57,    73,    74,    75,    -1,    62,
+      63,    64,    65,    66,    67,    68,    99,     3,     4,     5,
+       6,     7,     8,    76,    -1,    73,    74,    75,    -1,    -1,
+      -1,    99,    -1,    -1,    -1,    88,    89,    90,    -1,    -1,
+      -1,    -1,    -1,    96,    97,     0,     1,   100,   101,   102,
+     103,    99,    -1,    -1,     9,    -1,    11,    -1,    13,    14,
+      15,    16,    17,    -1,    -1,    20,    21,    22,    23,    24,
+      -1,    26,    27,    28,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    -1,    -1,
+      -1,    46,    47,    48,    49,    50,    -1,    52,    53,    54,
+      55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,    64,
+      65,    66,    67,    68,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    88,    89,    90,    -1,    -1,    -1,    -1,
+      -1,    96,    97,     1,    -1,   100,   101,   102,   103,    -1,
+      -1,     9,    10,    11,    -1,    13,    14,    15,    16,    17,
+      -1,    -1,    20,    21,    22,    23,    24,    -1,    26,    27,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
+      38,    39,    40,    41,    42,    -1,    -1,    -1,    46,    47,
+      48,    49,    50,    -1,    52,    53,    54,    55,    56,    57,
+      -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,    67,
+      68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    88,    89,    -1,    91,    -1,    93,    94,    -1,     1,
-      -1,    -1,    -1,   100,   101,   102,   103,     9,    10,    11,
-      -1,    13,    14,    15,    16,    17,    -1,    -1,    20,    21,
-      22,    23,    24,    -1,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    -1,    -1,    -1,    46,    47,    48,    49,    50,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,
-      62,    63,    64,    65,    66,    67,    68,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    91,
-      -1,    93,    94,    -1,     1,    -1,    -1,    -1,   100,   101,
-     102,   103,     9,    10,    11,    -1,    13,    14,    15,    16,
+      88,    89,    90,    -1,    -1,    -1,    -1,    -1,    96,    97,
+       1,    -1,   100,   101,   102,   103,    -1,    -1,     9,    10,
+      11,    -1,    13,    14,    15,    16,    17,    -1,    -1,    20,
+      21,    22,    23,    24,    -1,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    -1,    -1,    -1,    46,    47,    48,    49,    50,
+      -1,    52,    53,    54,    55,    56,    57,    -1,    -1,    -1,
+      -1,    62,    63,    64,    65,    66,    67,    68,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    90,
+      -1,    -1,    -1,    -1,    -1,    96,    97,     1,    -1,   100,
+     101,   102,   103,    -1,    -1,     9,    10,    11,    -1,    13,
+      14,    15,    16,    17,    -1,    -1,    20,    21,    22,    23,
+      24,    -1,    26,    27,    28,    29,    30,    31,    32,    33,
+      34,    35,    36,    37,    38,    39,    40,    41,    42,    -1,
+      -1,    -1,    46,    47,    48,    49,    50,    -1,    52,    53,
+      54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,
+      64,    65,    66,    67,    68,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    88,    89,    90,    -1,    -1,    -1,
+      -1,    -1,    96,    97,     1,    -1,   100,   101,   102,   103,
+      -1,    -1,     9,    10,    11,    -1,    13,    14,    15,    16,
       17,    -1,    -1,    20,    21,    22,    23,    24,    -1,    26,
       27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
       37,    38,    39,    40,    41,    42,    -1,    -1,    -1,    46,
@@ -746,102 +947,121 @@ static const yytype_int16 yycheck[] =
       57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,
       67,    68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    88,    89,    -1,    91,    -1,    93,    94,    -1,     1,
-      -1,    -1,    -1,   100,   101,   102,   103,     9,    10,    11,
-      -1,    13,    14,    15,    16,    17,    -1,    -1,    20,    21,
-      22,    23,    24,    -1,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    -1,    -1,    -1,    46,    47,    48,    49,    50,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,
-      62,    63,    64,    65,    66,    67,    68,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    91,
-      -1,    93,    94,    -1,     1,    -1,    -1,    -1,   100,   101,
-     102,   103,     9,    10,    11,    -1,    13,    14,    15,    16,
+      -1,    88,    89,    90,    -1,    -1,    -1,    -1,    -1,    96,
+      97,     1,    -1,   100,   101,   102,   103,    -1,    -1,     9,
+      10,    11,    -1,    13,    14,    15,    16,    17,    -1,    -1,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    29,
+      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    -1,    -1,    -1,    46,    47,    48,    49,
+      50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
+      -1,    -1,    62,    63,    64,    65,    66,    67,    68,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,
+      90,    -1,    -1,    -1,    -1,    -1,    96,    97,     1,    -1,
+     100,   101,   102,   103,    -1,    -1,     9,    -1,    11,    -1,
+      13,    14,    15,    16,    17,    -1,    -1,    20,    21,    22,
+      23,    24,    -1,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      -1,    -1,    -1,    46,    47,    48,    49,    50,    -1,    52,
+      53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,
+      63,    64,    65,    66,    67,    68,    -1,    -1,    71,    -1,
+      -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,    -1,
+      -1,    -1,    -1,    96,    97,     1,    -1,   100,   101,   102,
+     103,    -1,    -1,     9,    -1,    11,    -1,    13,    14,    15,
+      16,    17,    -1,    -1,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
+      36,    37,    38,    39,    40,    41,    42,    -1,    -1,    -1,
+      46,    47,    48,    49,    50,    -1,    52,    53,    54,    55,
+      56,    57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,
+      66,    67,    68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    88,    89,    90,    -1,    -1,    -1,    -1,    -1,
+      96,    97,     1,    -1,   100,   101,   102,   103,    -1,    -1,
+       9,    -1,    11,    -1,    13,    14,    15,    16,    17,    -1,
+      -1,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
+      29,    30,    31,    32,    -1,    34,    35,    36,    37,    38,
+      39,    40,    41,    42,    -1,    -1,    -1,    46,    47,    48,
+      49,    50,    -1,    52,    53,    54,    55,    56,    57,    -1,
+      -1,    -1,    -1,    62,    63,    64,    65,    66,    67,    68,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
+      89,    90,    -1,    -1,    -1,     1,    -1,    96,    97,    -1,
+      -1,   100,   101,   102,   103,    11,    -1,    13,    14,    15,
+      16,    17,    -1,    -1,    20,    21,    22,    23,    24,    -1,
+      26,    27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,
+      36,    -1,    -1,    51,    -1,    -1,    -1,    -1,    -1,    -1,
+      58,    59,    60,    61,    50,    -1,    52,    53,    54,    55,
+      56,    57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,
+      66,    67,    68,    81,    82,    83,    84,    85,    86,    87,
+      76,    -1,    -1,    -1,    92,    93,    94,    95,    -1,    -1,
+      98,    -1,    88,    89,    90,    -1,    -1,    -1,     1,    -1,
+      96,    97,    60,    61,   100,   101,   102,   103,    11,    -1,
+      13,    14,    15,    16,    17,    -1,    -1,    20,    21,    22,
+      23,    24,    -1,    26,    27,    28,    29,    30,    31,    87,
+      -1,    -1,    -1,    36,    92,    93,    94,    95,    -1,    -1,
+      98,    58,    59,    60,    61,    -1,    -1,    50,    -1,    52,
+      53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,
+      63,    64,    65,    66,    67,    68,    83,    84,    85,    86,
+      87,    -1,    -1,    76,    -1,    92,    93,    94,    95,    -1,
+      -1,    98,    -1,    -1,    -1,    88,    89,    90,    -1,    -1,
+      -1,    -1,    -1,    96,    97,    -1,    99,   100,    -1,   102,
+     103,     9,    -1,    11,    -1,    13,    14,    15,    16,    17,
+      -1,    -1,    20,    21,    22,    23,    24,    25,    26,    27,
+      28,    29,    30,    31,    -1,    -1,    -1,    -1,    36,    -1,
+      -1,    -1,    -1,    -1,    -1,    58,    59,    60,    61,    -1,
+      -1,    -1,    50,    -1,    52,    53,    54,    55,    56,    57,
+      -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,    67,
+      68,    84,    85,    86,    87,    -1,    -1,    -1,    76,    92,
+      93,    94,    95,    -1,    -1,    98,    -1,    -1,    -1,    -1,
+      88,    89,    90,    -1,    -1,    -1,    -1,    -1,    96,    97,
+      -1,    -1,   100,    -1,   102,   103,     9,    -1,    11,    -1,
+      13,    14,    15,    16,    17,    -1,    -1,    20,    21,    22,
+      23,    24,    -1,    26,    27,    28,    29,    30,    31,    -1,
+      -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,
+      58,    59,    60,    61,    -1,    -1,    -1,    50,    -1,    52,
+      53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,
+      63,    64,    65,    66,    67,    68,    -1,    -1,    86,    87,
+      -1,    -1,    -1,    76,    92,    93,    94,    95,    -1,    -1,
+      98,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,    -1,
+      -1,    -1,    -1,    96,    97,    -1,    -1,   100,    -1,   102,
+     103,    11,    12,    13,    14,    15,    16,    17,    -1,    -1,
+      20,    21,    22,    23,    24,    -1,    26,    27,    28,    29,
+      30,    31,    -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,
+      -1,    -1,    -1,    58,    -1,    60,    61,    -1,    -1,    -1,
+      50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
+      -1,    -1,    62,    63,    64,    65,    66,    67,    68,    -1,
+      -1,    86,    87,    -1,    -1,    -1,    76,    92,    93,    94,
+      95,    -1,    -1,    98,    -1,    -1,    -1,    -1,    88,    89,
+      90,    -1,    -1,    -1,    -1,    -1,    96,    97,    -1,    -1,
+     100,    -1,   102,   103,    11,    -1,    13,    14,    15,    16,
       17,    -1,    -1,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    -1,    -1,    -1,    46,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
-      57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,
-      67,    68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,
+      27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,    36,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    88,    89,    -1,    91,    -1,    93,    94,    -1,     1,
-      -1,    -1,    -1,   100,   101,   102,   103,     9,    -1,    11,
-      -1,    13,    14,    15,    16,    17,    -1,    -1,    20,    21,
-      22,    23,    24,    -1,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    -1,    -1,    -1,    46,    47,    48,    49,    50,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,
-      62,    63,    64,    65,    66,    67,    68,    -1,    -1,    71,
-      -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    91,
-      -1,    93,    94,    -1,     1,    -1,    -1,    -1,   100,   101,
-     102,   103,     9,    -1,    11,    -1,    13,    14,    15,    16,
-      17,    -1,    -1,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
-      37,    38,    39,    40,    41,    42,    -1,    -1,    -1,    46,
-      47,    48,    49,    50,    -1,    52,    53,    54,    55,    56,
+      -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,    56,
       57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,
       67,    68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    88,    89,    -1,    91,    -1,    93,    94,    -1,     1,
-      -1,    -1,    -1,   100,   101,   102,   103,     9,    -1,    11,
-      -1,    13,    14,    15,    16,    17,    -1,    -1,    20,    21,
-      22,    23,    24,    -1,    26,    27,    28,    29,    30,    31,
-      32,    -1,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    -1,    -1,    -1,    46,    47,    48,    49,    50,    -1,
-      52,    53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,
-      62,    63,    64,    65,    66,    67,    68,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    91,
-      -1,    93,    94,     1,    -1,    -1,    -1,    -1,   100,   101,
-     102,   103,    -1,    11,    -1,    13,    14,    15,    16,    17,
-      -1,    -1,    20,    21,    22,    23,    24,    -1,    26,    27,
-      28,    29,    30,    31,    -1,    -1,    -1,    -1,    36,    -1,
-      -1,    51,    -1,    -1,    -1,    -1,    -1,    -1,    58,    59,
-      60,    61,    50,    -1,    52,    53,    54,    55,    56,    57,
-      -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,    67,
-      68,    81,    82,    83,    84,    85,    86,    87,    76,    -1,
-      -1,    -1,    92,    -1,    -1,    95,    96,    97,    98,    -1,
-      88,    89,    -1,    91,    -1,    93,    94,     1,    -1,    -1,
-      -1,    -1,   100,   101,   102,   103,    -1,    11,    -1,    13,
+      -1,    88,    89,    90,    -1,    -1,    -1,    -1,    -1,    96,
+      97,    -1,    -1,   100,   101,   102,   103,    11,    -1,    13,
       14,    15,    16,    17,    -1,    -1,    20,    21,    22,    23,
       24,    -1,    26,    27,    28,    29,    30,    31,    -1,    -1,
       -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      58,    59,    60,    61,    -1,    -1,    50,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,
-      64,    65,    66,    67,    68,    83,    84,    85,    86,    87,
-      -1,    -1,    76,    -1,    92,    -1,    -1,    95,    96,    97,
-      98,    -1,    -1,    -1,    88,    89,    -1,    91,    -1,    93,
-      94,    -1,    -1,    -1,    -1,    99,   100,    -1,   102,   103,
-       9,    -1,    11,    -1,    13,    14,    15,    16,    17,    -1,
-      -1,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    -1,    -1,    -1,    -1,    36,    -1,    -1,
-      -1,    -1,    -1,    -1,    58,    59,    60,    61,    -1,    -1,
-      -1,    50,    -1,    52,    53,    54,    55,    56,    57,    -1,
-      -1,    -1,    -1,    62,    63,    64,    65,    66,    67,    68,
-      -1,    85,    86,    87,    -1,    -1,    -1,    76,    92,    -1,
-      -1,    95,    96,    97,    98,    -1,    -1,    -1,    -1,    88,
-      89,    -1,    91,    -1,    93,    94,    -1,    -1,    -1,    -1,
-      -1,   100,    -1,   102,   103,     9,    -1,    11,    -1,    13,
-      14,    15,    16,    17,    -1,    -1,    20,    21,    22,    23,
-      24,    -1,    26,    27,    28,    29,    30,    31,    -1,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    -1,    58,    59,    60,
-      61,    -1,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
+      -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
       54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,
-      64,    65,    66,    67,    68,    86,    87,    -1,    -1,    -1,
-      -1,    92,    76,    -1,    95,    96,    97,    98,    -1,    -1,
-      -1,    -1,    -1,    -1,    88,    89,    -1,    91,    -1,    93,
-      94,    -1,    -1,    -1,    -1,    -1,   100,    -1,   102,   103,
-      11,    12,    13,    14,    15,    16,    17,    -1,    -1,    20,
+      64,    65,    66,    67,    68,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    88,    89,    90,    -1,    -1,    -1,
+      -1,    -1,    96,    97,    -1,    99,   100,    -1,   102,   103,
+      11,    -1,    13,    14,    15,    16,    17,    -1,    -1,    20,
       21,    22,    23,    24,    -1,    26,    27,    28,    29,    30,
       31,    -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,
-      58,    59,    60,    61,    -1,    -1,    -1,    -1,    -1,    50,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
       -1,    52,    53,    54,    55,    56,    57,    -1,    -1,    -1,
-      -1,    62,    63,    64,    65,    66,    67,    68,    86,    87,
-      -1,    -1,    -1,    -1,    92,    76,    -1,    95,    96,    97,
-      98,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,
-      91,    -1,    93,    94,    -1,    -1,    -1,    -1,    -1,   100,
+      -1,    62,    63,    64,    65,    66,    67,    68,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    90,
+      -1,    -1,    -1,    -1,    -1,    96,    97,    -1,    99,   100,
       -1,   102,   103,    11,    -1,    13,    14,    15,    16,    17,
       -1,    -1,    20,    21,    22,    23,    24,    -1,    26,    27,
       28,    29,    30,    31,    -1,    -1,    -1,    -1,    36,    -1,
@@ -850,8 +1070,8 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,    67,
       68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      88,    89,    -1,    91,    -1,    93,    94,    -1,    -1,    -1,
-      -1,    -1,   100,   101,   102,   103,    11,    -1,    13,    14,
+      88,    89,    90,    -1,    -1,    -1,    -1,    -1,    96,    97,
+      -1,    99,   100,    -1,   102,   103,    11,    -1,    13,    14,
       15,    16,    17,    -1,    -1,    20,    21,    22,    23,    24,
       -1,    26,    27,    28,    29,    30,    31,    -1,    -1,    -1,
       -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -859,8 +1079,8 @@ static const yytype_int16 yycheck[] =
       55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,    64,
       65,    66,    67,    68,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    88,    89,    -1,    91,    -1,    93,    94,
-      -1,    -1,    -1,    -1,    99,   100,    -1,   102,   103,    11,
+      -1,    -1,    -1,    88,    89,    90,    -1,    -1,    -1,    -1,
+      -1,    96,    97,    -1,    99,   100,    -1,   102,   103,    11,
       -1,    13,    14,    15,    16,    17,    -1,    -1,    20,    21,
       22,    23,    24,    -1,    26,    27,    28,    29,    30,    31,
       -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,
@@ -868,8 +1088,8 @@ static const yytype_int16 yycheck[] =
       52,    53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,
       62,    63,    64,    65,    66,    67,    68,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    91,
-      -1,    93,    94,    -1,    -1,    -1,    -1,    99,   100,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,
+      -1,    -1,    -1,    -1,    96,    97,    -1,    99,   100,    -1,
      102,   103,    11,    -1,    13,    14,    15,    16,    17,    -1,
       -1,    20,    21,    22,    23,    24,    -1,    26,    27,    28,
       29,    30,    31,    -1,    -1,    -1,    -1,    36,    -1,    -1,
@@ -878,7 +1098,7 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    -1,    62,    63,    64,    65,    66,    67,    68,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,
-      89,    -1,    91,    -1,    93,    94,    -1,    -1,    -1,    -1,
+      89,    90,    -1,    -1,    -1,    -1,    -1,    96,    97,    -1,
       99,   100,    -1,   102,   103,    11,    -1,    13,    14,    15,
       16,    17,    -1,    -1,    20,    21,    22,    23,    24,    -1,
       26,    27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,
@@ -887,8 +1107,8 @@ static const yytype_int16 yycheck[] =
       56,    57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,
       66,    67,    68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    88,    89,    -1,    91,    -1,    93,    94,    -1,
-      -1,    -1,    -1,    99,   100,    -1,   102,   103,    11,    -1,
+      -1,    -1,    88,    89,    90,    -1,    -1,    -1,    -1,    -1,
+      96,    97,    -1,    99,   100,    -1,   102,   103,    11,    -1,
       13,    14,    15,    16,    17,    -1,    -1,    20,    21,    22,
       23,    24,    -1,    26,    27,    28,    29,    30,    31,    -1,
       -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -896,56 +1116,28 @@ static const yytype_int16 yycheck[] =
       53,    54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,
       63,    64,    65,    66,    67,    68,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    88,    89,    -1,    91,    -1,
-      93,    94,    -1,    -1,    -1,    -1,    99,   100,    -1,   102,
+      -1,    -1,    -1,    -1,    -1,    88,    89,    90,    -1,    -1,
+      -1,    -1,    -1,    96,    97,    -1,    -1,   100,    -1,   102,
      103,    11,    -1,    13,    14,    15,    16,    17,    -1,    -1,
       20,    21,    22,    23,    24,    -1,    26,    27,    28,    29,
       30,    31,    -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       50,    -1,    52,    53,    54,    55,    56,    57,    -1,    -1,
       -1,    -1,    62,    63,    64,    65,    66,    67,    68,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    76,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    88,    89,
-      -1,    91,    -1,    93,    94,    -1,    -1,    -1,    -1,    99,
-     100,    -1,   102,   103,    11,    -1,    13,    14,    15,    16,
-      17,    -1,    -1,    20,    21,    22,    23,    24,    -1,    26,
-      27,    28,    29,    30,    31,    -1,    -1,    -1,    -1,    36,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    50,    -1,    52,    53,    54,    55,    56,
-      57,    -1,    -1,    -1,    -1,    62,    63,    64,    65,    66,
-      67,    68,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    76,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    88,    89,    -1,    91,    -1,    93,    94,    -1,    -1,
-      -1,    -1,    99,   100,    -1,   102,   103,    11,    -1,    13,
-      14,    15,    16,    17,    -1,    -1,    20,    21,    22,    23,
-      24,    -1,    26,    27,    28,    29,    30,    31,    -1,    -1,
-      -1,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,    52,    53,
-      54,    55,    56,    57,    -1,    -1,    -1,    -1,    62,    63,
-      64,    65,    66,    67,    68,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    76,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    88,    89,    -1,    91,    -1,    93,
-      94,    -1,    -1,    -1,    -1,    -1,   100,    -1,   102,   103,
-      11,    -1,    13,    14,    15,    16,    17,    -1,    -1,    20,
-      21,    22,    23,    24,    -1,    26,    27,    28,    29,    30,
-      31,    -1,    -1,    -1,    -1,    36,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
-      -1,    52,    53,    54,    55,    56,    57,    -1,    -1,    -1,
-      -1,    62,    63,    64,    65,    66,    67,    68,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    76,    51,    -1,    -1,    -1,
-      -1,    -1,    -1,    58,    59,    60,    61,    88,    89,    -1,
-      91,    -1,    93,    94,    -1,    -1,    -1,    -1,    -1,   100,
-      -1,   102,   103,    78,    79,    -1,    81,    82,    83,    84,
-      85,    86,    87,    -1,    -1,    -1,    -1,    92,    51,    -1,
-      95,    96,    97,    98,    -1,    58,    59,    60,    61,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    76,    51,    -1,    -1,
+      -1,    -1,    -1,    -1,    58,    59,    60,    61,    88,    89,
+      90,    -1,    -1,    -1,    -1,    -1,    96,    97,    -1,    -1,
+     100,    -1,   102,   103,    78,    79,    -1,    81,    82,    83,
+      84,    85,    86,    87,    -1,    -1,    -1,    -1,    92,    93,
+      94,    95,    51,    -1,    98,    -1,    -1,    -1,    -1,    58,
+      59,    60,    61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    79,    -1,    81,    82,
-      83,    84,    85,    86,    87,    -1,    -1,    -1,    -1,    92,
-      -1,    -1,    95,    96,    97,    98
+      79,    -1,    81,    82,    83,    84,    85,    86,    87,    -1,
+      -1,    -1,    -1,    92,    93,    94,    95,    -1,    -1,    98
 };
 
-  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
        0,     3,     4,     5,     6,     7,     8,   106,   107,   108,
@@ -953,7 +1145,7 @@ static const yytype_uint8 yystos[] =
       16,    17,    20,    21,    22,    23,    24,    26,    27,    28,
       29,    30,    31,    36,    50,    52,    53,    54,    55,    56,
       57,    62,    63,    64,    65,    66,    67,    68,    76,    88,
-      89,    91,    93,    94,   100,   102,   103,   160,   161,   162,
+      89,    90,    96,    97,   100,   102,   103,   160,   161,   162,
      165,   166,   167,   168,   169,   170,   172,   175,   181,   182,
      183,   184,   185,   186,   187,   188,   189,     9,   113,     1,
       32,    34,    35,    37,    38,    39,    40,    41,    42,    46,
@@ -962,13 +1154,13 @@ static const yytype_uint8 yystos[] =
      113,   182,   190,   190,   190,   190,   190,   171,    11,   100,
      170,   143,   143,   170,   100,   100,   100,   113,   170,    20,
      161,   174,   182,   190,   190,   113,   170,   101,   160,    20,
-      25,   145,   170,    91,   100,   173,   182,   183,   184,   170,
+      25,   145,   170,    90,   100,   173,   182,   183,   184,   170,
      161,   170,   170,   170,   170,   170,    99,   160,   190,   190,
       73,    74,    75,    77,     9,    11,   100,    51,    58,    59,
       60,    61,    78,    79,    81,    82,    83,    84,    85,    86,
-      87,    92,    95,    96,    97,    98,   100,     9,    11,     9,
+      87,    92,    93,    94,    95,    98,   100,     9,    11,     9,
       11,     9,    11,     9,   115,   144,   145,    20,   142,   100,
-     100,   100,   100,    67,    91,   100,   180,   182,   100,   100,
+     100,   100,   100,    67,    90,   100,   180,   182,   100,   100,
      113,    45,   134,   101,    39,    40,    41,    42,    46,    48,
      121,   122,   120,    12,   174,   100,   100,   160,    99,   113,
       23,   115,   146,    99,    99,   160,   175,   190,   161,    10,
@@ -978,7 +1170,7 @@ static const yytype_uint8 yystos[] =
      170,   170,   170,   170,   170,   170,   170,     9,    11,    15,
       16,    17,    21,    62,   100,   102,   103,   164,   182,    99,
      160,   160,   160,   160,   160,   160,   160,   160,   118,    20,
-     141,   142,    20,   125,   115,   115,   115,   115,    91,   115,
+     141,   142,    20,   125,   115,   115,   115,   115,    90,   115,
       67,   178,   179,   181,   182,   183,   184,   115,   115,   100,
      115,   115,   113,   160,   138,   160,   160,   160,   160,   160,
      175,   161,    12,   163,   100,   157,    69,   147,    99,    99,
@@ -1004,72 +1196,6 @@ static const yytype_uint8 yystos[] =
      135,   134,   118,   116,   140,    71,   133,    99,   116
 };
 
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,   105,   107,   106,   108,   106,   109,   106,   110,   106,
-     111,   106,   112,   106,   113,   114,   115,   116,   117,   118,
-     118,   119,   119,   120,   120,   121,   121,   122,   122,   123,
-     122,   124,   122,   122,   125,   122,   122,   122,   122,   122,
-     122,   122,   122,   126,   127,   122,   122,   122,   128,   122,
-     122,   122,   122,   129,   122,   122,   122,   130,   131,   131,
-     132,   132,   132,   132,   132,   132,   132,   132,   133,   133,
-     133,   134,   134,   135,   136,   136,   137,   137,   138,   139,
-     140,   141,   141,   142,   143,   144,   145,   145,   146,   146,
-     147,   147,   147,   148,   148,   149,   149,   150,   150,   151,
-     152,   152,   152,   153,   154,   154,   155,   155,   155,   156,
-     156,   158,   157,   159,   159,   160,   160,   160,   160,   161,
-     161,   161,   162,   162,   162,   162,   162,   162,   162,   162,
-     163,   162,   164,   164,   165,   165,   165,   165,   165,   165,
-     165,   165,   165,   165,   165,   165,   165,   165,   166,   166,
-     166,   166,   166,   166,   166,   166,   166,   166,   166,   166,
-     166,   166,   167,   167,   167,   167,   167,   167,   167,   167,
-     167,   168,   168,   168,   168,   168,   168,   169,   169,   170,
-     170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
-     170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
-     170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
-     170,   170,   170,   170,   170,   170,   170,   170,   170,   170,
-     170,   170,   170,   170,   170,   170,   170,   170,   171,   170,
-     170,   170,   170,   170,   172,   172,   172,   173,   173,   173,
-     173,   173,   174,   174,   175,   175,   176,   176,   177,   178,
-     178,   178,   179,   179,   180,   180,   181,   182,   183,   184,
-     185,   185,   186,   187,   187,   188,   188,   189,   189,   190,
-     190,   190,   190
-};
-
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     0,     4,     0,     3,     0,     3,     0,     3,
-       0,     3,     0,     3,     4,     7,     0,     4,     0,     0,
-       2,     0,     2,     1,     1,     2,     2,     1,     4,     0,
-       7,     0,    10,     4,     0,     7,     7,     7,     6,     6,
-       2,     8,     8,     0,     0,    13,     9,     8,     0,    10,
-       9,     7,     2,     0,     8,     2,     1,     2,     0,     3,
-       1,     1,     3,     3,     3,     3,     3,     3,     0,     2,
-       6,     0,     2,     0,     0,     1,     0,     1,     1,     1,
-       1,     1,     0,     0,     0,     0,     1,     1,     0,     1,
-       0,     2,     1,     2,     1,     0,     1,     1,     1,     3,
-       0,     1,     2,     3,     1,     1,     2,     3,     1,     0,
-       1,     0,     4,     1,     1,     3,     3,     3,     1,     2,
-       3,     1,     3,     5,     6,     3,     3,     5,     2,     4,
-       0,     5,     1,     1,     5,     4,     5,     4,     5,     6,
-       5,     4,     5,     4,     3,     6,     4,     5,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     3,     2,     4,     3,     5,     8,     2,     2,     1,
-       1,     1,     1,     5,     2,     3,     1,     2,     3,     1,
-       2,     1,     1,     1,     1,     1,     1,     4,     4,     5,
-       5,     1,     1,     3,     4,     3,     4,     4,     4,     4,
-       4,     1,     2,     2,     1,     2,     2,     1,     2,     1,
-       2,     1,     3,     1,     3,     1,     3,     4,     0,     6,
-       1,     1,     1,     1,     3,     2,     4,     3,     2,     1,
-       1,     1,     0,     1,     0,     1,     0,     2,     1,     1,
-       1,     1,     1,     1,     2,     2,     2,     2,     2,     2,
-       2,     4,     2,     1,     3,     1,     3,     1,     3,     1,
-       1,     1,     1
-};
-
 typedef enum {
 	toketype_ival, toketype_opval, toketype_pval
 } toketypes;
@@ -1092,23 +1218,23 @@ static const toketypes yy_type_tab[] =
   toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
   toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
   toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
-  toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval,
-  toketype_ival, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
-  toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival,
-  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival,
+  toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_ival,
+  toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_opval, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival, toketype_ival,
+  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval,
+  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival,
   toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval,
   toketype_opval, toketype_opval, toketype_ival, toketype_opval,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival,
+  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
   toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival,
+  toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival, toketype_opval,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
-  toketype_opval, toketype_opval
+  toketype_opval
 };
 
 /* Generated from:
- * 1a8fc0f841dee6e563463a6b91bf9c410b47437c760f485a16d87ade3d66bf1d perly.y
+ * b1f32b9f6f7c53d22517de00b5b5bfe4dd9d657c8573b9ea9eab7a43e852850a perly.y
  * 3e1dff60f26df8933d7aed0c0e87177a0f022c14800c0707eb62a7db4196ac98 regen_perly.pl
  * ex: set ro: */
diff --git a/perly.y b/perly.y
index ff14780..2332a7d 100644
--- a/perly.y
+++ b/perly.y
@@ -788,7 +788,9 @@ subsignature:	'('
                             UNOP_AUX_item *aux;
                             OP            *check;
 
-                            assert(FEATURE_SIGNATURES_IS_ENABLED);
+                            if (!parser->error_count) {
+                                assert(FEATURE_SIGNATURES_IS_ENABLED);
+                            }
 
                             /* We shouldn't get here otherwise */
                             Perl_ck_warner_d(aTHX_
diff --git a/t/comp/parser.t b/t/comp/parser.t
index 981f265..2da145c 100644
--- a/t/comp/parser.t
+++ b/t/comp/parser.t
@@ -543,6 +543,9 @@ eval "grep+grep";
 # Used to crash [perl #125679]
 eval 'BEGIN {$^H=-1} \eval=time';
 
+# Used to fail an assertion [perl #129073]
+eval '${p{};sub p}()';
+
 # RT #124207 syntax error during stringify can leave stringify op
 # with multiple children and assertion failures
 
-- 
1.8.3.1