Use GNU Bison's named references

Usage of Bison's named references makes actions little bit easier
to read and maintain.

diff --git a/AUTHORS b/AUTHORS
index 991d7e9..353c21d 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -175,6 +175,7 @@ Brad Lanam                     <bll@gentoo.com>
 Bradley Dean                   <bjdean@bjdean.id.au>
 Bram                           <perl-rt@wizbit.be>
 Brandon Black                  <blblack@gmail.com>
 Bradley Dean                   <bjdean@bjdean.id.au>
 Bram                           <perl-rt@wizbit.be>
 Brandon Black                  <blblack@gmail.com>

+Branislav Zahradník            <barney@cpan.org>

 Brendan Byrd                   <BBYRD@CPAN.org>
 Brendan O'Dea                  <bod@debian.org>
 Breno G. de Oliveira           <garu@cpan.org>
 Brendan Byrd                   <BBYRD@CPAN.org>
 Brendan O'Dea                  <bod@debian.org>
 Breno G. de Oliveira           <garu@cpan.org>

diff --git a/perly.act b/perly.act
index bc684e7..1004d34 100644 (file)
--- a/perly.act
+++ b/perly.act
@@ -5,8 +5,8 @@
  */
 
 case 2:
  */
 
 case 2:

-#line 121 "perly.y"
-    {
+#line 122 "perly.y"
+                        {

                          parser->expect = XSTATE;
                           (yyval.ival) = 0;
                        }
                          parser->expect = XSTATE;
                           (yyval.ival) = 0;
                        }


@@ -14,8 +14,8 @@ case 2:
     break;
 
   case 3:
     break;
 
   case 3:

-#line 126 "perly.y"
-    {
+#line 127 "perly.y"
+                        {

                          newPROG(block_end((ps[-1].val.ival),(ps[0].val.opval)));
                          PL_compiling.cop_seq = 0;
                          (yyval.ival) = 0;
                          newPROG(block_end((ps[-1].val.ival),(ps[0].val.opval)));
                          PL_compiling.cop_seq = 0;
                          (yyval.ival) = 0;


@@ -24,8 +24,8 @@ case 2:
     break;
 
   case 4:
     break;
 
   case 4:

-#line 132 "perly.y"
-    {
+#line 133 "perly.y"
+                        {

                          parser->expect = XTERM;
                           (yyval.ival) = 0;
                        }
                          parser->expect = XTERM;
                           (yyval.ival) = 0;
                        }


@@ -33,8 +33,8 @@ case 2:
     break;
 
   case 5:
     break;
 
   case 5:

-#line 137 "perly.y"
-    {
+#line 138 "perly.y"
+                        {

                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                        }
                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                        }


@@ -42,8 +42,8 @@ case 2:
     break;
 
   case 6:
     break;
 
   case 6:

-#line 142 "perly.y"
-    {
+#line 143 "perly.y"
+                        {

                          parser->expect = XBLOCK;
                           (yyval.ival) = 0;
                        }
                          parser->expect = XBLOCK;
                           (yyval.ival) = 0;
                        }


@@ -51,8 +51,8 @@ case 2:
     break;
 
   case 7:
     break;
 
   case 7:

-#line 147 "perly.y"
-    {
+#line 148 "perly.y"
+                        {

                          PL_pad_reset_pending = TRUE;
                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                          PL_pad_reset_pending = TRUE;
                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;


@@ -63,8 +63,8 @@ case 2:
     break;
 
   case 8:
     break;
 
   case 8:

-#line 155 "perly.y"
-    {
+#line 156 "perly.y"
+                        {

                          parser->expect = XSTATE;
                           (yyval.ival) = 0;
                        }
                          parser->expect = XSTATE;
                           (yyval.ival) = 0;
                        }


@@ -72,8 +72,8 @@ case 2:
     break;
 
   case 9:
     break;
 
   case 9:

-#line 160 "perly.y"
-    {
+#line 161 "perly.y"
+                        {

                          PL_pad_reset_pending = TRUE;
                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                          PL_pad_reset_pending = TRUE;
                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;


@@ -84,8 +84,8 @@ case 2:
     break;
 
   case 10:
     break;
 
   case 10:

-#line 168 "perly.y"
-    {
+#line 169 "perly.y"
+                        {

                          parser->expect = XSTATE;
                           (yyval.ival) = 0;
                        }
                          parser->expect = XSTATE;
                           (yyval.ival) = 0;
                        }


@@ -93,8 +93,8 @@ case 2:
     break;
 
   case 11:
     break;
 
   case 11:

-#line 173 "perly.y"
-    {
+#line 174 "perly.y"
+                        {

                          PL_pad_reset_pending = TRUE;
                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                          PL_pad_reset_pending = TRUE;
                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;


@@ -105,8 +105,8 @@ case 2:
     break;
 
   case 12:
     break;
 
   case 12:

-#line 181 "perly.y"
-    {
+#line 182 "perly.y"
+                        {

                          parser->expect = XSTATE;
                           (yyval.ival) = 0;
                        }
                          parser->expect = XSTATE;
                           (yyval.ival) = 0;
                        }


@@ -114,8 +114,8 @@ case 2:
     break;
 
   case 13:
     break;
 
   case 13:

-#line 186 "perly.y"
-    {
+#line 187 "perly.y"
+                        {

                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                        }
                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                        }


@@ -123,8 +123,8 @@ case 2:
     break;
 
   case 14:
     break;
 
   case 14:

-#line 191 "perly.y"
-    {
+#line 192 "perly.y"
+                        {

                          parser->expect = XSTATE;
                          (yyval.ival) = 0;
                        }
                          parser->expect = XSTATE;
                          (yyval.ival) = 0;
                        }


@@ -132,8 +132,8 @@ case 2:
     break;
 
   case 15:
     break;
 
   case 15:

-#line 196 "perly.y"
-    {
+#line 197 "perly.y"
+                        {

                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                        }
                          PL_eval_root = (ps[0].val.opval);
                          (yyval.ival) = 0;
                        }


@@ -141,8 +141,8 @@ case 2:
     break;
 
   case 16:
     break;
 
   case 16:

-#line 204 "perly.y"
-    { if (parser->copline > (line_t)(ps[-3].val.ival))
+#line 205 "perly.y"
+                        { 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));
                        }
                              parser->copline = (line_t)(ps[-3].val.ival);
                          (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval));
                        }


@@ -150,8 +150,8 @@ case 2:
     break;
 
   case 17:
     break;
 
   case 17:

-#line 212 "perly.y"
-    { if (parser->copline > (line_t)(ps[-6].val.ival))
+#line 213 "perly.y"
+                        { 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));
                        }
                              parser->copline = (line_t)(ps[-6].val.ival);
                          (yyval.opval) = block_end((ps[-5].val.ival), (ps[-2].val.opval));
                        }


@@ -159,15 +159,15 @@ case 2:
     break;
 
   case 18:
     break;
 
   case 18:

-#line 219 "perly.y"
-    { (yyval.ival) = block_start(TRUE);
+#line 220 "perly.y"
+                        { (yyval.ival) = block_start(TRUE);

                          parser->parsed_sub = 0; }
 
     break;
 
   case 19:
                          parser->parsed_sub = 0; }
 
     break;
 
   case 19:

-#line 224 "perly.y"
-    { if (parser->copline > (line_t)(ps[-3].val.ival))
+#line 225 "perly.y"
+                        { 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));
                        }
                              parser->copline = (line_t)(ps[-3].val.ival);
                          (yyval.opval) = block_end((ps[-2].val.ival), (ps[-1].val.opval));
                        }


@@ -175,21 +175,21 @@ case 2:
     break;
 
   case 20:
     break;
 
   case 20:

-#line 231 "perly.y"
-    { (yyval.ival) = block_start(FALSE);
+#line 232 "perly.y"
+                        { (yyval.ival) = block_start(FALSE);

                          parser->parsed_sub = 0; }
 
     break;
 
   case 21:
                          parser->parsed_sub = 0; }
 
     break;
 
   case 21:

-#line 237 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 238 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 22:
 
     break;
 
   case 22:

-#line 239 "perly.y"
-    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval));
+#line 240 "perly.y"
+                        {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval));

                            PL_pad_reset_pending = TRUE;
                            if ((ps[-1].val.opval) && (ps[0].val.opval))
                                PL_hints |= HINT_BLOCK_SCOPE;
                            PL_pad_reset_pending = TRUE;
                            if ((ps[-1].val.opval) && (ps[0].val.opval))
                                PL_hints |= HINT_BLOCK_SCOPE;


@@ -198,14 +198,14 @@ case 2:
     break;
 
   case 23:
     break;
 
   case 23:

-#line 248 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 249 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 24:
 
     break;
 
   case 24:

-#line 250 "perly.y"
-    {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval));
+#line 251 "perly.y"
+                        {   (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-1].val.opval), (ps[0].val.opval));

                            PL_pad_reset_pending = TRUE;
                            if ((ps[-1].val.opval) && (ps[0].val.opval))
                                PL_hints |= HINT_BLOCK_SCOPE;
                            PL_pad_reset_pending = TRUE;
                            if ((ps[-1].val.opval) && (ps[0].val.opval))
                                PL_hints |= HINT_BLOCK_SCOPE;


@@ -214,22 +214,22 @@ case 2:
     break;
 
   case 25:
     break;
 
   case 25:

-#line 259 "perly.y"
-    {
+#line 260 "perly.y"
+                        {

                          (yyval.opval) = (ps[0].val.opval) ? newSTATEOP(0, NULL, (ps[0].val.opval)) : NULL;
                        }
 
     break;
 
   case 26:
                          (yyval.opval) = (ps[0].val.opval) ? newSTATEOP(0, NULL, (ps[0].val.opval)) : NULL;
                        }
 
     break;
 
   case 26:

-#line 263 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 264 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 27:
 
     break;
 
   case 27:

-#line 267 "perly.y"
-    {
+#line 268 "perly.y"
+                        {

                           SV *label = cSVOPx_sv((ps[-1].val.opval));
                          (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8,
                                             savepv(SvPVX_const(label)), (ps[0].val.opval));
                           SV *label = cSVOPx_sv((ps[-1].val.opval));
                          (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8,
                                             savepv(SvPVX_const(label)), (ps[0].val.opval));


@@ -239,8 +239,8 @@ case 2:
     break;
 
   case 28:
     break;
 
   case 28:

-#line 274 "perly.y"
-    {
+#line 275 "perly.y"
+                        {

                           SV *label = cSVOPx_sv((ps[-1].val.opval));
                          (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8,
                                             savepv(SvPVX_const(label)), (ps[0].val.opval));
                           SV *label = cSVOPx_sv((ps[-1].val.opval));
                          (yyval.opval) = newSTATEOP(SvFLAGS(label) & SVf_UTF8,
                                             savepv(SvPVX_const(label)), (ps[0].val.opval));


@@ -250,14 +250,14 @@ case 2:
     break;
 
   case 29:
     break;
 
   case 29:

-#line 284 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 285 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 30:
 
     break;
 
   case 30:

-#line 286 "perly.y"
-    {
+#line 287 "perly.y"
+                        {

                          CV *fmtcv = PL_compcv;
                          newFORM((ps[-2].val.ival), (ps[-1].val.opval), (ps[0].val.opval));
                          (yyval.opval) = NULL;
                          CV *fmtcv = PL_compcv;
                          newFORM((ps[-2].val.ival), (ps[-1].val.opval), (ps[0].val.opval));
                          (yyval.opval) = NULL;


@@ -270,8 +270,8 @@ case 2:
     break;
 
   case 31:
     break;
 
   case 31:

-#line 298 "perly.y"
-    {
+#line 299 "perly.y"
+                        {

                           init_named_cv(PL_compcv, (ps[-1].val.opval));
                          parser->in_my = 0;
                          parser->in_my_stash = NULL;
                           init_named_cv(PL_compcv, (ps[-1].val.opval));
                          parser->in_my = 0;
                          parser->in_my_stash = NULL;


@@ -280,8 +280,8 @@ case 2:
     break;
 
   case 32:
     break;
 
   case 32:

-#line 304 "perly.y"
-    {
+#line 305 "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))
                          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))


@@ -295,8 +295,8 @@ case 2:
     break;
 
   case 33:
     break;
 
   case 33:

-#line 319 "perly.y"
-    {
+#line 320 "perly.y"
+                        {

                           init_named_cv(PL_compcv, (ps[-1].val.opval));
                          parser->in_my = 0;
                          parser->in_my_stash = NULL;
                           init_named_cv(PL_compcv, (ps[-1].val.opval));
                          parser->in_my = 0;
                          parser->in_my_stash = NULL;


@@ -305,8 +305,8 @@ case 2:
     break;
 
   case 34:
     break;
 
   case 34:

-#line 325 "perly.y"
-    {
+#line 326 "perly.y"
+                        {

                          SvREFCNT_inc_simple_void(PL_compcv);
                          (ps[-4].val.opval)->op_type == OP_CONST
                              ? newATTRSUB((ps[-3].val.ival), (ps[-4].val.opval), NULL, (ps[-1].val.opval), (ps[0].val.opval))
                          SvREFCNT_inc_simple_void(PL_compcv);
                          (ps[-4].val.opval)->op_type == OP_CONST
                              ? newATTRSUB((ps[-3].val.ival), (ps[-4].val.opval), NULL, (ps[-1].val.opval), (ps[0].val.opval))


@@ -320,8 +320,8 @@ case 2:
     break;
 
   case 35:
     break;
 
   case 35:

-#line 336 "perly.y"
-    {
+#line 337 "perly.y"
+                        {

                          package((ps[-1].val.opval));
                          if ((ps[-2].val.opval))
                              package_version((ps[-2].val.opval));
                          package((ps[-1].val.opval));
                          if ((ps[-2].val.opval))
                              package_version((ps[-2].val.opval));


@@ -331,14 +331,14 @@ case 2:
     break;
 
   case 36:
     break;
 
   case 36:

-#line 343 "perly.y"
-    { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
+#line 344 "perly.y"
+                        { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }

 
     break;
 
   case 37:
 
     break;
 
   case 37:

-#line 345 "perly.y"
-    {
+#line 346 "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));
                          parser->parsed_sub = 1;
                          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));
                          parser->parsed_sub = 1;


@@ -348,8 +348,8 @@ case 2:
     break;
 
   case 38:
     break;
 
   case 38:

-#line 352 "perly.y"
-    {
+#line 353 "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[-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);


@@ -358,8 +358,8 @@ case 2:
     break;
 
   case 39:
     break;
 
   case 39:

-#line 358 "perly.y"
-    {
+#line 359 "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[-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);


@@ -368,8 +368,8 @@ case 2:
     break;
 
   case 40:
     break;
 
   case 40:

-#line 364 "perly.y"
-    {
+#line 365 "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].val.ival), newGIVENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)), 0));
                          parser->copline = (line_t)(ps[-5].val.ival);
                        }


@@ -377,20 +377,20 @@ case 2:
     break;
 
   case 41:
     break;
 
   case 41:

-#line 369 "perly.y"
-    { (yyval.opval) = block_end((ps[-3].val.ival), newWHENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)))); }
+#line 370 "perly.y"
+                        { (yyval.opval) = block_end((ps[-3].val.ival), newWHENOP((ps[-2].val.opval), op_scope((ps[0].val.opval)))); }

 
     break;
 
   case 42:
 
     break;
 
   case 42:

-#line 371 "perly.y"
-    { (yyval.opval) = newWHENOP(0, op_scope((ps[0].val.opval))); }
+#line 372 "perly.y"
+                        { (yyval.opval) = newWHENOP(0, op_scope((ps[0].val.opval))); }

 
     break;
 
   case 43:
 
     break;
 
   case 43:

-#line 373 "perly.y"
-    {
+#line 374 "perly.y"
+                        {

                          (yyval.opval) = block_end((ps[-5].val.ival),
                                  newWHILEOP(0, 1, NULL,
                                      (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival)));
                          (yyval.opval) = block_end((ps[-5].val.ival),
                                  newWHILEOP(0, 1, NULL,
                                      (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival)));


@@ -400,8 +400,8 @@ case 2:
     break;
 
   case 44:
     break;
 
   case 44:

-#line 380 "perly.y"
-    {
+#line 381 "perly.y"
+                        {

                          (yyval.opval) = block_end((ps[-5].val.ival),
                                  newWHILEOP(0, 1, NULL,
                                      (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival)));
                          (yyval.opval) = block_end((ps[-5].val.ival),
                                  newWHILEOP(0, 1, NULL,
                                      (ps[-4].val.opval), (ps[-1].val.opval), (ps[0].val.opval), (ps[-2].val.ival)));


@@ -411,20 +411,20 @@ case 2:
     break;
 
   case 45:
     break;
 
   case 45:

-#line 387 "perly.y"
-    { parser->expect = XTERM; }
+#line 388 "perly.y"
+                        { parser->expect = XTERM; }

 
     break;
 
   case 46:
 
     break;
 
   case 46:

-#line 389 "perly.y"
-    { parser->expect = XTERM; }
+#line 390 "perly.y"
+                        { parser->expect = XTERM; }

 
     break;
 
   case 47:
 
     break;
 
   case 47:

-#line 392 "perly.y"
-    {
+#line 393 "perly.y"
+                        {

                          OP *initop = (ps[-9].val.opval);
                          OP *forop = newWHILEOP(0, 1, NULL,
                                      scalar((ps[-6].val.opval)), (ps[0].val.opval), (ps[-2].val.opval), (ps[-3].val.ival));
                          OP *initop = (ps[-9].val.opval);
                          OP *forop = newWHILEOP(0, 1, NULL,
                                      scalar((ps[-6].val.opval)), (ps[0].val.opval), (ps[-2].val.opval), (ps[-3].val.ival));


@@ -442,8 +442,8 @@ case 2:
     break;
 
   case 48:
     break;
 
   case 48:

-#line 407 "perly.y"
-    {
+#line 408 "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[-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);
                        }


@@ -451,8 +451,8 @@ case 2:
     break;
 
   case 49:
     break;
 
   case 49:

-#line 412 "perly.y"
-    {
+#line 413 "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].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);


@@ -461,14 +461,14 @@ case 2:
     break;
 
   case 50:
     break;
 
   case 50:

-#line 418 "perly.y"
-    { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
+#line 419 "perly.y"
+                        { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }

 
     break;
 
   case 51:
 
     break;
 
   case 51:

-#line 420 "perly.y"
-    {
+#line 421 "perly.y"
+                        {

                          (yyval.opval) = block_end(
                                (ps[-7].val.ival),
                                newFOROP(0,
                          (yyval.opval) = block_end(
                                (ps[-7].val.ival),
                                newFOROP(0,


@@ -484,8 +484,8 @@ case 2:
     break;
 
   case 52:
     break;
 
   case 52:

-#line 433 "perly.y"
-    {
+#line 434 "perly.y"
+                        {

                          (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(
                                0, op_lvalue(newUNOP(OP_REFGEN, 0,
                                                     (ps[-6].val.opval)),
                          (yyval.opval) = block_end((ps[-4].val.ival), newFOROP(
                                0, op_lvalue(newUNOP(OP_REFGEN, 0,
                                                     (ps[-6].val.opval)),


@@ -496,8 +496,8 @@ case 2:
     break;
 
   case 53:
     break;
 
   case 53:

-#line 441 "perly.y"
-    {
+#line 442 "perly.y"
+                        {

                          (yyval.opval) = block_end((ps[-4].val.ival),
                                  newFOROP(0, 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[-4].val.ival),
                                  newFOROP(0, NULL, (ps[-3].val.opval), (ps[-1].val.opval), (ps[0].val.opval)));
                          parser->copline = (line_t)(ps[-6].val.ival);


@@ -506,8 +506,8 @@ case 2:
     break;
 
   case 54:
     break;
 
   case 54:

-#line 447 "perly.y"
-    {
+#line 448 "perly.y"
+                        {

                          /* a block is a loop that happens once */
                          (yyval.opval) = newWHILEOP(0, 1, NULL,
                                  NULL, (ps[-1].val.opval), (ps[0].val.opval), 0);
                          /* a block is a loop that happens once */
                          (yyval.opval) = newWHILEOP(0, 1, NULL,
                                  NULL, (ps[-1].val.opval), (ps[0].val.opval), 0);


@@ -516,8 +516,8 @@ case 2:
     break;
 
   case 55:
     break;
 
   case 55:

-#line 453 "perly.y"
-    {
+#line 454 "perly.y"
+                        {

                          package((ps[-2].val.opval));
                          if ((ps[-3].val.opval)) {
                              package_version((ps[-3].val.opval));
                          package((ps[-2].val.opval));
                          if ((ps[-3].val.opval)) {
                              package_version((ps[-3].val.opval));


@@ -527,8 +527,8 @@ case 2:
     break;
 
   case 56:
     break;
 
   case 56:

-#line 460 "perly.y"
-    {
+#line 461 "perly.y"
+                        {

                          /* a block is a loop that happens once */
                          (yyval.opval) = newWHILEOP(0, 1, NULL,
                                  NULL, block_end((ps[-3].val.ival), (ps[-1].val.opval)), NULL, 0);
                          /* a block is a loop that happens once */
                          (yyval.opval) = newWHILEOP(0, 1, NULL,
                                  NULL, block_end((ps[-3].val.ival), (ps[-1].val.opval)), NULL, 0);


@@ -539,16 +539,16 @@ case 2:
     break;
 
   case 57:
     break;
 
   case 57:

-#line 468 "perly.y"
-    {
+#line 469 "perly.y"
+                        {

                          (yyval.opval) = (ps[-1].val.opval);
                        }
 
     break;
 
   case 58:
                          (yyval.opval) = (ps[-1].val.opval);
                        }
 
     break;
 
   case 58:

-#line 472 "perly.y"
-    {
+#line 473 "perly.y"
+                        {

                          (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
                                newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
                        }
                          (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
                                newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
                        }


@@ -556,8 +556,8 @@ case 2:
     break;
 
   case 59:
     break;
 
   case 59:

-#line 477 "perly.y"
-    {
+#line 478 "perly.y"
+                        {

                          (yyval.opval) = NULL;
                          parser->copline = NOLINE;
                        }
                          (yyval.opval) = NULL;
                          parser->copline = NOLINE;
                        }


@@ -565,8 +565,8 @@ case 2:
     break;
 
   case 60:
     break;
 
   case 60:

-#line 485 "perly.y"
-    { OP *list;
+#line 486 "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[0].val.opval)) {
                              OP *term = (ps[0].val.opval);
                              list = op_append_elem(OP_LIST, (ps[-1].val.opval), term);


@@ -584,84 +584,84 @@ case 2:
     break;
 
   case 61:
     break;
 
   case 61:

-#line 502 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 503 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 62:
 
     break;
 
   case 62:

-#line 504 "perly.y"
-    { (yyval.opval) = op_unscope((ps[-1].val.opval)); }
-
-    break;
-
-  case 63:
-#line 509 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 505 "perly.y"
+                        { (yyval.opval) = op_unscope((ps[-1].val.opval)); }

 
     break;
 
   case 64:
 
     break;
 
   case 64:

-#line 511 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 513 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 65:
 
     break;
 
   case 65:

-#line 513 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
+#line 515 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 66:
 
     break;
 
   case 66:

-#line 515 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[0].val.opval), (ps[-2].val.opval)); }
+#line 517 "perly.y"
+                        { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[0].val.opval), (ps[-2].val.opval)); }

 
     break;
 
   case 67:
 
     break;
 
   case 67:

-#line 517 "perly.y"
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[0].val.opval)), (ps[-2].val.opval)); }
+#line 519 "perly.y"
+                        { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[0].val.opval), (ps[-2].val.opval)); }

 
     break;
 
   case 68:
 
     break;
 
   case 68:

-#line 519 "perly.y"
-    { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[0].val.opval), (ps[-2].val.opval)); }
+#line 521 "perly.y"
+                        { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[0].val.opval)), (ps[-2].val.opval)); }

 
     break;
 
   case 69:
 
     break;
 
   case 69:

-#line 521 "perly.y"
-    { (yyval.opval) = newFOROP(0, NULL, (ps[0].val.opval), (ps[-2].val.opval), NULL);
-                         parser->copline = (line_t)(ps[-1].val.ival); }
+#line 523 "perly.y"
+                        { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[0].val.opval), (ps[-2].val.opval)); }

 
     break;
 
   case 70:
 
     break;
 
   case 70:

-#line 524 "perly.y"
-    { (yyval.opval) = newWHENOP((ps[0].val.opval), op_scope((ps[-2].val.opval))); }
+#line 525 "perly.y"
+                        { (yyval.opval) = newFOROP(0, NULL, (ps[0].val.opval), (ps[-2].val.opval), NULL);
+                         parser->copline = (line_t)(ps[-1].val.ival); }

 
     break;
 
   case 71:
 
     break;
 
   case 71:

-#line 529 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 528 "perly.y"
+                        { (yyval.opval) = newWHENOP((ps[0].val.opval), op_scope((ps[-2].val.opval))); }

 
     break;
 
   case 72:
 
     break;
 
   case 72:

-#line 531 "perly.y"
-    {
+#line 533 "perly.y"
+                        { (yyval.opval) = NULL; }
+
+    break;
+
+  case 73:
+#line 535 "perly.y"
+                        {

                          ((ps[0].val.opval))->op_flags |= OPf_PARENS;
                          (yyval.opval) = op_scope((ps[0].val.opval));
                        }
 
     break;
 
                          ((ps[0].val.opval))->op_flags |= OPf_PARENS;
                          (yyval.opval) = op_scope((ps[0].val.opval));
                        }
 
     break;
 

-  case 73:
-#line 536 "perly.y"
-    { parser->copline = (line_t)(ps[-5].val.ival);
+  case 74:
+#line 540 "perly.y"
+                        { parser->copline = (line_t)(ps[-5].val.ival);

                            (yyval.opval) = newCONDOP(0,
                                newSTATEOP(OPf_SPECIAL,NULL,(ps[-3].val.opval)),
                                op_scope((ps[-1].val.opval)), (ps[0].val.opval));
                            (yyval.opval) = newCONDOP(0,
                                newSTATEOP(OPf_SPECIAL,NULL,(ps[-3].val.opval)),
                                op_scope((ps[-1].val.opval)), (ps[0].val.opval));


@@ -670,154 +670,154 @@ case 2:
 
     break;
 
 
     break;
 

-  case 74:
-#line 546 "perly.y"
-    { (yyval.opval) = NULL; }
+  case 75:
+#line 550 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
 
     break;
 

-  case 75:
-#line 548 "perly.y"
-    { (yyval.opval) = op_scope((ps[0].val.opval)); }
+  case 76:
+#line 552 "perly.y"
+                        { (yyval.opval) = op_scope((ps[0].val.opval)); }

 
     break;
 
 
     break;
 

-  case 76:
-#line 553 "perly.y"
-    { (yyval.ival) = (PL_min_intro_pending &&
+  case 77:
+#line 557 "perly.y"
+                        { (yyval.ival) = (PL_min_intro_pending &&

                            PL_max_intro_pending >=  PL_min_intro_pending);
                          intro_my(); }
 
     break;
 
                            PL_max_intro_pending >=  PL_min_intro_pending);
                          intro_my(); }
 
     break;
 

-  case 77:
-#line 559 "perly.y"
-    { (yyval.opval) = NULL; }
+  case 78:
+#line 563 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
 
     break;
 

-  case 79:
-#line 565 "perly.y"
-    { YYSTYPE tmplval;
+  case 80:
+#line 569 "perly.y"
+                        { YYSTYPE tmplval;

                          (void)scan_num("1", &tmplval);
                          (yyval.opval) = tmplval.opval; }
 
     break;
 
                          (void)scan_num("1", &tmplval);
                          (yyval.opval) = tmplval.opval; }
 
     break;
 

-  case 81:
-#line 573 "perly.y"
-    { (yyval.opval) = invert(scalar((ps[0].val.opval))); }
-
-    break;
-

   case 82:
   case 82:

-#line 578 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); intro_my(); }
+#line 577 "perly.y"
+                        { (yyval.opval) = invert(scalar((ps[0].val.opval))); }

 
     break;
 
   case 83:
 #line 582 "perly.y"
 
     break;
 
   case 83:
 #line 582 "perly.y"

-    { (yyval.opval) = (ps[0].val.opval); intro_my(); }
+                        { (yyval.opval) = (ps[0].val.opval); intro_my(); }

 
     break;
 
   case 84:
 
     break;
 
   case 84:

-#line 585 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 586 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); intro_my(); }

 
     break;
 
   case 85:
 
     break;
 
   case 85:

-#line 586 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 589 "perly.y"
+                                { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 86:
 #line 590 "perly.y"
 
     break;
 
   case 86:
 #line 590 "perly.y"

-    { (yyval.ival) = start_subparse(FALSE, 0);
-                           SAVEFREESV(PL_compcv); }
+                                { (yyval.opval) = NULL; }

 
     break;
 
   case 87:
 
     break;
 
   case 87:

-#line 596 "perly.y"
-    { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
+#line 594 "perly.y"
+                        { (yyval.ival) = start_subparse(FALSE, 0);

                            SAVEFREESV(PL_compcv); }
 
     break;
 
   case 88:
                            SAVEFREESV(PL_compcv); }
 
     break;
 
   case 88:

-#line 601 "perly.y"
-    { (yyval.ival) = start_subparse(TRUE, 0);
+#line 600 "perly.y"
+                        { (yyval.ival) = start_subparse(FALSE, CVf_ANON);

                            SAVEFREESV(PL_compcv); }
 
     break;
 
                            SAVEFREESV(PL_compcv); }
 
     break;
 

-  case 91:
-#line 612 "perly.y"
-    { (yyval.opval) = NULL; }
+  case 89:
+#line 605 "perly.y"
+                        { (yyval.ival) = start_subparse(TRUE, 0);
+                           SAVEFREESV(PL_compcv); }

 
     break;
 
 
     break;
 

-  case 93:
-#line 618 "perly.y"
-    { (yyval.opval) = NULL; }
+  case 92:
+#line 616 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 94:
 
     break;
 
   case 94:

-#line 620 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 622 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 95:
 
     break;
 
   case 95:

-#line 622 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 624 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 96:
 
     break;
 
   case 96:

-#line 627 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 626 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 97:
 
     break;
 
   case 97:

-#line 629 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 631 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 98:
 
     break;
 
   case 98:

-#line 640 "perly.y"
-    { parser->in_my = 0; (yyval.opval) = NULL; }
+#line 633 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 99:
 
     break;
 
   case 99:

-#line 642 "perly.y"
-    { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }
+#line 644 "perly.y"
+                        { parser->in_my = 0; (yyval.opval) = NULL; }

 
     break;
 
   case 100:
 
     break;
 
   case 100:

-#line 647 "perly.y"
-    { (yyval.ival) = '@'; }
+#line 646 "perly.y"
+                        { parser->in_my = 0; (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 101:
 
     break;
 
   case 101:

-#line 649 "perly.y"
-    { (yyval.ival) = '%'; }
+#line 651 "perly.y"
+                        { (yyval.ival) = '@'; }

 
     break;
 
   case 102:
 #line 653 "perly.y"
 
     break;
 
   case 102:
 #line 653 "perly.y"

-    {
+                        { (yyval.ival) = '%'; }
+
+    break;
+
+  case 103:
+#line 657 "perly.y"
+                        {

                             I32 sigil   = (ps[-2].val.ival);
                             OP *var     = (ps[-1].val.opval);
                             OP *defexpr = (ps[0].val.opval);
                             I32 sigil   = (ps[-2].val.ival);
                             OP *var     = (ps[-1].val.opval);
                             OP *defexpr = (ps[0].val.opval);


@@ -835,27 +835,27 @@ case 2:
 
     break;
 
 
     break;
 

-  case 103:
-#line 672 "perly.y"
-    { (yyval.opval) = NULL; }
-
-    break;
-

   case 104:
   case 104:

-#line 674 "perly.y"
-    { (yyval.opval) = newOP(OP_NULL, 0); }
+#line 676 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 105:
 
     break;
 
   case 105:

-#line 676 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 678 "perly.y"
+                        { (yyval.opval) = newOP(OP_NULL, 0); }

 
     break;
 
   case 106:
 
     break;
 
   case 106:

-#line 682 "perly.y"
-    {
+#line 680 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }
+
+    break;
+
+  case 107:
+#line 686 "perly.y"
+                        {

                             OP *var     = (ps[-1].val.opval);
                             OP *defexpr = (ps[0].val.opval);
 
                             OP *var     = (ps[-1].val.opval);
                             OP *defexpr = (ps[0].val.opval);
 


@@ -918,71 +918,71 @@ case 2:
 
     break;
 
 
     break;
 

-  case 107:
-#line 747 "perly.y"
-    { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
-
-    break;
-

   case 108:
   case 108:

-#line 749 "perly.y"
-    { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }
+#line 751 "perly.y"
+                        { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 109:
 
     break;
 
   case 109:

-#line 755 "perly.y"
-    { (yyval.opval) = (ps[-1].val.opval); }
+#line 753 "perly.y"
+                        { parser->in_my = KEY_sigvar; (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 110:
 
     break;
 
   case 110:

-#line 757 "perly.y"
-    {
-                         (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-2].val.opval), (ps[0].val.opval));
-                       }
+#line 759 "perly.y"
+                        { (yyval.opval) = (ps[-1].val.opval); }

 
     break;
 
   case 111:
 #line 761 "perly.y"
 
     break;
 
   case 111:
 #line 761 "perly.y"

-    { (yyval.opval) = (ps[0].val.opval); }
+                        {
+                         (yyval.opval) = op_append_list(OP_LINESEQ, (ps[-2].val.opval), (ps[0].val.opval));
+                       }

 
     break;
 
   case 112:
 
     break;
 
   case 112:

-#line 766 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 765 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 113:
 
     break;
 
   case 113:

-#line 768 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 770 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 114:
 #line 772 "perly.y"
 
     break;
 
   case 114:
 #line 772 "perly.y"

-    { (yyval.opval) = NULL; }
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 115:
 
     break;
 
   case 115:

-#line 774 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 776 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 116:
 #line 778 "perly.y"
 
     break;
 
   case 116:
 #line 778 "perly.y"

-    { (yyval.opval) = (ps[-1].val.opval); }
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 117:
 
     break;
 
   case 117:

-#line 781 "perly.y"
-    {
+#line 782 "perly.y"
+                        { (yyval.opval) = (ps[-1].val.opval); }
+
+    break;
+
+  case 118:
+#line 785 "perly.y"
+                        {

                             ENTER;
                             SAVEIV(parser->sig_elems);
                             SAVEIV(parser->sig_optelems);
                             ENTER;
                             SAVEIV(parser->sig_elems);
                             SAVEIV(parser->sig_optelems);


@@ -995,9 +995,9 @@ case 2:
 
     break;
 
 
     break;
 

-  case 118:
-#line 792 "perly.y"
-    {
+  case 119:
+#line 796 "perly.y"
+                        {

                             OP            *sigops = (ps[0].val.opval);
                             struct op_argcheck_aux *aux;
                             OP            *check;
                             OP            *sigops = (ps[0].val.opval);
                             struct op_argcheck_aux *aux;
                             OP            *check;


@@ -1054,21 +1054,21 @@ case 2:
 
     break;
 
 
     break;
 

-  case 119:
-#line 849 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+  case 120:
+#line 853 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
 
     break;
 

-  case 120:
-#line 850 "perly.y"
-    { (yyval.opval) = NULL; }
+  case 121:
+#line 854 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
 
     break;
 

-  case 121:
-#line 856 "perly.y"
-    {
+  case 122:
+#line 860 "perly.y"
+                        {

                          if (parser->copline > (line_t)(ps[-2].val.ival))
                              parser->copline = (line_t)(ps[-2].val.ival);
                          (yyval.opval) = block_end((ps[-3].val.ival), (ps[-1].val.opval));
                          if (parser->copline > (line_t)(ps[-2].val.ival))
                              parser->copline = (line_t)(ps[-2].val.ival);
                          (yyval.opval) = block_end((ps[-3].val.ival), (ps[-1].val.opval));


@@ -1076,21 +1076,21 @@ case 2:
 
     break;
 
 
     break;
 

-  case 122:
-#line 866 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
-
-    break;
-

   case 123:
   case 123:

-#line 867 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 870 "perly.y"
+                           { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 124:
 #line 871 "perly.y"
 
     break;
 
   case 124:
 #line 871 "perly.y"

-    {
+                           { (yyval.opval) = NULL; }
+
+    break;
+
+  case 125:
+#line 875 "perly.y"
+                        {

                          if (parser->copline > (line_t)(ps[-2].val.ival))
                              parser->copline = (line_t)(ps[-2].val.ival);
                          (yyval.opval) = block_end((ps[-4].val.ival),
                          if (parser->copline > (line_t)(ps[-2].val.ival))
                              parser->copline = (line_t)(ps[-2].val.ival);
                          (yyval.opval) = block_end((ps[-4].val.ival),


@@ -1099,58 +1099,58 @@ case 2:
 
     break;
 
 
     break;
 

-  case 125:
-#line 882 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
-
-    break;
-

   case 126:
   case 126:

-#line 884 "perly.y"
-    { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); }
+#line 886 "perly.y"
+                        { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 127:
 
     break;
 
   case 127:

-#line 886 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
+#line 888 "perly.y"
+                        { (yyval.opval) = newLOGOP((ps[-1].val.ival), 0, (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
 
     break;
 

-  case 129:
-#line 892 "perly.y"
-    { (yyval.opval) = (ps[-1].val.opval); }
+  case 128:
+#line 890 "perly.y"
+                        { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 130:
 
     break;
 
   case 130:

-#line 894 "perly.y"
-    {
+#line 896 "perly.y"
+                        { (yyval.opval) = (ps[-1].val.opval); }
+
+    break;
+
+  case 131:
+#line 898 "perly.y"
+                        {

                          OP* term = (ps[0].val.opval);
                          (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term);
                        }
 
     break;
 
                          OP* term = (ps[0].val.opval);
                          (yyval.opval) = op_append_elem(OP_LIST, (ps[-2].val.opval), term);
                        }
 
     break;
 

-  case 132:
-#line 903 "perly.y"
-    { (yyval.opval) = op_convert_list((ps[-2].val.ival), OPf_STACKED,
+  case 133:
+#line 907 "perly.y"
+                        { (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)) );
                        }
 
     break;
 
                                op_prepend_elem(OP_LIST, newGVREF((ps[-2].val.ival),(ps[-1].val.opval)), (ps[0].val.opval)) );
                        }
 
     break;
 

-  case 133:
-#line 907 "perly.y"
-    { (yyval.opval) = op_convert_list((ps[-4].val.ival), OPf_STACKED,
+  case 134:
+#line 911 "perly.y"
+                        { (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)) );
                        }
 
     break;
 
                                op_prepend_elem(OP_LIST, newGVREF((ps[-4].val.ival),(ps[-2].val.opval)), (ps[-1].val.opval)) );
                        }
 
     break;
 

-  case 134:
-#line 911 "perly.y"
-    { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
+  case 135:
+#line 915 "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_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))));


@@ -1158,18 +1158,18 @@ case 2:
 
     break;
 
 
     break;
 

-  case 135:
-#line 917 "perly.y"
-    { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
+  case 136:
+#line 921 "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))));
                        }
 
     break;
 
                                op_append_elem(OP_LIST, scalar((ps[-2].val.opval)),
                                    newMETHOP(OP_METHOD, 0, (ps[0].val.opval))));
                        }
 
     break;
 

-  case 136:
-#line 922 "perly.y"
-    { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
+  case 137:
+#line 926 "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_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))));


@@ -1177,9 +1177,9 @@ case 2:
 
     break;
 
 
     break;
 

-  case 137:
-#line 928 "perly.y"
-    { (yyval.opval) = op_convert_list(OP_ENTERSUB, OPf_STACKED,
+  case 138:
+#line 932 "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_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))));


@@ -1187,97 +1187,97 @@ case 2:
 
     break;
 
 
     break;
 

-  case 138:
-#line 934 "perly.y"
-    { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); }
-
-    break;
-

   case 139:
   case 139:

-#line 936 "perly.y"
-    { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
+#line 938 "perly.y"
+                        { (yyval.opval) = op_convert_list((ps[-1].val.ival), 0, (ps[0].val.opval)); }

 
     break;
 
   case 140:
 
     break;
 
   case 140:

-#line 938 "perly.y"
-    { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
+#line 940 "perly.y"
+                        { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }

 
     break;
 
   case 141:
 
     break;
 
   case 141:

-#line 940 "perly.y"
-    { SvREFCNT_inc_simple_void(PL_compcv);
-                         (yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, NULL, (ps[0].val.opval)); }
+#line 942 "perly.y"
+                        { (yyval.opval) = op_convert_list((ps[-3].val.ival), 0, (ps[-1].val.opval)); }

 
     break;
 
   case 142:
 
     break;
 
   case 142:

-#line 943 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+#line 944 "perly.y"
+                        { SvREFCNT_inc_simple_void(PL_compcv);
+                         (yyval.opval) = newANONATTRSUB((ps[-1].val.ival), 0, NULL, (ps[0].val.opval)); }
+
+    break;
+
+  case 143:
+#line 947 "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)));
                        }
 
     break;
 
                                 op_append_elem(OP_LIST,
                                   op_prepend_elem(OP_LIST, (ps[-1].val.opval), (ps[0].val.opval)), (ps[-4].val.opval)));
                        }
 
     break;
 

-  case 145:
-#line 958 "perly.y"
-    { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); }
+  case 146:
+#line 962 "perly.y"
+                        { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[-4].val.opval), scalar((ps[-2].val.opval))); }

 
     break;
 
 
     break;
 

-  case 146:
-#line 960 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval)));
+  case 147:
+#line 964 "perly.y"
+                        { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[-3].val.opval)), scalar((ps[-1].val.opval)));

                        }
 
     break;
 
                        }
 
     break;
 

-  case 147:
-#line 963 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0,
+  case 148:
+#line 967 "perly.y"
+                        { (yyval.opval) = newBINOP(OP_AELEM, 0,

                                        ref(newAVREF((ps[-4].val.opval)),OP_RV2AV),
                                        scalar((ps[-1].val.opval)));
                        }
 
     break;
 
                                        ref(newAVREF((ps[-4].val.opval)),OP_RV2AV),
                                        scalar((ps[-1].val.opval)));
                        }
 
     break;
 

-  case 148:
-#line 968 "perly.y"
-    { (yyval.opval) = newBINOP(OP_AELEM, 0,
+  case 149:
+#line 972 "perly.y"
+                        { (yyval.opval) = newBINOP(OP_AELEM, 0,

                                        ref(newAVREF((ps[-3].val.opval)),OP_RV2AV),
                                        scalar((ps[-1].val.opval)));
                        }
 
     break;
 
                                        ref(newAVREF((ps[-3].val.opval)),OP_RV2AV),
                                        scalar((ps[-1].val.opval)));
                        }
 
     break;
 

-  case 149:
-#line 973 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval)));
+  case 150:
+#line 977 "perly.y"
+                        { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[-4].val.opval)), jmaybe((ps[-2].val.opval)));

                        }
 
     break;
 
                        }
 
     break;
 

-  case 150:
-#line 976 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0,
+  case 151:
+#line 980 "perly.y"
+                        { (yyval.opval) = newBINOP(OP_HELEM, 0,

                                        ref(newHVREF((ps[-5].val.opval)),OP_RV2HV),
                                        jmaybe((ps[-2].val.opval))); }
 
     break;
 
                                        ref(newHVREF((ps[-5].val.opval)),OP_RV2HV),
                                        jmaybe((ps[-2].val.opval))); }
 
     break;
 

-  case 151:
-#line 980 "perly.y"
-    { (yyval.opval) = newBINOP(OP_HELEM, 0,
+  case 152:
+#line 984 "perly.y"
+                        { (yyval.opval) = newBINOP(OP_HELEM, 0,

                                        ref(newHVREF((ps[-4].val.opval)),OP_RV2HV),
                                        jmaybe((ps[-2].val.opval))); }
 
     break;
 
                                        ref(newHVREF((ps[-4].val.opval)),OP_RV2HV),
                                        jmaybe((ps[-2].val.opval))); }
 
     break;
 

-  case 152:
-#line 984 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+  case 153:
+#line 988 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,

                                   newCVREF(0, scalar((ps[-3].val.opval))));
                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                                   newCVREF(0, scalar((ps[-3].val.opval))));
                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;


@@ -1285,9 +1285,9 @@ case 2:
 
     break;
 
 
     break;
 

-  case 153:
-#line 990 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+  case 154:
+#line 994 "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)))));
                          if (parser->expect == XBLOCK)
                                   op_append_elem(OP_LIST, (ps[-1].val.opval),
                                       newCVREF(0, scalar((ps[-4].val.opval)))));
                          if (parser->expect == XBLOCK)


@@ -1296,9 +1296,9 @@ case 2:
 
     break;
 
 
     break;
 

-  case 154:
-#line 998 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+  case 155:
+#line 1002 "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)))));
                          if (parser->expect == XBLOCK)
                                   op_append_elem(OP_LIST, (ps[-1].val.opval),
                                               newCVREF(0, scalar((ps[-3].val.opval)))));
                          if (parser->expect == XBLOCK)


@@ -1307,9 +1307,9 @@ case 2:
 
     break;
 
 
     break;
 

-  case 155:
-#line 1005 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+  case 156:
+#line 1009 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,

                                   newCVREF(0, scalar((ps[-2].val.opval))));
                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                                   newCVREF(0, scalar((ps[-2].val.opval))));
                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;


@@ -1317,224 +1317,224 @@ case 2:
 
     break;
 
 
     break;
 

-  case 156:
-#line 1011 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); }
-
-    break;
-

   case 157:
   case 157:

-#line 1013 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); }
+#line 1015 "perly.y"
+                        { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-4].val.opval)); }

 
     break;
 
   case 158:
 
     break;
 
   case 158:

-#line 1015 "perly.y"
-    { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), NULL); }
+#line 1017 "perly.y"
+                        { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), (ps[-3].val.opval)); }

 
     break;
 
   case 159:
 
     break;
 
   case 159:

-#line 1020 "perly.y"
-    { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); }
+#line 1019 "perly.y"
+                        { (yyval.opval) = newSLICEOP(0, (ps[-1].val.opval), NULL); }

 
     break;
 
   case 160:
 
     break;
 
   case 160:

-#line 1022 "perly.y"
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+#line 1024 "perly.y"
+                        { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[-2].val.opval), (ps[-1].val.ival), (ps[0].val.opval)); }

 
     break;
 
   case 161:
 
     break;
 
   case 161:

-#line 1024 "perly.y"
-    {   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 1026 "perly.y"
+                        { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }

 
     break;
 
   case 162:
 
     break;
 
   case 162:

-#line 1029 "perly.y"
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+#line 1028 "perly.y"
+                        {   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)));
+                       }

 
     break;
 
   case 163:
 
     break;
 
   case 163:

-#line 1031 "perly.y"
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+#line 1033 "perly.y"
+                        { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }

 
     break;
 
   case 164:
 
     break;
 
   case 164:

-#line 1033 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1035 "perly.y"
+                        { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }

 
     break;
 
   case 165:
 
     break;
 
   case 165:

-#line 1035 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1037 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 166:
 
     break;
 
   case 166:

-#line 1037 "perly.y"
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+#line 1039 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 167:
 
     break;
 
   case 167:

-#line 1039 "perly.y"
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+#line 1041 "perly.y"
+                        { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }

 
     break;
 
   case 168:
 
     break;
 
   case 168:

-#line 1041 "perly.y"
-    { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+#line 1043 "perly.y"
+                        { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }

 
     break;
 
   case 169:
 
     break;
 
   case 169:

-#line 1043 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
+#line 1045 "perly.y"
+                        { (yyval.opval) = newRANGE((ps[-1].val.ival), scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }

 
     break;
 
   case 170:
 
     break;
 
   case 170:

-#line 1045 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
+#line 1047 "perly.y"
+                        { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 171:
 
     break;
 
   case 171:

-#line 1047 "perly.y"
-    { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }
+#line 1049 "perly.y"
+                        { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 172:
 
     break;
 
   case 172:

-#line 1049 "perly.y"
-    { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
+#line 1051 "perly.y"
+                        { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 173:
 #line 1053 "perly.y"
 
     break;
 
   case 173:
 #line 1053 "perly.y"

-    { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }
+                        { (yyval.opval) = bind_match((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 174:
 
     break;
 
   case 174:

-#line 1055 "perly.y"
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+#line 1057 "perly.y"
+                        { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }

 
     break;
 
   case 175:
 
     break;
 
   case 175:

-#line 1057 "perly.y"
-    { yyerror("syntax error"); YYERROR; }
+#line 1059 "perly.y"
+                        { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }

 
     break;
 
   case 176:
 
     break;
 
   case 176:

-#line 1059 "perly.y"
-    { yyerror("syntax error"); YYERROR; }
+#line 1061 "perly.y"
+                        { yyerror("syntax error"); YYERROR; }

 
     break;
 
   case 177:
 #line 1063 "perly.y"
 
     break;
 
   case 177:
 #line 1063 "perly.y"

-    { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
+                        { yyerror("syntax error"); YYERROR; }

 
     break;
 
   case 178:
 
     break;
 
   case 178:

-#line 1065 "perly.y"
-    { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
+#line 1067 "perly.y"
+                        { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 179:
 #line 1069 "perly.y"
 
     break;
 
   case 179:
 #line 1069 "perly.y"

-    { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }
+                        { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 180:
 
     break;
 
   case 180:

-#line 1071 "perly.y"
-    { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }
+#line 1073 "perly.y"
+                        { (yyval.opval) = cmpchain_finish((ps[0].val.opval)); }

 
     break;
 
   case 181:
 
     break;
 
   case 181:

-#line 1073 "perly.y"
-    { yyerror("syntax error"); YYERROR; }
+#line 1075 "perly.y"
+                        { (yyval.opval) = newBINOP((ps[-1].val.ival), 0, scalar((ps[-2].val.opval)), scalar((ps[0].val.opval))); }

 
     break;
 
   case 182:
 
     break;
 
   case 182:

-#line 1075 "perly.y"
-    { yyerror("syntax error"); YYERROR; }
+#line 1077 "perly.y"
+                        { yyerror("syntax error"); YYERROR; }

 
     break;
 
   case 183:
 #line 1079 "perly.y"
 
     break;
 
   case 183:
 #line 1079 "perly.y"

-    { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
+                        { yyerror("syntax error"); YYERROR; }

 
     break;
 
   case 184:
 
     break;
 
   case 184:

-#line 1081 "perly.y"
-    { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }
+#line 1083 "perly.y"
+                        { (yyval.opval) = cmpchain_start((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 185:
 
     break;
 
   case 185:

-#line 1086 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); }
+#line 1085 "perly.y"
+                        { (yyval.opval) = cmpchain_extend((ps[-1].val.ival), (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 186:
 
     break;
 
   case 186:

-#line 1088 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1090 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[0].val.opval))); }

 
     break;
 
   case 187:
 
     break;
 
   case 187:

-#line 1091 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
+#line 1092 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 188:
 
     break;
 
   case 188:

-#line 1093 "perly.y"
-    { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); }
+#line 1095 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }

 
     break;
 
   case 189:
 
     break;
 
   case 189:

-#line 1095 "perly.y"
-    { (yyval.opval) = newUNOP(OP_POSTINC, 0,
-                                       op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); }
+#line 1097 "perly.y"
+                        { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, scalar((ps[0].val.opval))); }

 
     break;
 
   case 190:
 
     break;
 
   case 190:

-#line 1098 "perly.y"
-    { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
-                                       op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));}
+#line 1099 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_POSTINC, 0,
+                                       op_lvalue(scalar((ps[-1].val.opval)), OP_POSTINC)); }

 
     break;
 
   case 191:
 
     break;
 
   case 191:

-#line 1101 "perly.y"
-    { (yyval.opval) = op_convert_list(OP_JOIN, 0,
+#line 1102 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
+                                       op_lvalue(scalar((ps[-1].val.opval)), OP_POSTDEC));}
+
+    break;
+
+  case 192:
+#line 1105 "perly.y"
+                        { (yyval.opval) = op_convert_list(OP_JOIN, 0,

                                       op_append_elem(
                                        OP_LIST,
                                        newSVREF(scalar(
                                       op_append_elem(
                                        OP_LIST,
                                        newSVREF(scalar(


@@ -1547,157 +1547,157 @@ case 2:
 
     break;
 
 
     break;
 

-  case 192:
-#line 1112 "perly.y"
-    { (yyval.opval) = newUNOP(OP_PREINC, 0,
-                                       op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); }
-
-    break;
-

   case 193:
   case 193:

-#line 1115 "perly.y"
-    { (yyval.opval) = newUNOP(OP_PREDEC, 0,
-                                       op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); }
+#line 1116 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_PREINC, 0,
+                                       op_lvalue(scalar((ps[0].val.opval)), OP_PREINC)); }

 
     break;
 
   case 194:
 
     break;
 
   case 194:

-#line 1122 "perly.y"
-    { (yyval.opval) = newANONLIST((ps[-1].val.opval)); }
+#line 1119 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_PREDEC, 0,
+                                       op_lvalue(scalar((ps[0].val.opval)), OP_PREDEC)); }

 
     break;
 
   case 195:
 
     break;
 
   case 195:

-#line 1124 "perly.y"
-    { (yyval.opval) = newANONLIST(NULL);}
+#line 1126 "perly.y"
+                        { (yyval.opval) = newANONLIST((ps[-1].val.opval)); }

 
     break;
 
   case 196:
 
     break;
 
   case 196:

-#line 1126 "perly.y"
-    { (yyval.opval) = newANONHASH((ps[-2].val.opval)); }
+#line 1128 "perly.y"
+                        { (yyval.opval) = newANONLIST(NULL);}

 
     break;
 
   case 197:
 
     break;
 
   case 197:

-#line 1128 "perly.y"
-    { (yyval.opval) = newANONHASH(NULL); }
+#line 1130 "perly.y"
+                        { (yyval.opval) = newANONHASH((ps[-2].val.opval)); }

 
     break;
 
   case 198:
 
     break;
 
   case 198:

-#line 1130 "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)); }
+#line 1132 "perly.y"
+                        { (yyval.opval) = newANONHASH(NULL); }

 
     break;
 
   case 199:
 
     break;
 
   case 199:

-#line 1133 "perly.y"
-    { SvREFCNT_inc_simple_void(PL_compcv);
-                         (yyval.opval) = newANONATTRSUB((ps[-2].val.ival), NULL, (ps[-1].val.opval), (ps[0].val.opval)); }
+#line 1134 "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)); }

 
     break;
 
   case 200:
 
     break;
 
   case 200:

-#line 1139 "perly.y"
-    { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}
+#line 1137 "perly.y"
+                        { SvREFCNT_inc_simple_void(PL_compcv);
+                         (yyval.opval) = newANONATTRSUB((ps[-2].val.ival), NULL, (ps[-1].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 201:
 
     break;
 
   case 201:

-#line 1141 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));}
+#line 1143 "perly.y"
+                        { (yyval.opval) = dofile((ps[0].val.opval), (ps[-1].val.ival));}

 
     break;
 
 
     break;
 

-  case 206:
-#line 1149 "perly.y"
-    { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); }
+  case 202:
+#line 1145 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[0].val.opval)));}

 
     break;
 
   case 207:
 
     break;
 
   case 207:

-#line 1151 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }
+#line 1153 "perly.y"
+                        { (yyval.opval) = newCONDOP(0, (ps[-4].val.opval), (ps[-2].val.opval), (ps[0].val.opval)); }

 
     break;
 
   case 208:
 
     break;
 
   case 208:

-#line 1153 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }
+#line 1155 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_REFGEN, 0, (ps[0].val.opval)); }

 
     break;
 
   case 209:
 
     break;
 
   case 209:

-#line 1155 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1157 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_REFGEN, 0, localize((ps[0].val.opval),1)); }

 
     break;
 
   case 210:
 
     break;
 
   case 210:

-#line 1157 "perly.y"
-    { (yyval.opval) = localize((ps[0].val.opval),0); }
+#line 1159 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 211:
 
     break;
 
   case 211:

-#line 1159 "perly.y"
-    { (yyval.opval) = sawparens((ps[-1].val.opval)); }
+#line 1161 "perly.y"
+                        { (yyval.opval) = localize((ps[0].val.opval),0); }

 
     break;
 
   case 212:
 
     break;
 
   case 212:

-#line 1161 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1163 "perly.y"
+                        { (yyval.opval) = sawparens((ps[-1].val.opval)); }

 
     break;
 
   case 213:
 
     break;
 
   case 213:

-#line 1163 "perly.y"
-    { (yyval.opval) = sawparens(newNULLLIST()); }
+#line 1165 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 214:
 
     break;
 
   case 214:

-#line 1165 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1167 "perly.y"
+                        { (yyval.opval) = sawparens(newNULLLIST()); }

 
     break;
 
   case 215:
 
     break;
 
   case 215:

-#line 1167 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1169 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 216:
 
     break;
 
   case 216:

-#line 1169 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1171 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 217:
 
     break;
 
   case 217:

-#line 1171 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1173 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 218:
 
     break;
 
   case 218:

-#line 1173 "perly.y"
-    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));}
+#line 1175 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 219:
 
     break;
 
   case 219:

-#line 1175 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1177 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[0].val.opval), OP_AV2ARYLEN));}

 
     break;
 
   case 220:
 
     break;
 
   case 220:

-#line 1177 "perly.y"
-    { (yyval.opval) = op_prepend_elem(OP_ASLICE,
+#line 1179 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }
+
+    break;
+
+  case 221:
+#line 1181 "perly.y"
+                        { (yyval.opval) = op_prepend_elem(OP_ASLICE,

                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_ASLICE, 0,
                                        list((ps[-1].val.opval)),
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_ASLICE, 0,
                                        list((ps[-1].val.opval)),


@@ -1709,9 +1709,9 @@ case 2:
 
     break;
 
 
     break;
 

-  case 221:
-#line 1187 "perly.y"
-    { (yyval.opval) = op_prepend_elem(OP_KVASLICE,
+  case 222:
+#line 1191 "perly.y"
+                        { (yyval.opval) = op_prepend_elem(OP_KVASLICE,

                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVASLICE, 0,
                                        list((ps[-1].val.opval)),
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVASLICE, 0,
                                        list((ps[-1].val.opval)),


@@ -1723,9 +1723,9 @@ case 2:
 
     break;
 
 
     break;
 

-  case 222:
-#line 1197 "perly.y"
-    { (yyval.opval) = op_prepend_elem(OP_HSLICE,
+  case 223:
+#line 1201 "perly.y"
+                        { (yyval.opval) = op_prepend_elem(OP_HSLICE,

                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_HSLICE, 0,
                                        list((ps[-2].val.opval)),
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_HSLICE, 0,
                                        list((ps[-2].val.opval)),


@@ -1737,9 +1737,9 @@ case 2:
 
     break;
 
 
     break;
 

-  case 223:
-#line 1207 "perly.y"
-    { (yyval.opval) = op_prepend_elem(OP_KVHSLICE,
+  case 224:
+#line 1211 "perly.y"
+                        { (yyval.opval) = op_prepend_elem(OP_KVHSLICE,

                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVHSLICE, 0,
                                        list((ps[-2].val.opval)),
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVHSLICE, 0,
                                        list((ps[-2].val.opval)),


@@ -1751,182 +1751,182 @@ case 2:
 
     break;
 
 
     break;
 

-  case 224:
-#line 1217 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
-
-    break;
-

   case 225:
   case 225:

-#line 1219 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); }
+#line 1221 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 226:
 
     break;
 
   case 226:

-#line 1221 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval)));
-                       }
+#line 1223 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[0].val.opval))); }

 
     break;
 
   case 227:
 
     break;
 
   case 227:

-#line 1224 "perly.y"
-    {
-                         (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                               op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval))));
+#line 1225 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[-2].val.opval)));

                        }
 
     break;
 
   case 228:
                        }
 
     break;
 
   case 228:

-#line 1229 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                           op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval))));
+#line 1228 "perly.y"
+                        {
+                         (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                               op_append_elem(OP_LIST, (ps[-1].val.opval), scalar((ps[-3].val.opval))));

                        }
 
     break;
 
   case 229:
 #line 1233 "perly.y"
                        }
 
     break;
 
   case 229:
 #line 1233 "perly.y"

-    { (yyval.opval) = newSVREF((ps[-3].val.opval)); }
+                        { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                           op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval))));
+                       }

 
     break;
 
   case 230:
 
     break;
 
   case 230:

-#line 1235 "perly.y"
-    { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
+#line 1237 "perly.y"
+                        { (yyval.opval) = newSVREF((ps[-3].val.opval)); }

 
     break;
 
   case 231:
 
     break;
 
   case 231:

-#line 1237 "perly.y"
-    { (yyval.opval) = newHVREF((ps[-3].val.opval)); }
+#line 1239 "perly.y"
+                        { (yyval.opval) = newAVREF((ps[-3].val.opval)); }

 
     break;
 
   case 232:
 
     break;
 
   case 232:

-#line 1239 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
-                                      scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); }
+#line 1241 "perly.y"
+                        { (yyval.opval) = newHVREF((ps[-3].val.opval)); }

 
     break;
 
   case 233:
 
     break;
 
   case 233:

-#line 1242 "perly.y"
-    { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); }
+#line 1243 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_ENTERSUB, 0,
+                                      scalar(newCVREF((ps[-1].val.ival),(ps[-3].val.opval)))); }

 
     break;
 
   case 234:
 
     break;
 
   case 234:

-#line 1244 "perly.y"
-    { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL);
-                           PL_hints |= HINT_BLOCK_SCOPE; }
+#line 1246 "perly.y"
+                        { (yyval.opval) = newGVREF(0,(ps[-3].val.opval)); }

 
     break;
 
   case 235:
 
     break;
 
   case 235:

-#line 1247 "perly.y"
-    { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); }
+#line 1248 "perly.y"
+                        { (yyval.opval) = newOP((ps[0].val.ival), OPf_SPECIAL);
+                           PL_hints |= HINT_BLOCK_SCOPE; }

 
     break;
 
   case 236:
 
     break;
 
   case 236:

-#line 1249 "perly.y"
-    { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }
+#line 1251 "perly.y"
+                        { (yyval.opval) = newLOOPEX((ps[-1].val.ival),(ps[0].val.opval)); }

 
     break;
 
   case 237:
 
     break;
 
   case 237:

-#line 1251 "perly.y"
-    { (yyval.opval) = newOP((ps[0].val.ival), 0); }
+#line 1253 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[0].val.opval))); }

 
     break;
 
   case 238:
 
     break;
 
   case 238:

-#line 1253 "perly.y"
-    { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
+#line 1255 "perly.y"
+                        { (yyval.opval) = newOP((ps[0].val.ival), 0); }

 
     break;
 
   case 239:
 
     break;
 
   case 239:

-#line 1255 "perly.y"
-    { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }
+#line 1257 "perly.y"
+                        { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }

 
     break;
 
   case 240:
 
     break;
 
   case 240:

-#line 1257 "perly.y"
-    { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); }
+#line 1259 "perly.y"
+                        { (yyval.opval) = newUNOP((ps[-1].val.ival), 0, (ps[0].val.opval)); }

 
     break;
 
   case 241:
 
     break;
 
   case 241:

-#line 1259 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); }
+#line 1261 "perly.y"
+                        { (yyval.opval) = newOP(OP_REQUIRE, (ps[0].val.ival) ? OPf_SPECIAL : 0); }

 
     break;
 
   case 242:
 
     break;
 
   case 242:

-#line 1261 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
+#line 1263 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[-1].val.ival) ? OPf_SPECIAL : 0, (ps[0].val.opval)); }

 
     break;
 
   case 243:
 
     break;
 
   case 243:

-#line 1263 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
-                           op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); }
+#line 1265 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }

 
     break;
 
   case 244:
 
     break;
 
   case 244:

-#line 1266 "perly.y"
-    { (yyval.opval) = newOP((ps[0].val.ival), 0); }
+#line 1267 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
+                           op_append_elem(OP_LIST, (ps[0].val.opval), scalar((ps[-1].val.opval)))); }

 
     break;
 
   case 245:
 
     break;
 
   case 245:

-#line 1268 "perly.y"
-    { (yyval.opval) = newOP((ps[-2].val.ival), 0);}
+#line 1270 "perly.y"
+                        { (yyval.opval) = newOP((ps[0].val.ival), 0); }

 
     break;
 
   case 246:
 
     break;
 
   case 246:

-#line 1270 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1272 "perly.y"
+                        { (yyval.opval) = newOP((ps[-2].val.ival), 0);}

 
     break;
 
   case 247:
 
     break;
 
   case 247:

-#line 1272 "perly.y"
-    { (yyval.opval) = (ps[-2].val.opval); }
+#line 1274 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 248:
 
     break;
 
   case 248:

-#line 1274 "perly.y"
-    { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }
+#line 1276 "perly.y"
+                        { (yyval.opval) = (ps[-2].val.opval); }

 
     break;
 
   case 249:
 
     break;
 
   case 249:

-#line 1276 "perly.y"
-    { (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 1278 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[0].val.opval))); }

 
     break;
 
   case 250:
 #line 1280 "perly.y"
 
     break;
 
   case 250:
 #line 1280 "perly.y"

-    { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
+                        { (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); }

 
     break;
 
   case 251:
 
     break;
 
   case 251:

-#line 1282 "perly.y"
-    {
+#line 1284 "perly.y"
+                        { (yyval.opval) = newUNOP((ps[-3].val.ival), 0, (ps[-1].val.opval)); }
+
+    break;
+
+  case 252:
+#line 1286 "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[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))


@@ -1939,196 +1939,197 @@ case 2:
 
     break;
 
 
     break;
 

-  case 252:
-#line 1293 "perly.y"
-    { (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); }
-
-    break;
-
-  case 256:
-#line 1301 "perly.y"
-    { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); }
+  case 253:
+#line 1297 "perly.y"
+                        { (yyval.opval) = pmruntime((ps[-5].val.opval), (ps[-2].val.opval), (ps[-1].val.opval), 1, (ps[-4].val.ival)); }

 
     break;
 
   case 257:
 
     break;
 
   case 257:

-#line 1303 "perly.y"
-    { (yyval.opval) = localize((ps[0].val.opval),1); }
+#line 1305 "perly.y"
+                        { (yyval.opval) = my_attrs((ps[-1].val.opval),(ps[0].val.opval)); }

 
     break;
 
   case 258:
 
     break;
 
   case 258:

-#line 1305 "perly.y"
-    { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); }
+#line 1307 "perly.y"
+                        { (yyval.opval) = localize((ps[0].val.opval),1); }

 
     break;
 
   case 259:
 
     break;
 
   case 259:

-#line 1310 "perly.y"
-    { (yyval.opval) = sawparens((ps[-1].val.opval)); }
+#line 1309 "perly.y"
+                        { (yyval.opval) = newUNOP(OP_REFGEN, 0, my_attrs((ps[-1].val.opval),(ps[0].val.opval))); }

 
     break;
 
   case 260:
 
     break;
 
   case 260:

-#line 1312 "perly.y"
-    { (yyval.opval) = sawparens(newNULLLIST()); }
+#line 1314 "perly.y"
+                        { (yyval.opval) = sawparens((ps[-1].val.opval)); }

 
     break;
 
   case 261:
 
     break;
 
   case 261:

-#line 1315 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1316 "perly.y"
+                        { (yyval.opval) = sawparens(newNULLLIST()); }

 
     break;
 
   case 262:
 
     break;
 
   case 262:

-#line 1317 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1319 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 263:
 
     break;
 
   case 263:

-#line 1319 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1321 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 264:
 
     break;
 
   case 264:

-#line 1324 "perly.y"
-    { (yyval.opval) = NULL; }
+#line 1323 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 265:
 
     break;
 
   case 265:

-#line 1326 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1328 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 266:
 #line 1330 "perly.y"
 
     break;
 
   case 266:
 #line 1330 "perly.y"

-    { (yyval.opval) = NULL; }
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 267:
 
     break;
 
   case 267:

-#line 1332 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1334 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 268:
 #line 1336 "perly.y"
 
     break;
 
   case 268:
 #line 1336 "perly.y"

-    { (yyval.opval) = NULL; }
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
   case 269:
 
     break;
 
   case 269:

-#line 1338 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1340 "perly.y"
+                        { (yyval.opval) = NULL; }

 
     break;
 
   case 270:
 
     break;
 
   case 270:

-#line 1344 "perly.y"
-    { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }
+#line 1342 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }

 
     break;
 
 
     break;
 

-  case 278:
-#line 1361 "perly.y"
-    { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); }
+  case 271:
+#line 1348 "perly.y"
+                        { parser->in_my = 0; (yyval.opval) = my((ps[0].val.opval)); }

 
     break;
 
   case 279:
 #line 1365 "perly.y"
 
     break;
 
   case 279:
 #line 1365 "perly.y"

-    { (yyval.opval) = newSVREF((ps[0].val.opval)); }
+                        { (yyval.opval) = newCVREF((ps[-1].val.ival),(ps[0].val.opval)); }

 
     break;
 
   case 280:
 #line 1369 "perly.y"
 
     break;
 
   case 280:
 #line 1369 "perly.y"

-    { (yyval.opval) = newAVREF((ps[0].val.opval));
-                         if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
-                       }
+                        { (yyval.opval) = newSVREF((ps[0].val.opval)); }

 
     break;
 
   case 281:
 
     break;
 
   case 281:

-#line 1375 "perly.y"
-    { (yyval.opval) = newHVREF((ps[0].val.opval));
+#line 1373 "perly.y"
+                        { (yyval.opval) = newAVREF((ps[0].val.opval));

                          if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
                        }
 
     break;
 
   case 282:
                          if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
                        }
 
     break;
 
   case 282:

-#line 1381 "perly.y"
-    { (yyval.opval) = newAVREF((ps[0].val.opval)); }
+#line 1379 "perly.y"
+                        { (yyval.opval) = newHVREF((ps[0].val.opval));
+                         if ((yyval.opval)) (yyval.opval)->op_private |= (ps[-1].val.ival);
+                       }

 
     break;
 
   case 283:
 
     break;
 
   case 283:

-#line 1383 "perly.y"
-    { (yyval.opval) = newAVREF((ps[-3].val.opval)); }
+#line 1385 "perly.y"
+                        { (yyval.opval) = newAVREF((ps[0].val.opval)); }

 
     break;
 
   case 284:
 #line 1387 "perly.y"
 
     break;
 
   case 284:
 #line 1387 "perly.y"

-    { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); }
+                        { (yyval.opval) = newAVREF((ps[-3].val.opval)); }

 
     break;
 
 
     break;
 

-  case 286:
-#line 1392 "perly.y"
-    { (yyval.opval) = newAVREF((ps[-2].val.opval)); }
+  case 285:
+#line 1391 "perly.y"
+                        { (yyval.opval) = newGVREF(0,(ps[0].val.opval)); }

 
     break;
 
 
     break;
 

-  case 288:
-#line 1397 "perly.y"
-    { (yyval.opval) = newHVREF((ps[-2].val.opval)); }
+  case 287:
+#line 1396 "perly.y"
+                        { (yyval.opval) = newAVREF((ps[-2].val.opval)); }

 
     break;
 
 
     break;
 

-  case 290:
-#line 1402 "perly.y"
-    { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); }
+  case 289:
+#line 1401 "perly.y"
+                        { (yyval.opval) = newHVREF((ps[-2].val.opval)); }

 
     break;
 
   case 291:
 
     break;
 
   case 291:

-#line 1407 "perly.y"
-    { (yyval.opval) = scalar((ps[0].val.opval)); }
+#line 1406 "perly.y"
+                        { (yyval.opval) = newGVREF(0,(ps[-2].val.opval)); }

 
     break;
 
   case 292:
 
     break;
 
   case 292:

-#line 1409 "perly.y"
-    { (yyval.opval) = scalar((ps[0].val.opval)); }
+#line 1411 "perly.y"
+                        { (yyval.opval) = scalar((ps[0].val.opval)); }

 
     break;
 
   case 293:
 
     break;
 
   case 293:

-#line 1411 "perly.y"
-    { (yyval.opval) = op_scope((ps[0].val.opval)); }
+#line 1413 "perly.y"
+                        { (yyval.opval) = scalar((ps[0].val.opval)); }

 
     break;
 
   case 294:
 
     break;
 
   case 294:

-#line 1414 "perly.y"
-    { (yyval.opval) = (ps[0].val.opval); }
+#line 1415 "perly.y"
+                        { (yyval.opval) = op_scope((ps[0].val.opval)); }

 
     break;
 
 
     break;
 

+  case 295:
+#line 1418 "perly.y"
+                        { (yyval.opval) = (ps[0].val.opval); }
+
+    break;
+
+

 
 
       default: break;
     
 
 /* Generated from:
 
 
       default: break;
     
 
 /* Generated from:

- * f83d884147747f2d8f5a62eebc4ccd07d71b6b34e5ba1a8d7559526ad864dc97 perly.y
- * 01ce33b49f9f04b8d3112b7f042cde113a7d29763a846e870f9766072a5bc614 regen_perly.pl
+ * cb0b53384d9fa75068c8e30d8fe9016dec2e65e0a5c16ce6479563d6b41626d6 perly.y
+ * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl

  * ex: set ro: */
  * ex: set ro: */

diff --git a/perly.h b/perly.h
index 0cbbf3b..1bc9d63 100644 (file)
--- a/perly.h
+++ b/perly.h
@@ -4,14 +4,14 @@
    Any changes made here will be lost!
  */
 
    Any changes made here will be lost!
  */
 

-#define PERL_BISON_VERSION  30003
+#define PERL_BISON_VERSION  30005

 
 #ifdef PERL_CORE
 
 #ifdef PERL_CORE

-/* A Bison parser, made by GNU Bison 3.3.2.  */
+/* A Bison parser, made by GNU Bison 3.5.1.  */

 
 /* Bison interface for Yacc-like parsers in C
 
 
 /* Bison interface for Yacc-like parsers in C
 

-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software Foundation,

    Inc.
 
    This program is free software: you can redistribute it and/or modify
    Inc.
 
    This program is free software: you can redistribute it and/or modify


@@ -172,7 +172,6 @@ S_is_opval_token(int type) {
 #endif /* PERL_IN_TOKE_C */
 #endif /* PERL_CORE */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 #endif /* PERL_IN_TOKE_C */
 #endif /* PERL_CORE */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED

-

 union YYSTYPE
 {
 
 union YYSTYPE
 {
 


@@ -182,8 +181,8 @@ union YYSTYPE
     OP *opval;
     GV *gvval;
 
     OP *opval;
     GV *gvval;
 

-};

 
 

+};

 typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1
 typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define YYSTYPE_IS_DECLARED 1


@@ -195,6 +194,6 @@ int yyparse (void);
 
 
 /* Generated from:
 
 
 /* Generated from:

- * f83d884147747f2d8f5a62eebc4ccd07d71b6b34e5ba1a8d7559526ad864dc97 perly.y
- * 01ce33b49f9f04b8d3112b7f042cde113a7d29763a846e870f9766072a5bc614 regen_perly.pl
+ * cb0b53384d9fa75068c8e30d8fe9016dec2e65e0a5c16ce6479563d6b41626d6 perly.y
+ * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl

  * ex: set ro: */
  * ex: set ro: */

diff --git a/perly.tab b/perly.tab
index 0154f44..42ac1f6 100644 (file)
--- a/perly.tab
+++ b/perly.tab
@@ -6,28 +6,29 @@
 
 #define YYFINAL  16
 /* YYLAST -- Last index in YYTABLE.  */
 
 #define YYFINAL  16
 /* YYLAST -- Last index in YYTABLE.  */

-#define YYLAST   3348
+#define YYLAST   3303

 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  112
 /* YYNNTS -- Number of nonterminals.  */
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  112
 /* YYNNTS -- Number of nonterminals.  */

-#define YYNNTS  96
+#define YYNNTS  97

 /* YYNRULES -- Number of rules.  */
 /* YYNRULES -- Number of rules.  */

-#define YYNRULES  294
+#define YYNRULES  295

 /* YYNSTATES -- Number of states.  */
 /* YYNSTATES -- Number of states.  */

-#define YYNSTATES  572
+#define YYNSTATES  573

 
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   344
 
 
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   344
 

+

 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
 #define YYTRANSLATE(YYX)                                                \
 /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex, with out-of-bounds checking.  */
 #define YYTRANSLATE(YYX)                                                \

-  ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+  (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)

 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */
 
 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
    as returned by yylex.  */

-static const yytype_uint8 yytranslate[] =
+static const yytype_int8 yytranslate[] =

 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,


@@ -68,38 +69,38 @@ static const yytype_uint8 yytranslate[] =
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */

-static const yytype_uint16 yyrline[] =
+static const yytype_int16 yyrline[] =

 {
 {

-       0,   121,   121,   120,   132,   131,   142,   141,   155,   154,
-     168,   167,   181,   180,   191,   190,   203,   211,   219,   223,
-     231,   237,   238,   248,   249,   258,   262,   266,   273,   283,
-     285,   298,   295,   319,   314,   335,   343,   342,   351,   357,
-     363,   368,   370,   372,   379,   387,   389,   386,   406,   411,
-     418,   417,   432,   440,   446,   453,   452,   467,   471,   476,
-     484,   502,   503,   508,   510,   512,   514,   516,   518,   520,
-     523,   529,   530,   535,   546,   547,   553,   559,   560,   565,
-     568,   572,   577,   581,   585,   586,   590,   596,   601,   606,
-     607,   612,   613,   618,   619,   621,   626,   628,   640,   641,
-     646,   648,   652,   672,   673,   675,   681,   746,   748,   754,
-     756,   760,   766,   767,   772,   773,   777,   781,   781,   849,
-     850,   855,   866,   867,   870,   881,   883,   885,   887,   891,
-     893,   898,   902,   906,   910,   916,   921,   927,   933,   935,
-     937,   940,   939,   950,   951,   955,   959,   962,   967,   972,
-     975,   979,   983,   989,   997,  1004,  1010,  1012,  1014,  1019,
-    1021,  1023,  1028,  1030,  1032,  1034,  1036,  1038,  1040,  1042,
-    1044,  1046,  1048,  1052,  1054,  1056,  1058,  1062,  1064,  1068,
-    1070,  1072,  1074,  1078,  1080,  1085,  1087,  1090,  1092,  1094,
-    1097,  1100,  1111,  1114,  1121,  1123,  1125,  1127,  1129,  1132,
-    1138,  1140,  1144,  1145,  1146,  1147,  1148,  1150,  1152,  1154,
-    1156,  1158,  1160,  1162,  1164,  1166,  1168,  1170,  1172,  1174,
-    1176,  1186,  1196,  1206,  1216,  1218,  1220,  1223,  1228,  1232,
-    1234,  1236,  1238,  1241,  1243,  1246,  1248,  1250,  1252,  1254,
-    1256,  1258,  1260,  1262,  1265,  1267,  1269,  1271,  1273,  1275,
-    1279,  1282,  1281,  1294,  1295,  1296,  1300,  1302,  1304,  1309,
-    1311,  1314,  1316,  1318,  1323,  1325,  1330,  1331,  1336,  1337,
-    1343,  1347,  1348,  1349,  1352,  1353,  1356,  1357,  1360,  1364,
-    1368,  1374,  1380,  1382,  1386,  1390,  1391,  1395,  1396,  1400,
-    1401,  1406,  1408,  1410,  1413
+       0,   122,   122,   121,   133,   132,   143,   142,   156,   155,
+     169,   168,   182,   181,   192,   191,   204,   212,   220,   224,
+     232,   238,   239,   249,   250,   259,   263,   267,   274,   284,
+     286,   299,   296,   320,   315,   336,   344,   343,   352,   358,
+     364,   369,   371,   373,   380,   388,   390,   387,   407,   412,
+     419,   418,   433,   441,   447,   454,   453,   468,   472,   477,
+     485,   503,   504,   508,   512,   514,   516,   518,   520,   522,
+     524,   527,   533,   534,   539,   550,   551,   557,   563,   564,
+     569,   572,   576,   581,   585,   589,   590,   594,   600,   605,
+     610,   611,   616,   617,   622,   623,   625,   630,   632,   644,
+     645,   650,   652,   656,   676,   677,   679,   685,   750,   752,
+     758,   760,   764,   770,   771,   776,   777,   781,   785,   785,
+     853,   854,   859,   870,   871,   874,   885,   887,   889,   891,
+     895,   897,   902,   906,   910,   914,   920,   925,   931,   937,
+     939,   941,   944,   943,   954,   955,   959,   963,   966,   971,
+     976,   979,   983,   987,   993,  1001,  1008,  1014,  1016,  1018,
+    1023,  1025,  1027,  1032,  1034,  1036,  1038,  1040,  1042,  1044,
+    1046,  1048,  1050,  1052,  1056,  1058,  1060,  1062,  1066,  1068,
+    1072,  1074,  1076,  1078,  1082,  1084,  1089,  1091,  1094,  1096,
+    1098,  1101,  1104,  1115,  1118,  1125,  1127,  1129,  1131,  1133,
+    1136,  1142,  1144,  1148,  1149,  1150,  1151,  1152,  1154,  1156,
+    1158,  1160,  1162,  1164,  1166,  1168,  1170,  1172,  1174,  1176,
+    1178,  1180,  1190,  1200,  1210,  1220,  1222,  1224,  1227,  1232,
+    1236,  1238,  1240,  1242,  1245,  1247,  1250,  1252,  1254,  1256,
+    1258,  1260,  1262,  1264,  1266,  1269,  1271,  1273,  1275,  1277,
+    1279,  1283,  1286,  1285,  1298,  1299,  1300,  1304,  1306,  1308,
+    1313,  1315,  1318,  1320,  1322,  1327,  1329,  1334,  1335,  1340,
+    1341,  1347,  1351,  1352,  1353,  1356,  1357,  1360,  1361,  1364,
+    1368,  1372,  1378,  1384,  1386,  1390,  1394,  1395,  1399,  1400,
+    1404,  1405,  1410,  1412,  1414,  1417

 };
 #endif
 
 };
 #endif
 


@@ -127,10 +128,10 @@ static const char *const yytname[] =
   "grammar", "@1", "@2", "@3", "@4", "@5", "@6", "@7", "block",
   "formblock", "remember", "mblock", "mremember", "stmtseq", "formstmtseq",
   "fullstmt", "labfullstmt", "barestmt", "$@8", "$@9", "$@10", "$@11",
   "grammar", "@1", "@2", "@3", "@4", "@5", "@6", "@7", "block",
   "formblock", "remember", "mblock", "mremember", "stmtseq", "formstmtseq",
   "fullstmt", "labfullstmt", "barestmt", "$@8", "$@9", "$@10", "$@11",

-  "$@12", "@13", "$@14", "formline", "formarg", "sideff", "else", "cont",
-  "mintro", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr", "formname",
-  "startsub", "startanonsub", "startformsub", "subname", "proto",
-  "subattrlist", "myattrlist", "sigvarname", "sigslurpsigil",
+  "$@12", "@13", "$@14", "formline", "formarg", "condition", "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", "optsubsignature", "subsignature", "subsigguts", "$@15",
   "optsubbody", "subbody", "optsigsubbody", "sigsubbody", "expr",
   "sigslurpelem", "sigdefault", "sigscalarelem", "sigelem", "siglist",
   "siglistornull", "optsubsignature", "subsignature", "subsigguts", "$@15",
   "optsubbody", "subbody", "optsigsubbody", "sigsubbody", "expr",


@@ -146,7 +147,7 @@ static const char *const yytname[] =
 # ifdef YYPRINT
 /* YYTOKNUM[NUM] -- (External) token number corresponding to the
    (internal) symbol number NUM (which must be that of a token).  */
 # ifdef YYPRINT
 /* YYTOKNUM[NUM] -- (External) token number corresponding to the
    (internal) symbol number NUM (which must be that of a token).  */

-static const yytype_uint16 yytoknum[] =
+static const yytype_int16 yytoknum[] =

 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      123,   125,    91,    93,    45,    43,    64,    37,    38,    61,
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      123,   125,    91,    93,    45,    43,    64,    37,    38,    61,


@@ -163,173 +164,173 @@ static const yytype_uint16 yytoknum[] =
 };
 # endif
 
 };
 # endif
 

-#define YYPACT_NINF -485
+#define YYPACT_NINF (-456)

 
 

-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-485)))
+#define yypact_value_is_default(Yyn) \
+  ((Yyn) == YYPACT_NINF)

 
 

-#define YYTABLE_NINF -290
+#define YYTABLE_NINF (-291)

 
 

-#define yytable_value_is_error(Yytable_value) \
-  (!!((Yytable_value) == (-290)))
+#define yytable_value_is_error(Yyn) \
+  ((Yyn) == YYTABLE_NINF)

 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
 
   /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {

-     739,  -485,  -485,  -485,  -485,  -485,  -485,  -485,    28,  -485,
-    2976,    32,  1582,  1481,  -485,  -485,  -485,  -485,  2085,  2976,
-    2976,     6,     6,     6,  -485,     6,     6,  -485,  -485,    50,
-     -31,  -485,  2976,  -485,  -485,  -485,  -485,  2976,   -13,    20,
-     -33,  1986,  1885,     6,  1986,  2184,     4,  2976,    83,  2976,
-    2976,  2976,  2976,  2976,  2976,  2976,  2283,     6,     6,    41,
-      -7,  -485,    14,  -485,   -34,    -1,   -20,    22,  -485,  -485,
-    -485,  3151,  -485,  -485,    29,    56,    95,   102,  -485,   153,
-     247,   254,   157,  -485,  -485,  -485,  -485,  -485,     4,     4,
-     132,  -485,    79,   100,   119,   130,   174,   146,   154,    32,
-     152,  -485,   217,  -485,   160,  1984,  1481,  -485,  -485,  -485,
-     672,  -485,    30,   774,  -485,   111,   142,   142,  -485,  -485,
-    -485,  -485,  -485,  -485,  -485,  2976,   172,   207,  2976,   176,
-     430,    32,   261,   216,  3151,   202,  2382,  2976,  1885,  -485,
-     430,   572,    -7,  -485,   476,  2976,  -485,  -485,   430,   299,
-     197,  -485,  -485,  2976,   430,  3075,  2481,   242,  -485,  -485,
-    -485,   430,    -7,   142,   142,   142,    57,    57,   306,   267,
-    -485,  -485,  2976,  2976,  2976,  2976,  2976,  2976,  2580,  -485,
-    -485,  2976,  -485,  -485,  2976,  2976,  2976,  2976,  2976,  2976,
-    2976,  2976,  2976,  2976,  2976,  2976,  2976,  2976,  2976,  2976,
-    2976,  2976,  -485,  -485,  -485,    75,  2679,  2976,  2976,  2976,
-    2976,  2976,  2976,  2976,  -485,   307,  -485,  -485,   311,  -485,
-    -485,  -485,  -485,  -485,   224,    36,  -485,  -485,   226,  -485,
-    -485,  -485,  -485,    32,  -485,  -485,  2976,  2976,  2976,  2976,
-    2976,  2976,  -485,  -485,  -485,  -485,  -485,   320,   320,  -485,
-    -485,  -485,   273,  -485,  -485,  -485,  2976,  2976,   118,  -485,
-    -485,  -485,   216,   330,  -485,  -485,  -485,   331,   284,   260,
-    2976,    -7,  -485,   348,  -485,  2778,   142,   242,    33,    55,
-      67,  -485,   342,   344,  -485,  2976,   357,   294,   294,  -485,
-    3151,   249,   133,  -485,   433,   430,   363,  3243,   504,   329,
-    3151,  3105,  1667,  1667,  1767,  1867,   538,   363,   363,   430,
-     430,   301,   142,   142,  2976,  2976,   271,   272,   274,  -485,
-     278,  2877,    23,   279,   270,  -485,  -485,   470,   253,   136,
-     302,   158,   364,   162,   407,   875,  -485,   372,  -485,  -485,
-       1,   375,  2976,  2976,  2976,  2976,  -485,   292,  -485,  -485,
-     305,  -485,  -485,  -485,  -485,  1683,    34,  -485,  2976,  2976,
-    -485,    41,  -485,    41,    41,    41,    41,    41,  -485,   332,
-     332,    30,   308,   -39,  -485,  2976,  -485,  -485,   309,  -485,
-    -485,  -485,  -485,   512,  -485,     5,   516,  -485,  -485,  -485,
-     178,  2976,   416,  -485,  -485,  2976,   418,   193,  -485,  -485,
-    -485,  -485,  -485,   519,  -485,  -485,  2976,  -485,   436,  -485,
-     438,  -485,   440,  -485,   447,  -485,  -485,  -485,   261,   216,
-    -485,  -485,   439,   353,    41,   358,   368,    41,   369,   356,
-    -485,  -485,  -485,  -485,   374,   373,   401,  -485,  2976,   381,
-     387,  2976,  -485,  -485,  -485,  -485,  2976,   423,  -485,   489,
-    -485,  -485,   490,  -485,  -485,    19,  -485,   239,  -485,  3197,
-     492,  -485,  -485,   398,  -485,  -485,  -485,  -485,   397,   216,
-     404,  -485,  2976,  -485,  -485,   496,   496,  2976,  2976,   496,
-    -485,   406,   408,   496,   496,  3151,    41,  -485,  -485,   410,
-    -485,  -485,  -485,  -485,   445,   414,  -485,  -485,  -485,  -485,
-     420,   496,   496,  -485,    37,    37,   434,   435,   217,  2976,
-    2976,   496,  -485,  -485,   976,  -485,  1077,  -485,  -485,  -485,
-    -485,  1178,  -485,   217,   217,  -485,   496,   442,  -485,  -485,
-     496,   496,  -485,   437,   449,   217,  -485,  -485,   -10,  -485,
-    -485,  -485,  1279,  -485,  2976,   217,   217,  -485,   496,  -485,
-     472,   531,  -485,  -485,   465,  -485,  -485,  -485,   217,  -485,
-    -485,  -485,   496,  1784,  -485,  1380,    37,   467,  -485,  -485,
-     496,  -485
+     842,  -456,  -456,  -456,  -456,  -456,  -456,  -456,    57,  -456,
+    2977,    17,  1583,  1482,  -456,  -456,  -456,  -456,  2086,  2977,
+    2977,     5,     5,     5,  -456,     5,     5,  -456,  -456,    50,
+     -13,  -456,  2977,  -456,  -456,  -456,  -456,  2977,    -7,    32,
+     -24,  1987,  1886,     5,  1987,  2185,     4,  2977,     0,  2977,
+    2977,  2977,  2977,  2977,  2977,  2977,  2284,     5,     5,   -11,
+     -10,  -456,    -1,  -456,   -41,    52,   -43,    64,  -456,  -456,
+    -456,  3106,  -456,  -456,    60,    72,    89,   230,  -456,   176,
+     318,   359,   216,  -456,  -456,  -456,  -456,  -456,     4,     4,
+     157,  -456,   100,   134,   140,   150,   272,   169,   172,    17,
+     148,  -456,   217,  -456,   175,   437,  1482,  -456,  -456,  -456,
+     673,  -456,    16,   775,  -456,    55,   -30,   -30,  -456,  -456,
+    -456,  -456,  -456,  -456,  -456,  2977,   201,   236,  2977,   209,
+     431,    17,   292,   251,  3106,   237,  2383,  2977,  1886,  -456,
+     431,   573,   -10,  -456,   477,  2977,  -456,  -456,   431,   331,
+     197,  -456,  -456,  2977,   431,  3076,  2482,   278,  -456,  -456,
+    -456,   431,   -10,   -30,   -30,   -30,    58,    58,   341,   313,
+    -456,  -456,  2977,  2977,  2977,  2977,  2977,  2977,  2581,  -456,
+    -456,  2977,  -456,  -456,  2977,  2977,  2977,  2977,  2977,  2977,
+    2977,  2977,  2977,  2977,  2977,  2977,  2977,  2977,  2977,  2977,
+    2977,  2977,  -456,  -456,  -456,    75,  2680,  2977,  2977,  2977,
+    2977,  2977,  2977,  2977,  -456,   340,  -456,  -456,   344,  -456,
+    -456,  -456,  -456,  -456,   270,    36,  -456,  -456,   267,  -456,
+    -456,  -456,  -456,    17,  -456,  -456,  2977,  2977,  2977,  2977,
+    2977,  2977,  -456,  -456,  -456,  -456,  -456,   352,   352,  -456,
+    -456,  -456,   300,  -456,  -456,  -456,  2977,  2977,   111,  -456,
+    -456,  -456,   251,   358,  -456,  -456,  -456,   379,   309,   281,
+    2977,   -10,  -456,   391,  -456,  2779,   -30,   278,    67,   105,
+     256,  -456,   440,   377,  -456,  2977,   396,   333,   333,  -456,
+    3106,   204,   114,  -456,   471,   431,  1929,  3198,   652,   301,
+    3106,   360,  1668,  1668,  1768,  1868,   539,  1929,  1929,   431,
+     431,   659,   -30,   -30,  2977,  2977,   303,   305,   307,  -456,
+     308,  2878,     2,   310,   302,  -456,  -456,   513,   299,   133,
+     320,   136,   390,   158,   419,   876,  -456,   404,  -456,  -456,
+      -3,   405,  2977,  2977,  2977,  2977,  -456,   316,  -456,  -456,
+     322,  -456,  -456,  -456,  -456,  1684,    27,  -456,  2977,  2977,
+    -456,  -456,   -11,  -456,   -11,  -456,  -456,  -456,  -456,  -456,
+     349,   349,    16,   327,   -35,  -456,  2977,  -456,  -456,   328,
+    -456,  -456,  -456,  -456,   517,  -456,   109,   520,  -456,  -456,
+    -456,   168,  2977,   423,  -456,  -456,  2977,   434,   183,  -456,
+    -456,  -456,  -456,  -456,   530,  -456,  -456,  2977,  -456,   426,
+    -456,   427,  -456,   429,  -456,   447,  -456,  -456,  -456,   292,
+     251,  -456,  -456,   439,   363,   -11,   367,   369,   -11,   370,
+     371,  -456,  -456,  -456,  -456,   378,   386,   280,  -456,  2977,
+     394,   395,  2977,  -456,  -456,  -456,  -456,  2977,   449,  -456,
+     498,  -456,  -456,   519,  -456,  -456,   194,  -456,   242,  -456,
+    3152,   521,  -456,  -456,   435,  -456,  -456,  -456,  -456,   432,
+     251,   436,  -456,  2977,  -456,  -456,   542,   542,  2977,  2977,
+     542,  -456,   465,   450,   542,   542,  3106,   -11,  -456,  -456,
+     468,  -456,  -456,  -456,  -456,   503,   470,  -456,  -456,  -456,
+    -456,   476,   542,   542,  -456,    43,    43,   481,   486,   217,
+    2977,  2977,   542,  -456,  -456,   977,  -456,  1078,  -456,  -456,
+    -456,  -456,  1179,  -456,   217,   217,  -456,   542,   492,  -456,
+    -456,   542,   542,  -456,   494,   497,   217,  -456,  -456,    18,
+    -456,  -456,  -456,  1280,  -456,  2977,   217,   217,  -456,   542,
+    -456,   533,   585,  -456,  -456,   504,  -456,  -456,  -456,   217,
+    -456,  -456,  -456,   542,  1785,  -456,  1381,    43,   505,  -456,
+    -456,   542,  -456

 };
 
   /* 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-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.  */

-static const yytype_uint16 yydefact[] =
+static const yytype_int16 yydefact[] =

 {
        0,     2,     4,     6,     8,    10,    12,    14,     0,    18,
 {
        0,     2,     4,     6,     8,    10,    12,    14,     0,    18,

-     266,     0,     0,     0,    21,   117,     1,    21,     0,     0,
-       0,     0,     0,     0,   253,     0,     0,   224,   251,   212,
-     246,   248,   242,    87,   255,    87,    87,   234,   244,     0,
-       0,   237,   264,     0,     0,     0,     0,     0,     0,   240,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   267,
-     128,   254,   219,   202,   164,   173,   165,   179,   203,   204,
-     205,   131,   209,     5,   225,   214,   217,   216,   218,   215,
-       0,     0,     0,    18,     7,    63,    29,    88,     0,     0,
-       0,    86,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    59,    74,     9,     0,    64,     0,    11,    26,    25,
-       0,    15,   112,     0,   195,     0,   185,   186,   291,   294,
-     293,   292,   280,   281,   278,   264,     0,     0,     0,     0,
-     243,     0,    91,    93,   235,     0,     0,   266,   266,   238,
-     239,   291,   265,   138,   292,     0,   282,   201,   200,     0,
-       0,    89,    90,   264,   210,     0,     0,   257,   261,   263,
-     262,   241,   236,   187,   188,   207,   192,   193,   213,     0,
-     279,   284,     0,     0,     0,   129,     0,     0,     0,   176,
-     175,     0,   182,   181,     0,     0,     0,     0,     0,     0,
+     267,     0,     0,     0,    21,   118,     1,    21,     0,     0,
+       0,     0,     0,     0,   254,     0,     0,   225,   252,   213,
+     247,   249,   243,    88,   256,    88,    88,   235,   245,     0,
+       0,   238,   265,     0,     0,     0,     0,     0,     0,   241,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   268,
+     129,   255,   220,   203,   165,   174,   166,   180,   204,   205,
+     206,   132,   210,     5,   226,   215,   218,   217,   219,   216,
+       0,     0,     0,    18,     7,    64,    29,    89,     0,     0,
+       0,    87,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    59,    75,     9,     0,    65,     0,    11,    26,    25,
+       0,    15,   113,     0,   196,     0,   186,   187,   292,   295,
+     294,   293,   281,   282,   279,   265,     0,     0,     0,     0,
+     244,     0,    92,    94,   236,     0,     0,   267,   267,   239,
+     240,   292,   266,   139,   293,     0,   283,   202,   201,     0,
+       0,    90,    91,   265,   211,     0,     0,   258,   262,   264,
+     263,   242,   237,   188,   189,   208,   193,   194,   214,     0,
+     280,   285,     0,     0,     0,   130,     0,     0,     0,   177,
+     176,     0,   183,   182,     0,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,   189,   190,   191,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    21,    85,    86,    86,     0,    36,
+       0,     0,   190,   191,   192,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    21,    86,    87,    87,     0,    36,

       18,    18,    18,    18,    18,     0,    18,    18,     0,    18,
       18,    42,    58,     0,    54,    57,     0,     0,     0,     0,
       18,    18,    18,    18,    18,     0,    18,    18,     0,    18,
       18,    42,    58,     0,    54,    57,     0,     0,     0,     0,

-       0,     0,    28,    27,    22,   100,   101,    98,    98,   108,
-     107,   111,   113,   118,   194,   136,   266,     0,     0,   247,
-     141,    92,    93,    95,    18,   245,   249,     0,     0,     0,
-       0,   132,   197,     0,   228,     0,   208,     0,   214,   217,
-     216,   260,     0,    97,   256,     0,   211,   126,   127,   125,
-     130,     0,     0,   155,     0,   178,   184,   168,   161,   162,
-     159,     0,   170,   171,   169,   167,   166,   183,   180,   177,
-     174,   163,   172,   160,     0,     0,   286,   288,     0,   143,
-       0,     0,     0,   290,   135,   144,   226,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    84,     0,    31,    33,
-       0,     0,    79,     0,     0,     0,   276,     0,   277,   274,
-       0,   275,   271,   272,   273,     0,     0,    18,     0,     0,
-      75,    67,    68,    81,    65,    66,    69,    70,    99,   103,
-     103,   109,     0,   268,   157,   264,    18,    94,   114,   199,
-     250,   140,   139,     0,   196,   213,     0,   258,   259,    96,
-       0,     0,     0,   148,   154,     0,     0,     0,   230,   231,
-     232,   283,   152,     0,   229,   233,   266,   227,     0,   146,
-       0,   220,     0,   221,     0,    16,    18,    30,    91,    93,
-      18,    35,     0,     0,    80,     0,     0,    82,     0,     0,
-     270,    18,    78,    83,     0,     0,    64,    50,     0,     0,
-       0,   104,   106,   102,   110,   137,     0,     0,   142,     0,
-     198,   117,     0,   115,   133,   211,   158,     0,   151,   206,
-       0,   147,   153,     0,   149,   222,   223,   145,     0,    93,
-      18,    55,   264,    76,    76,     0,     0,     0,     0,     0,
-      45,     0,     0,     0,     0,   105,   269,   252,    21,     0,
-      21,   156,   150,   134,     0,    18,   123,    34,   122,    21,
-       0,     0,     0,    20,    71,    71,     0,     0,    74,    79,
-       0,     0,    40,    41,     0,   116,     0,    23,   120,    32,
-     119,     0,    37,    74,    74,    21,     0,     0,    38,    39,
-       0,     0,    53,     0,     0,    74,   121,   124,     0,    56,
-      43,    44,     0,    72,     0,    74,    74,    46,     0,    49,
-      61,     0,    24,    19,     0,    48,    52,    76,    74,    21,
-      60,    17,     0,     0,    51,     0,    71,     0,    62,    73,
-       0,    47
+       0,     0,    28,    27,    22,   101,   102,    99,    99,   109,
+     108,   112,   114,   119,   195,   137,   267,     0,     0,   248,
+     142,    93,    94,    96,    18,   246,   250,     0,     0,     0,
+       0,   133,   198,     0,   229,     0,   209,     0,   215,   218,
+     217,   261,     0,    98,   257,     0,   212,   127,   128,   126,
+     131,     0,     0,   156,     0,   179,   185,   169,   162,   163,
+     160,     0,   171,   172,   170,   168,   167,   184,   181,   178,
+     175,   164,   173,   161,     0,     0,   287,   289,     0,   144,
+       0,     0,     0,   291,   136,   145,   227,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    85,     0,    31,    33,
+       0,     0,    80,     0,     0,     0,   277,     0,   278,   275,
+       0,   276,   272,   273,   274,     0,     0,    18,     0,     0,
+      76,    68,    63,    69,    82,    66,    67,    70,    71,   100,
+     104,   104,   110,     0,   269,   158,   265,    18,    95,   115,
+     200,   251,   141,   140,     0,   197,   214,     0,   259,   260,
+      97,     0,     0,     0,   149,   155,     0,     0,     0,   231,
+     232,   233,   284,   153,     0,   230,   234,   267,   228,     0,
+     147,     0,   221,     0,   222,     0,    16,    18,    30,    92,
+      94,    18,    35,     0,     0,    81,     0,     0,    83,     0,
+       0,   271,    18,    79,    84,     0,     0,    65,    50,     0,
+       0,     0,   105,   107,   103,   111,   138,     0,     0,   143,
+       0,   199,   118,     0,   116,   134,   212,   159,     0,   152,
+     207,     0,   148,   154,     0,   150,   223,   224,   146,     0,
+      94,    18,    55,   265,    77,    77,     0,     0,     0,     0,
+       0,    45,     0,     0,     0,     0,   106,   270,   253,    21,
+       0,    21,   157,   151,   135,     0,    18,   124,    34,   123,
+      21,     0,     0,     0,    20,    72,    72,     0,     0,    75,
+      80,     0,     0,    40,    41,     0,   117,     0,    23,   121,
+      32,   120,     0,    37,    75,    75,    21,     0,     0,    38,
+      39,     0,     0,    53,     0,     0,    75,   122,   125,     0,
+      56,    43,    44,     0,    73,     0,    75,    75,    46,     0,
+      49,    61,     0,    24,    19,     0,    48,    52,    77,    75,
+      21,    60,    17,     0,     0,    51,     0,    72,     0,    62,
+      74,     0,    47

 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {

-    -485,  -485,  -485,  -485,  -485,  -485,  -485,  -485,  -485,   298,
-    -485,    -5,  -109,  -485,   -17,  -485,   561,   471,     0,  -485,
-    -485,  -485,  -485,  -485,  -485,  -485,  -485,  -485,  -340,  -484,
-    -159,  -456,  -485,    74,   243,  -336,    39,  -485,   -44,   143,
-    -485,   161,   173,  -242,   324,   362,  -485,  -485,   234,  -485,
-     240,  -485,  -485,  -485,  -485,   168,  -485,  -485,   110,  -485,
-     165,    -8,   -37,  -485,  -485,  -485,  -485,  -485,  -485,  -485,
-    -485,  -485,  -485,  -485,  -485,   103,  -485,  -485,   457,  -124,
-    -130,  -485,  -485,   257,  -485,  -485,   399,    38,   -45,   -42,
-    -485,  -485,  -485,  -485,  -485,    13
+    -456,  -456,  -456,  -456,  -456,  -456,  -456,  -456,  -456,   228,
+    -456,    -5,  -139,  -456,   -17,  -456,   596,   506,    12,  -456,
+    -456,  -456,  -456,  -456,  -456,  -456,  -456,  -456,   266,  -341,
+    -448,  -192,  -455,  -456,   104,   277,  -337,    49,  -456,   -44,
+     159,  -456,   149,   202,  -243,   348,   389,  -456,  -456,   268,
+    -456,   273,  -456,  -456,  -456,  -456,   188,  -456,  -456,   152,
+    -456,   181,    -8,   -37,  -456,  -456,  -456,  -456,  -456,  -456,
+    -456,  -456,  -456,  -456,  -456,  -456,   103,  -456,  -456,   491,
+    -124,   -97,  -456,  -456,   312,  -456,  -456,   444,    38,   -45,
+     -42,  -456,  -456,  -456,  -456,  -456,    13

 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,     8,     9,    10,    11,    12,    13,    14,    15,   102,
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,     8,     9,    10,    11,    12,    13,    14,    15,   102,

-     417,   378,   504,   525,   110,   538,   244,   108,   109,   418,
-     419,   341,   509,   557,   481,   499,   552,   560,   104,   528,
-     234,   501,   433,   423,   362,   426,   435,   337,   219,   131,
-     215,   153,   262,   264,   284,   369,   248,   249,   442,   250,
-     251,   252,   253,   452,   453,   111,   112,   519,   450,   497,
-     379,   105,    60,    61,   375,   324,    62,    63,    64,    65,
-      66,    67,    68,    69,    70,    71,   127,    72,   157,   143,
-      73,   447,   429,   349,   350,   227,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,   170
+     418,   379,   505,   526,   110,   539,   244,   108,   109,   419,
+     420,   341,   510,   558,   482,   500,   553,   561,   361,   104,
+     529,   234,   502,   434,   424,   363,   427,   436,   337,   219,
+     131,   215,   153,   262,   264,   284,   370,   248,   249,   443,
+     250,   251,   252,   253,   453,   454,   111,   112,   520,   451,
+     498,   380,   105,    60,    61,   376,   324,    62,    63,    64,
+      65,    66,    67,    68,    69,    70,    71,   127,    72,   157,
+     143,    73,   448,   430,   349,   350,   227,    74,    75,    76,
+      77,    78,    79,    80,    81,    82,   170

 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
 };
 
   /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If


@@ -337,105 +338,95 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {

-     113,   255,    59,   159,    17,   142,   160,   268,   269,   428,
-     115,   420,   103,   162,   550,   432,    83,   285,   502,   434,
-     376,   529,   439,   440,   176,   151,   177,   118,    16,   274,
-     152,   391,   119,    83,   122,   123,   124,   150,   125,   126,
-     137,   175,    83,   207,   118,   208,   245,   246,   169,   119,
-      21,    22,    21,    22,    23,   145,   146,   179,   180,   121,
-     121,   121,   128,   121,   121,  -285,   207,  -285,   208,   182,
-     183,   171,   446,   175,   138,  -260,   129,  -287,   214,  -287,
-     144,   121,   569,   526,   527,   314,   158,   315,   142,  -259,
-     181,   316,   317,   318,   135,   121,   121,   319,   551,    21,
-      22,   563,   482,  -261,   348,  -285,   243,  -285,   271,   421,
-     279,   184,  -287,   280,  -287,    57,   142,   172,   173,   174,
-     258,   178,   116,   117,   254,  -263,   372,   136,   267,    59,
-      59,   374,    57,   404,   228,   130,   206,  -262,   320,   247,
-     134,   506,   507,    57,   140,    57,   393,   148,   282,   409,
-     154,   270,   161,   218,   163,   164,   165,   166,   167,  -290,
-    -290,  -290,   205,  -289,   287,   288,   289,   213,   291,   292,
-     294,   411,   338,   339,   534,   413,   144,   470,   132,   133,
-     353,   155,   321,   354,   322,   323,   220,   172,   173,   174,
-     156,   456,    57,   278,   172,   173,   174,   335,   327,   328,
-     329,   330,   331,   332,   333,   334,   461,   221,   554,   172,
+     113,   255,    59,   159,    17,   142,   160,   421,   429,   176,
+     115,   177,    83,   162,   433,    83,    21,    22,   435,   377,
+     503,   440,   441,   118,   103,   151,   118,    83,   119,   274,
+     152,   119,   245,   246,   122,   123,   124,   150,   125,   126,
+     268,   269,   551,    21,    22,   175,   182,   183,   169,   137,
+     179,   180,    21,    22,    23,   145,   146,    16,   530,   121,
+     121,   121,   128,   121,   121,   172,   173,   174,   254,   201,
+     175,   171,   202,   203,   204,   205,   447,   207,   214,   208,
+     144,   121,   207,   138,   208,   314,   158,   315,   142,   527,
+     528,   316,   317,   318,   129,   121,   121,   319,   155,  -286,
+     135,  -286,   483,   564,   348,   422,   178,   156,   271,    57,
+     279,    57,   405,   280,    57,  -286,   142,  -286,   243,   570,
+     258,   285,   116,   117,   375,   247,   552,   394,   267,    59,
+      59,   172,   173,   174,   228,   130,    57,  -262,   320,   136,
+     134,   507,   508,   181,   140,    57,   410,   148,   282,   412,
+     154,   270,   161,   184,   163,   164,   165,   166,   167,   373,
+    -291,  -291,  -291,   205,   287,   288,   289,   206,   291,   292,
+     294,   414,   338,   339,   535,  -264,   144,   471,   218,  -261,
+     353,   457,   321,   354,   322,   323,  -290,   172,   173,   174,
+     172,   173,   174,   278,   132,   133,   462,   335,   327,   328,
+     329,   330,   331,   332,   333,   334,   392,   220,   555,   172,

      173,   174,   172,   173,   174,   342,   343,   344,   345,   347,
      173,   174,   172,   173,   174,   342,   343,   344,   345,   347,

-     373,   355,   356,   432,   358,   359,   222,   495,   361,   363,
-     364,   365,   366,   367,   172,   173,   174,   223,   172,   173,
-     174,   201,   224,   325,   202,   203,   204,   205,    59,   216,
-     217,   448,   491,   229,   172,   173,   174,   209,   276,   210,
-     232,   230,   383,   352,   211,   233,   212,   386,   235,   172,
-     173,   174,   225,   172,   173,   174,   463,   390,   290,   256,
-     257,   226,   259,    57,   295,   261,   263,   296,   297,   298,
+     374,   355,   356,   433,   358,   359,   213,   496,   362,   364,
+     362,   362,   362,   362,   172,   173,   174,   216,   217,    84,
+    -288,   221,  -288,   325,   172,   173,   174,   222,    59,   120,
+     120,   120,   449,   120,   120,   492,   232,   223,   276,   172,
+     173,   174,   384,   352,  -260,   233,  -288,   387,  -288,   139,
+     120,   120,   147,   172,   173,   174,   229,   391,   290,   230,
+     172,   173,   174,   235,   295,   120,   120,   296,   297,   298,

      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
      299,   300,   301,   302,   303,   304,   305,   306,   307,   308,

-     309,   310,   311,   312,   313,   273,   396,   397,   265,    84,
-     272,   353,   283,   403,   354,   172,   173,   174,   285,   120,
-     120,   120,   346,   120,   120,   172,   173,   174,   336,   172,
-     173,   174,   340,   357,   424,   363,   427,   427,   142,   139,
-     120,   120,   147,   172,   173,   174,   368,   436,   500,   532,
-     427,   427,   438,   371,   377,   120,   120,   392,   381,   384,
-     121,   408,   186,   187,   540,   541,   382,   505,   389,   391,
-     508,   449,   174,   286,   512,   513,   549,   406,   172,   173,
-     174,   398,   399,   457,   400,   430,   555,   556,   401,   405,
-     186,   416,   523,   524,   352,   200,   422,   231,    59,   564,
-     201,    57,   535,   202,   203,   204,   205,   172,   173,   174,
-     410,   468,   431,   441,   445,   471,   451,   543,   172,   173,
-     174,   545,   546,   200,   186,   187,   478,   458,   201,   260,
-     427,   202,   203,   204,   205,   142,   120,   380,   486,   558,
-     172,   173,   174,   236,   237,   238,   239,   464,   388,   465,
-     240,   466,   241,   566,   197,   198,   199,   200,   467,   473,
-     472,   571,   201,   477,   474,   202,   203,   204,   205,   427,
-     427,   514,   412,   516,   475,   476,  -214,   172,   173,   174,
-     479,   480,   521,   172,   173,   174,   207,   483,   208,  -214,
-     449,   186,   187,   484,   172,   173,   174,   487,   459,   488,
-     490,   424,   427,   492,   493,   494,   503,   -82,   542,   172,
-     173,   174,   496,   510,   511,   414,   515,   517,  -214,  -214,
-    -214,  -214,   518,   199,   200,  -214,   460,  -214,   522,   201,
-    -214,   360,   202,   203,   204,   205,   427,  -214,  -214,   394,
-     530,   531,   565,   559,   485,   547,   172,   173,   174,   544,
-    -214,   561,  -214,  -214,  -214,   548,  -214,  -214,  -214,  -214,
-    -214,  -214,  -214,  -214,  -214,  -214,  -214,  -214,  -214,  -214,
-    -214,   562,  -253,   570,   107,  -214,   407,   242,  -214,  -214,
-    -214,  -214,  -214,   533,  -214,  -253,   425,  -214,   172,   173,
-     174,   469,   172,   173,   174,   172,   173,   174,   200,   186,
-     187,   387,   567,   201,   443,   520,   202,   203,   204,   205,
-     370,   444,   277,   437,  -253,  -253,  -253,  -253,   454,   489,
-     120,  -253,   455,  -253,   351,   462,  -253,   195,   196,   197,
-     198,   199,   200,  -253,  -253,   498,     0,   201,     0,     0,
-     202,   203,   204,   205,     0,     0,  -253,     0,  -253,  -253,
-    -253,     0,  -253,  -253,  -253,  -253,  -253,  -253,  -253,  -253,
-    -253,  -253,  -253,  -253,  -253,  -253,  -253,     0,     0,     0,
-       0,  -253,   -13,    85,  -253,  -253,  -253,  -253,  -253,     0,
-    -253,     0,    83,  -253,    18,     0,    19,    20,    21,    22,
-      23,     0,     0,    24,    25,    26,    27,    28,     0,    29,
-      30,    31,    32,    33,    34,    86,   106,    87,    88,    89,
-      35,    36,    90,    91,    92,    93,    94,    95,     0,     0,
-       0,    96,    97,    98,    99,    37,     0,   100,    38,    39,
-      40,    41,    42,     0,     0,    43,    44,    45,    46,    47,
-      48,    49,     1,     2,     3,     4,     5,     6,     7,     0,
-       0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    51,    52,     0,
-      53,     0,    54,    55,    -3,    85,     0,     0,     0,    56,
-     101,    57,    58,     0,    83,     0,    18,     0,    19,    20,
-      21,    22,    23,     0,     0,    24,    25,    26,    27,    28,
-       0,    29,    30,    31,    32,    33,    34,    86,   106,    87,
-      88,    89,    35,    36,    90,    91,    92,    93,    94,    95,
-       0,     0,     0,    96,    97,    98,    99,    37,     0,   100,
-      38,    39,    40,    41,    42,     0,     0,    43,    44,    45,
-      46,    47,    48,    49,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    50,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    51,
-      52,     0,    53,     0,    54,    55,    85,     0,     0,     0,
-       0,    56,   101,    57,    58,    83,   415,    18,     0,    19,
+     309,   310,   311,   312,   313,   273,   397,   398,   256,   257,
+     464,   353,   393,   404,   354,   259,   261,   533,   172,   173,
+     174,   263,   236,   237,   238,   239,  -263,   231,   209,   240,
+     210,   241,   541,   542,   425,   364,   428,   428,   506,   142,
+     224,   509,   272,   265,   550,   513,   514,   437,   283,   501,
+     428,   428,   439,   285,   556,   557,   172,   173,   174,   260,
+     121,   336,   186,   524,   525,   340,   120,   565,   346,   211,
+     225,   212,   450,   536,   357,   172,   173,   174,   369,   226,
+     372,    57,   378,   382,   458,   431,   -83,   383,   544,   172,
+     173,   174,   546,   547,   352,   200,   172,   173,   174,    59,
+     201,   390,   385,   202,   203,   204,   205,   409,   392,   407,
+     559,   174,   469,   399,   185,   400,   472,   401,   402,   286,
+     406,   186,   187,   417,   567,    57,   423,   479,   411,   432,
+     442,   428,   572,   446,   459,   452,   142,   465,   466,   487,
+     467,   188,   189,   396,   190,   191,   192,   193,   194,   195,
+     196,   197,   198,   199,   200,   172,   173,   174,   468,   201,
+     473,   360,   202,   203,   204,   205,   172,   173,   174,   474,
+     428,   428,   515,   475,   517,   476,   477,  -215,   478,   236,
+     237,   238,   239,   522,   480,   381,   240,   207,   241,   208,
+    -215,   450,   186,   187,   481,   172,   173,   174,   413,   460,
+     484,   485,   425,   428,   365,   366,   367,   368,   489,   543,
+     172,   173,   174,   172,   173,   174,   172,   173,   174,  -215,
+    -215,  -215,  -215,   488,   199,   200,  -215,   415,  -215,   491,
+     201,  -215,   493,   202,   203,   204,   205,   428,  -215,  -215,
+     495,   494,   461,   566,   497,   486,   389,   172,   173,   174,
+     120,  -215,   504,  -215,  -215,  -215,   512,  -215,  -215,  -215,
+    -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,  -215,
+    -215,  -215,   511,  -254,   516,   518,  -215,   395,   519,  -215,
+    -215,  -215,  -215,  -215,   523,  -215,  -254,   531,  -215,   172,
+     173,   174,   532,   172,   173,   174,   172,   173,   174,   545,
+     186,   187,   548,   549,   560,   562,   172,   173,   174,   107,
+     563,   571,   242,   568,   534,  -254,  -254,  -254,  -254,   408,
+     426,   470,  -254,   455,  -254,   388,   456,  -254,   195,   196,
+     197,   198,   199,   200,  -254,  -254,   463,   371,   201,   444,
+     490,   202,   203,   204,   205,   445,   277,  -254,   521,  -254,
+    -254,  -254,   499,  -254,  -254,  -254,  -254,  -254,  -254,  -254,
+    -254,  -254,  -254,  -254,  -254,  -254,  -254,  -254,   438,   351,
+       0,     0,  -254,   -13,    85,  -254,  -254,  -254,  -254,  -254,
+       0,  -254,     0,    83,  -254,    18,     0,    19,    20,    21,
+      22,    23,     0,     0,    24,    25,    26,    27,    28,     0,
+      29,    30,    31,    32,    33,    34,    86,   106,    87,    88,
+      89,    35,    36,    90,    91,    92,    93,    94,    95,     0,
+     186,   187,    96,    97,    98,    99,    37,     0,   100,    38,
+      39,    40,    41,    42,     0,     0,    43,    44,    45,    46,
+      47,    48,    49,     0,     0,     0,   200,     0,     0,     0,
+       0,   201,    50,   200,   202,   203,   204,   205,   201,     0,
+       0,   202,   203,   204,   205,     0,     0,     0,    51,    52,
+       0,    53,     0,    54,    55,    -3,    85,     0,     0,     0,
+      56,   101,    57,    58,     0,    83,     0,    18,     0,    19,

       20,    21,    22,    23,     0,     0,    24,    25,    26,    27,
       28,     0,    29,    30,    31,    32,    33,    34,    86,   106,
       87,    88,    89,    35,    36,    90,    91,    92,    93,    94,
       95,     0,     0,     0,    96,    97,    98,    99,    37,     0,
      100,    38,    39,    40,    41,    42,     0,     0,    43,    44,
       20,    21,    22,    23,     0,     0,    24,    25,    26,    27,
       28,     0,    29,    30,    31,    32,    33,    34,    86,   106,
       87,    88,    89,    35,    36,    90,    91,    92,    93,    94,
       95,     0,     0,     0,    96,    97,    98,    99,    37,     0,
      100,    38,    39,    40,    41,    42,     0,     0,    43,    44,

-      45,    46,    47,    48,    49,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    50,     0,     0,     0,     0,     0,
+      45,    46,    47,    48,    49,     1,     2,     3,     4,     5,
+       6,     7,     0,     0,    50,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       51,    52,     0,    53,     0,    54,    55,    85,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       51,    52,     0,    53,     0,    54,    55,    85,     0,     0,

-       0,     0,    56,   101,    57,    58,    83,   536,    18,     0,
+       0,     0,    56,   101,    57,    58,    83,   416,    18,     0,

       19,    20,    21,    22,    23,     0,     0,    24,    25,    26,
       27,    28,     0,    29,    30,    31,    32,    33,    34,    86,
      106,    87,    88,    89,    35,    36,    90,    91,    92,    93,
       19,    20,    21,    22,    23,     0,     0,    24,    25,    26,
       27,    28,     0,    29,    30,    31,    32,    33,    34,    86,
      106,    87,    88,    89,    35,    36,    90,    91,    92,    93,


@@ -455,7 +446,7 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,     0,     0,    50,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    51,    52,     0,    53,     0,    54,    55,    85,
        0,     0,     0,     0,     0,     0,    50,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    51,    52,     0,    53,     0,    54,    55,    85,

-       0,     0,     0,     0,    56,   101,    57,    58,    83,   539,
+       0,     0,     0,     0,    56,   101,    57,    58,    83,   538,

       18,     0,    19,    20,    21,    22,    23,     0,     0,    24,
       25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
       34,    86,   106,    87,    88,    89,    35,    36,    90,    91,
       18,     0,    19,    20,    21,    22,    23,     0,     0,    24,
       25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
       34,    86,   106,    87,    88,    89,    35,    36,    90,    91,


@@ -466,7 +457,7 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    51,    52,     0,    53,     0,    54,    55,
       85,     0,     0,     0,     0,    56,   101,    57,    58,    83,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    51,    52,     0,    53,     0,    54,    55,
       85,     0,     0,     0,     0,    56,   101,    57,    58,    83,

-     553,    18,     0,    19,    20,    21,    22,    23,     0,     0,
+     540,    18,     0,    19,    20,    21,    22,    23,     0,     0,

       24,    25,    26,    27,    28,     0,    29,    30,    31,    32,
       33,    34,    86,   106,    87,    88,    89,    35,    36,    90,
       91,    92,    93,    94,    95,     0,     0,     0,    96,    97,
       24,    25,    26,    27,    28,     0,    29,    30,    31,    32,
       33,    34,    86,   106,    87,    88,    89,    35,    36,    90,
       91,    92,    93,    94,    95,     0,     0,     0,    96,    97,


@@ -476,13 +467,13 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    51,    52,     0,    53,     0,    54,
       55,    85,     0,     0,     0,     0,    56,   101,    57,    58,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    51,    52,     0,    53,     0,    54,
       55,    85,     0,     0,     0,     0,    56,   101,    57,    58,

-      83,     0,    18,     0,    19,    20,    21,    22,    23,     0,
+      83,   554,    18,     0,    19,    20,    21,    22,    23,     0,

        0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
       32,    33,    34,    86,   106,    87,    88,    89,    35,    36,
       90,    91,    92,    93,    94,    95,     0,     0,     0,    96,
       97,    98,    99,    37,     0,   100,    38,    39,    40,    41,
       42,     0,     0,    43,    44,    45,    46,    47,    48,    49,
        0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
       32,    33,    34,    86,   106,    87,    88,    89,    35,    36,
       90,    91,    92,    93,    94,    95,     0,     0,     0,    96,
       97,    98,    99,    37,     0,   100,    38,    39,    40,    41,
       42,     0,     0,    43,    44,    45,    46,    47,    48,    49,

-       0,     0,   568,     0,     0,     0,     0,     0,     0,    50,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    50,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    51,    52,     0,    53,     0,
       54,    55,    85,     0,     0,     0,     0,    56,   101,    57,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    51,    52,     0,    53,     0,
       54,    55,    85,     0,     0,     0,     0,    56,   101,    57,


@@ -492,13 +483,13 @@ static const yytype_int16 yytable[] =
       36,    90,    91,    92,    93,    94,    95,     0,     0,     0,
       96,    97,    98,    99,    37,     0,   100,    38,    39,    40,
       41,    42,     0,     0,    43,    44,    45,    46,    47,    48,
       36,    90,    91,    92,    93,    94,    95,     0,     0,     0,
       96,    97,    98,    99,    37,     0,   100,    38,    39,    40,
       41,    42,     0,     0,    43,    44,    45,    46,    47,    48,

-      49,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      49,     0,     0,   569,     0,     0,     0,     0,     0,     0,

       50,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    51,    52,     0,    53,
        0,    54,    55,    85,     0,     0,     0,     0,    56,   101,
       57,    58,    83,     0,    18,     0,    19,    20,    21,    22,
       23,     0,     0,    24,    25,    26,    27,    28,     0,    29,
       50,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    51,    52,     0,    53,
        0,    54,    55,    85,     0,     0,     0,     0,    56,   101,
       57,    58,    83,     0,    18,     0,    19,    20,    21,    22,
       23,     0,     0,    24,    25,    26,    27,    28,     0,    29,

-      30,    31,    32,    33,    34,    86,     0,    87,    88,    89,
+      30,    31,    32,    33,    34,    86,   106,    87,    88,    89,

       35,    36,    90,    91,    92,    93,    94,    95,     0,     0,
        0,    96,    97,    98,    99,    37,     0,   100,    38,    39,
       40,    41,    42,     0,     0,    43,    44,    45,    46,    47,
       35,    36,    90,    91,    92,    93,    94,    95,     0,     0,
        0,    96,    97,    98,    99,    37,     0,   100,    38,    39,
       40,    41,    42,     0,     0,    43,    44,    45,    46,    47,


@@ -506,47 +497,67 @@ static const yytype_int16 yytable[] =
        0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    51,    52,     0,
       53,     0,    54,    55,    85,     0,     0,     0,     0,    56,
        0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    51,    52,     0,
       53,     0,    54,    55,    85,     0,     0,     0,     0,    56,

-     101,    57,    58,     0,     0,    18,     0,    19,    20,    21,
+     101,    57,    58,    83,     0,    18,     0,    19,    20,    21,

       22,    23,     0,     0,    24,    25,    26,    27,    28,     0,
       22,    23,     0,     0,    24,    25,    26,    27,    28,     0,

-      29,    30,    31,    32,    33,    34,     0,     0,     0,     0,
-       0,    35,    36,     0,     0,     0,     0,     0,   186,   187,
-       0,     0,     0,     0,     0,     0,    37,     0,     0,    38,
+      29,    30,    31,    32,    33,    34,    86,     0,    87,    88,
+      89,    35,    36,    90,    91,    92,    93,    94,    95,     0,
+       0,     0,    96,    97,    98,    99,    37,     0,   100,    38,

       39,    40,    41,    42,     0,     0,    43,    44,    45,    46,
       39,    40,    41,    42,     0,     0,    43,    44,    45,    46,

-      47,    48,    49,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,    50,     0,     0,     0,   201,     0,     0,   202,
-     203,   204,   205,     0,     0,     0,     0,     0,    51,    52,
+      47,    48,    49,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    50,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    51,    52,

        0,    53,     0,    54,    55,    85,     0,     0,     0,     0,
        0,    53,     0,    54,    55,    85,     0,     0,     0,     0,

-      56,   -77,    57,    58,     0,     0,    18,     0,    19,    20,
+      56,   101,    57,    58,     0,     0,    18,     0,    19,    20,

       21,    22,    23,     0,     0,    24,    25,    26,    27,    28,
        0,    29,    30,    31,    32,    33,    34,     0,     0,     0,
       21,    22,    23,     0,     0,    24,    25,    26,    27,    28,
        0,    29,    30,    31,    32,    33,    34,     0,     0,     0,

-       0,     0,    35,    36,     0,     0,     0,     0,   186,   187,
-       0,     0,     0,     0,     0,     0,     0,    37,     0,     0,
+       0,     0,    35,    36,     0,     0,     0,     0,     0,   186,
+     187,     0,     0,     0,     0,     0,     0,    37,     0,     0,

       38,    39,    40,    41,    42,     0,     0,    43,    44,    45,
       38,    39,    40,    41,    42,     0,     0,    43,    44,    45,

-      46,    47,    48,    49,   193,   194,   195,   196,   197,   198,
-     199,   200,     0,    50,     0,     0,   201,     0,     0,   202,
-     203,   204,   205,     0,     0,     0,     0,     0,     0,    51,
-      52,     0,    53,     0,    54,    55,     0,     0,     0,     0,
-     -77,    56,     0,    57,    58,    83,     0,    18,     0,    19,
-      20,    21,    22,    23,     0,     0,   141,    25,    26,    27,
-      28,   119,    29,    30,    31,    32,    33,    34,     0,     0,
-       0,     0,     0,    35,    36,     0,     0,     0,   186,   187,
-       0,     0,     0,     0,     0,     0,     0,     0,    37,     0,
+      46,    47,    48,    49,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,    50,     0,     0,     0,   201,     0,     0,
+     202,   203,   204,   205,     0,     0,     0,     0,     0,    51,
+      52,     0,    53,     0,    54,    55,    85,     0,     0,     0,
+       0,    56,   -78,    57,    58,     0,     0,    18,     0,    19,
+      20,    21,    22,    23,     0,     0,    24,    25,    26,    27,
+      28,     0,    29,    30,    31,    32,    33,    34,     0,     0,
+       0,     0,     0,    35,    36,     0,     0,     0,     0,   186,
+     187,     0,     0,     0,     0,     0,     0,     0,    37,     0,

        0,    38,    39,    40,    41,    42,     0,     0,    43,    44,
        0,    38,    39,    40,    41,    42,     0,     0,    43,    44,

-      45,    46,    47,    48,    49,   194,   195,   196,   197,   198,
-     199,   200,     0,     0,    50,     0,   201,     0,     0,   202,
-     203,   204,   205,     0,     0,     0,     0,     0,     0,     0,
+      45,    46,    47,    48,    49,   193,   194,   195,   196,   197,
+     198,   199,   200,     0,    50,     0,     0,   201,     0,     0,
+     202,   203,   204,   205,     0,     0,     0,     0,     0,     0,

       51,    52,     0,    53,     0,    54,    55,     0,     0,     0,
       51,    52,     0,    53,     0,    54,    55,     0,     0,     0,

-       0,     0,    56,     0,    57,    58,    83,     0,    18,     0,
+       0,   -78,    56,     0,    57,    58,    83,     0,    18,     0,
+      19,    20,    21,    22,    23,     0,     0,   141,    25,    26,
+      27,    28,   119,    29,    30,    31,    32,    33,    34,     0,
+       0,     0,     0,     0,    35,    36,     0,     0,     0,   186,
+     187,     0,     0,     0,     0,     0,     0,     0,     0,    37,
+       0,     0,    38,    39,    40,    41,    42,     0,     0,    43,
+      44,    45,    46,    47,    48,    49,   194,   195,   196,   197,
+     198,   199,   200,     0,     0,    50,     0,   201,     0,     0,
+     202,   203,   204,   205,     0,     0,     0,     0,     0,     0,
+       0,    51,    52,     0,    53,     0,    54,    55,     0,     0,
+     186,   187,     0,    56,     0,    57,    58,    83,     0,    18,
+       0,    19,    20,    21,    22,    23,     0,     0,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
+     197,   198,   199,   200,     0,    35,    36,     0,   201,     0,
+       0,   202,   203,   204,   205,     0,     0,     0,     0,     0,
+      37,     0,     0,    38,    39,    40,    41,    42,     0,     0,
+      43,    44,    45,    46,    47,    48,    49,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    50,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,    51,    52,     0,    53,     0,    54,    55,     0,
+       0,     0,     0,     0,    56,     0,    57,    58,    18,   114,

       19,    20,    21,    22,    23,     0,     0,    24,    25,    26,
       27,    28,     0,    29,    30,    31,    32,    33,    34,     0,
       19,    20,    21,    22,    23,     0,     0,    24,    25,    26,
       27,    28,     0,    29,    30,    31,    32,    33,    34,     0,

-       0,     0,     0,     0,    35,    36,   236,   237,   238,   239,
-       0,     0,     0,   240,     0,   241,     0,     0,     0,    37,
+       0,     0,     0,     0,    35,    36,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    37,

        0,     0,    38,    39,    40,    41,    42,     0,     0,    43,
       44,    45,    46,    47,    48,    49,     0,     0,     0,     0,
        0,     0,    38,    39,    40,    41,    42,     0,     0,    43,
       44,    45,    46,    47,    48,    49,     0,     0,     0,     0,

-     172,   173,   174,     0,     0,    50,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    50,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,    51,    52,     0,    53,     0,    54,    55,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,    51,    52,     0,    53,     0,    54,    55,     0,     0,

-       0,     0,     0,    56,     0,    57,    58,    18,   114,    19,
+       0,     0,     0,    56,     0,    57,    58,    18,     0,    19,

       20,    21,    22,    23,     0,     0,    24,    25,    26,    27,
       28,     0,    29,    30,    31,    32,    33,    34,     0,     0,
        0,     0,     0,    35,    36,     0,     0,     0,     0,     0,
       20,    21,    22,    23,     0,     0,    24,    25,    26,    27,
       28,     0,    29,    30,    31,    32,    33,    34,     0,     0,
        0,     0,     0,    35,    36,     0,     0,     0,     0,     0,


@@ -556,7 +567,7 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,    50,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       51,    52,     0,    53,     0,    54,    55,     0,     0,     0,
        0,     0,     0,     0,    50,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       51,    52,     0,    53,     0,    54,    55,     0,     0,     0,

-       0,     0,    56,     0,    57,    58,    18,     0,    19,    20,
+       0,     0,    56,   149,    57,    58,    18,     0,    19,    20,

       21,    22,    23,     0,     0,    24,    25,    26,    27,    28,
        0,    29,    30,    31,    32,    33,    34,     0,     0,     0,
        0,     0,    35,    36,     0,     0,     0,     0,     0,     0,
       21,    22,    23,     0,     0,    24,    25,    26,    27,    28,
        0,    29,    30,    31,    32,    33,    34,     0,     0,     0,
        0,     0,    35,    36,     0,     0,     0,     0,     0,     0,


@@ -566,7 +577,7 @@ static const yytype_int16 yytable[] =
        0,     0,     0,    50,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    51,
       52,     0,    53,     0,    54,    55,     0,     0,     0,     0,
        0,     0,     0,    50,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    51,
       52,     0,    53,     0,    54,    55,     0,     0,     0,     0,

-       0,    56,   149,    57,    58,    18,     0,    19,    20,    21,
+     168,    56,     0,    57,    58,    18,     0,    19,    20,    21,

       22,    23,     0,     0,    24,    25,    26,    27,    28,     0,
       29,    30,    31,    32,    33,    34,     0,     0,     0,     0,
        0,    35,    36,     0,     0,     0,     0,     0,     0,     0,
       22,    23,     0,     0,    24,    25,    26,    27,    28,     0,
       29,    30,    31,    32,    33,    34,     0,     0,     0,     0,
        0,    35,    36,     0,     0,     0,     0,     0,     0,     0,


@@ -575,7 +586,7 @@ static const yytype_int16 yytable[] =
       47,    48,    49,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    50,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    51,    52,
       47,    48,    49,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    50,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,    51,    52,

-       0,    53,     0,    54,    55,     0,     0,     0,     0,   168,
+       0,    53,     0,    54,    55,     0,     0,     0,     0,   266,

       56,     0,    57,    58,    18,     0,    19,    20,    21,    22,
       23,     0,     0,    24,    25,    26,    27,    28,     0,    29,
       30,    31,    32,    33,    34,     0,     0,     0,     0,     0,
       56,     0,    57,    58,    18,     0,    19,    20,    21,    22,
       23,     0,     0,    24,    25,    26,    27,    28,     0,    29,
       30,    31,    32,    33,    34,     0,     0,     0,     0,     0,


@@ -585,7 +596,7 @@ static const yytype_int16 yytable[] =
       48,    49,     0,     0,     0,     0,     0,     0,     0,     0,
        0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    51,    52,     0,
       48,    49,     0,     0,     0,     0,     0,     0,     0,     0,
        0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,    51,    52,     0,

-      53,     0,    54,    55,     0,     0,     0,     0,   266,    56,
+      53,     0,    54,    55,     0,     0,     0,     0,   281,    56,

        0,    57,    58,    18,     0,    19,    20,    21,    22,    23,
        0,     0,    24,    25,    26,    27,    28,     0,    29,    30,
       31,    32,    33,    34,     0,     0,     0,     0,     0,    35,
        0,    57,    58,    18,     0,    19,    20,    21,    22,    23,
        0,     0,    24,    25,    26,    27,    28,     0,    29,    30,
       31,    32,    33,    34,     0,     0,     0,     0,     0,    35,


@@ -595,7 +606,7 @@ static const yytype_int16 yytable[] =
       49,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       50,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    51,    52,     0,    53,
       49,     0,     0,     0,     0,     0,     0,     0,     0,     0,
       50,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    51,    52,     0,    53,

-       0,    54,    55,     0,     0,     0,     0,   281,    56,     0,
+       0,    54,    55,     0,     0,     0,     0,   293,    56,     0,

       57,    58,    18,     0,    19,    20,    21,    22,    23,     0,
        0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
       32,    33,    34,     0,     0,     0,     0,     0,    35,    36,
       57,    58,    18,     0,    19,    20,    21,    22,    23,     0,
        0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
       32,    33,    34,     0,     0,     0,     0,     0,    35,    36,


@@ -605,7 +616,7 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,     0,     0,     0,     0,     0,    50,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    51,    52,     0,    53,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    50,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    51,    52,     0,    53,     0,

-      54,    55,     0,     0,     0,     0,   293,    56,     0,    57,
+      54,    55,     0,     0,     0,     0,   326,    56,     0,    57,

       58,    18,     0,    19,    20,    21,    22,    23,     0,     0,
       24,    25,    26,    27,    28,     0,    29,    30,    31,    32,
       33,    34,     0,     0,     0,     0,     0,    35,    36,     0,
       58,    18,     0,    19,    20,    21,    22,    23,     0,     0,
       24,    25,    26,    27,    28,     0,    29,    30,    31,    32,
       33,    34,     0,     0,     0,     0,     0,    35,    36,     0,


@@ -615,7 +626,7 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,     0,     0,     0,     0,    50,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    51,    52,     0,    53,     0,    54,
        0,     0,     0,     0,     0,     0,     0,     0,    50,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    51,    52,     0,    53,     0,    54,

-      55,     0,     0,     0,     0,   326,    56,     0,    57,    58,
+      55,     0,     0,     0,     0,   386,    56,     0,    57,    58,

       18,     0,    19,    20,    21,    22,    23,     0,     0,    24,
       25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
       34,     0,     0,     0,     0,     0,    35,    36,     0,     0,
       18,     0,    19,    20,    21,    22,    23,     0,     0,    24,
       25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
       34,     0,     0,     0,     0,     0,    35,    36,     0,     0,


@@ -625,7 +636,7 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,     0,     0,     0,    50,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    51,    52,     0,    53,     0,    54,    55,
        0,     0,     0,     0,     0,     0,     0,    50,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    51,    52,     0,    53,     0,    54,    55,

-       0,     0,     0,     0,   385,    56,     0,    57,    58,    18,
+       0,     0,     0,     0,   403,    56,     0,    57,    58,    18,

        0,    19,    20,    21,    22,    23,     0,     0,    24,    25,
       26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
        0,     0,     0,     0,     0,    35,    36,     0,     0,     0,
        0,    19,    20,    21,    22,    23,     0,     0,    24,    25,
       26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
        0,     0,     0,     0,     0,    35,    36,     0,     0,     0,


@@ -635,7 +646,7 @@ static const yytype_int16 yytable[] =
        0,     0,     0,     0,     0,     0,    50,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    51,    52,     0,    53,     0,    54,    55,     0,
        0,     0,     0,     0,     0,     0,    50,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    51,    52,     0,    53,     0,    54,    55,     0,

-       0,     0,     0,   402,    56,     0,    57,    58,    18,     0,
+       0,     0,     0,     0,    56,     0,    57,    58,    18,     0,

       19,    20,    21,    22,    23,     0,     0,    24,    25,    26,
       27,    28,     0,    29,    30,    31,    32,    33,    34,     0,
        0,     0,     0,     0,    35,    36,     0,     0,     0,     0,
       19,    20,    21,    22,    23,     0,     0,    24,    25,    26,
       27,    28,     0,    29,    30,    31,    32,    33,    34,     0,
        0,     0,     0,     0,    35,    36,     0,     0,     0,     0,


@@ -643,135 +654,111 @@ static const yytype_int16 yytable[] =
        0,     0,    38,    39,    40,    41,    42,     0,     0,    43,
       44,    45,    46,    47,    48,    49,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    50,     0,     0,     0,     0,
        0,     0,    38,    39,    40,    41,    42,     0,     0,    43,
       44,    45,    46,    47,    48,    49,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    50,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     185,     0,     0,     0,     0,     0,     0,   186,   187,     0,

        0,    51,    52,     0,    53,     0,    54,    55,     0,     0,
        0,    51,    52,     0,    53,     0,    54,    55,     0,     0,

-       0,     0,     0,    56,     0,    57,    58,    18,     0,    19,
-      20,    21,    22,    23,     0,     0,    24,    25,    26,    27,
-      28,     0,    29,    30,    31,    32,    33,    34,     0,     0,
-       0,     0,     0,    35,    36,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    37,     0,
-       0,    38,    39,    40,    41,    42,     0,     0,    43,    44,
-      45,    46,    47,    48,    49,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    50,     0,     0,     0,     0,   185,
-       0,     0,     0,     0,     0,     0,   186,   187,     0,     0,
-      51,    52,     0,    53,     0,    54,    55,     0,     0,     0,
-       0,     0,   275,     0,    57,    58,   188,   189,   395,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-       0,     0,     0,     0,   201,   185,     0,   202,   203,   204,
-     205,     0,   186,   187,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   188,   189,     0,   190,   191,   192,   193,   194,
-     195,   196,   197,   198,   199,   200,     0,     0,     0,     0,
-     201,   185,     0,   202,   203,   204,   205,     0,   186,   187,
+       0,     0,     0,   275,     0,    57,    58,   188,   189,     0,
+     190,   191,   192,   193,   194,   195,   196,   197,   198,   199,
+     200,     0,     0,     0,     0,   201,   185,     0,   202,   203,
+     204,   205,     0,   186,   187,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,     0,     0,   189,
-       0,   190,   191,   192,   193,   194,   195,   196,   197,   198,
-     199,   200,     0,     0,     0,     0,   201,  -290,     0,   202,
-     203,   204,   205,     0,   186,   187,     0,     0,     0,     0,
+       0,     0,     0,     0,   189,     0,   190,   191,   192,   193,
+     194,   195,   196,   197,   198,   199,   200,     0,     0,     0,
+       0,   201,  -291,     0,   202,   203,   204,   205,     0,   186,
+     187,     0,     0,     0,     0,     0,     0,     0,     0,     0,

        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,

-       0,     0,     0,     0,     0,     0,     0,   190,   191,   192,
-     193,   194,   195,   196,   197,   198,   199,   200,     0,     0,
-       0,     0,   201,     0,     0,   202,   203,   204,   205
+       0,     0,   190,   191,   192,   193,   194,   195,   196,   197,
+     198,   199,   200,     0,     0,     0,     0,   201,     0,     0,
+     202,   203,   204,   205

 };
 
 static const yytype_int16 yycheck[] =
 {
 };
 
 static const yytype_int16 yycheck[] =
 {

-      17,   125,    10,    48,     9,    42,    48,   137,   138,   345,
-      18,    10,    12,    50,    24,   355,    10,    12,   474,   355,
-     262,   505,   358,   359,    10,    21,    12,    21,     0,   153,
-      26,    12,    26,    10,    21,    22,    23,    45,    25,    26,
-      73,    80,    10,    10,    21,    12,    16,    17,    56,    26,
-      16,    17,    16,    17,    18,    42,    43,    91,    92,    21,
-      22,    23,    12,    25,    26,    10,    10,    12,    12,    89,
-      90,    58,   111,    80,   107,    70,   107,    10,    83,    12,
-      42,    43,   566,    46,    47,    10,    48,    12,   125,    70,
-      91,    16,    17,    18,   107,    57,    58,    22,   108,    16,
-      17,   557,   438,    70,    68,    10,   106,    12,   145,   108,
-     155,    89,    10,   155,    12,   109,   153,    76,    77,    78,
-     128,   107,    19,    20,    13,    70,   256,   107,   136,   137,
-     138,    13,   109,   110,    96,    32,   107,    70,    63,   109,
-      37,   477,   478,   109,    41,   109,    13,    44,   156,    13,
-      47,   138,    49,    21,    51,    52,    53,    54,    55,   102,
-     103,   104,   105,    10,   172,   173,   174,    10,   176,   177,
-     178,    13,   216,   217,   510,    13,   138,   419,    35,    36,
-     225,    98,   107,   225,   109,   110,   107,    76,    77,    78,
-     107,    13,   109,   155,    76,    77,    78,   214,   206,   207,
-     208,   209,   210,   211,   212,   213,    13,   107,   544,    76,
+      17,   125,    10,    48,     9,    42,    48,    10,   345,    10,
+      18,    12,    10,    50,   355,    10,    16,    17,   355,   262,
+     475,   358,   359,    21,    12,    21,    21,    10,    26,   153,
+      26,    26,    16,    17,    21,    22,    23,    45,    25,    26,
+     137,   138,    24,    16,    17,    80,    89,    90,    56,    73,
+      91,    92,    16,    17,    18,    42,    43,     0,   506,    21,
+      22,    23,    12,    25,    26,    76,    77,    78,    13,    99,
+      80,    58,   102,   103,   104,   105,   111,    10,    83,    12,
+      42,    43,    10,   107,    12,    10,    48,    12,   125,    46,
+      47,    16,    17,    18,   107,    57,    58,    22,    98,    10,
+     107,    12,   439,   558,    68,   108,   107,   107,   145,   109,
+     155,   109,   110,   155,   109,    10,   153,    12,   106,   567,
+     128,    12,    19,    20,    13,   109,   108,    13,   136,   137,
+     138,    76,    77,    78,    96,    32,   109,    70,    63,   107,
+      37,   478,   479,    91,    41,   109,    13,    44,   156,    13,
+      47,   138,    49,    89,    51,    52,    53,    54,    55,   256,
+     102,   103,   104,   105,   172,   173,   174,   107,   176,   177,
+     178,    13,   216,   217,   511,    70,   138,   420,    21,    70,
+     225,    13,   107,   225,   109,   110,    10,    76,    77,    78,
+      76,    77,    78,   155,    35,    36,    13,   214,   206,   207,
+     208,   209,   210,   211,   212,   213,    12,   107,   545,    76,

       77,    78,    76,    77,    78,   220,   221,   222,   223,   224,
       77,    78,    76,    77,    78,   220,   221,   222,   223,   224,

-     257,   226,   227,   563,   229,   230,   107,   469,   236,   237,
-     238,   239,   240,   241,    76,    77,    78,   107,    76,    77,
-      78,    99,    68,   205,   102,   103,   104,   105,   256,    88,
-      89,   375,    13,   107,    76,    77,    78,    10,   155,    12,
-     108,   107,   270,   225,    10,    48,    12,   275,   108,    76,
-      77,    78,    98,    76,    77,    78,   406,   285,   175,   107,
-      73,   107,   106,   109,   181,    24,    70,   184,   185,   186,
+     257,   226,   227,   564,   229,   230,    10,   470,   236,   237,
+     238,   239,   240,   241,    76,    77,    78,    88,    89,    11,
+      10,   107,    12,   205,    76,    77,    78,   107,   256,    21,
+      22,    23,   376,    25,    26,    13,   108,   107,   155,    76,
+      77,    78,   270,   225,    70,    48,    10,   275,    12,    41,
+      42,    43,    44,    76,    77,    78,   107,   285,   175,   107,
+      76,    77,    78,   108,   181,    57,    58,   184,   185,   186,

      187,   188,   189,   190,   191,   192,   193,   194,   195,   196,
      187,   188,   189,   190,   191,   192,   193,   194,   195,   196,

-     197,   198,   199,   200,   201,   108,   314,   315,   106,    11,
-      11,   356,    70,   321,   356,    76,    77,    78,    12,    21,
-      22,    23,    98,    25,    26,    76,    77,    78,    21,    76,
-      77,    78,    21,   107,   342,   343,   344,   345,   375,    41,
-      42,    43,    44,    76,    77,    78,    26,   355,   472,   508,
-     358,   359,   357,    80,    24,    57,    58,   108,    74,    11,
-     322,   108,    61,    62,   523,   524,   106,   476,    24,    12,
-     479,   376,    78,   106,   483,   484,   535,   107,    76,    77,
-      78,   110,   110,   391,   110,   347,   545,   546,   110,   110,
-      61,    19,   501,   502,   356,    94,    21,    99,   406,   558,
-      99,   109,   511,   102,   103,   104,   105,    76,    77,    78,
-     108,   416,   107,    81,   106,   420,   107,   526,    76,    77,
-      78,   530,   531,    94,    61,    62,   431,    11,    99,   131,
-     438,   102,   103,   104,   105,   472,   138,   106,   446,   548,
-      76,    77,    78,    42,    43,    44,    45,    11,   106,    11,
-      49,    11,    51,   562,    91,    92,    93,    94,    11,   106,
-      21,   570,    99,   107,   106,   102,   103,   104,   105,   477,
-     478,   488,   108,   490,   106,   106,     0,    76,    77,    78,
-     106,   108,   499,    76,    77,    78,    10,   106,    12,    13,
-     495,    61,    62,   106,    76,    77,    78,    74,   395,    10,
-      10,   509,   510,    11,   106,   108,    10,   106,   525,    76,
-      77,    78,   108,   107,   106,   108,   106,    72,    42,    43,
-      44,    45,   108,    93,    94,    49,   108,    51,   108,    99,
-      54,   233,   102,   103,   104,   105,   544,    61,    62,   106,
-     106,   106,   559,    71,   441,   108,    76,    77,    78,   107,
-      74,    20,    76,    77,    78,   106,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,   106,     0,   106,    13,    99,   106,   106,   102,   103,
-     104,   105,   106,   509,   108,    13,   343,   111,    76,    77,
-      78,   418,    76,    77,    78,    76,    77,    78,    94,    61,
-      62,   277,   563,    99,   370,   495,   102,   103,   104,   105,
-     248,   371,   155,   356,    42,    43,    44,    45,   106,   451,
-     322,    49,   106,    51,   225,   106,    54,    89,    90,    91,
-      92,    93,    94,    61,    62,   470,    -1,    99,    -1,    -1,
-     102,   103,   104,   105,    -1,    -1,    74,    -1,    76,    77,
-      78,    -1,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    -1,    -1,    -1,
-      -1,    99,     0,     1,   102,   103,   104,   105,   106,    -1,
-     108,    -1,    10,   111,    12,    -1,    14,    15,    16,    17,
-      18,    -1,    -1,    21,    22,    23,    24,    25,    -1,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    51,    52,    53,    -1,    55,    56,    57,
-      58,    59,    60,    -1,    -1,    63,    64,    65,    66,    67,
-      68,    69,     3,     4,     5,     6,     7,     8,     9,    -1,
-      -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    -1,
-      98,    -1,   100,   101,     0,     1,    -1,    -1,    -1,   107,
-     108,   109,   110,    -1,    10,    -1,    12,    -1,    14,    15,
-      16,    17,    18,    -1,    -1,    21,    22,    23,    24,    25,
-      -1,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,    55,
-      56,    57,    58,    59,    60,    -1,    -1,    63,    64,    65,
-      66,    67,    68,    69,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    95,
-      96,    -1,    98,    -1,   100,   101,     1,    -1,    -1,    -1,
-      -1,   107,   108,   109,   110,    10,    11,    12,    -1,    14,
+     197,   198,   199,   200,   201,   108,   314,   315,   107,    73,
+     407,   356,   108,   321,   356,   106,    24,   509,    76,    77,
+      78,    70,    42,    43,    44,    45,    70,    99,    10,    49,
+      12,    51,   524,   525,   342,   343,   344,   345,   477,   376,
+      68,   480,    11,   106,   536,   484,   485,   355,    70,   473,
+     358,   359,   357,    12,   546,   547,    76,    77,    78,   131,
+     322,    21,    61,   502,   503,    21,   138,   559,    98,    10,
+      98,    12,   377,   512,   107,    76,    77,    78,    26,   107,
+      80,   109,    24,    74,   392,   347,   106,   106,   527,    76,
+      77,    78,   531,   532,   356,    94,    76,    77,    78,   407,
+      99,    24,    11,   102,   103,   104,   105,   108,    12,   107,
+     549,    78,   417,   110,    54,   110,   421,   110,   110,   106,
+     110,    61,    62,    19,   563,   109,    21,   432,   108,   107,
+      81,   439,   571,   106,    11,   107,   473,    11,    11,   447,
+      11,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    76,    77,    78,    11,    99,
+      21,   233,   102,   103,   104,   105,    76,    77,    78,   106,
+     478,   479,   489,   106,   491,   106,   106,     0,   107,    42,
+      43,    44,    45,   500,   106,   106,    49,    10,    51,    12,
+      13,   496,    61,    62,   108,    76,    77,    78,   108,   396,
+     106,   106,   510,   511,   238,   239,   240,   241,    10,   526,
+      76,    77,    78,    76,    77,    78,    76,    77,    78,    42,
+      43,    44,    45,    74,    93,    94,    49,   108,    51,    10,
+      99,    54,    11,   102,   103,   104,   105,   545,    61,    62,
+     108,   106,   108,   560,   108,   442,   106,    76,    77,    78,
+     322,    74,    10,    76,    77,    78,   106,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,   107,     0,   106,    72,    99,   106,   108,   102,
+     103,   104,   105,   106,   108,   108,    13,   106,   111,    76,
+      77,    78,   106,    76,    77,    78,    76,    77,    78,   107,
+      61,    62,   108,   106,    71,    20,    76,    77,    78,    13,
+     106,   106,   106,   564,   510,    42,    43,    44,    45,   106,
+     343,   419,    49,   106,    51,   277,   106,    54,    89,    90,
+      91,    92,    93,    94,    61,    62,   106,   248,    99,   371,
+     452,   102,   103,   104,   105,   372,   155,    74,   496,    76,
+      77,    78,   471,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,   356,   225,
+      -1,    -1,    99,     0,     1,   102,   103,   104,   105,   106,
+      -1,   108,    -1,    10,   111,    12,    -1,    14,    15,    16,
+      17,    18,    -1,    -1,    21,    22,    23,    24,    25,    -1,
+      27,    28,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    -1,
+      61,    62,    49,    50,    51,    52,    53,    -1,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
+      67,    68,    69,    -1,    -1,    -1,    94,    -1,    -1,    -1,
+      -1,    99,    79,    94,   102,   103,   104,   105,    99,    -1,
+      -1,   102,   103,   104,   105,    -1,    -1,    -1,    95,    96,
+      -1,    98,    -1,   100,   101,     0,     1,    -1,    -1,    -1,
+     107,   108,   109,   110,    -1,    10,    -1,    12,    -1,    14,

       15,    16,    17,    18,    -1,    -1,    21,    22,    23,    24,
       25,    -1,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,
       55,    56,    57,    58,    59,    60,    -1,    -1,    63,    64,
       15,    16,    17,    18,    -1,    -1,    21,    22,    23,    24,
       25,    -1,    27,    28,    29,    30,    31,    32,    33,    34,
       35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
       45,    -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,
       55,    56,    57,    58,    59,    60,    -1,    -1,    63,    64,

-      65,    66,    67,    68,    69,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,     3,     4,     5,     6,     7,
+       8,     9,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       95,    96,    -1,    98,    -1,   100,   101,     1,    -1,    -1,
       -1,    -1,   107,   108,   109,   110,    10,    11,    12,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       95,    96,    -1,    98,    -1,   100,   101,     1,    -1,    -1,
       -1,    -1,   107,   108,   109,   110,    10,    11,    12,    -1,


@@ -815,13 +802,13 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    95,    96,    -1,    98,    -1,   100,
      101,     1,    -1,    -1,    -1,    -1,   107,   108,   109,   110,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    95,    96,    -1,    98,    -1,   100,
      101,     1,    -1,    -1,    -1,    -1,   107,   108,   109,   110,

-      10,    -1,    12,    -1,    14,    15,    16,    17,    18,    -1,
+      10,    11,    12,    -1,    14,    15,    16,    17,    18,    -1,

       -1,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
       40,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
       50,    51,    52,    53,    -1,    55,    56,    57,    58,    59,
       60,    -1,    -1,    63,    64,    65,    66,    67,    68,    69,
       -1,    21,    22,    23,    24,    25,    -1,    27,    28,    29,
       30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
       40,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
       50,    51,    52,    53,    -1,    55,    56,    57,    58,    59,
       60,    -1,    -1,    63,    64,    65,    66,    67,    68,    69,

-      -1,    -1,    72,    -1,    -1,    -1,    -1,    -1,    -1,    79,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    95,    96,    -1,    98,    -1,
      100,   101,     1,    -1,    -1,    -1,    -1,   107,   108,   109,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    95,    96,    -1,    98,    -1,
      100,   101,     1,    -1,    -1,    -1,    -1,   107,   108,   109,


@@ -831,13 +818,13 @@ static const yytype_int16 yycheck[] =
       39,    40,    41,    42,    43,    44,    45,    -1,    -1,    -1,
       49,    50,    51,    52,    53,    -1,    55,    56,    57,    58,
       59,    60,    -1,    -1,    63,    64,    65,    66,    67,    68,
       39,    40,    41,    42,    43,    44,    45,    -1,    -1,    -1,
       49,    50,    51,    52,    53,    -1,    55,    56,    57,    58,
       59,    60,    -1,    -1,    63,    64,    65,    66,    67,    68,

-      69,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      69,    -1,    -1,    72,    -1,    -1,    -1,    -1,    -1,    -1,

       79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    -1,    98,
       -1,   100,   101,     1,    -1,    -1,    -1,    -1,   107,   108,
      109,   110,    10,    -1,    12,    -1,    14,    15,    16,    17,
       18,    -1,    -1,    21,    22,    23,    24,    25,    -1,    27,
       79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    -1,    98,
       -1,   100,   101,     1,    -1,    -1,    -1,    -1,   107,   108,
      109,   110,    10,    -1,    12,    -1,    14,    15,    16,    17,
       18,    -1,    -1,    21,    22,    23,    24,    25,    -1,    27,

-      28,    29,    30,    31,    32,    33,    -1,    35,    36,    37,
+      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,

       38,    39,    40,    41,    42,    43,    44,    45,    -1,    -1,
       -1,    49,    50,    51,    52,    53,    -1,    55,    56,    57,
       58,    59,    60,    -1,    -1,    63,    64,    65,    66,    67,
       38,    39,    40,    41,    42,    43,    44,    45,    -1,    -1,
       -1,    49,    50,    51,    52,    53,    -1,    55,    56,    57,
       58,    59,    60,    -1,    -1,    63,    64,    65,    66,    67,


@@ -845,47 +832,67 @@ static const yytype_int16 yycheck[] =
       -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    -1,
       98,    -1,   100,   101,     1,    -1,    -1,    -1,    -1,   107,
       -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    95,    96,    -1,
       98,    -1,   100,   101,     1,    -1,    -1,    -1,    -1,   107,

-     108,   109,   110,    -1,    -1,    12,    -1,    14,    15,    16,
+     108,   109,   110,    10,    -1,    12,    -1,    14,    15,    16,

       17,    18,    -1,    -1,    21,    22,    23,    24,    25,    -1,
       17,    18,    -1,    -1,    21,    22,    23,    24,    25,    -1,

-      27,    28,    29,    30,    31,    32,    -1,    -1,    -1,    -1,
-      -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    61,    62,
-      -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,    -1,    56,
+      27,    28,    29,    30,    31,    32,    33,    -1,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    51,    52,    53,    -1,    55,    56,

       57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,
       57,    58,    59,    60,    -1,    -1,    63,    64,    65,    66,

-      67,    68,    69,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    79,    -1,    -1,    -1,    99,    -1,    -1,   102,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    95,    96,
+      67,    68,    69,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    95,    96,

       -1,    98,    -1,   100,   101,     1,    -1,    -1,    -1,    -1,
      107,   108,   109,   110,    -1,    -1,    12,    -1,    14,    15,
       16,    17,    18,    -1,    -1,    21,    22,    23,    24,    25,
       -1,    27,    28,    29,    30,    31,    32,    -1,    -1,    -1,
       -1,    98,    -1,   100,   101,     1,    -1,    -1,    -1,    -1,
      107,   108,   109,   110,    -1,    -1,    12,    -1,    14,    15,
       16,    17,    18,    -1,    -1,    21,    22,    23,    24,    25,
       -1,    27,    28,    29,    30,    31,    32,    -1,    -1,    -1,

-      -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    61,    62,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,    -1,
+      -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    61,
+      62,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,    -1,

       56,    57,    58,    59,    60,    -1,    -1,    63,    64,    65,
       56,    57,    58,    59,    60,    -1,    -1,    63,    64,    65,

-      66,    67,    68,    69,    87,    88,    89,    90,    91,    92,
-      93,    94,    -1,    79,    -1,    -1,    99,    -1,    -1,   102,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    95,
-      96,    -1,    98,    -1,   100,   101,    -1,    -1,    -1,    -1,
-     106,   107,    -1,   109,   110,    10,    -1,    12,    -1,    14,
+      66,    67,    68,    69,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    79,    -1,    -1,    -1,    99,    -1,    -1,
+     102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    95,
+      96,    -1,    98,    -1,   100,   101,     1,    -1,    -1,    -1,
+      -1,   107,   108,   109,   110,    -1,    -1,    12,    -1,    14,

       15,    16,    17,    18,    -1,    -1,    21,    22,    23,    24,
       15,    16,    17,    18,    -1,    -1,    21,    22,    23,    24,

-      25,    26,    27,    28,    29,    30,    31,    32,    -1,    -1,
-      -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    61,    62,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,
+      25,    -1,    27,    28,    29,    30,    31,    32,    -1,    -1,
+      -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    61,
+      62,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,

       -1,    56,    57,    58,    59,    60,    -1,    -1,    63,    64,
       -1,    56,    57,    58,    59,    60,    -1,    -1,    63,    64,

-      65,    66,    67,    68,    69,    88,    89,    90,    91,    92,
-      93,    94,    -1,    -1,    79,    -1,    99,    -1,    -1,   102,
-     103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,    87,    88,    89,    90,    91,
+      92,    93,    94,    -1,    79,    -1,    -1,    99,    -1,    -1,
+     102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,

       95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,    -1,
       95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,    -1,

-      -1,    -1,   107,    -1,   109,   110,    10,    -1,    12,    -1,
+      -1,   106,   107,    -1,   109,   110,    10,    -1,    12,    -1,
+      14,    15,    16,    17,    18,    -1,    -1,    21,    22,    23,
+      24,    25,    26,    27,    28,    29,    30,    31,    32,    -1,
+      -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    61,
+      62,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,
+      -1,    -1,    56,    57,    58,    59,    60,    -1,    -1,    63,
+      64,    65,    66,    67,    68,    69,    88,    89,    90,    91,
+      92,    93,    94,    -1,    -1,    79,    -1,    99,    -1,    -1,
+     102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,
+      61,    62,    -1,   107,    -1,   109,   110,    10,    -1,    12,
+      -1,    14,    15,    16,    17,    18,    -1,    -1,    21,    22,
+      23,    24,    25,    -1,    27,    28,    29,    30,    31,    32,
+      91,    92,    93,    94,    -1,    38,    39,    -1,    99,    -1,
+      -1,   102,   103,   104,   105,    -1,    -1,    -1,    -1,    -1,
+      53,    -1,    -1,    56,    57,    58,    59,    60,    -1,    -1,
+      63,    64,    65,    66,    67,    68,    69,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    95,    96,    -1,    98,    -1,   100,   101,    -1,
+      -1,    -1,    -1,    -1,   107,    -1,   109,   110,    12,    13,

       14,    15,    16,    17,    18,    -1,    -1,    21,    22,    23,
       24,    25,    -1,    27,    28,    29,    30,    31,    32,    -1,
       14,    15,    16,    17,    18,    -1,    -1,    21,    22,    23,
       24,    25,    -1,    27,    28,    29,    30,    31,    32,    -1,

-      -1,    -1,    -1,    -1,    38,    39,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    -1,    51,    -1,    -1,    -1,    53,
+      -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,

       -1,    -1,    56,    57,    58,    59,    60,    -1,    -1,    63,
       64,    65,    66,    67,    68,    69,    -1,    -1,    -1,    -1,
       -1,    -1,    56,    57,    58,    59,    60,    -1,    -1,    63,
       64,    65,    66,    67,    68,    69,    -1,    -1,    -1,    -1,

-      76,    77,    78,    -1,    -1,    79,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,

-      -1,    -1,    -1,   107,    -1,   109,   110,    12,    13,    14,
+      -1,    -1,    -1,   107,    -1,   109,   110,    12,    -1,    14,

       15,    16,    17,    18,    -1,    -1,    21,    22,    23,    24,
       25,    -1,    27,    28,    29,    30,    31,    32,    -1,    -1,
       -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,
       15,    16,    17,    18,    -1,    -1,    21,    22,    23,    24,
       25,    -1,    27,    28,    29,    30,    31,    32,    -1,    -1,
       -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,


@@ -895,7 +902,7 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,    -1,

-      -1,    -1,   107,    -1,   109,   110,    12,    -1,    14,    15,
+      -1,    -1,   107,   108,   109,   110,    12,    -1,    14,    15,

       16,    17,    18,    -1,    -1,    21,    22,    23,    24,    25,
       -1,    27,    28,    29,    30,    31,    32,    -1,    -1,    -1,
       -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,
       16,    17,    18,    -1,    -1,    21,    22,    23,    24,    25,
       -1,    27,    28,    29,    30,    31,    32,    -1,    -1,    -1,
       -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,


@@ -905,7 +912,7 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    95,
       96,    -1,    98,    -1,   100,   101,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    95,
       96,    -1,    98,    -1,   100,   101,    -1,    -1,    -1,    -1,

-      -1,   107,   108,   109,   110,    12,    -1,    14,    15,    16,
+     106,   107,    -1,   109,   110,    12,    -1,    14,    15,    16,

       17,    18,    -1,    -1,    21,    22,    23,    24,    25,    -1,
       27,    28,    29,    30,    31,    32,    -1,    -1,    -1,    -1,
       -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       17,    18,    -1,    -1,    21,    22,    23,    24,    25,    -1,
       27,    28,    29,    30,    31,    32,    -1,    -1,    -1,    -1,
       -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,


@@ -974,7 +981,7 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    95,    96,    -1,    98,    -1,   100,   101,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    95,    96,    -1,    98,    -1,   100,   101,    -1,

-      -1,    -1,    -1,   106,   107,    -1,   109,   110,    12,    -1,
+      -1,    -1,    -1,    -1,   107,    -1,   109,   110,    12,    -1,

       14,    15,    16,    17,    18,    -1,    -1,    21,    22,    23,
       24,    25,    -1,    27,    28,    29,    30,    31,    32,    -1,
       -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,
       14,    15,    16,    17,    18,    -1,    -1,    21,    22,    23,
       24,    25,    -1,    27,    28,    29,    30,    31,    32,    -1,
       -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,


@@ -982,35 +989,21 @@ static const yytype_int16 yycheck[] =
       -1,    -1,    56,    57,    58,    59,    60,    -1,    -1,    63,
       64,    65,    66,    67,    68,    69,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,
       -1,    -1,    56,    57,    58,    59,    60,    -1,    -1,    63,
       64,    65,    66,    67,    68,    69,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      54,    -1,    -1,    -1,    -1,    -1,    -1,    61,    62,    -1,

       -1,    95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,
       -1,    95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,

-      -1,    -1,    -1,   107,    -1,   109,   110,    12,    -1,    14,
-      15,    16,    17,    18,    -1,    -1,    21,    22,    23,    24,
-      25,    -1,    27,    28,    29,    30,    31,    32,    -1,    -1,
-      -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,
-      -1,    56,    57,    58,    59,    60,    -1,    -1,    63,    64,
-      65,    66,    67,    68,    69,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    79,    -1,    -1,    -1,    -1,    54,
-      -1,    -1,    -1,    -1,    -1,    -1,    61,    62,    -1,    -1,
-      95,    96,    -1,    98,    -1,   100,   101,    -1,    -1,    -1,
-      -1,    -1,   107,    -1,   109,   110,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      -1,    -1,    -1,    -1,    99,    54,    -1,   102,   103,   104,
-     105,    -1,    61,    62,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    81,    82,    -1,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    -1,    -1,    -1,    -1,
-      99,    54,    -1,   102,   103,   104,   105,    -1,    61,    62,
+      -1,    -1,    -1,   107,    -1,   109,   110,    81,    82,    -1,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    -1,    -1,    -1,    -1,    99,    54,    -1,   102,   103,
+     104,   105,    -1,    61,    62,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    82,
-      -1,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    -1,    -1,    -1,    -1,    99,    54,    -1,   102,
-     103,   104,   105,    -1,    61,    62,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    82,    -1,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    -1,    -1,    -1,
+      -1,    99,    54,    -1,   102,   103,   104,   105,    -1,    61,
+      62,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,

-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    94,    -1,    -1,
-      -1,    -1,    99,    -1,    -1,   102,   103,   104,   105
+      -1,    -1,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    -1,    -1,    -1,    -1,    99,    -1,    -1,
+     102,   103,   104,   105

 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing


@@ -1022,59 +1015,59 @@ static const yytype_uint8 yystos[] =
       15,    16,    17,    18,    21,    22,    23,    24,    25,    27,
       28,    29,    30,    31,    32,    38,    39,    53,    56,    57,
       58,    59,    60,    63,    64,    65,    66,    67,    68,    69,
       15,    16,    17,    18,    21,    22,    23,    24,    25,    27,
       28,    29,    30,    31,    32,    38,    39,    53,    56,    57,
       58,    59,    60,    63,    64,    65,    66,    67,    68,    69,

-      79,    95,    96,    98,   100,   101,   107,   109,   110,   173,
-     174,   175,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   189,   192,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,    10,   121,     1,    33,    35,    36,    37,
+      79,    95,    96,    98,   100,   101,   107,   109,   110,   174,
+     175,   176,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   190,   193,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,    10,   121,     1,    33,    35,    36,    37,

       40,    41,    42,    43,    44,    45,    49,    50,    51,    52,
       40,    41,    42,    43,    44,    45,    49,    50,    51,    52,

-      55,   108,   121,   130,   140,   173,    34,   128,   129,   130,
-     126,   167,   168,   126,    13,   173,   187,   187,    21,    26,
-     121,   199,   207,   207,   207,   207,   207,   188,    12,   107,
-     187,   151,   151,   151,   187,   107,   107,    73,   107,   121,
-     187,    21,   174,   191,   199,   207,   207,   121,   187,   108,
-     173,    21,    26,   153,   187,    98,   107,   190,   199,   200,
-     201,   187,   174,   187,   187,   187,   187,   187,   106,   173,
-     207,   207,    76,    77,    78,    80,    10,    12,   107,    91,
+      55,   108,   121,   130,   141,   174,    34,   128,   129,   130,
+     126,   168,   169,   126,    13,   174,   188,   188,    21,    26,
+     121,   200,   208,   208,   208,   208,   208,   189,    12,   107,
+     188,   152,   152,   152,   188,   107,   107,    73,   107,   121,
+     188,    21,   175,   192,   200,   208,   208,   121,   188,   108,
+     174,    21,    26,   154,   188,    98,   107,   191,   200,   201,
+     202,   188,   175,   188,   188,   188,   188,   188,   106,   174,
+     208,   208,    76,    77,    78,    80,    10,    12,   107,    91,

       92,    91,    89,    90,    89,    54,    61,    62,    81,    82,
       84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
       94,    99,   102,   103,   104,   105,   107,    10,    12,    10,
       92,    91,    89,    90,    89,    54,    61,    62,    81,    82,
       84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
       94,    99,   102,   103,   104,   105,   107,    10,    12,    10,

-      12,    10,    12,    10,   123,   152,   153,   153,    21,   150,
-     107,   107,   107,   107,    68,    98,   107,   197,   199,   107,
-     107,   121,   108,    48,   142,   108,    42,    43,    44,    45,
-      49,    51,   129,   130,   128,    16,    17,   109,   158,   159,
-     161,   162,   163,   164,    13,   191,   107,    73,   173,   106,
-     121,    24,   154,    70,   155,   106,   106,   173,   192,   192,
-     207,   174,    11,   108,   191,   107,   187,   190,   199,   200,
-     201,   106,   173,    70,   156,    12,   106,   173,   173,   173,
-     187,   173,   173,   106,   173,   187,   187,   187,   187,   187,
-     187,   187,   187,   187,   187,   187,   187,   187,   187,   187,
-     187,   187,   187,   187,    10,    12,    16,    17,    18,    22,
-      63,   107,   109,   110,   177,   199,   106,   173,   173,   173,
-     173,   173,   173,   173,   173,   126,    21,   149,   150,   150,
-      21,   133,   123,   123,   123,   123,    98,   123,    68,   195,
-     196,   198,   199,   200,   201,   123,   123,   107,   123,   123,
-     121,   173,   146,   173,   173,   173,   173,   173,    26,   157,
-     157,    80,   192,   174,    13,   176,   155,    24,   123,   172,
-     106,    74,   106,   173,    11,   106,   173,   156,   106,    24,
-     173,    12,   108,    13,   106,    83,   173,   173,   110,   110,
-     110,   110,   106,   173,   110,   110,   107,   106,   108,    13,
-     108,    13,   108,    13,   108,    11,    19,   122,   131,   132,
-      10,   108,    21,   145,   173,   146,   147,   173,   147,   194,
-     199,   107,   140,   144,   147,   148,   173,   195,   123,   147,
-     147,    81,   160,   160,   162,   106,   111,   193,   191,   123,
-     170,   107,   165,   166,   106,   106,    13,   173,    11,   187,
-     108,    13,   106,   192,    11,    11,    11,    11,   123,   154,
-     155,   123,    21,   106,   106,   106,   106,   107,   123,   106,
-     108,   136,   147,   106,   106,   187,   173,    74,    10,   167,
-      10,    13,    11,   106,   108,   155,   108,   171,   172,   137,
-     191,   143,   143,    10,   124,   124,   147,   147,   124,   134,
-     107,   106,   124,   124,   126,   106,   126,    72,   108,   169,
-     170,   126,   108,   124,   124,   125,    46,    47,   141,   141,
-     106,   106,   142,   145,   147,   124,    11,    11,   127,    11,
-     142,   142,   126,   124,   107,   124,   124,   108,   106,   142,
-      24,   108,   138,    11,   147,   142,   142,   135,   124,    71,
-     139,    20,   106,   143,   142,   126,   124,   148,    72,   141,
-     106,   124
+      12,    10,    12,    10,   123,   153,   154,   154,    21,   151,
+     107,   107,   107,   107,    68,    98,   107,   198,   200,   107,
+     107,   121,   108,    48,   143,   108,    42,    43,    44,    45,
+      49,    51,   129,   130,   128,    16,    17,   109,   159,   160,
+     162,   163,   164,   165,    13,   192,   107,    73,   174,   106,
+     121,    24,   155,    70,   156,   106,   106,   174,   193,   193,
+     208,   175,    11,   108,   192,   107,   188,   191,   200,   201,
+     202,   106,   174,    70,   157,    12,   106,   174,   174,   174,
+     188,   174,   174,   106,   174,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,    10,    12,    16,    17,    18,    22,
+      63,   107,   109,   110,   178,   200,   106,   174,   174,   174,
+     174,   174,   174,   174,   174,   126,    21,   150,   151,   151,
+      21,   133,   123,   123,   123,   123,    98,   123,    68,   196,
+     197,   199,   200,   201,   202,   123,   123,   107,   123,   123,
+     121,   140,   174,   147,   174,   140,   140,   140,   140,    26,
+     158,   158,    80,   193,   175,    13,   177,   156,    24,   123,
+     173,   106,    74,   106,   174,    11,   106,   174,   157,   106,
+      24,   174,    12,   108,    13,   106,    83,   174,   174,   110,
+     110,   110,   110,   106,   174,   110,   110,   107,   106,   108,
+      13,   108,    13,   108,    13,   108,    11,    19,   122,   131,
+     132,    10,   108,    21,   146,   174,   147,   148,   174,   148,
+     195,   200,   107,   141,   145,   148,   149,   174,   196,   123,
+     148,   148,    81,   161,   161,   163,   106,   111,   194,   192,
+     123,   171,   107,   166,   167,   106,   106,    13,   174,    11,
+     188,   108,    13,   106,   193,    11,    11,    11,    11,   123,
+     155,   156,   123,    21,   106,   106,   106,   106,   107,   123,
+     106,   108,   136,   148,   106,   106,   188,   174,    74,    10,
+     168,    10,    13,    11,   106,   108,   156,   108,   172,   173,
+     137,   192,   144,   144,    10,   124,   124,   148,   148,   124,
+     134,   107,   106,   124,   124,   126,   106,   126,    72,   108,
+     170,   171,   126,   108,   124,   124,   125,    46,    47,   142,
+     142,   106,   106,   143,   146,   148,   124,    11,    11,   127,
+      11,   143,   143,   126,   124,   107,   124,   124,   108,   106,
+     143,    24,   108,   138,    11,   148,   143,   143,   135,   124,
+      71,   139,    20,   106,   144,   143,   126,   124,   149,    72,
+     142,   106,   124

 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */


@@ -1086,34 +1079,34 @@ static const yytype_uint8 yyr1[] =
      130,   131,   130,   132,   130,   130,   133,   130,   130,   130,
      130,   130,   130,   130,   130,   134,   135,   130,   130,   130,
      136,   130,   130,   130,   130,   137,   130,   130,   130,   130,
      130,   131,   130,   132,   130,   130,   133,   130,   130,   130,
      130,   130,   130,   130,   130,   134,   135,   130,   130,   130,
      136,   130,   130,   130,   130,   137,   130,   130,   130,   130,

-     138,   139,   139,   140,   140,   140,   140,   140,   140,   140,
-     140,   141,   141,   141,   142,   142,   143,   144,   144,   145,
-     145,   146,   147,   148,   149,   149,   150,   151,   152,   153,
-     153,   154,   154,   155,   155,   155,   156,   156,   157,   157,
-     158,   158,   159,   160,   160,   160,   161,   162,   162,   163,
-     163,   163,   164,   164,   165,   165,   166,   168,   167,   169,
-     169,   170,   171,   171,   172,   173,   173,   173,   173,   174,
-     174,   174,   175,   175,   175,   175,   175,   175,   175,   175,
-     175,   176,   175,   177,   177,   178,   178,   178,   178,   178,
-     178,   178,   178,   178,   178,   178,   178,   178,   178,   179,
+     138,   139,   139,   140,   141,   141,   141,   141,   141,   141,
+     141,   141,   142,   142,   142,   143,   143,   144,   145,   145,
+     146,   146,   147,   148,   149,   150,   150,   151,   152,   153,
+     154,   154,   155,   155,   156,   156,   156,   157,   157,   158,
+     158,   159,   159,   160,   161,   161,   161,   162,   163,   163,
+     164,   164,   164,   165,   165,   166,   166,   167,   169,   168,
+     170,   170,   171,   172,   172,   173,   174,   174,   174,   174,
+     175,   175,   175,   176,   176,   176,   176,   176,   176,   176,
+     176,   176,   177,   176,   178,   178,   179,   179,   179,   179,

      179,   179,   179,   179,   179,   179,   179,   179,   179,   179,
      179,   179,   179,   179,   179,   179,   179,   179,   179,   179,

-     179,   179,   179,   180,   180,   180,   180,   181,   181,   182,
-     182,   182,   182,   183,   183,   184,   184,   184,   184,   184,
-     184,   184,   184,   184,   185,   185,   185,   185,   185,   185,
-     186,   186,   187,   187,   187,   187,   187,   187,   187,   187,
-     187,   187,   187,   187,   187,   187,   187,   187,   187,   187,
-     187,   187,   187,   187,   187,   187,   187,   187,   187,   187,
-     187,   187,   187,   187,   187,   187,   187,   187,   187,   187,
-     187,   187,   187,   187,   187,   187,   187,   187,   187,   187,
-     187,   188,   187,   187,   187,   187,   189,   189,   189,   190,
-     190,   190,   190,   190,   191,   191,   192,   192,   193,   193,
-     194,   195,   195,   195,   196,   196,   197,   197,   198,   199,
-     200,   201,   202,   202,   203,   204,   204,   205,   205,   206,
-     206,   207,   207,   207,   207
+     180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
+     180,   180,   180,   180,   181,   181,   181,   181,   182,   182,
+     183,   183,   183,   183,   184,   184,   185,   185,   185,   185,
+     185,   185,   185,   185,   185,   186,   186,   186,   186,   186,
+     186,   187,   187,   188,   188,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
+     188,   188,   188,   188,   188,   188,   188,   188,   188,   188,
+     188,   188,   189,   188,   188,   188,   188,   190,   190,   190,
+     191,   191,   191,   191,   191,   192,   192,   193,   193,   194,
+     194,   195,   196,   196,   196,   197,   197,   198,   198,   199,
+     200,   201,   202,   203,   203,   204,   205,   205,   206,   206,
+     207,   207,   208,   208,   208,   208

 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */

-static const yytype_uint8 yyr2[] =
+static const yytype_int8 yyr2[] =

 {
        0,     2,     0,     4,     0,     3,     0,     3,     0,     3,
        0,     3,     0,     3,     0,     3,     4,     7,     0,     4,
 {
        0,     2,     0,     4,     0,     3,     0,     3,     0,     3,
        0,     3,     0,     3,     0,     3,     4,     7,     0,     4,


@@ -1121,30 +1114,30 @@ static const yytype_uint8 yyr2[] =
        4,     0,     7,     0,     6,     4,     0,     7,     7,     7,
        6,     6,     2,     8,     8,     0,     0,    13,     9,     8,
        0,    10,     9,     7,     2,     0,     8,     2,     2,     1,
        4,     0,     7,     0,     6,     4,     0,     7,     7,     7,
        6,     6,     2,     8,     8,     0,     0,    13,     9,     8,
        0,    10,     9,     7,     2,     0,     8,     2,     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,     1,     3,     0,     2,     1,
-       1,     4,     1,     1,     5,     3,     3,     3,     1,     2,
-       3,     1,     3,     5,     6,     3,     3,     5,     2,     4,
-       4,     0,     5,     1,     1,     5,     4,     5,     4,     5,
-       6,     5,     4,     5,     4,     3,     6,     4,     5,     3,
-       3,     3,     3,     3,     1,     1,     3,     3,     3,     3,
-       3,     3,     3,     1,     3,     2,     2,     3,     3,     1,
-       3,     2,     2,     3,     3,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     3,     2,     4,     3,     5,     4,
-       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,     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
+       2,     0,     3,     1,     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,     1,     3,     0,     2,
+       1,     1,     4,     1,     1,     5,     3,     3,     3,     1,
+       2,     3,     1,     3,     5,     6,     3,     3,     5,     2,
+       4,     4,     0,     5,     1,     1,     5,     4,     5,     4,
+       5,     6,     5,     4,     5,     4,     3,     6,     4,     5,
+       3,     3,     3,     3,     3,     1,     1,     3,     3,     3,
+       3,     3,     3,     3,     1,     3,     2,     2,     3,     3,
+       1,     3,     2,     2,     3,     3,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     3,     2,     4,     3,     5,
+       4,     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,     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 {
 };
 
 typedef enum {


@@ -1173,10 +1166,10 @@ static const toketypes yy_type_tab[] =
   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_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_ival, toketype_ival, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_opval, toketype_ival, toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
+  toketype_opval, toketype_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_opval, toketype_opval, toketype_ival,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_ival,
   toketype_opval, toketype_opval, toketype_opval, toketype_opval, toketype_opval,


@@ -1189,6 +1182,6 @@ static const toketypes yy_type_tab[] =
 };
 
 /* Generated from:
 };
 
 /* Generated from:

- * f83d884147747f2d8f5a62eebc4ccd07d71b6b34e5ba1a8d7559526ad864dc97 perly.y
- * 01ce33b49f9f04b8d3112b7f042cde113a7d29763a846e870f9766072a5bc614 regen_perly.pl
+ * cb0b53384d9fa75068c8e30d8fe9016dec2e65e0a5c16ce6479563d6b41626d6 perly.y
+ * acf1cbfd2545faeaaa58b1cf0cf9d7f98b5be0752eb7a54528ef904a9e2e1ca7 regen_perly.pl

  * ex: set ro: */
  * ex: set ro: */

diff --git a/perly.y b/perly.y
index 843a3b1..433de1f 100644 (file)
--- a/perly.y
+++ b/perly.y
@@ -69,6 +69,7 @@
 
 %type <opval> stmtseq fullstmt labfullstmt barestmt block mblock else
 %type <opval> expr term subscripted scalar ary hsh arylen star amper sideff
 
 %type <opval> stmtseq fullstmt labfullstmt barestmt block mblock else
 %type <opval> expr term subscripted scalar ary hsh arylen star amper sideff

+%type <opval> condition

 %type <opval> sliceme kvslice gelem
 %type <opval> listexpr nexpr texpr iexpr mexpr mnexpr
 %type <opval> optlistexpr optexpr optrepl indirob listop method
 %type <opval> sliceme kvslice gelem
 %type <opval> listexpr nexpr texpr iexpr mexpr mnexpr
 %type <opval> optlistexpr optexpr optrepl indirob listop method


@@ -124,7 +125,7 @@ grammar     :       GRAMPROG
                        }
                remember stmtseq
                        {
                        }
                remember stmtseq
                        {

-                         newPROG(block_end($3,$4));
+                         newPROG(block_end($remember,$stmtseq));

                          PL_compiling.cop_seq = 0;
                          $$ = 0;
                        }
                          PL_compiling.cop_seq = 0;
                          $$ = 0;
                        }


@@ -135,7 +136,7 @@ grammar     :       GRAMPROG
                        }
                optexpr
                        {
                        }
                optexpr
                        {

-                         PL_eval_root = $3;
+                         PL_eval_root = $optexpr;

                          $$ = 0;
                        }
        |       GRAMBLOCK
                          $$ = 0;
                        }
        |       GRAMBLOCK


@@ -146,7 +147,7 @@ grammar     :       GRAMPROG
                block
                        {
                          PL_pad_reset_pending = TRUE;
                block
                        {
                          PL_pad_reset_pending = TRUE;

-                         PL_eval_root = $3;
+                         PL_eval_root = $block;

                          $$ = 0;
                          yyunlex();
                          parser->yychar = yytoken = YYEOF;
                          $$ = 0;
                          yyunlex();
                          parser->yychar = yytoken = YYEOF;


@@ -159,7 +160,7 @@ grammar     :       GRAMPROG
                barestmt
                        {
                          PL_pad_reset_pending = TRUE;
                barestmt
                        {
                          PL_pad_reset_pending = TRUE;

-                         PL_eval_root = $3;
+                         PL_eval_root = $barestmt;

                          $$ = 0;
                          yyunlex();
                          parser->yychar = yytoken = YYEOF;
                          $$ = 0;
                          yyunlex();
                          parser->yychar = yytoken = YYEOF;


@@ -172,7 +173,7 @@ grammar     :       GRAMPROG
                fullstmt
                        {
                          PL_pad_reset_pending = TRUE;
                fullstmt
                        {
                          PL_pad_reset_pending = TRUE;

-                         PL_eval_root = $3;
+                         PL_eval_root = $fullstmt;

                          $$ = 0;
                          yyunlex();
                          parser->yychar = yytoken = YYEOF;
                          $$ = 0;
                          yyunlex();
                          parser->yychar = yytoken = YYEOF;


@@ -184,7 +185,7 @@ grammar     :       GRAMPROG
                        }
                stmtseq
                        {
                        }
                stmtseq
                        {

-                         PL_eval_root = $3;
+                         PL_eval_root = $stmtseq;

                          $$ = 0;
                        }
        |       GRAMSUBSIGNATURE
                          $$ = 0;
                        }
        |       GRAMSUBSIGNATURE


@@ -194,7 +195,7 @@ grammar     :       GRAMPROG
                        }
                subsigguts
                        {
                        }
                subsigguts
                        {

-                         PL_eval_root = $3;
+                         PL_eval_root = $subsigguts;

                          $$ = 0;
                        }
        ;
                          $$ = 0;
                        }
        ;


@@ -203,7 +204,7 @@ grammar     :       GRAMPROG
 block  :       '{' remember stmtseq '}'
                        { if (parser->copline > (line_t)$1)
                              parser->copline = (line_t)$1;
 block  :       '{' remember stmtseq '}'
                        { if (parser->copline > (line_t)$1)
                              parser->copline = (line_t)$1;

-                         $$ = block_end($2, $3);
+                         $$ = block_end($remember, $stmtseq);

                        }
        ;
 
                        }
        ;
 


@@ -211,7 +212,7 @@ block       :       '{' remember stmtseq '}'
 formblock:     '=' remember ';' FORMRBRACK formstmtseq ';' '.'
                        { if (parser->copline > (line_t)$1)
                              parser->copline = (line_t)$1;
 formblock:     '=' remember ';' FORMRBRACK formstmtseq ';' '.'
                        { if (parser->copline > (line_t)$1)
                              parser->copline = (line_t)$1;

-                         $$ = block_end($2, $5);
+                         $$ = block_end($remember, $formstmtseq);

                        }
        ;
 
                        }
        ;
 


@@ -223,7 +224,7 @@ remember:   /* NULL */      /* start a full lexical scope */
 mblock :       '{' mremember stmtseq '}'
                        { if (parser->copline > (line_t)$1)
                              parser->copline = (line_t)$1;
 mblock :       '{' mremember stmtseq '}'
                        { if (parser->copline > (line_t)$1)
                              parser->copline = (line_t)$1;

-                         $$ = block_end($2, $3);
+                         $$ = block_end($mremember, $stmtseq);

                        }
        ;
 
                        }
        ;
 


@@ -235,10 +236,10 @@ mremember:        /* NULL */      /* start a partial lexical scope */
 /* A sequence of statements in the program */
 stmtseq        :       /* NULL */
                        { $$ = NULL; }
 /* A sequence of statements in the program */
 stmtseq        :       /* NULL */
                        { $$ = NULL; }

-       |       stmtseq fullstmt
-                       {   $$ = op_append_list(OP_LINESEQ, $1, $2);
+       |       stmtseq[list] fullstmt
+                       {   $$ = op_append_list(OP_LINESEQ, $list, $fullstmt);

                            PL_pad_reset_pending = TRUE;
                            PL_pad_reset_pending = TRUE;

-                           if ($1 && $2)
+                           if ($list && $fullstmt)

                                PL_hints |= HINT_BLOCK_SCOPE;
                        }
        ;
                                PL_hints |= HINT_BLOCK_SCOPE;
                        }
        ;


@@ -246,10 +247,10 @@ stmtseq   :       /* NULL */
 /* A sequence of format lines */
 formstmtseq:   /* NULL */
                        { $$ = NULL; }
 /* A sequence of format lines */
 formstmtseq:   /* NULL */
                        { $$ = NULL; }

-       |       formstmtseq formline
-                       {   $$ = op_append_list(OP_LINESEQ, $1, $2);
+       |       formstmtseq[list] formline
+                       {   $$ = op_append_list(OP_LINESEQ, $list, $formline);

                            PL_pad_reset_pending = TRUE;
                            PL_pad_reset_pending = TRUE;

-                           if ($1 && $2)
+                           if ($list && $formline)

                                PL_hints |= HINT_BLOCK_SCOPE;
                        }
        ;
                                PL_hints |= HINT_BLOCK_SCOPE;
                        }
        ;


@@ -257,35 +258,35 @@ formstmtseq:      /* NULL */
 /* A statement in the program, including optional labels */
 fullstmt:      barestmt
                        {
 /* A statement in the program, including optional labels */
 fullstmt:      barestmt
                        {

-                         $$ = $1 ? newSTATEOP(0, NULL, $1) : NULL;
+                         $$ = $barestmt ? newSTATEOP(0, NULL, $barestmt) : NULL;

                        }
        |       labfullstmt
                        }
        |       labfullstmt

-                       { $$ = $1; }
+                       { $$ = $labfullstmt; }

        ;
 
 labfullstmt:   LABEL barestmt
                        {
        ;
 
 labfullstmt:   LABEL barestmt
                        {

-                          SV *label = cSVOPx_sv($1);
+                          SV *label = cSVOPx_sv($LABEL);

                          $$ = newSTATEOP(SvFLAGS(label) & SVf_UTF8,
                          $$ = newSTATEOP(SvFLAGS(label) & SVf_UTF8,

-                                            savepv(SvPVX_const(label)), $2);
-                          op_free($1);
+                                            savepv(SvPVX_const(label)), $barestmt);
+                          op_free($LABEL);

                        }
                        }

-       |       LABEL labfullstmt
+       |       LABEL labfullstmt[list]

                        {
                        {

-                          SV *label = cSVOPx_sv($1);
+                          SV *label = cSVOPx_sv($LABEL);

                          $$ = newSTATEOP(SvFLAGS(label) & SVf_UTF8,
                          $$ = newSTATEOP(SvFLAGS(label) & SVf_UTF8,

-                                            savepv(SvPVX_const(label)), $2);
-                          op_free($1);
+                                            savepv(SvPVX_const(label)), $list);
+                          op_free($LABEL);

                        }
        ;
 
 /* A bare statement, lacking label and other aspects of state op */
 barestmt:      PLUGSTMT
                        }
        ;
 
 /* A bare statement, lacking label and other aspects of state op */
 barestmt:      PLUGSTMT

-                       { $$ = $1; }
+                       { $$ = $PLUGSTMT; }

        |       FORMAT startformsub formname formblock
                        {
                          CV *fmtcv = PL_compcv;
        |       FORMAT startformsub formname formblock
                        {
                          CV *fmtcv = PL_compcv;

-                         newFORM($2, $3, $4);
+                         newFORM($startformsub, $formname, $formblock);

                          $$ = NULL;
                          if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
                              pad_add_weakref(fmtcv);
                          $$ = NULL;
                          if (CvOUTSIDE(fmtcv) && !CvEVAL(CvOUTSIDE(fmtcv))) {
                              pad_add_weakref(fmtcv);


@@ -296,16 +297,16 @@ barestmt: PLUGSTMT
                     /* sub declaration or definition not within scope
                        of 'use feature "signatures"'*/
                        {
                     /* sub declaration or definition not within scope
                        of 'use feature "signatures"'*/
                        {

-                          init_named_cv(PL_compcv, $2);
+                          init_named_cv(PL_compcv, $subname);

                          parser->in_my = 0;
                          parser->in_my_stash = NULL;
                        }
                     proto subattrlist optsubbody
                        {
                          SvREFCNT_inc_simple_void(PL_compcv);
                          parser->in_my = 0;
                          parser->in_my_stash = NULL;
                        }
                     proto subattrlist optsubbody
                        {
                          SvREFCNT_inc_simple_void(PL_compcv);

-                         $2->op_type == OP_CONST
-                             ? newATTRSUB($3, $2, $5, $6, $7)
-                             : newMYSUB($3, $2, $5, $6, $7)
+                         $subname->op_type == OP_CONST
+                             ? newATTRSUB($startsub, $subname, $proto, $subattrlist, $optsubbody)
+                             : newMYSUB($startsub, $subname, $proto, $subattrlist, $optsubbody)

                          ;
                          $$ = NULL;
                          intro_my();
                          ;
                          $$ = NULL;
                          intro_my();


@@ -317,82 +318,82 @@ barestmt: PLUGSTMT
                      * allowed in a declaration)
                      */
                        {
                      * allowed in a declaration)
                      */
                        {

-                          init_named_cv(PL_compcv, $2);
+                          init_named_cv(PL_compcv, $subname);

                          parser->in_my = 0;
                          parser->in_my_stash = NULL;
                        }
                     subattrlist optsigsubbody
                        {
                          SvREFCNT_inc_simple_void(PL_compcv);
                          parser->in_my = 0;
                          parser->in_my_stash = NULL;
                        }
                     subattrlist optsigsubbody
                        {
                          SvREFCNT_inc_simple_void(PL_compcv);

-                         $2->op_type == OP_CONST
-                             ? newATTRSUB($3, $2, NULL, $5, $6)
-                             : newMYSUB(  $3, $2, NULL, $5, $6)
+                         $subname->op_type == OP_CONST
+                             ? newATTRSUB($startsub, $subname, NULL, $subattrlist, $optsigsubbody)
+                             : newMYSUB(  $startsub, $subname, NULL, $subattrlist, $optsigsubbody)

                          ;
                          $$ = NULL;
                          intro_my();
                          parser->parsed_sub = 1;
                        }
                          ;
                          $$ = NULL;
                          intro_my();
                          parser->parsed_sub = 1;
                        }

-       |       PACKAGE BAREWORD BAREWORD ';'
+       |       PACKAGE BAREWORD[version] BAREWORD[package] ';'

                        {
                        {

-                         package($3);
-                         if ($2)
-                             package_version($2);
+                         package($package);
+                         if ($version)
+                             package_version($version);

                          $$ = NULL;
                        }
        |       USE startsub
                        { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }
                          $$ = NULL;
                        }
        |       USE startsub
                        { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ }

-               BAREWORD BAREWORD optlistexpr ';'
+               BAREWORD[version] BAREWORD[module] optlistexpr ';'

                        {
                          SvREFCNT_inc_simple_void(PL_compcv);
                        {
                          SvREFCNT_inc_simple_void(PL_compcv);

-                         utilize($1, $2, $4, $5, $6);
+                         utilize($USE, $startsub, $version, $module, $optlistexpr);

                          parser->parsed_sub = 1;
                          $$ = NULL;
                        }
        |       IF '(' remember mexpr ')' mblock else
                        {
                          parser->parsed_sub = 1;
                          $$ = NULL;
                        }
        |       IF '(' remember mexpr ')' mblock else
                        {

-                         $$ = block_end($3,
-                             newCONDOP(0, $4, op_scope($6), $7));
-                         parser->copline = (line_t)$1;
+                         $$ = block_end($remember,
+                             newCONDOP(0, $mexpr, op_scope($mblock), $else));
+                         parser->copline = (line_t)$IF;

                        }
        |       UNLESS '(' remember mexpr ')' mblock else
                        {
                        }
        |       UNLESS '(' remember mexpr ')' mblock else
                        {

-                         $$ = block_end($3,
-                              newCONDOP(0, $4, $7, op_scope($6)));
-                         parser->copline = (line_t)$1;
+                         $$ = block_end($remember,
+                              newCONDOP(0, $mexpr, $else, op_scope($mblock)));
+                         parser->copline = (line_t)$UNLESS;

                        }
        |       GIVEN '(' remember mexpr ')' mblock
                        {
                        }
        |       GIVEN '(' remember mexpr ')' mblock
                        {

-                         $$ = block_end($3, newGIVENOP($4, op_scope($6), 0));
-                         parser->copline = (line_t)$1;
+                         $$ = block_end($remember, newGIVENOP($mexpr, op_scope($mblock), 0));
+                         parser->copline = (line_t)$GIVEN;

                        }
        |       WHEN '(' remember mexpr ')' mblock
                        }
        |       WHEN '(' remember mexpr ')' mblock

-                       { $$ = block_end($3, newWHENOP($4, op_scope($6))); }
+                       { $$ = block_end($remember, newWHENOP($mexpr, op_scope($mblock))); }

        |       DEFAULT block
        |       DEFAULT block

-                       { $$ = newWHENOP(0, op_scope($2)); }
+                       { $$ = newWHENOP(0, op_scope($block)); }

        |       WHILE '(' remember texpr ')' mintro mblock cont
                        {
        |       WHILE '(' remember texpr ')' mintro mblock cont
                        {

-                         $$ = block_end($3,
+                         $$ = block_end($remember,

                                  newWHILEOP(0, 1, NULL,
                                  newWHILEOP(0, 1, NULL,

-                                     $4, $7, $8, $6));
-                         parser->copline = (line_t)$1;
+                                     $texpr, $mblock, $cont, $mintro));
+                         parser->copline = (line_t)$WHILE;

                        }
        |       UNTIL '(' remember iexpr ')' mintro mblock cont
                        {
                        }
        |       UNTIL '(' remember iexpr ')' mintro mblock cont
                        {

-                         $$ = block_end($3,
+                         $$ = block_end($remember,

                                  newWHILEOP(0, 1, NULL,
                                  newWHILEOP(0, 1, NULL,

-                                     $4, $7, $8, $6));
-                         parser->copline = (line_t)$1;
+                                     $iexpr, $mblock, $cont, $mintro));
+                         parser->copline = (line_t)$UNTIL;

                        }
                        }

-       |       FOR '(' remember mnexpr ';'
+       |       FOR '(' remember mnexpr[init_mnexpr] ';'

                        { parser->expect = XTERM; }
                texpr ';'
                        { parser->expect = XTERM; }
                        { parser->expect = XTERM; }
                texpr ';'
                        { parser->expect = XTERM; }

-               mintro mnexpr ')'
+               mintro mnexpr[iterate_mnexpr] ')'

                mblock
                        {
                mblock
                        {

-                         OP *initop = $4;
+                         OP *initop = $init_mnexpr;

                          OP *forop = newWHILEOP(0, 1, NULL,
                          OP *forop = newWHILEOP(0, 1, NULL,

-                                     scalar($7), $13, $11, $10);
+                                     scalar($texpr), $mblock, $iterate_mnexpr, $mintro);

                          if (initop) {
                              forop = op_prepend_elem(OP_LINESEQ, initop,
                                  op_append_elem(OP_LINESEQ,
                          if (initop) {
                              forop = op_prepend_elem(OP_LINESEQ, initop,
                                  op_append_elem(OP_LINESEQ,


@@ -400,73 +401,73 @@ barestmt: PLUGSTMT
                                      forop));
                          }
                          PL_hints |= HINT_BLOCK_SCOPE;
                                      forop));
                          }
                          PL_hints |= HINT_BLOCK_SCOPE;

-                         $$ = block_end($3, forop);
-                         parser->copline = (line_t)$1;
+                         $$ = block_end($remember, forop);
+                         parser->copline = (line_t)$FOR;

                        }
        |       FOR MY remember my_scalar '(' mexpr ')' mblock cont
                        {
                        }
        |       FOR MY remember my_scalar '(' mexpr ')' mblock cont
                        {

-                         $$ = block_end($3, newFOROP(0, $4, $6, $8, $9));
-                         parser->copline = (line_t)$1;
+                         $$ = block_end($remember, newFOROP(0, $my_scalar, $mexpr, $mblock, $cont));
+                         parser->copline = (line_t)$FOR;

                        }
        |       FOR scalar '(' remember mexpr ')' mblock cont
                        {
                        }
        |       FOR scalar '(' remember mexpr ')' mblock cont
                        {

-                         $$ = block_end($4, newFOROP(0,
-                                     op_lvalue($2, OP_ENTERLOOP), $5, $7, $8));
-                         parser->copline = (line_t)$1;
+                         $$ = block_end($remember, newFOROP(0,
+                                     op_lvalue($scalar, OP_ENTERLOOP), $mexpr, $mblock, $cont));
+                         parser->copline = (line_t)$FOR;

                        }
        |       FOR my_refgen remember my_var
                        }
        |       FOR my_refgen remember my_var

-                       { parser->in_my = 0; $<opval>$ = my($4); }
+                       { parser->in_my = 0; $<opval>$ = my($my_var); }[variable]

                '(' mexpr ')' mblock cont
                        {
                          $$ = block_end(
                '(' mexpr ')' mblock cont
                        {
                          $$ = block_end(

-                               $3,
+                               $remember,

                                newFOROP(0,
                                         op_lvalue(
                                            newUNOP(OP_REFGEN, 0,
                                newFOROP(0,
                                         op_lvalue(
                                            newUNOP(OP_REFGEN, 0,

-                                                   $<opval>5),
+                                                   $<opval>variable),

                                            OP_ENTERLOOP),
                                            OP_ENTERLOOP),

-                                        $7, $9, $10)
+                                        $mexpr, $mblock, $cont)

                          );
                          );

-                         parser->copline = (line_t)$1;
+                         parser->copline = (line_t)$FOR;

                        }
        |       FOR REFGEN refgen_topic '(' remember mexpr ')' mblock cont
                        {
                        }
        |       FOR REFGEN refgen_topic '(' remember mexpr ')' mblock cont
                        {

-                         $$ = block_end($5, newFOROP(
+                         $$ = block_end($remember, newFOROP(

                                0, op_lvalue(newUNOP(OP_REFGEN, 0,
                                0, op_lvalue(newUNOP(OP_REFGEN, 0,

-                                                    $3),
-                                            OP_ENTERLOOP), $6, $8, $9));
-                         parser->copline = (line_t)$1;
+                                                    $refgen_topic),
+                                            OP_ENTERLOOP), $mexpr, $mblock, $cont));
+                         parser->copline = (line_t)$FOR;

                        }
        |       FOR '(' remember mexpr ')' mblock cont
                        {
                        }
        |       FOR '(' remember mexpr ')' mblock cont
                        {

-                         $$ = block_end($3,
-                                 newFOROP(0, NULL, $4, $6, $7));
-                         parser->copline = (line_t)$1;
+                         $$ = block_end($remember,
+                                 newFOROP(0, NULL, $mexpr, $mblock, $cont));
+                         parser->copline = (line_t)$FOR;

                        }
        |       block cont
                        {
                          /* a block is a loop that happens once */
                          $$ = newWHILEOP(0, 1, NULL,
                        }
        |       block cont
                        {
                          /* a block is a loop that happens once */
                          $$ = newWHILEOP(0, 1, NULL,

-                                 NULL, $1, $2, 0);
+                                 NULL, $block, $cont, 0);

                        }
                        }

-       |       PACKAGE BAREWORD BAREWORD '{' remember
+       |       PACKAGE BAREWORD[version] BAREWORD[package] '{' remember

                        {
                        {

-                         package($3);
-                         if ($2) {
-                             package_version($2);
+                         package($package);
+                         if ($version) {
+                             package_version($version);

                          }
                        }
                stmtseq '}'
                        {
                          /* a block is a loop that happens once */
                          $$ = newWHILEOP(0, 1, NULL,
                          }
                        }
                stmtseq '}'
                        {
                          /* a block is a loop that happens once */
                          $$ = newWHILEOP(0, 1, NULL,

-                                 NULL, block_end($5, $7), NULL, 0);
+                                 NULL, block_end($remember, $stmtseq), NULL, 0);

                          if (parser->copline > (line_t)$4)
                              parser->copline = (line_t)$4;
                        }
        |       sideff ';'
                        {
                          if (parser->copline > (line_t)$4)
                              parser->copline = (line_t)$4;
                        }
        |       sideff ';'
                        {

-                         $$ = $1;
+                         $$ = $sideff;

                        }
        |       YADAYADA ';'
                        {
                        }
        |       YADAYADA ';'
                        {


@@ -483,12 +484,12 @@ barestmt: PLUGSTMT
 /* Format line */
 formline:      THING formarg
                        { OP *list;
 /* Format line */
 formline:      THING formarg
                        { OP *list;

-                         if ($2) {
-                             OP *term = $2;
-                             list = op_append_elem(OP_LIST, $1, term);
+                         if ($formarg) {
+                             OP *term = $formarg;
+                             list = op_append_elem(OP_LIST, $THING, term);

                          }
                          else {
                          }
                          else {

-                             list = $1;
+                             list = $THING;

                          }
                          if (parser->copline == NOLINE)
                               parser->copline = CopLINE(PL_curcop)-1;
                          }
                          if (parser->copline == NOLINE)
                               parser->copline = CopLINE(PL_curcop)-1;


@@ -501,27 +502,30 @@ formline: THING formarg
 formarg        :       /* NULL */
                        { $$ = NULL; }
        |       FORMLBRACK stmtseq FORMRBRACK
 formarg        :       /* NULL */
                        { $$ = NULL; }
        |       FORMLBRACK stmtseq FORMRBRACK

-                       { $$ = op_unscope($2); }
+                       { $$ = op_unscope($stmtseq); }

        ;
 
        ;
 

+condition: expr
+;
+

 /* An expression which may have a side-effect */
 sideff :       error
                        { $$ = NULL; }
 /* An expression which may have a side-effect */
 sideff :       error
                        { $$ = NULL; }

-       |       expr
-                       { $$ = $1; }
-       |       expr IF expr
-                       { $$ = newLOGOP(OP_AND, 0, $3, $1); }
-       |       expr UNLESS expr
-                       { $$ = newLOGOP(OP_OR, 0, $3, $1); }
-       |       expr WHILE expr
-                       { $$ = newLOOPOP(OPf_PARENS, 1, scalar($3), $1); }
-       |       expr UNTIL iexpr
-                       { $$ = newLOOPOP(OPf_PARENS, 1, $3, $1); }
-       |       expr FOR expr
-                       { $$ = newFOROP(0, NULL, $3, $1, NULL);
-                         parser->copline = (line_t)$2; }
-       |       expr WHEN expr
-                       { $$ = newWHENOP($3, op_scope($1)); }
+       |       expr[body]
+                       { $$ = $body; }
+       |       expr[body] IF condition
+                       { $$ = newLOGOP(OP_AND, 0, $condition, $body); }
+       |       expr[body] UNLESS condition
+                       { $$ = newLOGOP(OP_OR, 0, $condition, $body); }
+       |       expr[body] WHILE condition
+                       { $$ = newLOOPOP(OPf_PARENS, 1, scalar($condition), $body); }
+       |       expr[body] UNTIL iexpr
+                       { $$ = newLOOPOP(OPf_PARENS, 1, $iexpr, $body); }
+       |       expr[body] FOR condition
+                       { $$ = newFOROP(0, NULL, $condition, $body, NULL);
+                         parser->copline = (line_t)$FOR; }
+       |       expr[body] WHEN condition
+                       { $$ = newWHENOP($condition, op_scope($body)); }

        ;
 
 /* else and elsif blocks */
        ;
 
 /* else and elsif blocks */


@@ -529,14 +533,14 @@ else      :       /* NULL */
                        { $$ = NULL; }
        |       ELSE mblock
                        {
                        { $$ = NULL; }
        |       ELSE mblock
                        {

-                         ($2)->op_flags |= OPf_PARENS;
-                         $$ = op_scope($2);
+                         ($mblock)->op_flags |= OPf_PARENS;
+                         $$ = op_scope($mblock);

                        }
                        }

-       |       ELSIF '(' mexpr ')' mblock else
-                       { parser->copline = (line_t)$1;
+       |       ELSIF '(' mexpr ')' mblock else[else.recurse]
+                       { parser->copline = (line_t)$ELSIF;

                            $$ = newCONDOP(0,
                            $$ = newCONDOP(0,

-                               newSTATEOP(OPf_SPECIAL,NULL,$3),
-                               op_scope($5), $6);
+                               newSTATEOP(OPf_SPECIAL,NULL,$mexpr),
+                               op_scope($mblock), $[else.recurse]);

                          PL_hints |= HINT_BLOCK_SCOPE;
                        }
        ;
                          PL_hints |= HINT_BLOCK_SCOPE;
                        }
        ;


@@ -545,7 +549,7 @@ else        :       /* NULL */
 cont   :       /* NULL */
                        { $$ = NULL; }
        |       CONTINUE block
 cont   :       /* NULL */
                        { $$ = NULL; }
        |       CONTINUE block

-                       { $$ = op_scope($2); }
+                       { $$ = op_scope($block); }

        ;
 
 /* determine whether there are any new my declarations */
        ;
 
 /* determine whether there are any new my declarations */


@@ -570,19 +574,19 @@ texpr     :       /* NULL means true */
 
 /* Inverted boolean expression */
 iexpr  :       expr
 
 /* Inverted boolean expression */
 iexpr  :       expr

-                       { $$ = invert(scalar($1)); }
+                       { $$ = invert(scalar($expr)); }

        ;
 
 /* Expression with its own lexical scope */
 mexpr  :       expr
        ;
 
 /* Expression with its own lexical scope */
 mexpr  :       expr

-                       { $$ = $1; intro_my(); }
+                       { $$ = $expr; intro_my(); }

        ;
 
 mnexpr :       nexpr
        ;
 
 mnexpr :       nexpr

-                       { $$ = $1; intro_my(); }
+                       { $$ = $nexpr; intro_my(); }

        ;
 
        ;
 

-formname:      BAREWORD        { $$ = $1; }
+formname:      BAREWORD        { $$ = $BAREWORD; }

        |       /* NULL */      { $$ = NULL; }
        ;
 
        |       /* NULL */      { $$ = NULL; }
        ;
 


@@ -617,14 +621,14 @@ proto     :       /* NULL */
 subattrlist:   /* NULL */
                        { $$ = NULL; }
        |       COLONATTR THING
 subattrlist:   /* NULL */
                        { $$ = NULL; }
        |       COLONATTR THING

-                       { $$ = $2; }
+                       { $$ = $THING; }

        |       COLONATTR
                        { $$ = NULL; }
        ;
 
 /* List of attributes for a "my" variable declaration */
 myattrlist:    COLONATTR THING
        |       COLONATTR
                        { $$ = NULL; }
        ;
 
 /* List of attributes for a "my" variable declaration */
 myattrlist:    COLONATTR THING

-                       { $$ = $2; }
+                       { $$ = $THING; }

        |       COLONATTR
                        { $$ = NULL; }
        ;
        |       COLONATTR
                        { $$ = NULL; }
        ;


@@ -639,7 +643,7 @@ myattrlist: COLONATTR THING
 sigvarname:     /* NULL */
                        { parser->in_my = 0; $$ = NULL; }
         |       PRIVATEREF
 sigvarname:     /* NULL */
                        { parser->in_my = 0; $$ = NULL; }
         |       PRIVATEREF

-                        { parser->in_my = 0; $$ = $1; }
+                        { parser->in_my = 0; $$ = $PRIVATEREF; }

        ;
 
 sigslurpsigil:
        ;
 
 sigslurpsigil:


@@ -651,9 +655,9 @@ sigslurpsigil:
 /* @, %, @foo, %foo */
 sigslurpelem: sigslurpsigil sigvarname sigdefault/* def only to catch errors */ 
                         {
 /* @, %, @foo, %foo */
 sigslurpelem: sigslurpsigil sigvarname sigdefault/* def only to catch errors */ 
                         {

-                            I32 sigil   = $1;
-                            OP *var     = $2;
-                            OP *defexpr = $3;
+                            I32 sigil   = $sigslurpsigil;
+                            OP *var     = $sigvarname;
+                            OP *defexpr = $sigdefault;

 
                             if (parser->sig_slurpy)
                                 yyerror("Multiple slurpy parameters not allowed");
 
                             if (parser->sig_slurpy)
                                 yyerror("Multiple slurpy parameters not allowed");


@@ -673,15 +677,15 @@ sigdefault:       /* NULL */
         |       ASSIGNOP
                         { $$ = newOP(OP_NULL, 0); }
         |       ASSIGNOP term
         |       ASSIGNOP
                         { $$ = newOP(OP_NULL, 0); }
         |       ASSIGNOP term

-                        { $$ = $2; }
+                        { $$ = $term; }

 
 
 /* subroutine signature scalar element: e.g. '$x', '$=', '$x = $default' */
 sigscalarelem:
                 '$' sigvarname sigdefault
                         {
 
 
 /* subroutine signature scalar element: e.g. '$x', '$=', '$x = $default' */
 sigscalarelem:
                 '$' sigvarname sigdefault
                         {

-                            OP *var     = $2;
-                            OP *defexpr = $3;
+                            OP *var     = $sigvarname;
+                            OP *defexpr = $sigdefault;

 
                             if (parser->sig_slurpy)
                                 yyerror("Slurpy parameter not last");
 
                             if (parser->sig_slurpy)
                                 yyerror("Slurpy parameter not last");


@@ -744,38 +748,38 @@ sigscalarelem:
 
 /* subroutine signature element: e.g. '$x = $default' or '%h' */
 sigelem:        sigscalarelem
 
 /* subroutine signature element: e.g. '$x = $default' or '%h' */
 sigelem:        sigscalarelem

-                        { parser->in_my = KEY_sigvar; $$ = $1; }
+                        { parser->in_my = KEY_sigvar; $$ = $sigscalarelem; }

         |       sigslurpelem
         |       sigslurpelem

-                        { parser->in_my = KEY_sigvar; $$ = $1; }
+                        { parser->in_my = KEY_sigvar; $$ = $sigslurpelem; }

        ;
 
 /* list of subroutine signature elements */
 siglist:
        ;
 
 /* list of subroutine signature elements */
 siglist:

-               siglist ','
-                       { $$ = $1; }
-       |       siglist ',' sigelem
+               siglist[list] ','
+                       { $$ = $list; }
+       |       siglist[list] ',' sigelem[element]

                        {
                        {

-                         $$ = op_append_list(OP_LINESEQ, $1, $3);
+                         $$ = op_append_list(OP_LINESEQ, $list, $element);

                        }
                        }

-        |      sigelem  %prec PREC_LOW
-                       { $$ = $1; }
+        |      sigelem[element]  %prec PREC_LOW
+                       { $$ = $element; }

        ;
 
 /* () or (....) */
 siglistornull:         /* NULL */
                        { $$ = NULL; }
        |       siglist
        ;
 
 /* () or (....) */
 siglistornull:         /* NULL */
                        { $$ = NULL; }
        |       siglist

-                       { $$ = $1; }
+                       { $$ = $siglist; }

 
 /* optional subroutine signature */
 optsubsignature:       /* NULL */
                        { $$ = NULL; }
        |       subsignature
 
 /* optional subroutine signature */
 optsubsignature:       /* NULL */
                        { $$ = NULL; }
        |       subsignature

-                       { $$ = $1; }
+                       { $$ = $subsignature; }

 
 /* Subroutine signature */
 subsignature:  '(' subsigguts ')'
 
 /* Subroutine signature */
 subsignature:  '(' subsigguts ')'

-                       { $$ = $2; }
+                       { $$ = $subsigguts; }

 
 subsigguts:
                         {
 
 subsigguts:
                         {


@@ -790,7 +794,7 @@ subsigguts:
                         }
                 siglistornull
                        {
                         }
                 siglistornull
                        {

-                            OP            *sigops = $2;
+                            OP            *sigops = $siglistornull;

                             struct op_argcheck_aux *aux;
                             OP            *check;
 
                             struct op_argcheck_aux *aux;
                             OP            *check;
 


@@ -846,7 +850,7 @@ subsigguts:
        ;
 
 /* Optional subroutine body (for named subroutine declaration) */
        ;
 
 /* Optional subroutine body (for named subroutine declaration) */

-optsubbody:    subbody { $$ = $1; }
+optsubbody:    subbody { $$ = $subbody; }

        |       ';'     { $$ = NULL; }
        ;
 
        |       ';'     { $$ = NULL; }
        ;
 


@@ -856,14 +860,14 @@ subbody:  remember  '{' stmtseq '}'
                        {
                          if (parser->copline > (line_t)$2)
                              parser->copline = (line_t)$2;
                        {
                          if (parser->copline > (line_t)$2)
                              parser->copline = (line_t)$2;

-                         $$ = block_end($1, $3);
+                         $$ = block_end($remember, $stmtseq);

                        }
        ;
 
 
 /* optional [ Subroutine body with optional signature ] (for named
  * subroutine declaration) */
                        }
        ;
 
 
 /* optional [ Subroutine body with optional signature ] (for named
  * subroutine declaration) */

-optsigsubbody: sigsubbody { $$ = $1; }
+optsigsubbody: sigsubbody { $$ = $sigsubbody; }

        |       ';'        { $$ = NULL; }
 
 /* Subroutine body with optional signature */
        |       ';'        { $$ = NULL; }
 
 /* Subroutine body with optional signature */


@@ -871,78 +875,78 @@ sigsubbody:       remember optsubsignature '{' stmtseq '}'
                        {
                          if (parser->copline > (line_t)$3)
                              parser->copline = (line_t)$3;
                        {
                          if (parser->copline > (line_t)$3)
                              parser->copline = (line_t)$3;

-                         $$ = block_end($1,
-                               op_append_list(OP_LINESEQ, $2, $4));
+                         $$ = block_end($remember,
+                               op_append_list(OP_LINESEQ, $optsubsignature, $stmtseq));

                        }
        ;
 
 
 /* Ordinary expressions; logical combinations */
                        }
        ;
 
 
 /* Ordinary expressions; logical combinations */

-expr   :       expr ANDOP expr
-                       { $$ = newLOGOP(OP_AND, 0, $1, $3); }
-       |       expr OROP expr
-                       { $$ = newLOGOP($2, 0, $1, $3); }
-       |       expr DOROP expr
-                       { $$ = newLOGOP(OP_DOR, 0, $1, $3); }
+expr   :       expr[lhs] ANDOP expr[rhs]
+                       { $$ = newLOGOP(OP_AND, 0, $lhs, $rhs); }
+       |       expr[lhs] OROP[operator] expr[rhs]
+                       { $$ = newLOGOP($operator, 0, $lhs, $rhs); }
+       |       expr[lhs] DOROP expr[rhs]
+                       { $$ = newLOGOP(OP_DOR, 0, $lhs, $rhs); }

        |       listexpr %prec PREC_LOW
        ;
 
 /* Expressions are a list of terms joined by commas */
        |       listexpr %prec PREC_LOW
        ;
 
 /* Expressions are a list of terms joined by commas */

-listexpr:      listexpr ','
-                       { $$ = $1; }
-       |       listexpr ',' term
+listexpr:      listexpr[list] ','
+                       { $$ = $list; }
+       |       listexpr[list] ',' term

                        {
                        {

-                         OP* term = $3;
-                         $$ = op_append_elem(OP_LIST, $1, term);
+                         OP* term = $term;
+                         $$ = op_append_elem(OP_LIST, $list, term);

                        }
        |       term %prec PREC_LOW
        ;
 
 /* List operators */
 listop :       LSTOP indirob listexpr /* map {...} @args or print $fh @args */
                        }
        |       term %prec PREC_LOW
        ;
 
 /* List operators */
 listop :       LSTOP indirob listexpr /* map {...} @args or print $fh @args */

-                       { $$ = op_convert_list($1, OPf_STACKED,
-                               op_prepend_elem(OP_LIST, newGVREF($1,$2), $3) );
+                       { $$ = op_convert_list($LSTOP, OPf_STACKED,
+                               op_prepend_elem(OP_LIST, newGVREF($LSTOP,$indirob), $listexpr) );

                        }
        |       FUNC '(' indirob expr ')'      /* print ($fh @args */
                        }
        |       FUNC '(' indirob expr ')'      /* print ($fh @args */

-                       { $$ = op_convert_list($1, OPf_STACKED,
-                               op_prepend_elem(OP_LIST, newGVREF($1,$3), $4) );
+                       { $$ = op_convert_list($FUNC, OPf_STACKED,
+                               op_prepend_elem(OP_LIST, newGVREF($FUNC,$indirob), $expr) );

                        }
        |       term ARROW method '(' optexpr ')' /* $foo->bar(list) */
                        { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,
                        }
        |       term ARROW method '(' optexpr ')' /* $foo->bar(list) */
                        { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,

-                                   op_prepend_elem(OP_LIST, scalar($1), $5),
-                                   newMETHOP(OP_METHOD, 0, $3)));
+                                   op_prepend_elem(OP_LIST, scalar($term), $optexpr),
+                                   newMETHOP(OP_METHOD, 0, $method)));

                        }
        |       term ARROW method                     /* $foo->bar */
                        { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                        }
        |       term ARROW method                     /* $foo->bar */
                        { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,

-                               op_append_elem(OP_LIST, scalar($1),
-                                   newMETHOP(OP_METHOD, 0, $3)));
+                               op_append_elem(OP_LIST, scalar($term),
+                                   newMETHOP(OP_METHOD, 0, $method)));

                        }
        |       METHOD indirob optlistexpr           /* new Class @args */
                        { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,
                        }
        |       METHOD indirob optlistexpr           /* new Class @args */
                        { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,

-                                   op_prepend_elem(OP_LIST, $2, $3),
-                                   newMETHOP(OP_METHOD, 0, $1)));
+                                   op_prepend_elem(OP_LIST, $indirob, $optlistexpr),
+                                   newMETHOP(OP_METHOD, 0, $METHOD)));

                        }
        |       FUNCMETH indirob '(' optexpr ')'    /* method $object (@args) */
                        { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,
                        }
        |       FUNCMETH indirob '(' optexpr ')'    /* method $object (@args) */
                        { $$ = op_convert_list(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,

-                                   op_prepend_elem(OP_LIST, $2, $4),
-                                   newMETHOP(OP_METHOD, 0, $1)));
+                                   op_prepend_elem(OP_LIST, $indirob, $optexpr),
+                                   newMETHOP(OP_METHOD, 0, $FUNCMETH)));

                        }
        |       LSTOP optlistexpr                    /* print @args */
                        }
        |       LSTOP optlistexpr                    /* print @args */

-                       { $$ = op_convert_list($1, 0, $2); }
+                       { $$ = op_convert_list($LSTOP, 0, $optlistexpr); }

        |       FUNC '(' optexpr ')'                 /* print (@args) */
        |       FUNC '(' optexpr ')'                 /* print (@args) */

-                       { $$ = op_convert_list($1, 0, $3); }
+                       { $$ = op_convert_list($FUNC, 0, $optexpr); }

        |       FUNC SUBLEXSTART optexpr SUBLEXEND          /* uc($arg) from "\U..." */
        |       FUNC SUBLEXSTART optexpr SUBLEXEND          /* uc($arg) from "\U..." */

-                       { $$ = op_convert_list($1, 0, $3); }
+                       { $$ = op_convert_list($FUNC, 0, $optexpr); }

        |       LSTOPSUB startanonsub block /* sub f(&@);   f { foo } ... */
                        { SvREFCNT_inc_simple_void(PL_compcv);
        |       LSTOPSUB startanonsub block /* sub f(&@);   f { foo } ... */
                        { SvREFCNT_inc_simple_void(PL_compcv);

-                         $<opval>$ = newANONATTRSUB($2, 0, NULL, $3); }
+                         $<opval>$ = newANONATTRSUB($startanonsub, 0, NULL, $block); }[anonattrsub]

                    optlistexpr         %prec LSTOP  /* ... @bar */
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                 op_append_elem(OP_LIST,
                    optlistexpr         %prec LSTOP  /* ... @bar */
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                 op_append_elem(OP_LIST,

-                                  op_prepend_elem(OP_LIST, $<opval>4, $5), $1));
+                                  op_prepend_elem(OP_LIST, $<opval>anonattrsub, $optlistexpr), $LSTOPSUB));

                        }
        ;
 
                        }
        ;
 


@@ -955,148 +959,148 @@ method  :       METHOD
 subscripted:    gelem '{' expr ';' '}'        /* *main::{something} */
                         /* In this and all the hash accessors, ';' is
                          * provided by the tokeniser */
 subscripted:    gelem '{' expr ';' '}'        /* *main::{something} */
                         /* In this and all the hash accessors, ';' is
                          * provided by the tokeniser */

-                       { $$ = newBINOP(OP_GELEM, 0, $1, scalar($3)); }
-       |       scalar '[' expr ']'          /* $array[$element] */
-                       { $$ = newBINOP(OP_AELEM, 0, oopsAV($1), scalar($3));
+                       { $$ = newBINOP(OP_GELEM, 0, $gelem, scalar($expr)); }
+       |       scalar[array] '[' expr ']'          /* $array[$element] */
+                       { $$ = newBINOP(OP_AELEM, 0, oopsAV($array), scalar($expr));

                        }
                        }

-       |       term ARROW '[' expr ']'      /* somearef->[$element] */
+       |       term[array_reference] ARROW '[' expr ']'      /* somearef->[$element] */

                        { $$ = newBINOP(OP_AELEM, 0,
                        { $$ = newBINOP(OP_AELEM, 0,

-                                       ref(newAVREF($1),OP_RV2AV),
-                                       scalar($4));
+                                       ref(newAVREF($array_reference),OP_RV2AV),
+                                       scalar($expr));

                        }
                        }

-       |       subscripted '[' expr ']'    /* $foo->[$bar]->[$baz] */
+       |       subscripted[array_reference] '[' expr ']'    /* $foo->[$bar]->[$baz] */

                        { $$ = newBINOP(OP_AELEM, 0,
                        { $$ = newBINOP(OP_AELEM, 0,

-                                       ref(newAVREF($1),OP_RV2AV),
-                                       scalar($3));
+                                       ref(newAVREF($array_reference),OP_RV2AV),
+                                       scalar($expr));

                        }
                        }

-       |       scalar '{' expr ';' '}'    /* $foo{bar();} */
-                       { $$ = newBINOP(OP_HELEM, 0, oopsHV($1), jmaybe($3));
+       |       scalar[hash] '{' expr ';' '}'    /* $foo{bar();} */
+                       { $$ = newBINOP(OP_HELEM, 0, oopsHV($hash), jmaybe($expr));

                        }
                        }

-       |       term ARROW '{' expr ';' '}' /* somehref->{bar();} */
+       |       term[hash_reference] ARROW '{' expr ';' '}' /* somehref->{bar();} */

                        { $$ = newBINOP(OP_HELEM, 0,
                        { $$ = newBINOP(OP_HELEM, 0,

-                                       ref(newHVREF($1),OP_RV2HV),
-                                       jmaybe($4)); }
-       |       subscripted '{' expr ';' '}' /* $foo->[bar]->{baz;} */
+                                       ref(newHVREF($hash_reference),OP_RV2HV),
+                                       jmaybe($expr)); }
+       |       subscripted[hash_reference] '{' expr ';' '}' /* $foo->[bar]->{baz;} */

                        { $$ = newBINOP(OP_HELEM, 0,
                        { $$ = newBINOP(OP_HELEM, 0,

-                                       ref(newHVREF($1),OP_RV2HV),
-                                       jmaybe($3)); }
-       |       term ARROW '(' ')'          /* $subref->() */
+                                       ref(newHVREF($hash_reference),OP_RV2HV),
+                                       jmaybe($expr)); }
+       |       term[code_reference] ARROW '(' ')'          /* $subref->() */

                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,

-                                  newCVREF(0, scalar($1)));
+                                  newCVREF(0, scalar($code_reference)));

                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                        }
                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                        }

-       |       term ARROW '(' expr ')'     /* $subref->(@args) */
+       |       term[code_reference] ARROW '(' expr ')'     /* $subref->(@args) */

                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,

-                                  op_append_elem(OP_LIST, $4,
-                                      newCVREF(0, scalar($1))));
+                                  op_append_elem(OP_LIST, $expr,
+                                      newCVREF(0, scalar($code_reference))));

                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                        }
 
                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                        }
 

-       |       subscripted '(' expr ')'   /* $foo->{bar}->(@args) */
+       |       subscripted[code_reference] '(' expr ')'   /* $foo->{bar}->(@args) */

                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,

-                                  op_append_elem(OP_LIST, $3,
-                                              newCVREF(0, scalar($1))));
+                                  op_append_elem(OP_LIST, $expr,
+                                              newCVREF(0, scalar($code_reference))));

                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                        }
                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                        }

-       |       subscripted '(' ')'        /* $foo->{bar}->() */
+       |       subscripted[code_reference] '(' ')'        /* $foo->{bar}->() */

                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,

-                                  newCVREF(0, scalar($1)));
+                                  newCVREF(0, scalar($code_reference)));

                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                        }
                          if (parser->expect == XBLOCK)
                              parser->expect = XOPERATOR;
                        }

-       |       '(' expr ')' '[' expr ']'            /* list slice */
-                       { $$ = newSLICEOP(0, $5, $2); }
+       |       '(' expr[list] ')' '[' expr[slice] ']'            /* list slice */
+                       { $$ = newSLICEOP(0, $slice, $list); }

        |       QWLIST '[' expr ']'            /* list literal slice */
        |       QWLIST '[' expr ']'            /* list literal slice */

-                       { $$ = newSLICEOP(0, $3, $1); }
+                       { $$ = newSLICEOP(0, $expr, $QWLIST); }

        |       '(' ')' '[' expr ']'                 /* empty list slice! */
        |       '(' ')' '[' expr ']'                 /* empty list slice! */

-                       { $$ = newSLICEOP(0, $4, NULL); }
+                       { $$ = newSLICEOP(0, $expr, NULL); }

     ;
 
 /* Binary operators between terms */
     ;
 
 /* Binary operators between terms */

-termbinop:     term ASSIGNOP term                     /* $x = $y, $x += $y */
-                       { $$ = newASSIGNOP(OPf_STACKED, $1, $2, $3); }
-       |       term POWOP term                        /* $x ** $y */
-                       { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       term MULOP term                        /* $x * $y, $x x $y */
-                       {   if ($2 != OP_REPEAT)
-                               scalar($1);
-                           $$ = newBINOP($2, 0, $1, scalar($3));
-                       }
-       |       term ADDOP term                        /* $x + $y */
-                       { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       term SHIFTOP term                      /* $x >> $y, $x << $y */
-                       { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
+termbinop:     term[lhs] ASSIGNOP term[rhs]                     /* $x = $y, $x += $y */
+                       { $$ = newASSIGNOP(OPf_STACKED, $lhs, $ASSIGNOP, $rhs); }
+       |       term[lhs] POWOP term[rhs]                        /* $x ** $y */
+                       { $$ = newBINOP($POWOP, 0, scalar($lhs), scalar($rhs)); }
+       |       term[lhs] MULOP term[rhs]                        /* $x * $y, $x x $y */
+                       {   if ($MULOP != OP_REPEAT)
+                               scalar($lhs);
+                           $$ = newBINOP($MULOP, 0, $lhs, scalar($rhs));
+                       }
+       |       term[lhs] ADDOP term[rhs]                        /* $x + $y */
+                       { $$ = newBINOP($ADDOP, 0, scalar($lhs), scalar($rhs)); }
+       |       term[lhs] SHIFTOP term[rhs]                      /* $x >> $y, $x << $y */
+                       { $$ = newBINOP($SHIFTOP, 0, scalar($lhs), scalar($rhs)); }

        |       termrelop %prec PREC_LOW               /* $x > $y, etc. */
        |       termrelop %prec PREC_LOW               /* $x > $y, etc. */

-                       { $$ = $1; }
+                       { $$ = $termrelop; }

        |       termeqop %prec PREC_LOW                /* $x == $y, $x cmp $y */
        |       termeqop %prec PREC_LOW                /* $x == $y, $x cmp $y */

-                       { $$ = $1; }
-       |       term BITANDOP term                     /* $x & $y */
-                       { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       term BITOROP term                      /* $x | $y */
-                       { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
-       |       term DOTDOT term                       /* $x..$y, $x...$y */
-                       { $$ = newRANGE($2, scalar($1), scalar($3)); }
-       |       term ANDAND term                       /* $x && $y */
-                       { $$ = newLOGOP(OP_AND, 0, $1, $3); }
-       |       term OROR term                         /* $x || $y */
-                       { $$ = newLOGOP(OP_OR, 0, $1, $3); }
-       |       term DORDOR term                       /* $x // $y */
-                       { $$ = newLOGOP(OP_DOR, 0, $1, $3); }
-       |       term MATCHOP term                      /* $x =~ /$y/ */
-                       { $$ = bind_match($2, $1, $3); }
+                       { $$ = $termeqop; }
+       |       term[lhs] BITANDOP term[rhs]                     /* $x & $y */
+                       { $$ = newBINOP($BITANDOP, 0, scalar($lhs), scalar($rhs)); }
+       |       term[lhs] BITOROP term[rhs]                      /* $x | $y */
+                       { $$ = newBINOP($BITOROP, 0, scalar($lhs), scalar($rhs)); }
+       |       term[lhs] DOTDOT term[rhs]                       /* $x..$y, $x...$y */
+                       { $$ = newRANGE($DOTDOT, scalar($lhs), scalar($rhs)); }
+       |       term[lhs] ANDAND term[rhs]                       /* $x && $y */
+                       { $$ = newLOGOP(OP_AND, 0, $lhs, $rhs); }
+       |       term[lhs] OROR term[rhs]                         /* $x || $y */
+                       { $$ = newLOGOP(OP_OR, 0, $lhs, $rhs); }
+       |       term[lhs] DORDOR term[rhs]                       /* $x // $y */
+                       { $$ = newLOGOP(OP_DOR, 0, $lhs, $rhs); }
+       |       term[lhs] MATCHOP term[rhs]                      /* $x =~ /$y/ */
+                       { $$ = bind_match($MATCHOP, $lhs, $rhs); }

     ;
 
 termrelop:     relopchain %prec PREC_LOW
     ;
 
 termrelop:     relopchain %prec PREC_LOW

-                       { $$ = cmpchain_finish($1); }
-       |       term NCRELOP term
-                       { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
+                       { $$ = cmpchain_finish($relopchain); }
+       |       term[lhs] NCRELOP term[rhs]
+                       { $$ = newBINOP($NCRELOP, 0, scalar($lhs), scalar($rhs)); }

        |       termrelop NCRELOP
                        { yyerror("syntax error"); YYERROR; }
        |       termrelop CHRELOP
                        { yyerror("syntax error"); YYERROR; }
        ;
 
        |       termrelop NCRELOP
                        { yyerror("syntax error"); YYERROR; }
        |       termrelop CHRELOP
                        { yyerror("syntax error"); YYERROR; }
        ;
 

-relopchain:    term CHRELOP term
-                       { $$ = cmpchain_start($2, $1, $3); }
-       |       relopchain CHRELOP term
-                       { $$ = cmpchain_extend($2, $1, $3); }
+relopchain:    term[lhs] CHRELOP term[rhs]
+                       { $$ = cmpchain_start($CHRELOP, $lhs, $rhs); }
+       |       relopchain[lhs] CHRELOP term[rhs]
+                       { $$ = cmpchain_extend($CHRELOP, $lhs, $rhs); }

        ;
 
 termeqop:      eqopchain %prec PREC_LOW
        ;
 
 termeqop:      eqopchain %prec PREC_LOW

-                       { $$ = cmpchain_finish($1); }
-       |       term NCEQOP term
-                       { $$ = newBINOP($2, 0, scalar($1), scalar($3)); }
+                       { $$ = cmpchain_finish($eqopchain); }
+       |       term[lhs] NCEQOP term[rhs]
+                       { $$ = newBINOP($NCEQOP, 0, scalar($lhs), scalar($rhs)); }

        |       termeqop NCEQOP
                        { yyerror("syntax error"); YYERROR; }
        |       termeqop CHEQOP
                        { yyerror("syntax error"); YYERROR; }
        ;
 
        |       termeqop NCEQOP
                        { yyerror("syntax error"); YYERROR; }
        |       termeqop CHEQOP
                        { yyerror("syntax error"); YYERROR; }
        ;
 

-eqopchain:     term CHEQOP term
-                       { $$ = cmpchain_start($2, $1, $3); }
-       |       eqopchain CHEQOP term
-                       { $$ = cmpchain_extend($2, $1, $3); }
+eqopchain:     term[lhs] CHEQOP term[rhs]
+                       { $$ = cmpchain_start($CHEQOP, $lhs, $rhs); }
+       |       eqopchain[lhs] CHEQOP term[rhs]
+                       { $$ = cmpchain_extend($CHEQOP, $lhs, $rhs); }

        ;
 
 /* Unary operators and terms */
 termunop : '-' term %prec UMINUS                       /* -$x */
        ;
 
 /* Unary operators and terms */
 termunop : '-' term %prec UMINUS                       /* -$x */

-                       { $$ = newUNOP(OP_NEGATE, 0, scalar($2)); }
+                       { $$ = newUNOP(OP_NEGATE, 0, scalar($term)); }

        |       '+' term %prec UMINUS                  /* +$x */
        |       '+' term %prec UMINUS                  /* +$x */

-                       { $$ = $2; }
+                       { $$ = $term; }

 
        |       '!' term                               /* !$x */
 
        |       '!' term                               /* !$x */

-                       { $$ = newUNOP(OP_NOT, 0, scalar($2)); }
+                       { $$ = newUNOP(OP_NOT, 0, scalar($term)); }

        |       '~' term                               /* ~$x */
        |       '~' term                               /* ~$x */

-                       { $$ = newUNOP($1, 0, scalar($2)); }
+                       { $$ = newUNOP($1, 0, scalar($term)); }

        |       term POSTINC                           /* $x++ */
                        { $$ = newUNOP(OP_POSTINC, 0,
        |       term POSTINC                           /* $x++ */
                        { $$ = newUNOP(OP_POSTINC, 0,

-                                       op_lvalue(scalar($1), OP_POSTINC)); }
+                                       op_lvalue(scalar($term), OP_POSTINC)); }

        |       term POSTDEC                           /* $x-- */
                        { $$ = newUNOP(OP_POSTDEC, 0,
        |       term POSTDEC                           /* $x-- */
                        { $$ = newUNOP(OP_POSTDEC, 0,

-                                       op_lvalue(scalar($1), OP_POSTDEC));}
+                                       op_lvalue(scalar($term), OP_POSTDEC));}

        |       term POSTJOIN    /* implicit join after interpolated ->@ */
                        { $$ = op_convert_list(OP_JOIN, 0,
                                       op_append_elem(
        |       term POSTJOIN    /* implicit join after interpolated ->@ */
                        { $$ = op_convert_list(OP_JOIN, 0,
                                       op_append_elem(


@@ -1105,184 +1109,184 @@ termunop : '-' term %prec UMINUS                       /* -$x */
                                            newSVOP(OP_CONST,0,
                                                    newSVpvs("\""))
                                        )),
                                            newSVOP(OP_CONST,0,
                                                    newSVpvs("\""))
                                        )),

-                                       $1
+                                       $term

                                       ));
                        }
        |       PREINC term                            /* ++$x */
                        { $$ = newUNOP(OP_PREINC, 0,
                                       ));
                        }
        |       PREINC term                            /* ++$x */
                        { $$ = newUNOP(OP_PREINC, 0,

-                                       op_lvalue(scalar($2), OP_PREINC)); }
+                                       op_lvalue(scalar($term), OP_PREINC)); }

        |       PREDEC term                            /* --$x */
                        { $$ = newUNOP(OP_PREDEC, 0,
        |       PREDEC term                            /* --$x */
                        { $$ = newUNOP(OP_PREDEC, 0,

-                                       op_lvalue(scalar($2), OP_PREDEC)); }
+                                       op_lvalue(scalar($term), OP_PREDEC)); }

 
     ;
 
 /* Constructors for anonymous data */
 anonymous:     '[' expr ']'
 
     ;
 
 /* Constructors for anonymous data */
 anonymous:     '[' expr ']'

-                       { $$ = newANONLIST($2); }
+                       { $$ = newANONLIST($expr); }

        |       '[' ']'
                        { $$ = newANONLIST(NULL);}
        |       HASHBRACK expr ';' '}'  %prec '(' /* { foo => "Bar" } */
        |       '[' ']'
                        { $$ = newANONLIST(NULL);}
        |       HASHBRACK expr ';' '}'  %prec '(' /* { foo => "Bar" } */

-                       { $$ = newANONHASH($2); }
+                       { $$ = newANONHASH($expr); }

        |       HASHBRACK ';' '}'       %prec '(' /* { } (';' by tokener) */
                        { $$ = newANONHASH(NULL); }
        |       ANONSUB     startanonsub proto subattrlist subbody    %prec '('
                        { SvREFCNT_inc_simple_void(PL_compcv);
        |       HASHBRACK ';' '}'       %prec '(' /* { } (';' by tokener) */
                        { $$ = newANONHASH(NULL); }
        |       ANONSUB     startanonsub proto subattrlist subbody    %prec '('
                        { SvREFCNT_inc_simple_void(PL_compcv);

-                         $$ = newANONATTRSUB($2, $3, $4, $5); }
+                         $$ = newANONATTRSUB($startanonsub, $proto, $subattrlist, $subbody); }

        |       ANON_SIGSUB startanonsub subattrlist sigsubbody %prec '('
                        { SvREFCNT_inc_simple_void(PL_compcv);
        |       ANON_SIGSUB startanonsub subattrlist sigsubbody %prec '('
                        { SvREFCNT_inc_simple_void(PL_compcv);

-                         $$ = newANONATTRSUB($2, NULL, $3, $4); }
+                         $$ = newANONATTRSUB($startanonsub, NULL, $subattrlist, $sigsubbody); }

     ;
 
 /* Things called with "do" */
 termdo :       DO term %prec UNIOP                     /* do $filename */
     ;
 
 /* Things called with "do" */
 termdo :       DO term %prec UNIOP                     /* do $filename */

-                       { $$ = dofile($2, $1);}
+                       { $$ = dofile($term, $DO);}

        |       DO block        %prec '('               /* do { code */
        |       DO block        %prec '('               /* do { code */

-                       { $$ = newUNOP(OP_NULL, OPf_SPECIAL, op_scope($2));}
+                       { $$ = newUNOP(OP_NULL, OPf_SPECIAL, op_scope($block));}

         ;
 
         ;
 

-term   :       termbinop
+term[product]  :       termbinop

        |       termunop
        |       anonymous
        |       termdo
        |       termunop
        |       anonymous
        |       termdo

-       |       term '?' term ':' term
-                       { $$ = newCONDOP(0, $1, $3, $5); }
-       |       REFGEN term                          /* \$x, \@y, \%z */
-                       { $$ = newUNOP(OP_REFGEN, 0, $2); }
-       |       MY REFGEN term
-                       { $$ = newUNOP(OP_REFGEN, 0, localize($3,1)); }
+       |       term[condition] '?' term[then] ':' term[else]
+                       { $$ = newCONDOP(0, $condition, $then, $else); }
+       |       REFGEN term[operand]                          /* \$x, \@y, \%z */
+                       { $$ = newUNOP(OP_REFGEN, 0, $operand); }
+       |       MY REFGEN term[operand]
+                       { $$ = newUNOP(OP_REFGEN, 0, localize($operand,1)); }

        |       myattrterm      %prec UNIOP
        |       myattrterm      %prec UNIOP

-                       { $$ = $1; }
-       |       LOCAL term      %prec UNIOP
-                       { $$ = localize($2,0); }
+                       { $$ = $myattrterm; }
+       |       LOCAL term[operand]     %prec UNIOP
+                       { $$ = localize($operand,0); }

        |       '(' expr ')'
        |       '(' expr ')'

-                       { $$ = sawparens($2); }
+                       { $$ = sawparens($expr); }

        |       QWLIST
        |       QWLIST

-                       { $$ = $1; }
+                       { $$ = $QWLIST; }

        |       '(' ')'
                        { $$ = sawparens(newNULLLIST()); }
        |       scalar  %prec '('
        |       '(' ')'
                        { $$ = sawparens(newNULLLIST()); }
        |       scalar  %prec '('

-                       { $$ = $1; }
+                       { $$ = $scalar; }

        |       star    %prec '('
        |       star    %prec '('

-                       { $$ = $1; }
+                       { $$ = $star; }

        |       hsh     %prec '('
        |       hsh     %prec '('

-                       { $$ = $1; }
+                       { $$ = $hsh; }

        |       ary     %prec '('
        |       ary     %prec '('

-                       { $$ = $1; }
+                       { $$ = $ary; }

        |       arylen  %prec '('                    /* $#x, $#{ something } */
        |       arylen  %prec '('                    /* $#x, $#{ something } */

-                       { $$ = newUNOP(OP_AV2ARYLEN, 0, ref($1, OP_AV2ARYLEN));}
+                       { $$ = newUNOP(OP_AV2ARYLEN, 0, ref($arylen, OP_AV2ARYLEN));}

        |       subscripted
        |       subscripted

-                       { $$ = $1; }
+                       { $$ = $subscripted; }

        |       sliceme '[' expr ']'                     /* array slice */
                        { $$ = op_prepend_elem(OP_ASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_ASLICE, 0,
        |       sliceme '[' expr ']'                     /* array slice */
                        { $$ = op_prepend_elem(OP_ASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_ASLICE, 0,

-                                       list($3),
-                                       ref($1, OP_ASLICE)));
-                         if ($$ && $1)
+                                       list($expr),
+                                       ref($sliceme, OP_ASLICE)));
+                         if ($$ && $sliceme)

                              $$->op_private |=
                              $$->op_private |=

-                                 $1->op_private & OPpSLICEWARNING;
+                                 $sliceme->op_private & OPpSLICEWARNING;

                        }
        |       kvslice '[' expr ']'                 /* array key/value slice */
                        { $$ = op_prepend_elem(OP_KVASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVASLICE, 0,
                        }
        |       kvslice '[' expr ']'                 /* array key/value slice */
                        { $$ = op_prepend_elem(OP_KVASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVASLICE, 0,

-                                       list($3),
-                                       ref(oopsAV($1), OP_KVASLICE)));
-                         if ($$ && $1)
+                                       list($expr),
+                                       ref(oopsAV($kvslice), OP_KVASLICE)));
+                         if ($$ && $kvslice)

                              $$->op_private |=
                              $$->op_private |=

-                                 $1->op_private & OPpSLICEWARNING;
+                                 $kvslice->op_private & OPpSLICEWARNING;

                        }
        |       sliceme '{' expr ';' '}'                 /* @hash{@keys} */
                        { $$ = op_prepend_elem(OP_HSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_HSLICE, 0,
                        }
        |       sliceme '{' expr ';' '}'                 /* @hash{@keys} */
                        { $$ = op_prepend_elem(OP_HSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_HSLICE, 0,

-                                       list($3),
-                                       ref(oopsHV($1), OP_HSLICE)));
-                         if ($$ && $1)
+                                       list($expr),
+                                       ref(oopsHV($sliceme), OP_HSLICE)));
+                         if ($$ && $sliceme)

                              $$->op_private |=
                              $$->op_private |=

-                                 $1->op_private & OPpSLICEWARNING;
+                                 $sliceme->op_private & OPpSLICEWARNING;

                        }
        |       kvslice '{' expr ';' '}'                 /* %hash{@keys} */
                        { $$ = op_prepend_elem(OP_KVHSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVHSLICE, 0,
                        }
        |       kvslice '{' expr ';' '}'                 /* %hash{@keys} */
                        { $$ = op_prepend_elem(OP_KVHSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_KVHSLICE, 0,

-                                       list($3),
-                                       ref($1, OP_KVHSLICE)));
-                         if ($$ && $1)
+                                       list($expr),
+                                       ref($kvslice, OP_KVHSLICE)));
+                         if ($$ && $kvslice)

                              $$->op_private |=
                              $$->op_private |=

-                                 $1->op_private & OPpSLICEWARNING;
+                                 $kvslice->op_private & OPpSLICEWARNING;

                        }
        |       THING   %prec '('
                        }
        |       THING   %prec '('

-                       { $$ = $1; }
+                       { $$ = $THING; }

        |       amper                                /* &foo; */
        |       amper                                /* &foo; */

-                       { $$ = newUNOP(OP_ENTERSUB, 0, scalar($1)); }
+                       { $$ = newUNOP(OP_ENTERSUB, 0, scalar($amper)); }

        |       amper '(' ')'                 /* &foo() or foo() */
        |       amper '(' ')'                 /* &foo() or foo() */

-                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1));
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($amper));

                        }
        |       amper '(' expr ')'          /* &foo(@args) or foo(@args) */
                        {
                          $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                        }
        |       amper '(' expr ')'          /* &foo(@args) or foo(@args) */
                        {
                          $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,

-                               op_append_elem(OP_LIST, $3, scalar($1)));
+                               op_append_elem(OP_LIST, $expr, scalar($amper)));

                        }
        |       NOAMP subname optlistexpr       /* foo @args (no parens) */
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                        }
        |       NOAMP subname optlistexpr       /* foo @args (no parens) */
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,

-                           op_append_elem(OP_LIST, $3, scalar($2)));
-                       }
-       |       term ARROW '$' '*'
-                       { $$ = newSVREF($1); }
-       |       term ARROW '@' '*'
-                       { $$ = newAVREF($1); }
-       |       term ARROW '%' '*'
-                       { $$ = newHVREF($1); }
-       |       term ARROW '&' '*'
+                           op_append_elem(OP_LIST, $optlistexpr, scalar($subname)));
+                       }
+       |       term[operand] ARROW '$' '*'
+                       { $$ = newSVREF($operand); }
+       |       term[operand] ARROW '@' '*'
+                       { $$ = newAVREF($operand); }
+       |       term[operand] ARROW '%' '*'
+                       { $$ = newHVREF($operand); }
+       |       term[operand] ARROW '&' '*'

                        { $$ = newUNOP(OP_ENTERSUB, 0,
                        { $$ = newUNOP(OP_ENTERSUB, 0,

-                                      scalar(newCVREF($3,$1))); }
-       |       term ARROW '*' '*'      %prec '('
-                       { $$ = newGVREF(0,$1); }
+                                      scalar(newCVREF($3,$operand))); }
+       |       term[operand] ARROW '*' '*'     %prec '('
+                       { $$ = newGVREF(0,$operand); }

        |       LOOPEX  /* loop exiting command (goto, last, dump, etc) */
        |       LOOPEX  /* loop exiting command (goto, last, dump, etc) */

-                       { $$ = newOP($1, OPf_SPECIAL);
+                       { $$ = newOP($LOOPEX, OPf_SPECIAL);

                            PL_hints |= HINT_BLOCK_SCOPE; }
                            PL_hints |= HINT_BLOCK_SCOPE; }

-       |       LOOPEX term
-                       { $$ = newLOOPEX($1,$2); }
+       |       LOOPEX term[operand]
+                       { $$ = newLOOPEX($LOOPEX,$operand); }

        |       NOTOP listexpr                       /* not $foo */
        |       NOTOP listexpr                       /* not $foo */

-                       { $$ = newUNOP(OP_NOT, 0, scalar($2)); }
+                       { $$ = newUNOP(OP_NOT, 0, scalar($listexpr)); }

        |       UNIOP                                /* Unary op, $_ implied */
        |       UNIOP                                /* Unary op, $_ implied */

-                       { $$ = newOP($1, 0); }
+                       { $$ = newOP($UNIOP, 0); }

        |       UNIOP block                          /* eval { foo }* */
        |       UNIOP block                          /* eval { foo }* */

-                       { $$ = newUNOP($1, 0, $2); }
-       |       UNIOP term                           /* Unary op */
-                       { $$ = newUNOP($1, 0, $2); }
+                       { $$ = newUNOP($UNIOP, 0, $block); }
+       |       UNIOP term[operand]                           /* Unary op */
+                       { $$ = newUNOP($UNIOP, 0, $operand); }

        |       REQUIRE                              /* require, $_ implied */
        |       REQUIRE                              /* require, $_ implied */

-                       { $$ = newOP(OP_REQUIRE, $1 ? OPf_SPECIAL : 0); }
-       |       REQUIRE term                         /* require Foo */
-                       { $$ = newUNOP(OP_REQUIRE, $1 ? OPf_SPECIAL : 0, $2); }
+                       { $$ = newOP(OP_REQUIRE, $REQUIRE ? OPf_SPECIAL : 0); }
+       |       REQUIRE term[operand]                         /* require Foo */
+                       { $$ = newUNOP(OP_REQUIRE, $REQUIRE ? OPf_SPECIAL : 0, $operand); }

        |       UNIOPSUB
        |       UNIOPSUB

-                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1)); }
-       |       UNIOPSUB term                        /* Sub treated as unop */
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($UNIOPSUB)); }
+       |       UNIOPSUB term[operand]                        /* Sub treated as unop */

                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,
                        { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED,

-                           op_append_elem(OP_LIST, $2, scalar($1))); }
+                           op_append_elem(OP_LIST, $operand, scalar($UNIOPSUB))); }

        |       FUNC0                                /* Nullary operator */
        |       FUNC0                                /* Nullary operator */

-                       { $$ = newOP($1, 0); }
+                       { $$ = newOP($FUNC0, 0); }

        |       FUNC0 '(' ')'
        |       FUNC0 '(' ')'

-                       { $$ = newOP($1, 0);}
+                       { $$ = newOP($FUNC0, 0);}

        |       FUNC0OP       /* Same as above, but op created in toke.c */
        |       FUNC0OP       /* Same as above, but op created in toke.c */

-                       { $$ = $1; }
+                       { $$ = $FUNC0OP; }

        |       FUNC0OP '(' ')'
        |       FUNC0OP '(' ')'

-                       { $$ = $1; }
+                       { $$ = $FUNC0OP; }

        |       FUNC0SUB                             /* Sub treated as nullop */
        |       FUNC0SUB                             /* Sub treated as nullop */

-                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($1)); }
+                       { $$ = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar($FUNC0SUB)); }

        |       FUNC1 '(' ')'                        /* not () */
        |       FUNC1 '(' ')'                        /* not () */

-                       { $$ = ($1 == OP_NOT)
-                          ? newUNOP($1, 0, newSVOP(OP_CONST, 0, newSViv(0)))
-                          : newOP($1, OPf_SPECIAL); }
+                       { $$ = ($FUNC1 == OP_NOT)
+                          ? newUNOP($FUNC1, 0, newSVOP(OP_CONST, 0, newSViv(0)))
+                          : newOP($FUNC1, OPf_SPECIAL); }

        |       FUNC1 '(' expr ')'                   /* not($foo) */
        |       FUNC1 '(' expr ')'                   /* not($foo) */

-                       { $$ = newUNOP($1, 0, $3); }
+                       { $$ = newUNOP($FUNC1, 0, $expr); }

        |       PMFUNC /* m//, s///, qr//, tr/// */
                        {
        |       PMFUNC /* m//, s///, qr//, tr/// */
                        {

-                           if (   $1->op_type != OP_TRANS
-                               && $1->op_type != OP_TRANSR
-                               && (((PMOP*)$1)->op_pmflags & PMf_HAS_CV))
+                           if (   $PMFUNC->op_type != OP_TRANS
+                               && $PMFUNC->op_type != OP_TRANSR
+                               && (((PMOP*)$PMFUNC)->op_pmflags & PMf_HAS_CV))

                            {
                                $<ival>$ = start_subparse(FALSE, CVf_ANON);
                                SAVEFREESV(PL_compcv);
                            {
                                $<ival>$ = start_subparse(FALSE, CVf_ANON);
                                SAVEFREESV(PL_compcv);


@@ -1290,7 +1294,7 @@ term      :       termbinop
                                $<ival>$ = 0;
                        }
                    SUBLEXSTART listexpr optrepl SUBLEXEND
                                $<ival>$ = 0;
                        }
                    SUBLEXSTART listexpr optrepl SUBLEXEND

-                       { $$ = pmruntime($1, $4, $5, 1, $<ival>2); }
+                       { $$ = pmruntime($PMFUNC, $listexpr, $optrepl, 1, $<ival>2); }

        |       BAREWORD
        |       listop
        |       PLUGEXPR
        |       BAREWORD
        |       listop
        |       PLUGEXPR


@@ -1298,50 +1302,50 @@ term    :       termbinop
 
 /* "my" declarations, with optional attributes */
 myattrterm:    MY myterm myattrlist
 
 /* "my" declarations, with optional attributes */
 myattrterm:    MY myterm myattrlist

-                       { $$ = my_attrs($2,$3); }
+                       { $$ = my_attrs($myterm,$myattrlist); }

        |       MY myterm
        |       MY myterm

-                       { $$ = localize($2,1); }
+                       { $$ = localize($myterm,1); }

        |       MY REFGEN myterm myattrlist
        |       MY REFGEN myterm myattrlist

-                       { $$ = newUNOP(OP_REFGEN, 0, my_attrs($3,$4)); }
+                       { $$ = newUNOP(OP_REFGEN, 0, my_attrs($myterm,$myattrlist)); }

        ;
 
 /* Things that can be "my"'d */
 myterm :       '(' expr ')'
        ;
 
 /* Things that can be "my"'d */
 myterm :       '(' expr ')'

-                       { $$ = sawparens($2); }
+                       { $$ = sawparens($expr); }

        |       '(' ')'
                        { $$ = sawparens(newNULLLIST()); }
 
        |       scalar  %prec '('
        |       '(' ')'
                        { $$ = sawparens(newNULLLIST()); }
 
        |       scalar  %prec '('

-                       { $$ = $1; }
+                       { $$ = $scalar; }

        |       hsh     %prec '('
        |       hsh     %prec '('

-                       { $$ = $1; }
+                       { $$ = $hsh; }

        |       ary     %prec '('
        |       ary     %prec '('

-                       { $$ = $1; }
+                       { $$ = $ary; }

        ;
 
 /* Basic list expressions */
 optlistexpr:   /* NULL */ %prec PREC_LOW
                        { $$ = NULL; }
        |       listexpr    %prec PREC_LOW
        ;
 
 /* Basic list expressions */
 optlistexpr:   /* NULL */ %prec PREC_LOW
                        { $$ = NULL; }
        |       listexpr    %prec PREC_LOW

-                       { $$ = $1; }
+                       { $$ = $listexpr; }

        ;
 
 optexpr:       /* NULL */
                        { $$ = NULL; }
        |       expr
        ;
 
 optexpr:       /* NULL */
                        { $$ = NULL; }
        |       expr

-                       { $$ = $1; }
+                       { $$ = $expr; }

        ;
 
 optrepl:       /* NULL */
                        { $$ = NULL; }
        |       '/' expr
        ;
 
 optrepl:       /* NULL */
                        { $$ = NULL; }
        |       '/' expr

-                       { $$ = $2; }
+                       { $$ = $expr; }

        ;
 
 /* A little bit of trickery to make "for my $foo (@bar)" actually be
    lexical */
 my_scalar:     scalar
        ;
 
 /* A little bit of trickery to make "for my $foo (@bar)" actually be
    lexical */
 my_scalar:     scalar

-                       { parser->in_my = 0; $$ = my($1); }
+                       { parser->in_my = 0; $$ = my($scalar); }

        ;
 
 my_var :       scalar
        ;
 
 my_var :       scalar


@@ -1358,58 +1362,58 @@ my_refgen:      MY REFGEN
        ;
 
 amper  :       '&' indirob
        ;
 
 amper  :       '&' indirob

-                       { $$ = newCVREF($1,$2); }
+                       { $$ = newCVREF($1,$indirob); }

        ;
 
 scalar :       '$' indirob
        ;
 
 scalar :       '$' indirob

-                       { $$ = newSVREF($2); }
+                       { $$ = newSVREF($indirob); }

        ;
 
 ary    :       '@' indirob
        ;
 
 ary    :       '@' indirob

-                       { $$ = newAVREF($2);
+                       { $$ = newAVREF($indirob);

                          if ($$) $$->op_private |= $1;
                        }
        ;
 
 hsh    :       '%' indirob
                          if ($$) $$->op_private |= $1;
                        }
        ;
 
 hsh    :       '%' indirob

-                       { $$ = newHVREF($2);
+                       { $$ = newHVREF($indirob);

                          if ($$) $$->op_private |= $1;
                        }
        ;
 
 arylen :       DOLSHARP indirob
                          if ($$) $$->op_private |= $1;
                        }
        ;
 
 arylen :       DOLSHARP indirob

-                       { $$ = newAVREF($2); }
+                       { $$ = newAVREF($indirob); }

        |       term ARROW DOLSHARP '*'
        |       term ARROW DOLSHARP '*'

-                       { $$ = newAVREF($1); }
+                       { $$ = newAVREF($term); }

        ;
 
 star   :       '*' indirob
        ;
 
 star   :       '*' indirob

-                       { $$ = newGVREF(0,$2); }
+                       { $$ = newGVREF(0,$indirob); }

        ;
 
 sliceme        :       ary
        |       term ARROW '@'
        ;
 
 sliceme        :       ary
        |       term ARROW '@'

-                       { $$ = newAVREF($1); }
+                       { $$ = newAVREF($term); }

        ;
 
 kvslice        :       hsh
        |       term ARROW '%'
        ;
 
 kvslice        :       hsh
        |       term ARROW '%'

-                       { $$ = newHVREF($1); }
+                       { $$ = newHVREF($term); }

        ;
 
 gelem  :       star
        |       term ARROW '*'
        ;
 
 gelem  :       star
        |       term ARROW '*'

-                       { $$ = newGVREF(0,$1); }
+                       { $$ = newGVREF(0,$term); }

        ;
 
 /* Indirect objects */
 indirob        :       BAREWORD
        ;
 
 /* Indirect objects */
 indirob        :       BAREWORD

-                       { $$ = scalar($1); }
+                       { $$ = scalar($BAREWORD); }

        |       scalar %prec PREC_LOW
        |       scalar %prec PREC_LOW

-                       { $$ = scalar($1); }
+                       { $$ = scalar($scalar); }

        |       block
        |       block

-                       { $$ = op_scope($1); }
+                       { $$ = op_scope($block); }

 
        |       PRIVATEREF
 
        |       PRIVATEREF

-                       { $$ = $1; }
+                       { $$ = $PRIVATEREF; }

        ;
        ;