Allow when to be used as a statement modifier

diff --git a/perly.act b/perly.act
index 5a908c3..cb1d67d 100644 (file)
--- a/perly.act
+++ b/perly.act
@@ -1,10 +1,10 @@
 case 2:
-#line 137 "perly.y"
+#line 142 "perly.y"
     { (yyval.ival) = (ps[(1) - (2)].val.ival); newPROG(block_end((ps[(1) - (2)].val.ival),(ps[(2) - (2)].val.opval))); ;}
     break;
 
   case 3:
-#line 142 "perly.y"
+#line 147 "perly.y"
     { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval)))
                              PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval));
                          (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
@@ -14,24 +14,24 @@ case 2:
     break;
 
   case 4:
-#line 151 "perly.y"
+#line 156 "perly.y"
     { (yyval.ival) = block_start(TRUE); ;}
     break;
 
   case 5:
-#line 155 "perly.y"
+#line 160 "perly.y"
     { (yyval.ival) = (I32) allocmy("$_"); ;}
     break;
 
   case 6:
-#line 159 "perly.y"
+#line 164 "perly.y"
     {
                    PL_parser->expect = XSTATE; (yyval.ival) = block_start(TRUE);
                ;}
     break;
 
   case 7:
-#line 166 "perly.y"
+#line 171 "perly.y"
     { if (PL_parser->copline > (line_t)IVAL((ps[(1) - (4)].val.i_tkval)))
                              PL_parser->copline = (line_t)IVAL((ps[(1) - (4)].val.i_tkval));
                          (yyval.opval) = block_end((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval));
@@ -41,17 +41,17 @@ case 2:
     break;
 
   case 8:
-#line 175 "perly.y"
+#line 180 "perly.y"
     { (yyval.ival) = block_start(FALSE); ;}
     break;
 
   case 9:
-#line 180 "perly.y"
+#line 185 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 10:
-#line 182 "perly.y"
+#line 187 "perly.y"
     {
                        (yyval.opval) = IF_MAD(
                                append_list(OP_LINESEQ,
@@ -61,7 +61,7 @@ case 2:
     break;
 
   case 11:
-#line 189 "perly.y"
+#line 194 "perly.y"
     {   (yyval.opval) = append_list(OP_LINESEQ,
                                (LISTOP*)(ps[(1) - (2)].val.opval), (LISTOP*)(ps[(2) - (2)].val.opval));
                            PL_pad_reset_pending = TRUE;
@@ -71,23 +71,23 @@ case 2:
     break;
 
   case 12:
-#line 199 "perly.y"
+#line 204 "perly.y"
     { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;}
     break;
 
   case 14:
-#line 203 "perly.y"
+#line 208 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 15:
-#line 205 "perly.y"
+#line 210 "perly.y"
     { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), (ps[(2) - (2)].val.opval)); ;}
     break;
 
   case 16:
-#line 207 "perly.y"
+#line 212 "perly.y"
     {
                          if (PVAL((ps[(1) - (2)].val.p_tkval))) {
                              (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (2)].val.p_tkval)), newOP(OP_NULL, 0));
@@ -107,7 +107,7 @@ case 2:
     break;
 
   case 17:
-#line 224 "perly.y"
+#line 229 "perly.y"
     {
                          (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)), (ps[(2) - (3)].val.opval));
                          PL_parser->expect = XSTATE;
@@ -126,45 +126,45 @@ case 2:
     break;
 
   case 18:
-#line 243 "perly.y"
+#line 248 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 19:
-#line 245 "perly.y"
+#line 250 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 20:
-#line 247 "perly.y"
+#line 252 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
                        ;}
     break;
 
   case 21:
-#line 251 "perly.y"
+#line 256 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'i');
                        ;}
     break;
 
   case 22:
-#line 255 "perly.y"
+#line 260 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, scalar((ps[(3) - (3)].val.opval)), (ps[(1) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
                        ;}
     break;
 
   case 23:
-#line 259 "perly.y"
+#line 264 "perly.y"
     { (yyval.opval) = newLOOPOP(OPf_PARENS, 1, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'w');
                        ;}
     break;
 
   case 24:
-#line 263 "perly.y"
+#line 268 "perly.y"
     { (yyval.opval) = newFOROP(0, NULL, (line_t)IVAL((ps[(2) - (3)].val.i_tkval)),
                                        (OP*)NULL, (ps[(3) - (3)].val.opval), (ps[(1) - (3)].val.opval), (OP*)NULL);
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),((LISTOP*)(yyval.opval))->op_first->op_sibling,'w');
@@ -172,19 +172,24 @@ case 2:
     break;
 
   case 25:
-#line 271 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 273 "perly.y"
+    { (yyval.opval) = newWHENOP((ps[(3) - (3)].val.opval), scope((ps[(1) - (3)].val.opval))); ;}
     break;
 
   case 26:
-#line 273 "perly.y"
+#line 278 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
+    break;
+
+  case 27:
+#line 280 "perly.y"
     { ((ps[(2) - (2)].val.opval))->op_flags |= OPf_PARENS; (yyval.opval) = scope((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 27:
-#line 277 "perly.y"
+  case 28:
+#line 284 "perly.y"
     { PL_parser->copline = (line_t)IVAL((ps[(1) - (6)].val.i_tkval));
                            (yyval.opval) = newCONDOP(0, newSTATEOP(OPf_SPECIAL,NULL,(ps[(3) - (6)].val.opval)), scope((ps[(5) - (6)].val.opval)), (ps[(6) - (6)].val.opval));
                            PL_hints |= HINT_BLOCK_SCOPE;
@@ -194,8 +199,8 @@ case 2:
                        ;}
     break;
 
-  case 28:
-#line 288 "perly.y"
+  case 29:
+#line 295 "perly.y"
     { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
                            (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
                                   newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -205,8 +210,8 @@ case 2:
                        ;}
     break;
 
-  case 29:
-#line 296 "perly.y"
+  case 30:
+#line 303 "perly.y"
     { PL_parser->copline = (line_t)IVAL((ps[(1) - (7)].val.i_tkval));
                            (yyval.opval) = block_end((ps[(3) - (7)].val.ival),
                                   newCONDOP(0, (ps[(4) - (7)].val.opval), scope((ps[(6) - (7)].val.opval)), (ps[(7) - (7)].val.opval)));
@@ -216,31 +221,31 @@ case 2:
                        ;}
     break;
 
-  case 30:
-#line 307 "perly.y"
+  case 31:
+#line 314 "perly.y"
     { (yyval.opval) = block_end((ps[(3) - (6)].val.ival),
                newWHENOP((ps[(4) - (6)].val.opval), scope((ps[(6) - (6)].val.opval)))); ;}
     break;
 
-  case 31:
-#line 310 "perly.y"
+  case 32:
+#line 317 "perly.y"
     { (yyval.opval) = newWHENOP(0, scope((ps[(2) - (2)].val.opval))); ;}
     break;
 
-  case 32:
-#line 315 "perly.y"
+  case 33:
+#line 322 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 33:
-#line 317 "perly.y"
+  case 34:
+#line 324 "perly.y"
     { (yyval.opval) = scope((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 34:
-#line 324 "perly.y"
+  case 35:
+#line 331 "perly.y"
     { OP *innerop;
                          PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval);
                            (yyval.opval) = block_end((ps[(4) - (9)].val.ival),
@@ -254,8 +259,8 @@ case 2:
                        ;}
     break;
 
-  case 35:
-#line 337 "perly.y"
+  case 36:
+#line 344 "perly.y"
     { OP *innerop;
                          PL_parser->copline = (line_t)(ps[(2) - (9)].val.i_tkval);
                            (yyval.opval) = block_end((ps[(4) - (9)].val.ival),
@@ -269,8 +274,8 @@ case 2:
                        ;}
     break;
 
-  case 36:
-#line 349 "perly.y"
+  case 37:
+#line 356 "perly.y"
     { OP *innerop;
                          (yyval.opval) = block_end((ps[(4) - (10)].val.ival),
                             innerop = newFOROP(0, PVAL((ps[(1) - (10)].val.p_tkval)), (line_t)IVAL((ps[(2) - (10)].val.i_tkval)),
@@ -283,8 +288,8 @@ case 2:
                        ;}
     break;
 
-  case 37:
-#line 360 "perly.y"
+  case 38:
+#line 367 "perly.y"
     { OP *innerop;
                          (yyval.opval) = block_end((ps[(5) - (9)].val.ival),
                             innerop = newFOROP(0, PVAL((ps[(1) - (9)].val.p_tkval)), (line_t)IVAL((ps[(2) - (9)].val.i_tkval)),
@@ -296,8 +301,8 @@ case 2:
                        ;}
     break;
 
-  case 38:
-#line 370 "perly.y"
+  case 39:
+#line 377 "perly.y"
     { OP *innerop;
                          (yyval.opval) = block_end((ps[(4) - (8)].val.ival),
                             innerop = newFOROP(0, PVAL((ps[(1) - (8)].val.p_tkval)), (line_t)IVAL((ps[(2) - (8)].val.i_tkval)),
@@ -309,8 +314,8 @@ case 2:
                        ;}
     break;
 
-  case 39:
-#line 382 "perly.y"
+  case 40:
+#line 389 "perly.y"
     { OP *forop;
                          PL_parser->copline = (line_t)IVAL((ps[(2) - (12)].val.i_tkval));
                          forop = newSTATEOP(0, PVAL((ps[(1) - (12)].val.p_tkval)),
@@ -342,16 +347,16 @@ case 2:
                          (yyval.opval) = block_end((ps[(4) - (12)].val.ival), forop); ;}
     break;
 
-  case 40:
-#line 412 "perly.y"
+  case 41:
+#line 419 "perly.y"
     { (yyval.opval) = newSTATEOP(0, PVAL((ps[(1) - (3)].val.p_tkval)),
                                 newWHILEOP(0, 1, (LOOP*)(OP*)NULL,
                                            NOLINE, (OP*)NULL, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval), 0));
                          TOKEN_GETMAD((ps[(1) - (3)].val.p_tkval),((LISTOP*)(yyval.opval))->op_first,'L'); ;}
     break;
 
-  case 41:
-#line 420 "perly.y"
+  case 42:
+#line 427 "perly.y"
     { PL_parser->copline = (line_t) (ps[(2) - (8)].val.i_tkval);
                            (yyval.opval) = block_end((ps[(4) - (8)].val.ival),
                                newSTATEOP(0, PVAL((ps[(1) - (8)].val.p_tkval)),
@@ -359,47 +364,47 @@ case 2:
                                        (PADOFFSET) (ps[(5) - (8)].val.ival)) )); ;}
     break;
 
-  case 42:
-#line 429 "perly.y"
+  case 43:
+#line 436 "perly.y"
     { (yyval.ival) = (PL_min_intro_pending &&
                            PL_max_intro_pending >=  PL_min_intro_pending);
                          intro_my(); ;}
     break;
 
-  case 43:
-#line 435 "perly.y"
+  case 44:
+#line 442 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 45:
-#line 441 "perly.y"
+  case 46:
+#line 448 "perly.y"
     { YYSTYPE tmplval;
                          (void)scan_num("1", &tmplval);
                          (yyval.opval) = tmplval.opval; ;}
     break;
 
-  case 47:
-#line 449 "perly.y"
-    { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
-    break;
-
   case 48:
-#line 454 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
+#line 456 "perly.y"
+    { (yyval.opval) = invert(scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
   case 49:
-#line 458 "perly.y"
+#line 461 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
   case 50:
-#line 462 "perly.y"
+#line 465 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
     break;
 
   case 51:
-#line 467 "perly.y"
+#line 469 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); intro_my(); ;}
+    break;
+
+  case 52:
+#line 474 "perly.y"
     {
 #ifdef MAD
                          YYSTYPE tmplval;
@@ -411,45 +416,45 @@ case 2:
                        ;}
     break;
 
-  case 53:
-#line 481 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
-    break;
-
   case 54:
-#line 483 "perly.y"
+#line 488 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 55:
-#line 485 "perly.y"
+#line 490 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 56:
-#line 487 "perly.y"
+#line 492 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 57:
-#line 489 "perly.y"
+#line 494 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 58:
-#line 494 "perly.y"
+#line 496 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 59:
-#line 498 "perly.y"
+#line 501 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
+  case 60:
+#line 505 "perly.y"
     { (yyval.opval) = newOP(OP_NULL,0);
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'p');
                        ;}
     break;
 
-  case 60:
-#line 504 "perly.y"
+  case 61:
+#line 511 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
                          (yyval.opval) = newFORM((ps[(2) - (4)].val.ival), (ps[(3) - (4)].val.opval), (ps[(4) - (4)].val.opval));
@@ -463,18 +468,18 @@ case 2:
                        ;}
     break;
 
-  case 61:
-#line 517 "perly.y"
+  case 62:
+#line 524 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 62:
-#line 518 "perly.y"
+  case 63:
+#line 525 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 63:
-#line 523 "perly.y"
+  case 64:
+#line 530 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
                          (yyval.opval) = newMYSUB((ps[(2) - (6)].val.ival), (ps[(3) - (6)].val.opval), (ps[(4) - (6)].val.opval), (ps[(5) - (6)].val.opval), (ps[(6) - (6)].val.opval));
@@ -486,8 +491,8 @@ case 2:
                        ;}
     break;
 
-  case 64:
-#line 536 "perly.y"
+  case 65:
+#line 543 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
                          {
@@ -509,26 +514,26 @@ case 2:
                        ;}
     break;
 
-  case 65:
-#line 558 "perly.y"
+  case 66:
+#line 565 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, 0);
                            SAVEFREESV(PL_compcv); ;}
     break;
 
-  case 66:
-#line 564 "perly.y"
+  case 67:
+#line 571 "perly.y"
     { (yyval.ival) = start_subparse(FALSE, CVf_ANON);
                            SAVEFREESV(PL_compcv); ;}
     break;
 
-  case 67:
-#line 569 "perly.y"
+  case 68:
+#line 576 "perly.y"
     { (yyval.ival) = start_subparse(TRUE, 0);
                            SAVEFREESV(PL_compcv); ;}
     break;
 
-  case 68:
-#line 574 "perly.y"
+  case 69:
+#line 581 "perly.y"
     { const char *const name = SvPV_nolen_const(((SVOP*)(ps[(1) - (1)].val.opval))->op_sv);
                          if (strEQ(name, "BEGIN") || strEQ(name, "END")
                              || strEQ(name, "INIT") || strEQ(name, "CHECK")
@@ -537,25 +542,25 @@ case 2:
                          (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 69:
-#line 584 "perly.y"
+  case 70:
+#line 591 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 71:
-#line 590 "perly.y"
+  case 72:
+#line 597 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 72:
-#line 592 "perly.y"
+  case 73:
+#line 599 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
                        ;}
     break;
 
-  case 73:
-#line 596 "perly.y"
+  case 74:
+#line 603 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newOP(OP_NULL, 0),
                                    (OP*)NULL
@@ -564,15 +569,15 @@ case 2:
                        ;}
     break;
 
-  case 74:
-#line 606 "perly.y"
+  case 75:
+#line 613 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
                        ;}
     break;
 
-  case 75:
-#line 610 "perly.y"
+  case 76:
+#line 617 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newOP(OP_NULL, 0),
                                    (OP*)NULL
@@ -581,13 +586,13 @@ case 2:
                        ;}
     break;
 
-  case 76:
-#line 619 "perly.y"
+  case 77:
+#line 626 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 77:
-#line 620 "perly.y"
+  case 78:
+#line 627 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newOP(OP_NULL,0),
                                    (OP*)NULL
@@ -597,8 +602,8 @@ case 2:
                        ;}
     break;
 
-  case 78:
-#line 630 "perly.y"
+  case 79:
+#line 637 "perly.y"
     {
 #ifdef MAD
                          (yyval.opval) = package((ps[(2) - (3)].val.opval));
@@ -611,13 +616,13 @@ case 2:
                        ;}
     break;
 
-  case 79:
-#line 643 "perly.y"
+  case 80:
+#line 650 "perly.y"
     { CvSPECIAL_on(PL_compcv); /* It's a BEGIN {} */ ;}
     break;
 
-  case 80:
-#line 645 "perly.y"
+  case 81:
+#line 652 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
 #ifdef MAD
                          (yyval.opval) = utilize(IVAL((ps[(1) - (7)].val.i_tkval)), (ps[(2) - (7)].val.ival), (ps[(4) - (7)].val.opval), (ps[(5) - (7)].val.opval), (ps[(6) - (7)].val.opval));
@@ -633,29 +638,29 @@ case 2:
                        ;}
     break;
 
-  case 81:
-#line 662 "perly.y"
+  case 82:
+#line 669 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 82:
-#line 666 "perly.y"
+  case 83:
+#line 673 "perly.y"
     { (yyval.opval) = newLOGOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 83:
-#line 670 "perly.y"
+  case 84:
+#line 677 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 85:
-#line 678 "perly.y"
+  case 86:
+#line 685 "perly.y"
     {
 #ifdef MAD
                          OP* op = newNULLLIST();
@@ -667,8 +672,8 @@ case 2:
                        ;}
     break;
 
-  case 86:
-#line 688 "perly.y"
+  case 87:
+#line 695 "perly.y"
     { 
                          OP* term = (ps[(3) - (3)].val.opval);
                          DO_MAD(
@@ -679,16 +684,16 @@ case 2:
                        ;}
     break;
 
-  case 88:
-#line 701 "perly.y"
+  case 89:
+#line 708 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED,
                                prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (3)].val.i_tkval)),(ps[(2) - (3)].val.opval)), (ps[(3) - (3)].val.opval)) );
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 89:
-#line 706 "perly.y"
+  case 90:
+#line 713 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED,
                                prepend_elem(OP_LIST, newGVREF(IVAL((ps[(1) - (5)].val.i_tkval)),(ps[(3) - (5)].val.opval)), (ps[(4) - (5)].val.opval)) );
                          TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
@@ -697,8 +702,8 @@ case 2:
                        ;}
     break;
 
-  case 90:
-#line 713 "perly.y"
+  case 91:
+#line 720 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST,
                                    prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)),
@@ -709,8 +714,8 @@ case 2:
                        ;}
     break;
 
-  case 91:
-#line 722 "perly.y"
+  case 92:
+#line 729 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)),
                                    newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval))));
@@ -718,8 +723,8 @@ case 2:
                        ;}
     break;
 
-  case 92:
-#line 728 "perly.y"
+  case 93:
+#line 735 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST,
                                    prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)),
@@ -727,8 +732,8 @@ case 2:
                        ;}
     break;
 
-  case 93:
-#line 734 "perly.y"
+  case 94:
+#line 741 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST,
                                    prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)),
@@ -738,15 +743,15 @@ case 2:
                        ;}
     break;
 
-  case 94:
-#line 742 "perly.y"
+  case 95:
+#line 749 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 95:
-#line 746 "perly.y"
+  case 96:
+#line 753 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
@@ -754,22 +759,22 @@ case 2:
                        ;}
     break;
 
-  case 96:
-#line 752 "perly.y"
+  case 97:
+#line 759 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
                          (yyval.opval) = newANONATTRSUB((ps[(2) - (3)].val.ival), 0, (OP*)NULL, (ps[(3) - (3)].val.opval)); ;}
     break;
 
-  case 97:
-#line 755 "perly.y"
+  case 98:
+#line 762 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                 append_elem(OP_LIST,
                                   prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval)));
                        ;}
     break;
 
-  case 100:
-#line 770 "perly.y"
+  case 101:
+#line 777 "perly.y"
     { (yyval.opval) = newBINOP(OP_GELEM, 0, (ps[(1) - (5)].val.opval), scalar((ps[(3) - (5)].val.opval)));
                            PL_parser->expect = XOPERATOR;
                          TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
@@ -778,16 +783,16 @@ case 2:
                        ;}
     break;
 
-  case 101:
-#line 777 "perly.y"
+  case 102:
+#line 784 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0, oopsAV((ps[(1) - (4)].val.opval)), scalar((ps[(3) - (4)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'[');
                          TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),']');
                        ;}
     break;
 
-  case 102:
-#line 782 "perly.y"
+  case 103:
+#line 789 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
                                        ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV),
                                        scalar((ps[(4) - (5)].val.opval)));
@@ -797,8 +802,8 @@ case 2:
                        ;}
     break;
 
-  case 103:
-#line 790 "perly.y"
+  case 104:
+#line 797 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
                                        ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV),
                                        scalar((ps[(3) - (4)].val.opval)));
@@ -807,8 +812,8 @@ case 2:
                        ;}
     break;
 
-  case 104:
-#line 797 "perly.y"
+  case 105:
+#line 804 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0, oopsHV((ps[(1) - (5)].val.opval)), jmaybe((ps[(3) - (5)].val.opval)));
                            PL_parser->expect = XOPERATOR;
                          TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'{');
@@ -817,8 +822,8 @@ case 2:
                        ;}
     break;
 
-  case 105:
-#line 804 "perly.y"
+  case 106:
+#line 811 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV),
                                        jmaybe((ps[(4) - (6)].val.opval)));
@@ -830,8 +835,8 @@ case 2:
                        ;}
     break;
 
-  case 106:
-#line 814 "perly.y"
+  case 107:
+#line 821 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV),
                                        jmaybe((ps[(3) - (5)].val.opval)));
@@ -842,8 +847,8 @@ case 2:
                        ;}
     break;
 
-  case 107:
-#line 823 "perly.y"
+  case 108:
+#line 830 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   newCVREF(0, scalar((ps[(1) - (4)].val.opval))));
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'a');
@@ -852,8 +857,8 @@ case 2:
                        ;}
     break;
 
-  case 108:
-#line 830 "perly.y"
+  case 109:
+#line 837 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   append_elem(OP_LIST, (ps[(4) - (5)].val.opval),
                                       newCVREF(0, scalar((ps[(1) - (5)].val.opval)))));
@@ -863,8 +868,8 @@ case 2:
                        ;}
     break;
 
-  case 109:
-#line 839 "perly.y"
+  case 110:
+#line 846 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   append_elem(OP_LIST, (ps[(3) - (4)].val.opval),
                                               newCVREF(0, scalar((ps[(1) - (4)].val.opval)))));
@@ -873,8 +878,8 @@ case 2:
                        ;}
     break;
 
-  case 110:
-#line 846 "perly.y"
+  case 111:
+#line 853 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   newCVREF(0, scalar((ps[(1) - (3)].val.opval))));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
@@ -882,8 +887,8 @@ case 2:
                        ;}
     break;
 
-  case 111:
-#line 852 "perly.y"
+  case 112:
+#line 859 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(5) - (6)].val.opval), (ps[(2) - (6)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (6)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(3) - (6)].val.i_tkval),(yyval.opval),')');
@@ -892,8 +897,8 @@ case 2:
                        ;}
     break;
 
-  case 112:
-#line 859 "perly.y"
+  case 113:
+#line 866 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(4) - (5)].val.opval), (OP*)NULL);
                          TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),')');
@@ -902,22 +907,22 @@ case 2:
                        ;}
     break;
 
-  case 113:
-#line 869 "perly.y"
+  case 114:
+#line 876 "perly.y"
     { (yyval.opval) = newASSIGNOP(OPf_STACKED, (ps[(1) - (3)].val.opval), IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 114:
-#line 873 "perly.y"
+  case 115:
+#line 880 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 115:
-#line 877 "perly.y"
+  case 116:
+#line 884 "perly.y"
     {   if (IVAL((ps[(2) - (3)].val.i_tkval)) != OP_REPEAT)
                                scalar((ps[(1) - (3)].val.opval));
                            (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, (ps[(1) - (3)].val.opval), scalar((ps[(3) - (3)].val.opval)));
@@ -925,50 +930,50 @@ case 2:
                        ;}
     break;
 
-  case 116:
-#line 883 "perly.y"
-    { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
-                         TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
-                       ;}
-    break;
-
   case 117:
-#line 887 "perly.y"
+#line 890 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 118:
-#line 891 "perly.y"
+#line 894 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 119:
-#line 895 "perly.y"
+#line 898 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 120:
-#line 899 "perly.y"
+#line 902 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 121:
-#line 903 "perly.y"
+#line 906 "perly.y"
     { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
   case 122:
-#line 907 "perly.y"
+#line 910 "perly.y"
+    { (yyval.opval) = newBINOP(IVAL((ps[(2) - (3)].val.i_tkval)), 0, scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
+                         TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
+                       ;}
+    break;
+
+  case 123:
+#line 914 "perly.y"
     {
                          (yyval.opval) = newRANGE(IVAL((ps[(2) - (3)].val.i_tkval)), scalar((ps[(1) - (3)].val.opval)), scalar((ps[(3) - (3)].val.opval)));
                          DO_MAD({
@@ -982,29 +987,29 @@ case 2:
                        ;}
     break;
 
-  case 123:
-#line 919 "perly.y"
+  case 124:
+#line 926 "perly.y"
     { (yyval.opval) = newLOGOP(OP_AND, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 124:
-#line 923 "perly.y"
+  case 125:
+#line 930 "perly.y"
     { (yyval.opval) = newLOGOP(OP_OR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 125:
-#line 927 "perly.y"
+  case 126:
+#line 934 "perly.y"
     { (yyval.opval) = newLOGOP(OP_DOR, 0, (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 126:
-#line 931 "perly.y"
+  case 127:
+#line 938 "perly.y"
     { (yyval.opval) = bind_match(IVAL((ps[(2) - (3)].val.i_tkval)), (ps[(1) - (3)].val.opval), (ps[(3) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),
                                ((yyval.opval)->op_type == OP_NOT
@@ -1013,15 +1018,15 @@ case 2:
                        ;}
     break;
 
-  case 127:
-#line 941 "perly.y"
+  case 128:
+#line 948 "perly.y"
     { (yyval.opval) = newUNOP(OP_NEGATE, 0, scalar((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 128:
-#line 945 "perly.y"
+  case 129:
+#line 952 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)),
                                    (ps[(2) - (2)].val.opval)
@@ -1030,70 +1035,70 @@ case 2:
                        ;}
     break;
 
-  case 129:
-#line 952 "perly.y"
+  case 130:
+#line 959 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 130:
-#line 956 "perly.y"
+  case 131:
+#line 963 "perly.y"
     { (yyval.opval) = newUNOP(OP_COMPLEMENT, 0, scalar((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 131:
-#line 960 "perly.y"
+  case 132:
+#line 967 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
                                        mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC));
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 132:
-#line 965 "perly.y"
+  case 133:
+#line 972 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
                                        mod(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC));
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 133:
-#line 970 "perly.y"
+  case 134:
+#line 977 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
                                        mod(scalar((ps[(2) - (2)].val.opval)), OP_PREINC));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 134:
-#line 975 "perly.y"
+  case 135:
+#line 982 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
                                        mod(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 135:
-#line 984 "perly.y"
+  case 136:
+#line 991 "perly.y"
     { (yyval.opval) = newANONLIST((ps[(2) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'[');
                          TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),']');
                        ;}
     break;
 
-  case 136:
-#line 989 "perly.y"
+  case 137:
+#line 996 "perly.y"
     { (yyval.opval) = newANONLIST((OP*)NULL);
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'[');
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),']');
                        ;}
     break;
 
-  case 137:
-#line 994 "perly.y"
+  case 138:
+#line 1001 "perly.y"
     { (yyval.opval) = newANONHASH((ps[(2) - (4)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'{');
                          TOKEN_GETMAD((ps[(3) - (4)].val.i_tkval),(yyval.opval),';');
@@ -1101,8 +1106,8 @@ case 2:
                        ;}
     break;
 
-  case 138:
-#line 1000 "perly.y"
+  case 139:
+#line 1007 "perly.y"
     { (yyval.opval) = newANONHASH((OP*)NULL);
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'{');
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),';');
@@ -1110,8 +1115,8 @@ case 2:
                        ;}
     break;
 
-  case 139:
-#line 1006 "perly.y"
+  case 140:
+#line 1013 "perly.y"
     { SvREFCNT_inc_simple_void(PL_compcv);
                          (yyval.opval) = newANONATTRSUB((ps[(2) - (5)].val.ival), (ps[(3) - (5)].val.opval), (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (5)].val.i_tkval),(yyval.opval),'o');
@@ -1120,22 +1125,22 @@ case 2:
                        ;}
     break;
 
-  case 140:
-#line 1017 "perly.y"
+  case 141:
+#line 1024 "perly.y"
     { (yyval.opval) = dofile((ps[(2) - (2)].val.opval), IVAL((ps[(1) - (2)].val.i_tkval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 141:
-#line 1021 "perly.y"
+  case 142:
+#line 1028 "perly.y"
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, scope((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D');
                        ;}
     break;
 
-  case 142:
-#line 1025 "perly.y"
+  case 143:
+#line 1032 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
                            OPf_SPECIAL|OPf_STACKED,
                            prepend_elem(OP_LIST,
@@ -1149,8 +1154,8 @@ case 2:
                        ;}
     break;
 
-  case 143:
-#line 1037 "perly.y"
+  case 144:
+#line 1044 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
                            OPf_SPECIAL|OPf_STACKED,
                            append_elem(OP_LIST,
@@ -1165,8 +1170,8 @@ case 2:
                        ;}
     break;
 
-  case 144:
-#line 1050 "perly.y"
+  case 145:
+#line 1057 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
                            prepend_elem(OP_LIST,
                                scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep();
@@ -1176,8 +1181,8 @@ case 2:
                        ;}
     break;
 
-  case 145:
-#line 1058 "perly.y"
+  case 146:
+#line 1065 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
                            prepend_elem(OP_LIST,
                                (ps[(4) - (5)].val.opval),
@@ -1188,81 +1193,81 @@ case 2:
                        ;}
     break;
 
-  case 150:
-#line 1074 "perly.y"
+  case 151:
+#line 1081 "perly.y"
     { (yyval.opval) = newCONDOP(0, (ps[(1) - (5)].val.opval), (ps[(3) - (5)].val.opval), (ps[(5) - (5)].val.opval));
                          TOKEN_GETMAD((ps[(2) - (5)].val.i_tkval),(yyval.opval),'?');
                          TOKEN_GETMAD((ps[(4) - (5)].val.i_tkval),(yyval.opval),':');
                        ;}
     break;
 
-  case 151:
-#line 1079 "perly.y"
+  case 152:
+#line 1086 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, mod((ps[(2) - (2)].val.opval),OP_REFGEN));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 152:
-#line 1083 "perly.y"
+  case 153:
+#line 1090 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 153:
-#line 1085 "perly.y"
+  case 154:
+#line 1092 "perly.y"
     { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'k');
                        ;}
     break;
 
-  case 154:
-#line 1089 "perly.y"
+  case 155:
+#line 1096 "perly.y"
     { (yyval.opval) = sawparens(IF_MAD(newUNOP(OP_NULL,0,(ps[(2) - (3)].val.opval)), (ps[(2) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 155:
-#line 1094 "perly.y"
+  case 156:
+#line 1101 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST());
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 156:
-#line 1099 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
-    break;
-
   case 157:
-#line 1101 "perly.y"
+#line 1106 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 158:
-#line 1103 "perly.y"
+#line 1108 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 159:
-#line 1105 "perly.y"
+#line 1110 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 160:
-#line 1107 "perly.y"
-    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
+#line 1112 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 161:
-#line 1109 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1114 "perly.y"
+    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
     break;
 
   case 162:
-#line 1111 "perly.y"
+#line 1116 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
+  case 163:
+#line 1118 "perly.y"
     { (yyval.opval) = prepend_elem(OP_ASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_ASLICE, 0,
@@ -1273,8 +1278,8 @@ case 2:
                        ;}
     break;
 
-  case 163:
-#line 1120 "perly.y"
+  case 164:
+#line 1127 "perly.y"
     { (yyval.opval) = prepend_elem(OP_HSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_HSLICE, 0,
@@ -1287,26 +1292,26 @@ case 2:
                        ;}
     break;
 
-  case 164:
-#line 1131 "perly.y"
+  case 165:
+#line 1138 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 165:
-#line 1133 "perly.y"
+  case 166:
+#line 1140 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 166:
-#line 1135 "perly.y"
+  case 167:
+#line 1142 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (3)].val.opval)));
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 167:
-#line 1140 "perly.y"
+  case 168:
+#line 1147 "perly.y"
     {
                          (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval))));
@@ -1321,91 +1326,91 @@ case 2:
                        ;}
     break;
 
-  case 168:
-#line 1153 "perly.y"
+  case 169:
+#line 1160 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                            append_elem(OP_LIST, (ps[(3) - (3)].val.opval), scalar((ps[(2) - (3)].val.opval))));
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 169:
-#line 1158 "perly.y"
+  case 170:
+#line 1165 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), OPf_SPECIAL);
                            PL_hints |= HINT_BLOCK_SCOPE;
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 170:
-#line 1163 "perly.y"
+  case 171:
+#line 1170 "perly.y"
     { (yyval.opval) = newLOOPEX(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 171:
-#line 1167 "perly.y"
+  case 172:
+#line 1174 "perly.y"
     { (yyval.opval) = newUNOP(OP_NOT, 0, scalar((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 172:
-#line 1171 "perly.y"
+  case 173:
+#line 1178 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 173:
-#line 1175 "perly.y"
+  case 174:
+#line 1182 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 174:
-#line 1179 "perly.y"
+  case 175:
+#line 1186 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (2)].val.i_tkval)), 0, (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 175:
-#line 1183 "perly.y"
+  case 176:
+#line 1190 "perly.y"
     { (yyval.opval) = newOP(OP_REQUIRE, (ps[(1) - (1)].val.i_tkval) ? OPf_SPECIAL : 0);
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 176:
-#line 1187 "perly.y"
+  case 177:
+#line 1194 "perly.y"
     { (yyval.opval) = newUNOP(OP_REQUIRE, (ps[(1) - (2)].val.i_tkval) ? OPf_SPECIAL : 0, (ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 177:
-#line 1191 "perly.y"
+  case 178:
+#line 1198 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 178:
-#line 1193 "perly.y"
+  case 179:
+#line 1200 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                            append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
     break;
 
-  case 179:
-#line 1196 "perly.y"
+  case 180:
+#line 1203 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (1)].val.i_tkval)), 0);
                          TOKEN_GETMAD((ps[(1) - (1)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 180:
-#line 1200 "perly.y"
+  case 181:
+#line 1207 "perly.y"
     { (yyval.opval) = newOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0);
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'o');
                          TOKEN_GETMAD((ps[(2) - (3)].val.i_tkval),(yyval.opval),'(');
@@ -1413,14 +1418,14 @@ case 2:
                        ;}
     break;
 
-  case 181:
-#line 1206 "perly.y"
+  case 182:
+#line 1213 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 182:
-#line 1209 "perly.y"
+  case 183:
+#line 1216 "perly.y"
     { (yyval.opval) = (IVAL((ps[(1) - (3)].val.i_tkval)) == OP_NOT)
                            ? newUNOP(IVAL((ps[(1) - (3)].val.i_tkval)), 0, newSVOP(OP_CONST, 0, newSViv(0)))
                            : newOP(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_SPECIAL);
@@ -1431,8 +1436,8 @@ case 2:
                        ;}
     break;
 
-  case 183:
-#line 1218 "perly.y"
+  case 184:
+#line 1225 "perly.y"
     { (yyval.opval) = newUNOP(IVAL((ps[(1) - (4)].val.i_tkval)), 0, (ps[(3) - (4)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (4)].val.i_tkval),(yyval.opval),'o');
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
@@ -1440,24 +1445,24 @@ case 2:
                        ;}
     break;
 
-  case 184:
-#line 1224 "perly.y"
+  case 185:
+#line 1231 "perly.y"
     { (yyval.opval) = pmruntime((ps[(1) - (4)].val.opval), (ps[(3) - (4)].val.opval), 1);
                          TOKEN_GETMAD((ps[(2) - (4)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(4) - (4)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 187:
-#line 1231 "perly.y"
+  case 188:
+#line 1238 "perly.y"
     {
                          (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
                                newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
                        ;}
     break;
 
-  case 188:
-#line 1239 "perly.y"
+  case 189:
+#line 1246 "perly.y"
     { (yyval.opval) = my_attrs((ps[(2) - (3)].val.opval),(ps[(3) - (3)].val.opval));
                          DO_MAD(
                              token_getmad((ps[(1) - (3)].val.i_tkval),(yyval.opval),'d');
@@ -1467,66 +1472,66 @@ case 2:
                        ;}
     break;
 
-  case 189:
-#line 1247 "perly.y"
+  case 190:
+#line 1254 "perly.y"
     { (yyval.opval) = localize((ps[(2) - (2)].val.opval),IVAL((ps[(1) - (2)].val.i_tkval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'d');
                        ;}
     break;
 
-  case 190:
-#line 1254 "perly.y"
+  case 191:
+#line 1261 "perly.y"
     { (yyval.opval) = sawparens((ps[(2) - (3)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (3)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(3) - (3)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 191:
-#line 1259 "perly.y"
+  case 192:
+#line 1266 "perly.y"
     { (yyval.opval) = sawparens(newNULLLIST());
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 192:
-#line 1264 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
-    break;
-
   case 193:
-#line 1266 "perly.y"
+#line 1271 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 194:
-#line 1268 "perly.y"
+#line 1273 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 195:
-#line 1273 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 1275 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 196:
-#line 1275 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1280 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 197:
-#line 1279 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 1282 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 198:
-#line 1281 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1286 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 199:
-#line 1283 "perly.y"
+#line 1288 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
+  case 200:
+#line 1290 "perly.y"
     {
 #ifdef MAD
                          OP* op = newNULLLIST();
@@ -1539,75 +1544,72 @@ case 2:
                        ;}
     break;
 
-  case 200:
-#line 1298 "perly.y"
+  case 201:
+#line 1305 "perly.y"
     { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 201:
-#line 1302 "perly.y"
+  case 202:
+#line 1309 "perly.y"
     { (yyval.opval) = newCVREF(IVAL((ps[(1) - (2)].val.i_tkval)),(ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'&');
                        ;}
     break;
 
-  case 202:
-#line 1308 "perly.y"
+  case 203:
+#line 1315 "perly.y"
     { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$');
                        ;}
     break;
 
-  case 203:
-#line 1314 "perly.y"
+  case 204:
+#line 1321 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@');
                        ;}
     break;
 
-  case 204:
-#line 1320 "perly.y"
+  case 205:
+#line 1327 "perly.y"
     { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%');
                        ;}
     break;
 
-  case 205:
-#line 1326 "perly.y"
+  case 206:
+#line 1333 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l');
                        ;}
     break;
 
-  case 206:
-#line 1332 "perly.y"
+  case 207:
+#line 1339 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*');
                        ;}
     break;
 
-  case 207:
-#line 1339 "perly.y"
+  case 208:
+#line 1346 "perly.y"
     { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 208:
-#line 1341 "perly.y"
+  case 209:
+#line 1348 "perly.y"
     { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 209:
-#line 1343 "perly.y"
+  case 210:
+#line 1350 "perly.y"
     { (yyval.opval) = scope((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 210:
-#line 1346 "perly.y"
+  case 211:
+#line 1353 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-
-/* Line 1267 of yacc.c.  */
-
       default: break;
     

diff --git a/perly.h b/perly.h
index 802da29..a8c7f04 100644 (file)
--- a/perly.h
+++ b/perly.h
@@ -1,25 +1,24 @@
 #ifdef PERL_CORE
-/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton interface for Bison's Yacc-like parsers in C
+   
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
    Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
+   
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+   
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-
+   
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -30,10 +29,11 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-
+   
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+
 /* Tokens.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
@@ -111,6 +111,7 @@
      PEG = 326
    };
 #endif
+
 /* Tokens.  */
 #define WORD 258
 #define METHOD 259
@@ -184,11 +185,13 @@
 
 
 
-
 #endif /* PERL_CORE */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
 {
+
+/* Line 1676 of yacc.c  */
+
     I32        ival; /* __DEFAULT__ (marker for regen_perly.pl;
                                must always be 1st union member) */
     char *pval;
@@ -204,13 +207,16 @@ typedef union YYSTYPE
 #ifdef PERL_MAD
     TOKEN* tkval;
 #endif
-}
-/* Line 1489 of yacc.c.  */
-       YYSTYPE;
+
+
+
+/* Line 1676 of yacc.c  */
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
 #endif
 
 
 
+

diff --git a/perly.tab b/perly.tab
index 85c70a0..2b78718 100644 (file)
--- a/perly.tab
+++ b/perly.tab
@@ -1,15 +1,15 @@
 #define YYFINAL  3
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2059
+#define YYLAST   2061
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  91
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  65
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  210
+#define YYNRULES  211
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  420
+#define YYNSTATES  422
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -63,26 +63,26 @@ static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     6,    11,    12,    13,    14,    19,    20,
       21,    24,    27,    30,    32,    34,    37,    40,    44,    46,
-      48,    52,    56,    60,    64,    68,    69,    72,    79,    87,
-      95,   102,   105,   106,   109,   119,   129,   140,   150,   159,
-     172,   176,   185,   186,   187,   189,   190,   192,   194,   196,
-     198,   200,   201,   203,   205,   207,   209,   211,   213,   215,
-     217,   222,   224,   225,   232,   239,   240,   241,   242,   244,
-     245,   247,   248,   251,   253,   256,   258,   260,   262,   266,
-     267,   275,   279,   283,   287,   289,   292,   296,   298,   302,
-     308,   315,   319,   323,   329,   332,   337,   338,   344,   346,
-     348,   354,   359,   365,   370,   376,   383,   389,   394,   400,
-     405,   409,   416,   422,   426,   430,   434,   438,   442,   446,
-     450,   454,   458,   462,   466,   470,   474,   478,   481,   484,
-     487,   490,   493,   496,   499,   502,   506,   509,   514,   518,
-     524,   527,   530,   535,   541,   546,   552,   554,   556,   558,
-     560,   566,   569,   571,   574,   578,   581,   583,   585,   587,
-     589,   591,   593,   598,   604,   606,   608,   612,   617,   621,
-     623,   626,   629,   631,   634,   637,   639,   642,   644,   647,
-     649,   653,   655,   659,   664,   669,   671,   673,   675,   679,
-     682,   686,   689,   691,   693,   695,   696,   698,   699,   701,
-     704,   706,   709,   712,   715,   718,   721,   724,   726,   728,
-     730
+      48,    52,    56,    60,    64,    68,    72,    73,    76,    83,
+      91,    99,   106,   109,   110,   113,   123,   133,   144,   154,
+     163,   176,   180,   189,   190,   191,   193,   194,   196,   198,
+     200,   202,   204,   205,   207,   209,   211,   213,   215,   217,
+     219,   221,   226,   228,   229,   236,   243,   244,   245,   246,
+     248,   249,   251,   252,   255,   257,   260,   262,   264,   266,
+     270,   271,   279,   283,   287,   291,   293,   296,   300,   302,
+     306,   312,   319,   323,   327,   333,   336,   341,   342,   348,
+     350,   352,   358,   363,   369,   374,   380,   387,   393,   398,
+     404,   409,   413,   420,   426,   430,   434,   438,   442,   446,
+     450,   454,   458,   462,   466,   470,   474,   478,   482,   485,
+     488,   491,   494,   497,   500,   503,   506,   510,   513,   518,
+     522,   528,   531,   534,   539,   545,   550,   556,   558,   560,
+     562,   564,   570,   573,   575,   578,   582,   585,   587,   589,
+     591,   593,   595,   597,   602,   608,   610,   612,   616,   621,
+     625,   627,   630,   633,   635,   638,   641,   643,   646,   648,
+     651,   653,   657,   659,   663,   668,   673,   675,   677,   679,
+     683,   686,   690,   693,   695,   697,   699,   700,   702,   703,
+     705,   708,   710,   713,   716,   719,   722,   725,   728,   730,
+     732,   734
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -94,101 +94,101 @@ static const yytype_int16 yyrhs[] =
      106,    -1,   107,    -1,   115,   104,    -1,   115,    14,    -1,
      115,   101,    14,    -1,     1,    -1,   133,    -1,   133,    32,
      133,    -1,   133,    33,   133,    -1,   133,    30,   133,    -1,
-     133,    31,   111,    -1,   133,    37,   133,    -1,    -1,    34,
-      97,    -1,    35,    89,   112,    88,    97,   102,    -1,    32,
-      89,    94,   112,    88,    97,   102,    -1,    33,    89,    94,
-     114,    88,    97,   102,    -1,    39,    89,    94,   112,    88,
-      97,    -1,    40,    93,    -1,    -1,    36,    93,    -1,   115,
-      30,    89,    94,   110,    88,   108,    97,   105,    -1,   115,
-      31,    89,    94,   111,    88,   108,    97,   105,    -1,   115,
-      37,    58,    94,   148,    89,   112,    88,    97,   105,    -1,
-     115,    37,   150,    89,    94,   112,    88,    97,   105,    -1,
-     115,    37,    89,    94,   112,    88,    97,   105,    -1,   115,
-      37,    89,    94,   113,    14,   110,    14,   108,   113,    88,
-      97,    -1,   115,    93,   105,    -1,   115,    38,    89,    94,
-      95,   112,    88,    97,    -1,    -1,    -1,   101,    -1,    -1,
-     133,    -1,   133,    -1,   133,    -1,   109,    -1,   111,    -1,
-      -1,    24,    -1,   118,    -1,   121,    -1,   120,    -1,   130,
-      -1,   131,    -1,   117,    -1,    90,    -1,    25,   124,   119,
-      93,    -1,    15,    -1,    -1,    59,   122,   125,   126,   127,
-     129,    -1,    26,   122,   125,   126,   127,   129,    -1,    -1,
-      -1,    -1,    15,    -1,    -1,    18,    -1,    -1,    61,    18,
-      -1,    61,    -1,    61,    18,    -1,    61,    -1,    93,    -1,
-      14,    -1,    28,    15,    14,    -1,    -1,    29,   122,   132,
-      15,    15,   146,    14,    -1,   133,    65,   133,    -1,   133,
-      64,   133,    -1,   133,    63,   133,    -1,   134,    -1,   134,
-      67,    -1,   134,    67,   143,    -1,   143,    -1,    48,   155,
-     134,    -1,    46,    89,   155,   133,    88,    -1,   143,    87,
-     137,    89,   147,    88,    -1,   143,    87,   137,    -1,    16,
-     155,   146,    -1,    17,   155,    89,   147,    88,    -1,    48,
-     146,    -1,    46,    89,   147,    88,    -1,    -1,    23,   123,
-      93,   136,   146,    -1,    16,    -1,   150,    -1,   154,     3,
-     133,    14,     4,    -1,   150,     5,   133,     6,    -1,   143,
-      87,     5,   133,     6,    -1,   138,     5,   133,     6,    -1,
-     150,     3,   133,    14,     4,    -1,   143,    87,     3,   133,
-      14,     4,    -1,   138,     3,   133,    14,     4,    -1,   143,
-      87,    89,    88,    -1,   143,    87,    89,   133,    88,    -1,
-     138,    89,   133,    88,    -1,   138,    89,    88,    -1,    89,
-     133,    88,     5,   133,     6,    -1,    89,    88,     5,   133,
-       6,    -1,   143,    68,   143,    -1,   143,    82,   143,    -1,
-     143,    51,   143,    -1,   143,    52,   143,    -1,   143,    76,
-     143,    -1,   143,    49,   143,    -1,   143,    50,   143,    -1,
-     143,    75,   143,    -1,   143,    74,   143,    -1,   143,    42,
-     143,    -1,   143,    73,   143,    -1,   143,    72,   143,    -1,
-     143,    71,   143,    -1,   143,    77,   143,    -1,     7,   143,
-      -1,     8,   143,    -1,    78,   143,    -1,    79,   143,    -1,
-     143,    84,    -1,   143,    83,    -1,    86,   143,    -1,    85,
-     143,    -1,     5,   133,     6,    -1,     5,     6,    -1,    55,
-     133,    14,     4,    -1,    55,    14,     4,    -1,    27,   123,
-     126,   127,    93,    -1,    54,   143,    -1,    54,    93,    -1,
-      54,    15,    89,    88,    -1,    54,    15,    89,   133,    88,
-      -1,    54,   150,    89,    88,    -1,    54,   150,    89,   133,
-      88,    -1,   139,    -1,   140,    -1,   141,    -1,   142,    -1,
-     143,    69,   143,    70,   143,    -1,    80,   143,    -1,   144,
-      -1,    57,   143,    -1,    89,   133,    88,    -1,    89,    88,
-      -1,   150,    -1,   154,    -1,   152,    -1,   151,    -1,   153,
-      -1,   138,    -1,   151,     5,   133,     6,    -1,   151,     3,
-     133,    14,     4,    -1,    18,    -1,   149,    -1,   149,    89,
-      88,    -1,   149,    89,   133,    88,    -1,    56,    15,   146,
-      -1,    41,    -1,    41,   143,    -1,    66,   134,    -1,    47,
-      -1,    47,    93,    -1,    47,   143,    -1,    60,    -1,    60,
-     143,    -1,    22,    -1,    22,   143,    -1,    44,    -1,    44,
-      89,    88,    -1,    21,    -1,    45,    89,    88,    -1,    45,
-      89,   133,    88,    -1,    19,    89,   134,    88,    -1,    15,
-      -1,   135,    -1,    43,    -1,    58,   145,   128,    -1,    58,
-     145,    -1,    89,   133,    88,    -1,    89,    88,    -1,   150,
-      -1,   152,    -1,   151,    -1,    -1,   134,    -1,    -1,   133,
-      -1,   133,    67,    -1,   150,    -1,    13,   155,    -1,     9,
-     155,    -1,    10,   155,    -1,    11,   155,    -1,    53,   155,
-      -1,    12,   155,    -1,    15,    -1,   150,    -1,    93,    -1,
-      20,    -1
+     133,    31,   111,    -1,   133,    37,   133,    -1,   133,    39,
+     133,    -1,    -1,    34,    97,    -1,    35,    89,   112,    88,
+      97,   102,    -1,    32,    89,    94,   112,    88,    97,   102,
+      -1,    33,    89,    94,   114,    88,    97,   102,    -1,    39,
+      89,    94,   112,    88,    97,    -1,    40,    93,    -1,    -1,
+      36,    93,    -1,   115,    30,    89,    94,   110,    88,   108,
+      97,   105,    -1,   115,    31,    89,    94,   111,    88,   108,
+      97,   105,    -1,   115,    37,    58,    94,   148,    89,   112,
+      88,    97,   105,    -1,   115,    37,   150,    89,    94,   112,
+      88,    97,   105,    -1,   115,    37,    89,    94,   112,    88,
+      97,   105,    -1,   115,    37,    89,    94,   113,    14,   110,
+      14,   108,   113,    88,    97,    -1,   115,    93,   105,    -1,
+     115,    38,    89,    94,    95,   112,    88,    97,    -1,    -1,
+      -1,   101,    -1,    -1,   133,    -1,   133,    -1,   133,    -1,
+     109,    -1,   111,    -1,    -1,    24,    -1,   118,    -1,   121,
+      -1,   120,    -1,   130,    -1,   131,    -1,   117,    -1,    90,
+      -1,    25,   124,   119,    93,    -1,    15,    -1,    -1,    59,
+     122,   125,   126,   127,   129,    -1,    26,   122,   125,   126,
+     127,   129,    -1,    -1,    -1,    -1,    15,    -1,    -1,    18,
+      -1,    -1,    61,    18,    -1,    61,    -1,    61,    18,    -1,
+      61,    -1,    93,    -1,    14,    -1,    28,    15,    14,    -1,
+      -1,    29,   122,   132,    15,    15,   146,    14,    -1,   133,
+      65,   133,    -1,   133,    64,   133,    -1,   133,    63,   133,
+      -1,   134,    -1,   134,    67,    -1,   134,    67,   143,    -1,
+     143,    -1,    48,   155,   134,    -1,    46,    89,   155,   133,
+      88,    -1,   143,    87,   137,    89,   147,    88,    -1,   143,
+      87,   137,    -1,    16,   155,   146,    -1,    17,   155,    89,
+     147,    88,    -1,    48,   146,    -1,    46,    89,   147,    88,
+      -1,    -1,    23,   123,    93,   136,   146,    -1,    16,    -1,
+     150,    -1,   154,     3,   133,    14,     4,    -1,   150,     5,
+     133,     6,    -1,   143,    87,     5,   133,     6,    -1,   138,
+       5,   133,     6,    -1,   150,     3,   133,    14,     4,    -1,
+     143,    87,     3,   133,    14,     4,    -1,   138,     3,   133,
+      14,     4,    -1,   143,    87,    89,    88,    -1,   143,    87,
+      89,   133,    88,    -1,   138,    89,   133,    88,    -1,   138,
+      89,    88,    -1,    89,   133,    88,     5,   133,     6,    -1,
+      89,    88,     5,   133,     6,    -1,   143,    68,   143,    -1,
+     143,    82,   143,    -1,   143,    51,   143,    -1,   143,    52,
+     143,    -1,   143,    76,   143,    -1,   143,    49,   143,    -1,
+     143,    50,   143,    -1,   143,    75,   143,    -1,   143,    74,
+     143,    -1,   143,    42,   143,    -1,   143,    73,   143,    -1,
+     143,    72,   143,    -1,   143,    71,   143,    -1,   143,    77,
+     143,    -1,     7,   143,    -1,     8,   143,    -1,    78,   143,
+      -1,    79,   143,    -1,   143,    84,    -1,   143,    83,    -1,
+      86,   143,    -1,    85,   143,    -1,     5,   133,     6,    -1,
+       5,     6,    -1,    55,   133,    14,     4,    -1,    55,    14,
+       4,    -1,    27,   123,   126,   127,    93,    -1,    54,   143,
+      -1,    54,    93,    -1,    54,    15,    89,    88,    -1,    54,
+      15,    89,   133,    88,    -1,    54,   150,    89,    88,    -1,
+      54,   150,    89,   133,    88,    -1,   139,    -1,   140,    -1,
+     141,    -1,   142,    -1,   143,    69,   143,    70,   143,    -1,
+      80,   143,    -1,   144,    -1,    57,   143,    -1,    89,   133,
+      88,    -1,    89,    88,    -1,   150,    -1,   154,    -1,   152,
+      -1,   151,    -1,   153,    -1,   138,    -1,   151,     5,   133,
+       6,    -1,   151,     3,   133,    14,     4,    -1,    18,    -1,
+     149,    -1,   149,    89,    88,    -1,   149,    89,   133,    88,
+      -1,    56,    15,   146,    -1,    41,    -1,    41,   143,    -1,
+      66,   134,    -1,    47,    -1,    47,    93,    -1,    47,   143,
+      -1,    60,    -1,    60,   143,    -1,    22,    -1,    22,   143,
+      -1,    44,    -1,    44,    89,    88,    -1,    21,    -1,    45,
+      89,    88,    -1,    45,    89,   133,    88,    -1,    19,    89,
+     134,    88,    -1,    15,    -1,   135,    -1,    43,    -1,    58,
+     145,   128,    -1,    58,   145,    -1,    89,   133,    88,    -1,
+      89,    88,    -1,   150,    -1,   152,    -1,   151,    -1,    -1,
+     134,    -1,    -1,   133,    -1,   133,    67,    -1,   150,    -1,
+      13,   155,    -1,     9,   155,    -1,    10,   155,    -1,    11,
+     155,    -1,    53,   155,    -1,    12,   155,    -1,    15,    -1,
+     150,    -1,    93,    -1,    20,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   135,   135,   141,   151,   155,   159,   165,   175,   180,
-     181,   188,   198,   201,   202,   204,   206,   223,   242,   244,
-     246,   250,   254,   258,   262,   271,   272,   276,   287,   295,
-     306,   309,   315,   316,   323,   336,   348,   359,   369,   379,
-     411,   419,   429,   435,   436,   441,   444,   448,   453,   457,
-     461,   467,   476,   480,   482,   484,   486,   488,   493,   497,
-     503,   517,   518,   522,   535,   558,   564,   569,   574,   584,
-     585,   590,   591,   595,   605,   609,   619,   620,   629,   643,
-     642,   661,   665,   669,   673,   677,   687,   696,   700,   705,
-     712,   721,   727,   733,   741,   745,   752,   751,   762,   763,
-     767,   776,   781,   789,   796,   803,   813,   822,   829,   838,
-     845,   851,   858,   868,   872,   876,   882,   886,   890,   894,
-     898,   902,   906,   918,   922,   926,   930,   940,   944,   951,
-     955,   959,   964,   969,   974,   983,   988,   993,   999,  1005,
-    1016,  1020,  1024,  1036,  1049,  1057,  1069,  1070,  1071,  1072,
-    1073,  1078,  1082,  1084,  1088,  1093,  1098,  1100,  1102,  1104,
-    1106,  1108,  1110,  1119,  1130,  1132,  1134,  1139,  1152,  1157,
-    1162,  1166,  1170,  1174,  1178,  1182,  1186,  1190,  1192,  1195,
-    1199,  1205,  1208,  1217,  1223,  1228,  1229,  1230,  1238,  1246,
-    1253,  1258,  1263,  1265,  1267,  1272,  1274,  1279,  1280,  1282,
-    1297,  1301,  1307,  1313,  1319,  1325,  1331,  1338,  1340,  1342,
-    1345
+       0,   140,   140,   146,   156,   160,   164,   170,   180,   185,
+     186,   193,   203,   206,   207,   209,   211,   228,   247,   249,
+     251,   255,   259,   263,   267,   272,   278,   279,   283,   294,
+     302,   313,   316,   322,   323,   330,   343,   355,   366,   376,
+     386,   418,   426,   436,   442,   443,   448,   451,   455,   460,
+     464,   468,   474,   483,   487,   489,   491,   493,   495,   500,
+     504,   510,   524,   525,   529,   542,   565,   571,   576,   581,
+     591,   592,   597,   598,   602,   612,   616,   626,   627,   636,
+     650,   649,   668,   672,   676,   680,   684,   694,   703,   707,
+     712,   719,   728,   734,   740,   748,   752,   759,   758,   769,
+     770,   774,   783,   788,   796,   803,   810,   820,   829,   836,
+     845,   852,   858,   865,   875,   879,   883,   889,   893,   897,
+     901,   905,   909,   913,   925,   929,   933,   937,   947,   951,
+     958,   962,   966,   971,   976,   981,   990,   995,  1000,  1006,
+    1012,  1023,  1027,  1031,  1043,  1056,  1064,  1076,  1077,  1078,
+    1079,  1080,  1085,  1089,  1091,  1095,  1100,  1105,  1107,  1109,
+    1111,  1113,  1115,  1117,  1126,  1137,  1139,  1141,  1146,  1159,
+    1164,  1169,  1173,  1177,  1181,  1185,  1189,  1193,  1197,  1199,
+    1202,  1206,  1212,  1215,  1224,  1230,  1235,  1236,  1237,  1245,
+    1253,  1260,  1265,  1270,  1272,  1274,  1279,  1281,  1286,  1287,
+    1289,  1304,  1308,  1314,  1320,  1326,  1332,  1338,  1345,  1347,
+    1349,  1352
 };
 #endif
 
@@ -214,7 +214,7 @@ static const char *const yytname[] =
   "loop", "switch", "mintro", "nexpr", "texpr", "iexpr", "mexpr", "mnexpr",
   "miexpr", "label", "decl", "peg", "format", "formname", "mysubrout",
   "subrout", "startsub", "startanonsub", "startformsub", "subname",
-  "proto", "subattrlist", "myattrlist", "subbody", "package", "use", "@1",
+  "proto", "subattrlist", "myattrlist", "subbody", "package", "use", "$@1",
   "expr", "argexpr", "listop", "@2", "method", "subscripted", "termbinop",
   "termunop", "anonymous", "termdo", "term", "myattrterm", "myterm",
   "listexpr", "listexprcom", "my_scalar", "amper", "scalar", "ary", "hsh",
@@ -245,26 +245,26 @@ static const yytype_uint8 yyr1[] =
 {
        0,    91,    92,    93,    94,    95,    96,    97,    98,    99,
       99,    99,   100,   100,   100,   100,   100,   100,   101,   101,
-     101,   101,   101,   101,   101,   102,   102,   102,   103,   103,
-     104,   104,   105,   105,   106,   106,   106,   106,   106,   106,
-     106,   107,   108,   109,   109,   110,   110,   111,   112,   113,
-     114,   115,   115,   116,   116,   116,   116,   116,   116,   117,
-     118,   119,   119,   120,   121,   122,   123,   124,   125,   126,
-     126,   127,   127,   127,   128,   128,   129,   129,   130,   132,
-     131,   133,   133,   133,   133,   134,   134,   134,   135,   135,
-     135,   135,   135,   135,   135,   135,   136,   135,   137,   137,
-     138,   138,   138,   138,   138,   138,   138,   138,   138,   138,
-     138,   138,   138,   139,   139,   139,   139,   139,   139,   139,
-     139,   139,   139,   139,   139,   139,   139,   140,   140,   140,
-     140,   140,   140,   140,   140,   141,   141,   141,   141,   141,
-     142,   142,   142,   142,   142,   142,   143,   143,   143,   143,
+     101,   101,   101,   101,   101,   101,   102,   102,   102,   103,
+     103,   104,   104,   105,   105,   106,   106,   106,   106,   106,
+     106,   106,   107,   108,   109,   109,   110,   110,   111,   112,
+     113,   114,   115,   115,   116,   116,   116,   116,   116,   116,
+     117,   118,   119,   119,   120,   121,   122,   123,   124,   125,
+     126,   126,   127,   127,   127,   128,   128,   129,   129,   130,
+     132,   131,   133,   133,   133,   133,   134,   134,   134,   135,
+     135,   135,   135,   135,   135,   135,   135,   136,   135,   137,
+     137,   138,   138,   138,   138,   138,   138,   138,   138,   138,
+     138,   138,   138,   138,   139,   139,   139,   139,   139,   139,
+     139,   139,   139,   139,   139,   139,   139,   139,   140,   140,
+     140,   140,   140,   140,   140,   140,   141,   141,   141,   141,
+     141,   142,   142,   142,   142,   142,   142,   143,   143,   143,
      143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
      143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
      143,   143,   143,   143,   143,   143,   143,   143,   143,   143,
-     143,   143,   143,   143,   143,   143,   143,   143,   144,   144,
-     145,   145,   145,   145,   145,   146,   146,   147,   147,   147,
-     148,   149,   150,   151,   152,   153,   154,   155,   155,   155,
-     155
+     143,   143,   143,   143,   143,   143,   143,   143,   143,   144,
+     144,   145,   145,   145,   145,   145,   146,   146,   147,   147,
+     147,   148,   149,   150,   151,   152,   153,   154,   155,   155,
+     155,   155
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -272,26 +272,26 @@ static const yytype_uint8 yyr2[] =
 {
        0,     2,     2,     4,     0,     0,     0,     4,     0,     0,
        2,     2,     2,     1,     1,     2,     2,     3,     1,     1,
-       3,     3,     3,     3,     3,     0,     2,     6,     7,     7,
-       6,     2,     0,     2,     9,     9,    10,     9,     8,    12,
-       3,     8,     0,     0,     1,     0,     1,     1,     1,     1,
-       1,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       4,     1,     0,     6,     6,     0,     0,     0,     1,     0,
-       1,     0,     2,     1,     2,     1,     1,     1,     3,     0,
-       7,     3,     3,     3,     1,     2,     3,     1,     3,     5,
-       6,     3,     3,     5,     2,     4,     0,     5,     1,     1,
-       5,     4,     5,     4,     5,     6,     5,     4,     5,     4,
-       3,     6,     5,     3,     3,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     2,     2,     2,
-       2,     2,     2,     2,     2,     3,     2,     4,     3,     5,
-       2,     2,     4,     5,     4,     5,     1,     1,     1,     1,
-       5,     2,     1,     2,     3,     2,     1,     1,     1,     1,
-       1,     1,     4,     5,     1,     1,     3,     4,     3,     1,
-       2,     2,     1,     2,     2,     1,     2,     1,     2,     1,
-       3,     1,     3,     4,     4,     1,     1,     1,     3,     2,
-       3,     2,     1,     1,     1,     0,     1,     0,     1,     2,
-       1,     2,     2,     2,     2,     2,     2,     1,     1,     1,
-       1
+       3,     3,     3,     3,     3,     3,     0,     2,     6,     7,
+       7,     6,     2,     0,     2,     9,     9,    10,     9,     8,
+      12,     3,     8,     0,     0,     1,     0,     1,     1,     1,
+       1,     1,     0,     1,     1,     1,     1,     1,     1,     1,
+       1,     4,     1,     0,     6,     6,     0,     0,     0,     1,
+       0,     1,     0,     2,     1,     2,     1,     1,     1,     3,
+       0,     7,     3,     3,     3,     1,     2,     3,     1,     3,
+       5,     6,     3,     3,     5,     2,     4,     0,     5,     1,
+       1,     5,     4,     5,     4,     5,     6,     5,     4,     5,
+       4,     3,     6,     5,     3,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     2,     2,
+       2,     2,     2,     2,     2,     2,     3,     2,     4,     3,
+       5,     2,     2,     4,     5,     4,     5,     1,     1,     1,
+       1,     5,     2,     1,     2,     3,     2,     1,     1,     1,
+       1,     1,     1,     4,     5,     1,     1,     3,     4,     3,
+       1,     2,     2,     1,     2,     2,     1,     2,     1,     2,
+       1,     3,     1,     3,     4,     4,     1,     1,     1,     3,
+       2,     3,     2,     1,     1,     1,     0,     1,     0,     1,
+       2,     1,     2,     2,     2,     2,     2,     2,     1,     1,
+       1,     1
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -299,59 +299,60 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       6,     0,     9,     1,    51,    52,    67,    65,     0,    65,
-      65,    59,    11,    13,    14,     0,    10,    58,    53,    55,
-      54,    56,    57,    62,     0,     0,    79,     0,    18,     4,
-       0,     0,     0,     0,     0,     0,     0,     0,    16,   185,
-       0,     0,   164,     0,   181,   177,    66,    66,     0,     0,
-       0,     0,     0,     0,     0,     0,   169,   187,   179,     0,
-       0,   172,   195,     0,     0,     0,     0,     0,     0,   175,
-       0,     0,     0,     0,     0,     0,     0,    32,     0,    12,
-      15,    19,    84,   186,   161,   146,   147,   148,   149,    87,
-     152,   165,   156,   159,   158,   160,   157,    61,     0,    68,
-      69,    78,     0,    69,     9,   136,     0,   127,   128,   207,
-     210,   209,   208,   202,   203,   204,   206,   201,   195,     0,
-       0,   178,     0,    69,     4,     4,     4,     4,     4,     4,
-       0,     4,     4,    31,   170,     0,     0,   197,   173,   174,
-     207,   196,    94,   208,     0,   205,   185,   141,   140,   156,
-       0,     0,   195,   153,     0,   189,   192,   194,   193,   176,
-     171,   129,   130,   151,   134,   133,   155,     0,     0,    40,
-      17,     0,     0,     0,     0,     0,     0,     0,     0,    85,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   132,   131,
-       0,     0,     0,     0,     0,     0,     0,    60,    70,    71,
-       0,    71,    51,   135,    92,   197,     0,    96,    71,    45,
-       0,     0,     0,     0,     0,     4,     5,     0,   180,   182,
-       0,   198,     0,     0,    88,     0,     0,   138,     0,   168,
-     191,     0,    75,   188,     0,   154,    33,    22,    23,    47,
-      20,    21,    24,    83,    82,    81,    86,     0,     0,   110,
-       0,   122,   118,   119,   115,   116,   113,     0,   125,   124,
-     123,   121,   120,   117,   126,   114,     0,     0,    98,     0,
-      91,    99,   166,     0,     0,     0,     0,     0,     0,    73,
-       0,   195,     0,     3,     0,   184,   195,     0,     0,    46,
-       0,     0,    48,    50,     0,     0,   200,    44,    49,     0,
-       0,    19,     0,     0,     0,   183,   199,    95,     0,   142,
-       0,   144,     0,   137,   190,    74,     0,     0,     0,   103,
-     109,     0,     0,     0,   107,     0,   197,   167,     0,   101,
-       0,   162,     0,    72,    77,    76,    64,     0,    63,    93,
-      97,   139,    42,    42,     0,     0,     0,     0,    45,     0,
-       0,     0,    89,   143,   145,   112,     0,   106,   150,     0,
-     102,   108,     0,   104,   163,   100,    80,     0,     0,     8,
-      25,    25,     0,    32,     0,     0,     0,    30,   111,   105,
-      90,    32,    32,     9,     0,     0,    28,    29,     0,    38,
-      42,    32,    41,    34,    35,    51,    26,     0,    32,     0,
-      37,     7,     0,    36,     0,     0,     0,    25,    39,    27
+       6,     0,     9,     1,    52,    53,    68,    66,     0,    66,
+      66,    60,    11,    13,    14,     0,    10,    59,    54,    56,
+      55,    57,    58,    63,     0,     0,    80,     0,    18,     4,
+       0,     0,     0,     0,     0,     0,     0,     0,    16,   186,
+       0,     0,   165,     0,   182,   178,    67,    67,     0,     0,
+       0,     0,     0,     0,     0,     0,   170,   188,   180,     0,
+       0,   173,   196,     0,     0,     0,     0,     0,     0,   176,
+       0,     0,     0,     0,     0,     0,     0,    33,     0,    12,
+      15,    19,    85,   187,   162,   147,   148,   149,   150,    88,
+     153,   166,   157,   160,   159,   161,   158,    62,     0,    69,
+      70,    79,     0,    70,     9,   137,     0,   128,   129,   208,
+     211,   210,   209,   203,   204,   205,   207,   202,   196,     0,
+       0,   179,     0,    70,     4,     4,     4,     4,     4,     4,
+       0,     4,     4,    32,   171,     0,     0,   198,   174,   175,
+     208,   197,    95,   209,     0,   206,   186,   142,   141,   157,
+       0,     0,   196,   154,     0,   190,   193,   195,   194,   177,
+     172,   130,   131,   152,   135,   134,   156,     0,     0,    41,
+      17,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      86,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   133,
+     132,     0,     0,     0,     0,     0,     0,     0,    61,    71,
+      72,     0,    72,    52,   136,    93,   198,     0,    97,    72,
+      46,     0,     0,     0,     0,     0,     4,     5,     0,   181,
+     183,     0,   199,     0,     0,    89,     0,     0,   139,     0,
+     169,   192,     0,    76,   189,     0,   155,    34,    22,    23,
+      48,    20,    21,    24,    25,    84,    83,    82,    87,     0,
+       0,   111,     0,   123,   119,   120,   116,   117,   114,     0,
+     126,   125,   124,   122,   121,   118,   127,   115,     0,     0,
+      99,     0,    92,   100,   167,     0,     0,     0,     0,     0,
+       0,    74,     0,   196,     0,     3,     0,   185,   196,     0,
+       0,    47,     0,     0,    49,    51,     0,     0,   201,    45,
+      50,     0,     0,    19,     0,     0,     0,   184,   200,    96,
+       0,   143,     0,   145,     0,   138,   191,    75,     0,     0,
+       0,   104,   110,     0,     0,     0,   108,     0,   198,   168,
+       0,   102,     0,   163,     0,    73,    78,    77,    65,     0,
+      64,    94,    98,   140,    43,    43,     0,     0,     0,     0,
+      46,     0,     0,     0,    90,   144,   146,   113,     0,   107,
+     151,     0,   103,   109,     0,   105,   164,   101,    81,     0,
+       0,     8,    26,    26,     0,    33,     0,     0,     0,    31,
+     112,   106,    91,    33,    33,     9,     0,     0,    29,    30,
+       0,    39,    43,    33,    42,    35,    36,    52,    27,     0,
+      33,     0,    38,     7,     0,    37,     0,     0,     0,    26,
+      40,    28
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,   111,   104,   313,     2,   380,   393,     4,    12,
-     307,   396,    79,    80,   169,    13,    14,   377,   308,   298,
-     248,   301,   310,   304,    15,    16,    17,    18,    98,    19,
-      20,    24,   122,    23,   100,   209,   290,   243,   346,    21,
-      22,   102,   302,    82,    83,   296,   280,    84,    85,    86,
-      87,    88,    89,    90,   155,   142,   232,   305,    91,    92,
+      -1,     1,   111,   104,   315,     2,   382,   395,     4,    12,
+     309,   398,    79,    80,   169,    13,    14,   379,   310,   300,
+     249,   303,   312,   306,    15,    16,    17,    18,    98,    19,
+      20,    24,   122,    23,   100,   210,   292,   244,   348,    21,
+      22,   102,   304,    82,    83,   298,   282,    84,    85,    86,
+      87,    88,    89,    90,   155,   142,   233,   307,    91,    92,
       93,    94,    95,    96,   113
 };
 
@@ -360,485 +361,488 @@ static const yytype_int16 yydefgoto[] =
 #define YYPACT_NINF -354
 static const yytype_int16 yypact[] =
 {
-    -354,    40,  -354,  -354,    90,  -354,  -354,  -354,     3,  -354,
-    -354,  -354,  -354,  -354,  -354,   292,  -354,  -354,  -354,  -354,
-    -354,  -354,  -354,    66,    74,    57,  -354,    74,  -354,  -354,
-     874,  1720,  1720,   348,   348,   348,   348,   348,  -354,  -354,
-     348,   348,  -354,    19,  -354,  1720,  -354,  -354,    22,    44,
-      51,    58,     8,    75,    79,   168,  1720,  -354,    88,    95,
-      96,   643,   558,   348,   728,   957,   164,  1720,    43,  1720,
-    1720,  1720,  1720,  1720,  1720,  1720,  1040,   146,   181,  -354,
-    -354,  1001,   136,  -354,    18,  -354,  -354,  -354,  -354,  1894,
-    -354,   117,    54,   133,  -354,  -354,   211,  -354,   168,  -354,
-     197,  -354,   204,   197,  -354,  -354,    28,   504,   504,  -354,
-    -354,  -354,  -354,  -354,  -354,  -354,  -354,  -354,  1720,   128,
-    1720,   419,   168,   197,  -354,  -354,  -354,  -354,  -354,  -354,
-     139,  -354,  -354,  -354,  1894,   137,  1125,   558,  -354,   419,
-    1781,   136,  -354,   790,  1720,  -354,   148,  -354,   419,    24,
-     256,    35,  1720,   419,  1210,   208,  -354,  -354,  -354,   419,
-     136,   504,   504,   504,   114,   114,   258,   -33,   168,  -354,
-    -354,  1720,  1720,  1720,  1720,  1720,  1720,  1720,  1720,  1720,
-    1720,  1720,  1295,  1720,  1720,  1720,  1720,  1720,  1720,  1720,
-    1720,  1720,  1720,  1720,  1720,  1720,  1720,  1720,  -354,  -354,
-      17,  1380,  1720,  1720,  1720,  1720,  1720,  -354,  -354,   215,
-     253,   215,   198,  -354,  -354,  1720,   -43,  -354,   215,  1720,
-    1720,  1720,  1720,   269,   388,  -354,  -354,  1720,  -354,  -354,
-      81,   608,   195,  1720,   136,  1465,  1550,  -354,   287,  -354,
-    -354,    87,   274,  -354,  1720,   289,  -354,   217,  -354,   217,
-     217,   217,   217,   231,   231,  -354,  1894,   167,    78,  -354,
-     349,  1972,   906,   715,   339,   277,  1894,  1855,   459,   459,
-     545,   629,   859,   376,   504,   504,  1720,  1720,  -354,  1635,
-     209,  -354,  -354,   457,   222,   129,   302,   147,   320,   299,
-     123,  1720,   123,  -354,   238,  -354,  1720,   168,   239,   217,
-     254,   265,   217,  -354,   267,   229,  -354,  -354,  -354,   268,
-     330,   387,  1720,  1720,   281,  -354,  -354,  -354,   519,  -354,
-     604,  -354,   630,  -354,  -354,  -354,   202,  1720,   358,  -354,
-    -354,  1720,   327,   207,  -354,   689,  1720,  -354,   369,  -354,
-     370,  -354,   371,  -354,  -354,  -354,  -354,   362,  -354,  -354,
-    -354,  -354,  -354,  -354,   377,   377,  1720,   377,  1720,   291,
-     294,   377,  -354,  -354,  -354,  -354,   210,  -354,  1933,   382,
-    -354,  -354,   300,  -354,  -354,  -354,  -354,   377,   377,  -354,
-       9,     9,   337,   146,   394,   377,   377,  -354,  -354,  -354,
-    -354,   146,   146,  -354,   377,   341,  -354,  -354,   377,  -354,
-    -354,   146,  -354,  -354,  -354,   230,  -354,  1720,   146,   471,
-    -354,  -354,   350,  -354,   351,   377,   377,     9,  -354,  -354
+    -354,    26,  -354,  -354,   145,  -354,  -354,  -354,    25,  -354,
+    -354,  -354,  -354,  -354,  -354,   294,  -354,  -354,  -354,  -354,
+    -354,  -354,  -354,    64,    71,    96,  -354,    71,  -354,  -354,
+     876,  1722,  1722,   373,   373,   373,   373,   373,  -354,  -354,
+     373,   373,  -354,    24,  -354,  1722,  -354,  -354,    55,    63,
+      90,   104,     0,   107,   108,   116,  1722,  -354,   113,   118,
+     120,   645,   560,   373,   730,   959,   138,  1722,    35,  1722,
+    1722,  1722,  1722,  1722,  1722,  1722,  1042,   177,   204,  -354,
+    -354,  1003,   162,  -354,    14,  -354,  -354,  -354,  -354,  1896,
+    -354,   167,    38,    73,  -354,  -354,   231,  -354,   116,  -354,
+     239,  -354,   244,   239,  -354,  -354,    30,   133,   133,  -354,
+    -354,  -354,  -354,  -354,  -354,  -354,  -354,  -354,  1722,   172,
+    1722,   421,   116,   239,  -354,  -354,  -354,  -354,  -354,  -354,
+     173,  -354,  -354,  -354,  1896,   179,  1127,   560,  -354,   421,
+    1783,   162,  -354,   792,  1722,  -354,   176,  -354,   421,    22,
+     270,     7,  1722,   421,  1212,   219,  -354,  -354,  -354,   421,
+     162,   133,   133,   133,   -10,   -10,   277,   255,   116,  -354,
+    -354,  1722,  1722,  1722,  1722,  1722,  1722,  1722,  1722,  1722,
+    1722,  1722,  1722,  1297,  1722,  1722,  1722,  1722,  1722,  1722,
+    1722,  1722,  1722,  1722,  1722,  1722,  1722,  1722,  1722,  -354,
+    -354,    13,  1382,  1722,  1722,  1722,  1722,  1722,  -354,  -354,
+     226,   275,   226,   122,  -354,  -354,  1722,   -39,  -354,   226,
+    1722,  1722,  1722,  1722,   282,   390,  -354,  -354,  1722,  -354,
+    -354,   306,   360,   206,  1722,   162,  1467,  1552,  -354,   289,
+    -354,  -354,   322,   278,  -354,  1722,   293,  -354,   377,  -354,
+     377,   377,   377,   377,   377,   235,   235,  -354,  1896,    33,
+      69,  -354,   351,  1974,   908,   717,   201,   279,  1896,  1857,
+     461,   461,   547,   631,   861,   378,   133,   133,  1722,  1722,
+    -354,  1637,   233,  -354,  -354,   459,   121,    77,   135,   112,
+     168,   310,    78,  1722,    78,  -354,   241,  -354,  1722,   116,
+     248,   377,   256,   258,   377,  -354,   265,   266,  -354,  -354,
+    -354,   269,   344,   389,  1722,  1722,   276,  -354,  -354,  -354,
+     521,  -354,   606,  -354,   632,  -354,  -354,  -354,   174,  1722,
+     361,  -354,  -354,  1722,   212,   205,  -354,   691,  1722,  -354,
+     371,  -354,   374,  -354,   386,  -354,  -354,  -354,  -354,   367,
+    -354,  -354,  -354,  -354,  -354,  -354,   415,   415,  1722,   415,
+    1722,   304,   363,   415,  -354,  -354,  -354,  -354,   208,  -354,
+    1935,   428,  -354,  -354,   369,  -354,  -354,  -354,  -354,   415,
+     415,  -354,    81,    81,   370,   177,   435,   415,   415,  -354,
+    -354,  -354,  -354,   177,   177,  -354,   415,   375,  -354,  -354,
+     415,  -354,  -354,   177,  -354,  -354,  -354,   199,  -354,  1722,
+     177,   473,  -354,  -354,   379,  -354,   383,   415,   415,    81,
+    -354,  -354
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -354,  -354,   -13,   -49,  -354,  -354,  1505,  -354,  -103,  -354,
-     425,  -353,  -354,  -354,  -345,  -354,  -354,  -342,  -354,    89,
-     -48,  -208,    46,  -354,  -354,  -354,  -354,  -354,  -354,  -354,
-    -354,    93,   402,  -354,   429,    31,  -146,  -354,   165,  -354,
-    -354,  -354,   -15,   -58,  -354,  -354,  -354,  -354,  -354,  -354,
-    -354,  -354,    56,  -354,  -354,  -113,  -212,  -354,  -354,   -27,
-     393,   396,  -354,  -354,    33
+    -354,  -354,   -13,   -72,  -354,  -354,  1505,  -354,  -103,  -354,
+     444,  -353,  -354,  -354,   -26,  -354,  -354,  -335,  -354,   103,
+    -116,  -215,    76,  -354,  -354,  -354,  -354,  -354,  -354,  -354,
+    -354,   128,   419,  -354,   466,   -19,  -181,  -354,   207,  -354,
+    -354,  -354,   -15,   -38,  -354,  -354,  -354,  -354,  -354,  -354,
+    -354,  -354,    56,  -354,  -354,  -115,  -202,  -354,  -354,   -29,
+     431,   434,  -354,  -354,    28
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -186
+#define YYTABLE_NINF -187
 static const yytype_int16 yytable[] =
 {
-      81,   212,    77,   294,   141,   214,   112,   112,   112,   112,
-     112,   378,   160,   112,   112,   106,   309,    33,    25,   314,
-     276,   180,   277,   181,   179,   130,    33,   202,   397,   203,
-     176,   177,   178,   278,   213,   143,   112,   149,   399,   239,
-       3,   156,   133,   394,   395,   295,   403,   404,   138,   238,
-     151,   147,    33,    34,    35,   245,   410,   202,   409,   203,
-     141,   167,   216,   413,   419,   292,   128,   114,   115,   116,
-     117,   101,   297,   118,   119,   219,   220,   221,   222,   223,
-     224,    97,   226,   227,   329,   207,   234,   107,   108,    99,
-      -2,   176,   177,   178,   141,   144,   145,   129,   176,   177,
-     178,   121,    26,    27,   359,   360,   279,   182,   120,   217,
-     143,   124,   134,   236,     5,     6,     7,   139,     8,     9,
-     148,   230,   231,   153,   372,   159,    29,   161,   162,   163,
-     164,   165,   154,   125,   211,   339,   204,   344,   205,   241,
-     126,   176,   177,   178,   176,   177,   178,   127,   382,    10,
-     176,   177,   178,   341,   218,   246,   247,   249,   250,   251,
-     252,   253,   254,   255,   131,   257,   258,   260,   132,   315,
-     233,    29,   300,   281,   303,   324,   312,   135,   347,   152,
-      11,   328,   168,   350,   136,   137,   283,   284,   285,   286,
-     287,   288,   176,   177,   178,   170,   306,  -186,  -186,   412,
-     231,   200,   293,   179,   299,   249,   201,   249,   365,   311,
-     176,   177,   178,   370,   206,   208,   388,   215,   318,   210,
-     320,   322,     5,     6,     7,   228,     8,     9,   225,   326,
-     176,   177,   178,   141,   411,   256,   338,   235,   141,   261,
-     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-     272,   273,   274,   275,     5,     6,     7,    10,     8,     9,
-     237,   332,   333,   244,   335,   176,   177,   178,   291,   242,
-     176,   177,   178,   176,   177,   178,   289,   345,    33,   345,
-     176,   177,   178,   317,   351,   176,   177,   178,    11,    10,
-     405,   323,   325,    28,   327,    29,   178,    30,   336,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,   366,    44,    45,    46,   340,   343,   356,    47,
-      11,   231,    48,    49,    50,    51,   349,   352,   186,    52,
-      53,    54,    55,    56,   342,    57,    58,    59,    60,    61,
-      62,   369,   353,   299,   358,    63,    64,    65,    66,    67,
-      68,    29,    69,   354,   196,   355,   357,    33,    70,   197,
-     198,   199,   367,   109,   200,   176,   177,   178,   110,   361,
-      71,    72,    73,   373,   374,   375,   376,    74,    75,   385,
-     379,    76,   386,   176,   177,   178,   389,   368,   390,    28,
-     176,   177,   178,    30,    81,    31,    32,    33,    34,    35,
-      36,    37,   -43,    39,    40,    41,    42,    43,   400,    44,
-      45,    46,   176,   177,   178,    47,   196,   171,   172,   173,
-     174,   197,   198,   199,   175,   398,   200,   186,   187,    56,
-     407,    57,    58,    59,    60,    61,    62,   330,   415,   416,
-      78,    63,    64,    65,    66,    67,    68,   384,    69,   123,
-     176,   177,   178,   196,    70,   414,   103,   348,   197,   198,
-     199,   157,     0,   200,   158,     0,    71,    72,    73,     0,
-     186,   187,    28,    74,    75,   -48,    30,    76,    31,    32,
-      33,    34,    35,    36,    37,     0,    39,    40,    41,    42,
-      43,     0,    44,    45,    46,   195,   196,     0,    47,     0,
-       0,   197,   198,   199,     0,     0,   200,     0,   184,   185,
-     186,   187,    56,     0,    57,    58,    59,    60,    61,    62,
-     176,   177,   178,     0,    63,    64,    65,    66,    67,    68,
-       0,    69,   192,   193,   194,   195,   196,    70,     0,     0,
-       0,   197,   198,   199,     0,   337,   200,     0,     0,    71,
-      72,    73,     0,     0,     0,     0,    74,    75,     0,   -43,
-      76,    29,     0,    30,     0,    31,    32,    33,    34,    35,
-      36,    37,     0,   140,    40,    41,    42,    43,   110,    44,
-      45,    46,   176,   177,   178,    47,   197,   198,   199,     0,
-       0,   200,     0,     0,   184,   185,   186,   187,     0,    56,
-       0,    57,    58,    59,    60,    61,    62,   362,     0,     0,
-       0,    63,    64,    65,    66,    67,    68,     0,    69,   193,
-     194,   195,   196,     0,    70,     0,     0,   197,   198,   199,
-       0,     0,   200,     0,     0,     0,    71,    72,    73,     0,
-       0,     0,     0,    74,    75,     0,    29,    76,    30,     0,
-      31,    32,    33,    34,    35,    36,    37,     0,    39,    40,
-      41,    42,    43,     0,    44,    45,    46,   176,   177,   178,
-      47,   176,   177,   178,     0,   316,     0,     0,   184,   185,
-     186,   187,     0,     0,    56,     0,    57,    58,    59,    60,
-      61,    62,   363,   176,   177,   178,    63,    64,    65,    66,
-      67,    68,     0,    69,   194,   195,   196,     0,     0,    70,
-       0,   197,   198,   199,     0,     0,   200,     0,   364,     0,
+      81,   213,    77,   215,   112,   112,   112,   112,   112,    33,
+     311,   112,   112,   316,   296,   106,   278,   181,   279,   182,
+     380,   239,    33,   130,   141,   203,     3,   204,   180,   280,
+     399,   294,   160,   143,   112,   149,   214,   240,   299,   156,
+      25,   203,   133,   204,    33,    34,    35,   330,   138,   297,
+     151,   147,   220,   221,   222,   223,   224,   225,   128,   227,
+     228,   167,   114,   115,   116,   117,   421,   411,   118,   119,
+     177,   178,   179,  -187,  -187,   331,   205,   201,   206,    97,
+     141,    29,   217,   341,   212,   208,    99,   107,   108,   129,
+     144,   145,   346,   177,   178,   179,   177,   178,   179,   361,
+     362,   121,   281,   183,   219,   302,   235,   305,   143,   218,
+     101,   237,   134,   120,   141,   396,   397,   139,   343,    29,
+     148,   231,   232,   153,   154,   159,   295,   161,   162,   163,
+     164,   165,   177,   178,   179,   340,   374,    26,    27,   242,
+     177,   178,   179,   384,   124,    -2,     5,     6,     7,   342,
+       8,     9,   125,   152,   314,   247,   248,   250,   251,   252,
+     253,   254,   255,   256,   257,   234,   259,   260,   262,     5,
+       6,     7,   283,     8,     9,   177,   178,   179,   349,   126,
+     367,    10,   344,   352,   177,   178,   179,   285,   286,   287,
+     288,   289,   290,   127,   414,   308,   131,   132,   177,   178,
+     179,   232,   135,   413,    10,   301,   250,   136,   250,   137,
+     313,   372,    11,   168,   390,   198,   199,   200,   170,   320,
+     201,   322,   324,     5,     6,     7,   371,     8,     9,   180,
+     328,   177,   178,   179,   207,    11,   258,   177,   178,   179,
+     263,   264,   265,   266,   267,   268,   269,   270,   271,   272,
+     273,   274,   275,   276,   277,   141,   202,   209,    10,   211,
+     141,   216,   226,   334,   335,   236,   337,   229,   177,   178,
+     179,   177,   178,   179,   238,   177,   178,   179,   197,   347,
+     243,   347,   245,   198,   199,   200,   353,   291,   201,    11,
+     293,    33,   407,   325,   319,    28,   327,    29,   329,    30,
+     179,    31,    32,    33,    34,    35,    36,    37,    38,    39,
+      40,    41,    42,    43,   368,    44,    45,    46,   177,   178,
+     179,    47,   338,   232,    48,    49,    50,    51,   345,   351,
+     187,    52,    53,    54,    55,    56,   354,    57,    58,    59,
+      60,    61,    62,   246,   355,   301,   356,    63,    64,    65,
+      66,    67,    68,   357,    69,   358,   197,   359,   360,   401,
+      70,   198,   199,   200,   363,   369,   201,   405,   406,   177,
+     178,   179,    71,    72,    73,   375,    29,   412,   376,    74,
+      75,   378,    33,    76,   415,   177,   178,   179,   109,   370,
+     377,    28,   387,   110,   317,    30,    81,    31,    32,    33,
+      34,    35,    36,    37,   -44,    39,    40,    41,    42,    43,
+     326,    44,    45,    46,   177,   178,   179,    47,   381,   171,
+     172,   173,   174,   177,   178,   179,   175,   318,   176,   187,
+     188,    56,   391,    57,    58,    59,    60,    61,    62,   332,
+     177,   178,   179,    63,    64,    65,    66,    67,    68,   402,
+      69,   388,   177,   178,   179,   197,    70,   392,   400,    78,
+     198,   199,   200,   386,   409,   201,   123,   417,    71,    72,
+      73,   418,   187,   188,    28,    74,    75,   -49,    30,    76,
+      31,    32,    33,    34,    35,    36,    37,   416,    39,    40,
+      41,    42,    43,   103,    44,    45,    46,   196,   197,   157,
+      47,   350,   158,   198,   199,   200,     0,     0,   201,     0,
+     185,   186,   187,   188,    56,     0,    57,    58,    59,    60,
+      61,    62,   177,   178,   179,     0,    63,    64,    65,    66,
+      67,    68,     0,    69,   193,   194,   195,   196,   197,    70,
+       0,     0,     0,   198,   199,   200,     0,   339,   201,     0,
        0,    71,    72,    73,     0,     0,     0,     0,    74,    75,
-       0,    29,    76,    30,     0,    31,    32,    33,    34,    35,
-      36,    37,     0,   146,    40,    41,    42,    43,     0,    44,
-      45,    46,   176,   177,   178,    47,     0,     0,     0,     0,
-       0,     0,     0,     0,   184,  -186,   186,   187,     0,    56,
-       0,    57,    58,    59,    60,    61,    62,   371,     0,     0,
-       0,    63,    64,    65,    66,    67,    68,     0,    69,     0,
-       0,   195,   196,   202,    70,   203,  -156,   197,   198,   199,
-       0,     0,   200,     0,  -156,     0,    71,    72,    73,     0,
-       0,     0,     0,    74,    75,     0,     0,    76,     0,     0,
-    -156,  -156,  -156,  -156,     0,     0,     0,  -156,     0,     0,
-       0,     0,  -156,     0,     0,     0,     0,     0,     0,  -156,
-    -156,  -156,  -156,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  -156,  -156,  -156,     0,  -156,  -156,  -156,
-    -156,  -156,  -156,  -156,  -156,  -156,  -156,  -156,     0,     0,
-       0,     0,  -156,  -156,  -156,     0,     0,  -156,  -156,    30,
-     105,    31,    32,    33,    34,    35,    36,    37,     0,    39,
-      40,    41,    42,    43,     0,    44,    45,    46,     0,     0,
-       0,    47,     0,     0,     0,     0,     0,     0,   184,   185,
-     186,   187,     0,     0,     0,    56,     0,    57,    58,    59,
-      60,    61,    62,     0,     0,     0,     0,    63,    64,    65,
-      66,    67,    68,     0,    69,   195,   196,     0,     0,     0,
-      70,   197,   198,   199,     0,     0,   200,     0,     0,     0,
-       0,     0,    71,    72,    73,  -186,     0,   186,   187,    74,
-      75,     0,    30,    76,    31,    32,    33,    34,    35,    36,
-      37,   150,    39,    40,    41,    42,    43,     0,    44,    45,
-      46,     0,   195,   196,    47,     0,     0,     0,   197,   198,
-     199,     0,     0,   200,     0,     0,     0,     0,    56,     0,
+       0,   -44,    76,    29,     0,    30,     0,    31,    32,    33,
+      34,    35,    36,    37,     0,   140,    40,    41,    42,    43,
+     110,    44,    45,    46,   177,   178,   179,    47,     0,     0,
+       0,     0,     0,     0,     0,     0,   185,   186,   187,   188,
+       0,    56,     0,    57,    58,    59,    60,    61,    62,   364,
+       0,     0,     0,    63,    64,    65,    66,    67,    68,     0,
+      69,   194,   195,   196,   197,     0,    70,     0,     0,   198,
+     199,   200,     0,     0,   201,     0,     0,     0,    71,    72,
+      73,     0,     0,     0,     0,    74,    75,     0,    29,    76,
+      30,     0,    31,    32,    33,    34,    35,    36,    37,     0,
+      39,    40,    41,    42,    43,     0,    44,    45,    46,   177,
+     178,   179,    47,     0,     0,     0,     0,     0,     0,     0,
+     185,   186,   187,   188,     0,     0,    56,     0,    57,    58,
+      59,    60,    61,    62,   365,   177,   178,   179,    63,    64,
+      65,    66,    67,    68,     0,    69,   195,   196,   197,     0,
+       0,    70,     0,   198,   199,   200,     0,     0,   201,     0,
+     366,     0,     0,    71,    72,    73,     0,     0,     0,     0,
+      74,    75,     0,    29,    76,    30,     0,    31,    32,    33,
+      34,    35,    36,    37,     0,   146,    40,    41,    42,    43,
+       0,    44,    45,    46,   177,   178,   179,    47,     0,     0,
+       0,     0,     0,     0,     0,     0,   185,  -187,   187,   188,
+       0,    56,     0,    57,    58,    59,    60,    61,    62,   373,
+       0,     0,     0,    63,    64,    65,    66,    67,    68,     0,
+      69,     0,     0,   196,   197,   203,    70,   204,  -157,   198,
+     199,   200,     0,     0,   201,     0,  -157,     0,    71,    72,
+      73,     0,     0,     0,     0,    74,    75,     0,     0,    76,
+       0,     0,  -157,  -157,  -157,  -157,     0,     0,     0,  -157,
+       0,  -157,     0,     0,  -157,     0,     0,     0,     0,     0,
+       0,  -157,  -157,  -157,  -157,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,  -157,  -157,  -157,     0,  -157,
+    -157,  -157,  -157,  -157,  -157,  -157,  -157,  -157,  -157,  -157,
+       0,     0,     0,     0,  -157,  -157,  -157,     0,     0,  -157,
+    -157,    30,   105,    31,    32,    33,    34,    35,    36,    37,
+       0,    39,    40,    41,    42,    43,     0,    44,    45,    46,
+       0,     0,     0,    47,     0,     0,     0,     0,     0,     0,
+     185,   186,   187,   188,     0,     0,     0,    56,     0,    57,
+      58,    59,    60,    61,    62,     0,     0,     0,     0,    63,
+      64,    65,    66,    67,    68,     0,    69,   196,   197,     0,
+       0,     0,    70,   198,   199,   200,     0,     0,   201,     0,
+       0,     0,     0,     0,    71,    72,    73,  -187,     0,   187,
+     188,    74,    75,     0,    30,    76,    31,    32,    33,    34,
+      35,    36,    37,   150,    39,    40,    41,    42,    43,     0,
+      44,    45,    46,     0,   196,   197,    47,     0,     0,     0,
+     198,   199,   200,     0,     0,   201,     0,     0,     0,     0,
+      56,     0,    57,    58,    59,    60,    61,    62,     0,     0,
+       0,     0,    63,    64,    65,    66,    67,    68,     0,    69,
+       0,     0,     0,     0,     0,    70,     0,     0,     0,     0,
+       0,     0,     0,   171,   172,   173,   174,    71,    72,    73,
+     175,     0,   176,     0,    74,    75,     0,    30,    76,    31,
+      32,    33,    34,    35,    36,    37,     0,    39,    40,    41,
+      42,    43,     0,    44,    45,    46,   177,   178,   179,    47,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    56,     0,    57,    58,    59,    60,    61,
+      62,     0,     0,     0,     0,    63,    64,    65,    66,    67,
+      68,     0,    69,     0,     0,     0,     0,     0,    70,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      71,    72,    73,     0,     0,     0,     0,    74,    75,     0,
+     166,    76,    30,     0,    31,    32,    33,    34,    35,    36,
+      37,     0,    39,    40,    41,    42,    43,     0,    44,    45,
+      46,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    56,     0,
       57,    58,    59,    60,    61,    62,     0,     0,     0,     0,
       63,    64,    65,    66,    67,    68,     0,    69,     0,     0,
        0,     0,     0,    70,     0,     0,     0,     0,     0,     0,
-       0,   171,   172,   173,   174,    71,    72,    73,   175,     0,
-       0,     0,    74,    75,     0,    30,    76,    31,    32,    33,
-      34,    35,    36,    37,     0,    39,    40,    41,    42,    43,
-       0,    44,    45,    46,   176,   177,   178,    47,     0,     0,
+       0,     0,     0,     0,     0,    71,    72,    73,     0,     0,
+       0,     0,    74,    75,     0,   230,    76,    30,     0,    31,
+      32,    33,    34,    35,    36,    37,     0,    39,    40,    41,
+      42,    43,     0,    44,    45,    46,     0,     0,     0,    47,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    56,     0,    57,    58,    59,    60,    61,    62,     0,
-       0,     0,     0,    63,    64,    65,    66,    67,    68,     0,
-      69,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    71,    72,
-      73,     0,     0,     0,     0,    74,    75,     0,   166,    76,
-      30,     0,    31,    32,    33,    34,    35,    36,    37,     0,
-      39,    40,    41,    42,    43,     0,    44,    45,    46,     0,
-       0,     0,    47,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    56,     0,    57,    58,
-      59,    60,    61,    62,     0,     0,     0,     0,    63,    64,
-      65,    66,    67,    68,     0,    69,     0,     0,     0,     0,
-       0,    70,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    71,    72,    73,     0,     0,     0,     0,
-      74,    75,     0,   229,    76,    30,     0,    31,    32,    33,
-      34,    35,    36,    37,     0,    39,    40,    41,    42,    43,
-       0,    44,    45,    46,     0,     0,     0,    47,     0,     0,
+       0,     0,     0,    56,     0,    57,    58,    59,    60,    61,
+      62,     0,     0,     0,     0,    63,    64,    65,    66,    67,
+      68,     0,    69,     0,     0,     0,     0,     0,    70,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    56,     0,    57,    58,    59,    60,    61,    62,     0,
-       0,     0,     0,    63,    64,    65,    66,    67,    68,     0,
-      69,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    71,    72,
-      73,     0,     0,     0,     0,    74,    75,     0,   240,    76,
-      30,     0,    31,    32,    33,    34,    35,    36,    37,     0,
-      39,    40,    41,    42,    43,     0,    44,    45,    46,     0,
-       0,     0,    47,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    56,     0,    57,    58,
-      59,    60,    61,    62,     0,     0,     0,     0,    63,    64,
-      65,    66,    67,    68,     0,    69,     0,     0,     0,     0,
-       0,    70,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    71,    72,    73,     0,     0,     0,     0,
-      74,    75,     0,   259,    76,    30,     0,    31,    32,    33,
-      34,    35,    36,    37,     0,    39,    40,    41,    42,    43,
-       0,    44,    45,    46,     0,     0,     0,    47,     0,     0,
+      71,    72,    73,     0,     0,     0,     0,    74,    75,     0,
+     241,    76,    30,     0,    31,    32,    33,    34,    35,    36,
+      37,     0,    39,    40,    41,    42,    43,     0,    44,    45,
+      46,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    56,     0,
+      57,    58,    59,    60,    61,    62,     0,     0,     0,     0,
+      63,    64,    65,    66,    67,    68,     0,    69,     0,     0,
+       0,     0,     0,    70,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    71,    72,    73,     0,     0,
+       0,     0,    74,    75,     0,   261,    76,    30,     0,    31,
+      32,    33,    34,    35,    36,    37,     0,    39,    40,    41,
+      42,    43,     0,    44,    45,    46,     0,     0,     0,    47,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    56,     0,    57,    58,    59,    60,    61,    62,     0,
-       0,     0,     0,    63,    64,    65,    66,    67,    68,     0,
-      69,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    71,    72,
-      73,     0,     0,     0,     0,    74,    75,     0,   282,    76,
-      30,     0,    31,    32,    33,    34,    35,    36,    37,     0,
-      39,    40,    41,    42,    43,     0,    44,    45,    46,     0,
-       0,     0,    47,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    56,     0,    57,    58,
-      59,    60,    61,    62,     0,     0,     0,     0,    63,    64,
-      65,    66,    67,    68,     0,    69,     0,     0,     0,     0,
-       0,    70,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    71,    72,    73,     0,     0,     0,     0,
-      74,    75,     0,   319,    76,    30,     0,    31,    32,    33,
-      34,    35,    36,    37,     0,    39,    40,    41,    42,    43,
-       0,    44,    45,    46,     0,     0,     0,    47,     0,     0,
+       0,     0,     0,    56,     0,    57,    58,    59,    60,    61,
+      62,     0,     0,     0,     0,    63,    64,    65,    66,    67,
+      68,     0,    69,     0,     0,     0,     0,     0,    70,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    56,     0,    57,    58,    59,    60,    61,    62,     0,
-       0,     0,     0,    63,    64,    65,    66,    67,    68,     0,
-      69,     0,     0,     0,     0,     0,    70,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    71,    72,
-      73,     0,     0,     0,     0,    74,    75,     0,   321,    76,
-      30,     0,    31,    32,    33,    34,    35,    36,    37,     0,
-      39,    40,    41,    42,    43,     0,    44,    45,    46,     0,
-       0,     0,    47,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    56,     0,    57,    58,
-      59,    60,    61,    62,     0,     0,     0,     0,    63,    64,
-      65,    66,    67,    68,     0,    69,     0,     0,     0,     0,
-       0,    70,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    71,    72,    73,     0,     0,     0,     0,
-      74,    75,     0,   334,    76,    30,     0,    31,    32,    33,
-      34,    35,    36,    37,     0,    39,    40,    41,    42,    43,
-       0,    44,    45,    46,     0,     0,     0,    47,     0,     0,
+      71,    72,    73,     0,     0,     0,     0,    74,    75,     0,
+     284,    76,    30,     0,    31,    32,    33,    34,    35,    36,
+      37,     0,    39,    40,    41,    42,    43,     0,    44,    45,
+      46,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    56,     0,
+      57,    58,    59,    60,    61,    62,     0,     0,     0,     0,
+      63,    64,    65,    66,    67,    68,     0,    69,     0,     0,
+       0,     0,     0,    70,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    71,    72,    73,     0,     0,
+       0,     0,    74,    75,     0,   321,    76,    30,     0,    31,
+      32,    33,    34,    35,    36,    37,     0,    39,    40,    41,
+      42,    43,     0,    44,    45,    46,     0,     0,     0,    47,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    56,     0,    57,    58,    59,    60,    61,    62,     0,
-       0,     0,     0,    63,    64,    65,    66,    67,    68,     0,
-      69,     0,     0,     0,     0,     0,    70,  -185,     0,     0,
-       0,     0,     0,     0,     0,  -185,     0,     0,    71,    72,
-      73,     0,     0,     0,     0,    74,    75,     0,     0,    76,
-       0,  -185,  -185,  -185,  -185,     0,     0,     0,  -185,     0,
-       0,     0,     0,  -185,     0,     0,     0,     0,     0,     0,
-    -185,  -185,  -185,  -185,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  -185,  -185,  -185,     0,  -185,  -185,
-    -185,  -185,  -185,  -185,  -185,  -185,  -185,  -185,  -185,     0,
-     381,     0,   383,  -185,  -185,  -185,   387,     0,  -185,  -185,
+       0,     0,     0,    56,     0,    57,    58,    59,    60,    61,
+      62,     0,     0,     0,     0,    63,    64,    65,    66,    67,
+      68,     0,    69,     0,     0,     0,     0,     0,    70,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   391,   392,     0,     0,     0,     0,     0,     0,
-     401,   402,     0,     0,     0,     0,     0,   183,     0,   406,
-       0,     0,     0,   408,   184,   185,   186,   187,     0,     0,
+      71,    72,    73,     0,     0,     0,     0,    74,    75,     0,
+     323,    76,    30,     0,    31,    32,    33,    34,    35,    36,
+      37,     0,    39,    40,    41,    42,    43,     0,    44,    45,
+      46,     0,     0,     0,    47,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    56,     0,
+      57,    58,    59,    60,    61,    62,     0,     0,     0,     0,
+      63,    64,    65,    66,    67,    68,     0,    69,     0,     0,
+       0,     0,     0,    70,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    71,    72,    73,     0,     0,
+       0,     0,    74,    75,     0,   336,    76,    30,     0,    31,
+      32,    33,    34,    35,    36,    37,     0,    39,    40,    41,
+      42,    43,     0,    44,    45,    46,     0,     0,     0,    47,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    56,     0,    57,    58,    59,    60,    61,
+      62,     0,     0,     0,     0,    63,    64,    65,    66,    67,
+      68,     0,    69,     0,     0,     0,     0,     0,    70,  -186,
+       0,     0,     0,     0,     0,     0,     0,  -186,     0,     0,
+      71,    72,    73,     0,     0,     0,     0,    74,    75,     0,
+       0,    76,     0,  -186,  -186,  -186,  -186,     0,     0,     0,
+    -186,     0,  -186,     0,     0,  -186,     0,     0,     0,     0,
+       0,     0,  -186,  -186,  -186,  -186,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  -186,  -186,  -186,     0,
+    -186,  -186,  -186,  -186,  -186,  -186,  -186,  -186,  -186,  -186,
+    -186,     0,   383,     0,   385,  -186,  -186,  -186,   389,     0,
+    -186,  -186,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   393,   394,     0,     0,     0,     0,
+       0,     0,   403,   404,     0,     0,     0,     0,     0,   184,
+       0,   408,     0,     0,     0,   410,   185,   186,   187,   188,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     417,   418,     0,   188,   189,   331,   190,   191,   192,   193,
-     194,   195,   196,     0,     0,     0,   183,   197,   198,   199,
-       0,     0,   200,   184,   185,   186,   187,     0,     0,     0,
+       0,     0,   419,   420,     0,   189,   190,   333,   191,   192,
+     193,   194,   195,   196,   197,     0,     0,     0,   184,   198,
+     199,   200,     0,     0,   201,   185,   186,   187,   188,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   188,   189,     0,   190,   191,   192,   193,   194,
-     195,   196,     0,     0,     0,   183,   197,   198,   199,     0,
-       0,   200,   184,   185,   186,   187,     0,     0,     0,     0,
+       0,     0,     0,     0,   189,   190,     0,   191,   192,   193,
+     194,   195,   196,   197,     0,     0,     0,   184,   198,   199,
+     200,     0,     0,   201,   185,   186,   187,   188,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   189,     0,   190,   191,   192,   193,   194,   195,
-     196,     0,     0,     0,  -186,   197,   198,   199,     0,     0,
-     200,   184,   185,   186,   187,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   190,     0,   191,   192,   193,   194,
+     195,   196,   197,     0,     0,     0,  -187,   198,   199,   200,
+       0,     0,   201,   185,   186,   187,   188,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   190,   191,   192,   193,   194,   195,   196,
-       0,     0,     0,     0,   197,   198,   199,     0,     0,   200
+       0,     0,     0,     0,     0,   191,   192,   193,   194,   195,
+     196,   197,     0,     0,     0,     0,   198,   199,   200,     0,
+       0,   201
 };
 
 static const yytype_int16 yycheck[] =
 {
-      15,   104,    15,   215,    62,   118,    33,    34,    35,    36,
-      37,   353,    70,    40,    41,    30,   224,     9,    15,   227,
-       3,     3,     5,     5,    67,    52,     9,     3,   381,     5,
-      63,    64,    65,    16,     6,    62,    63,    64,   383,   152,
-       0,    68,    55,    34,    35,    88,   391,   392,    61,    14,
-      65,    64,     9,    10,    11,    88,   401,     3,   400,     5,
-     118,    76,   120,   408,   417,   211,    58,    34,    35,    36,
-      37,    14,   218,    40,    41,   124,   125,   126,   127,   128,
-     129,    15,   131,   132,     6,    98,   144,    31,    32,    15,
-       0,    63,    64,    65,   152,    62,    63,    89,    63,    64,
-      65,    45,     9,    10,   312,   313,    89,    89,    89,   122,
-     137,    89,    56,    89,    24,    25,    26,    61,    28,    29,
-      64,   136,   137,    67,   336,    69,     3,    71,    72,    73,
-      74,    75,    89,    89,   103,     6,     3,    14,     5,   154,
-      89,    63,    64,    65,    63,    64,    65,    89,   356,    59,
-      63,    64,    65,     6,   123,   168,   171,   172,   173,   174,
-     175,   176,   177,   178,    89,   180,   181,   182,    89,    88,
-     137,     3,   220,   200,   222,    88,   225,    89,   291,    15,
-      90,    14,    36,   296,    89,    89,   201,   202,   203,   204,
-     205,   206,    63,    64,    65,    14,   223,    83,    84,   407,
-     215,    87,     4,    67,   219,   220,    89,   222,     6,   224,
-      63,    64,    65,     6,     3,    18,     6,    89,   233,    15,
-     235,   236,    24,    25,    26,    88,    28,    29,    89,   244,
-      63,    64,    65,   291,     4,   179,    14,    89,   296,   183,
+      15,   104,    15,   118,    33,    34,    35,    36,    37,     9,
+     225,    40,    41,   228,   216,    30,     3,     3,     5,     5,
+     355,    14,     9,    52,    62,     3,     0,     5,    67,    16,
+     383,   212,    70,    62,    63,    64,     6,   152,   219,    68,
+      15,     3,    55,     5,     9,    10,    11,    14,    61,    88,
+      65,    64,   124,   125,   126,   127,   128,   129,    58,   131,
+     132,    76,    34,    35,    36,    37,   419,   402,    40,    41,
+      63,    64,    65,    83,    84,     6,     3,    87,     5,    15,
+     118,     3,   120,     6,   103,    98,    15,    31,    32,    89,
+      62,    63,    14,    63,    64,    65,    63,    64,    65,   314,
+     315,    45,    89,    89,   123,   221,   144,   223,   137,   122,
+      14,    89,    56,    89,   152,    34,    35,    61,     6,     3,
+      64,   136,   137,    67,    89,    69,     4,    71,    72,    73,
+      74,    75,    63,    64,    65,    14,   338,     9,    10,   154,
+      63,    64,    65,   358,    89,     0,    24,    25,    26,    14,
+      28,    29,    89,    15,   226,   168,   171,   172,   173,   174,
+     175,   176,   177,   178,   179,   137,   181,   182,   183,    24,
+      25,    26,   201,    28,    29,    63,    64,    65,   293,    89,
+       6,    59,    14,   298,    63,    64,    65,   202,   203,   204,
+     205,   206,   207,    89,   409,   224,    89,    89,    63,    64,
+      65,   216,    89,     4,    59,   220,   221,    89,   223,    89,
+     225,     6,    90,    36,     6,    82,    83,    84,    14,   234,
+      87,   236,   237,    24,    25,    26,    14,    28,    29,    67,
+     245,    63,    64,    65,     3,    90,   180,    63,    64,    65,
      184,   185,   186,   187,   188,   189,   190,   191,   192,   193,
-     194,   195,   196,   197,    24,    25,    26,    59,    28,    29,
-       4,   276,   277,     5,   279,    63,    64,    65,    15,    61,
-      63,    64,    65,    63,    64,    65,    61,   290,     9,   292,
-      63,    64,    65,    88,   297,    63,    64,    65,    90,    59,
-     393,     4,    18,     1,     5,     3,    65,     5,    89,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,   327,    21,    22,    23,    14,    18,    89,    27,
-      90,   336,    30,    31,    32,    33,    88,    88,    51,    37,
-      38,    39,    40,    41,    14,    43,    44,    45,    46,    47,
-      48,    14,    88,   358,    14,    53,    54,    55,    56,    57,
-      58,     3,    60,    88,    77,    88,    88,     9,    66,    82,
-      83,    84,     4,    15,    87,    63,    64,    65,    20,    88,
-      78,    79,    80,     4,     4,     4,    14,    85,    86,    88,
-       3,    89,    88,    63,    64,    65,     4,   331,    88,     1,
-      63,    64,    65,     5,   409,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    14,    21,
-      22,    23,    63,    64,    65,    27,    77,    30,    31,    32,
-      33,    82,    83,    84,    37,    88,    87,    51,    52,    41,
-      89,    43,    44,    45,    46,    47,    48,    88,    88,    88,
-      15,    53,    54,    55,    56,    57,    58,   358,    60,    47,
-      63,    64,    65,    77,    66,   409,    27,   292,    82,    83,
-      84,    68,    -1,    87,    68,    -1,    78,    79,    80,    -1,
-      51,    52,     1,    85,    86,    88,     5,    89,     7,     8,
-       9,    10,    11,    12,    13,    -1,    15,    16,    17,    18,
-      19,    -1,    21,    22,    23,    76,    77,    -1,    27,    -1,
-      -1,    82,    83,    84,    -1,    -1,    87,    -1,    49,    50,
-      51,    52,    41,    -1,    43,    44,    45,    46,    47,    48,
-      63,    64,    65,    -1,    53,    54,    55,    56,    57,    58,
-      -1,    60,    73,    74,    75,    76,    77,    66,    -1,    -1,
-      -1,    82,    83,    84,    -1,    88,    87,    -1,    -1,    78,
-      79,    80,    -1,    -1,    -1,    -1,    85,    86,    -1,    88,
-      89,     3,    -1,     5,    -1,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    63,    64,    65,    27,    82,    83,    84,    -1,
-      -1,    87,    -1,    -1,    49,    50,    51,    52,    -1,    41,
-      -1,    43,    44,    45,    46,    47,    48,    88,    -1,    -1,
-      -1,    53,    54,    55,    56,    57,    58,    -1,    60,    74,
-      75,    76,    77,    -1,    66,    -1,    -1,    82,    83,    84,
-      -1,    -1,    87,    -1,    -1,    -1,    78,    79,    80,    -1,
-      -1,    -1,    -1,    85,    86,    -1,     3,    89,     5,    -1,
-       7,     8,     9,    10,    11,    12,    13,    -1,    15,    16,
-      17,    18,    19,    -1,    21,    22,    23,    63,    64,    65,
-      27,    63,    64,    65,    -1,    67,    -1,    -1,    49,    50,
-      51,    52,    -1,    -1,    41,    -1,    43,    44,    45,    46,
-      47,    48,    88,    63,    64,    65,    53,    54,    55,    56,
-      57,    58,    -1,    60,    75,    76,    77,    -1,    -1,    66,
-      -1,    82,    83,    84,    -1,    -1,    87,    -1,    88,    -1,
+     194,   195,   196,   197,   198,   293,    89,    18,    59,    15,
+     298,    89,    89,   278,   279,    89,   281,    88,    63,    64,
+      65,    63,    64,    65,     4,    63,    64,    65,    77,   292,
+      61,   294,     5,    82,    83,    84,   299,    61,    87,    90,
+      15,     9,   395,     4,    88,     1,    18,     3,     5,     5,
+      65,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,   329,    21,    22,    23,    63,    64,
+      65,    27,    89,   338,    30,    31,    32,    33,    18,    88,
+      51,    37,    38,    39,    40,    41,    88,    43,    44,    45,
+      46,    47,    48,    88,    88,   360,    88,    53,    54,    55,
+      56,    57,    58,    88,    60,    89,    77,    88,    14,   385,
+      66,    82,    83,    84,    88,     4,    87,   393,   394,    63,
+      64,    65,    78,    79,    80,     4,     3,   403,     4,    85,
+      86,    14,     9,    89,   410,    63,    64,    65,    15,   333,
+       4,     1,    88,    20,    88,     5,   411,     7,     8,     9,
+      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      88,    21,    22,    23,    63,    64,    65,    27,     3,    30,
+      31,    32,    33,    63,    64,    65,    37,    67,    39,    51,
+      52,    41,     4,    43,    44,    45,    46,    47,    48,    88,
+      63,    64,    65,    53,    54,    55,    56,    57,    58,    14,
+      60,    88,    63,    64,    65,    77,    66,    88,    88,    15,
+      82,    83,    84,   360,    89,    87,    47,    88,    78,    79,
+      80,    88,    51,    52,     1,    85,    86,    88,     5,    89,
+       7,     8,     9,    10,    11,    12,    13,   411,    15,    16,
+      17,    18,    19,    27,    21,    22,    23,    76,    77,    68,
+      27,   294,    68,    82,    83,    84,    -1,    -1,    87,    -1,
+      49,    50,    51,    52,    41,    -1,    43,    44,    45,    46,
+      47,    48,    63,    64,    65,    -1,    53,    54,    55,    56,
+      57,    58,    -1,    60,    73,    74,    75,    76,    77,    66,
+      -1,    -1,    -1,    82,    83,    84,    -1,    88,    87,    -1,
       -1,    78,    79,    80,    -1,    -1,    -1,    -1,    85,    86,
-      -1,     3,    89,     5,    -1,     7,     8,     9,    10,    11,
-      12,    13,    -1,    15,    16,    17,    18,    19,    -1,    21,
-      22,    23,    63,    64,    65,    27,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    49,    50,    51,    52,    -1,    41,
-      -1,    43,    44,    45,    46,    47,    48,    88,    -1,    -1,
-      -1,    53,    54,    55,    56,    57,    58,    -1,    60,    -1,
-      -1,    76,    77,     3,    66,     5,     6,    82,    83,    84,
-      -1,    -1,    87,    -1,    14,    -1,    78,    79,    80,    -1,
-      -1,    -1,    -1,    85,    86,    -1,    -1,    89,    -1,    -1,
-      30,    31,    32,    33,    -1,    -1,    -1,    37,    -1,    -1,
-      -1,    -1,    42,    -1,    -1,    -1,    -1,    -1,    -1,    49,
-      50,    51,    52,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    63,    64,    65,    -1,    67,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    -1,    -1,
-      -1,    -1,    82,    83,    84,    -1,    -1,    87,    88,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    -1,    15,
-      16,    17,    18,    19,    -1,    21,    22,    23,    -1,    -1,
-      -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,    49,    50,
-      51,    52,    -1,    -1,    -1,    41,    -1,    43,    44,    45,
-      46,    47,    48,    -1,    -1,    -1,    -1,    53,    54,    55,
-      56,    57,    58,    -1,    60,    76,    77,    -1,    -1,    -1,
-      66,    82,    83,    84,    -1,    -1,    87,    -1,    -1,    -1,
-      -1,    -1,    78,    79,    80,    49,    -1,    51,    52,    85,
-      86,    -1,     5,    89,     7,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
-      23,    -1,    76,    77,    27,    -1,    -1,    -1,    82,    83,
-      84,    -1,    -1,    87,    -1,    -1,    -1,    -1,    41,    -1,
-      43,    44,    45,    46,    47,    48,    -1,    -1,    -1,    -1,
-      53,    54,    55,    56,    57,    58,    -1,    60,    -1,    -1,
-      -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    30,    31,    32,    33,    78,    79,    80,    37,    -1,
-      -1,    -1,    85,    86,    -1,     5,    89,     7,     8,     9,
+      -1,    88,    89,     3,    -1,     5,    -1,     7,     8,     9,
       10,    11,    12,    13,    -1,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    63,    64,    65,    27,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    41,    -1,    43,    44,    45,    46,    47,    48,    -1,
+      20,    21,    22,    23,    63,    64,    65,    27,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    49,    50,    51,    52,
+      -1,    41,    -1,    43,    44,    45,    46,    47,    48,    88,
       -1,    -1,    -1,    53,    54,    55,    56,    57,    58,    -1,
-      60,    -1,    -1,    -1,    -1,    -1,    66,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
-      80,    -1,    -1,    -1,    -1,    85,    86,    -1,    88,    89,
+      60,    74,    75,    76,    77,    -1,    66,    -1,    -1,    82,
+      83,    84,    -1,    -1,    87,    -1,    -1,    -1,    78,    79,
+      80,    -1,    -1,    -1,    -1,    85,    86,    -1,     3,    89,
        5,    -1,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    17,    18,    19,    -1,    21,    22,    23,    -1,
-      -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,    43,    44,
-      45,    46,    47,    48,    -1,    -1,    -1,    -1,    53,    54,
-      55,    56,    57,    58,    -1,    60,    -1,    -1,    -1,    -1,
-      -1,    66,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    80,    -1,    -1,    -1,    -1,
-      85,    86,    -1,    88,    89,     5,    -1,     7,     8,     9,
+      15,    16,    17,    18,    19,    -1,    21,    22,    23,    63,
+      64,    65,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      49,    50,    51,    52,    -1,    -1,    41,    -1,    43,    44,
+      45,    46,    47,    48,    88,    63,    64,    65,    53,    54,
+      55,    56,    57,    58,    -1,    60,    75,    76,    77,    -1,
+      -1,    66,    -1,    82,    83,    84,    -1,    -1,    87,    -1,
+      88,    -1,    -1,    78,    79,    80,    -1,    -1,    -1,    -1,
+      85,    86,    -1,     3,    89,     5,    -1,     7,     8,     9,
       10,    11,    12,    13,    -1,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    -1,    -1,    -1,    27,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    41,    -1,    43,    44,    45,    46,    47,    48,    -1,
+      -1,    21,    22,    23,    63,    64,    65,    27,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    49,    50,    51,    52,
+      -1,    41,    -1,    43,    44,    45,    46,    47,    48,    88,
       -1,    -1,    -1,    53,    54,    55,    56,    57,    58,    -1,
-      60,    -1,    -1,    -1,    -1,    -1,    66,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
-      80,    -1,    -1,    -1,    -1,    85,    86,    -1,    88,    89,
-       5,    -1,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    17,    18,    19,    -1,    21,    22,    23,    -1,
-      -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,    43,    44,
-      45,    46,    47,    48,    -1,    -1,    -1,    -1,    53,    54,
-      55,    56,    57,    58,    -1,    60,    -1,    -1,    -1,    -1,
-      -1,    66,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    80,    -1,    -1,    -1,    -1,
-      85,    86,    -1,    88,    89,     5,    -1,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    -1,    -1,    -1,    27,    -1,    -1,
+      60,    -1,    -1,    76,    77,     3,    66,     5,     6,    82,
+      83,    84,    -1,    -1,    87,    -1,    14,    -1,    78,    79,
+      80,    -1,    -1,    -1,    -1,    85,    86,    -1,    -1,    89,
+      -1,    -1,    30,    31,    32,    33,    -1,    -1,    -1,    37,
+      -1,    39,    -1,    -1,    42,    -1,    -1,    -1,    -1,    -1,
+      -1,    49,    50,    51,    52,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,    67,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      -1,    -1,    -1,    -1,    82,    83,    84,    -1,    -1,    87,
+      88,     5,     6,     7,     8,     9,    10,    11,    12,    13,
+      -1,    15,    16,    17,    18,    19,    -1,    21,    22,    23,
+      -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,
+      49,    50,    51,    52,    -1,    -1,    -1,    41,    -1,    43,
+      44,    45,    46,    47,    48,    -1,    -1,    -1,    -1,    53,
+      54,    55,    56,    57,    58,    -1,    60,    76,    77,    -1,
+      -1,    -1,    66,    82,    83,    84,    -1,    -1,    87,    -1,
+      -1,    -1,    -1,    -1,    78,    79,    80,    49,    -1,    51,
+      52,    85,    86,    -1,     5,    89,     7,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
+      21,    22,    23,    -1,    76,    77,    27,    -1,    -1,    -1,
+      82,    83,    84,    -1,    -1,    87,    -1,    -1,    -1,    -1,
+      41,    -1,    43,    44,    45,    46,    47,    48,    -1,    -1,
+      -1,    -1,    53,    54,    55,    56,    57,    58,    -1,    60,
+      -1,    -1,    -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    30,    31,    32,    33,    78,    79,    80,
+      37,    -1,    39,    -1,    85,    86,    -1,     5,    89,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    17,
+      18,    19,    -1,    21,    22,    23,    63,    64,    65,    27,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    41,    -1,    43,    44,    45,    46,    47,    48,    -1,
-      -1,    -1,    -1,    53,    54,    55,    56,    57,    58,    -1,
-      60,    -1,    -1,    -1,    -1,    -1,    66,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
-      80,    -1,    -1,    -1,    -1,    85,    86,    -1,    88,    89,
-       5,    -1,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    17,    18,    19,    -1,    21,    22,    23,    -1,
-      -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,    43,    44,
-      45,    46,    47,    48,    -1,    -1,    -1,    -1,    53,    54,
-      55,    56,    57,    58,    -1,    60,    -1,    -1,    -1,    -1,
-      -1,    66,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    80,    -1,    -1,    -1,    -1,
-      85,    86,    -1,    88,    89,     5,    -1,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    -1,    -1,    -1,    27,    -1,    -1,
+      -1,    -1,    -1,    41,    -1,    43,    44,    45,    46,    47,
+      48,    -1,    -1,    -1,    -1,    53,    54,    55,    56,    57,
+      58,    -1,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    41,    -1,    43,    44,    45,    46,    47,    48,    -1,
-      -1,    -1,    -1,    53,    54,    55,    56,    57,    58,    -1,
-      60,    -1,    -1,    -1,    -1,    -1,    66,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    78,    79,
-      80,    -1,    -1,    -1,    -1,    85,    86,    -1,    88,    89,
-       5,    -1,     7,     8,     9,    10,    11,    12,    13,    -1,
-      15,    16,    17,    18,    19,    -1,    21,    22,    23,    -1,
-      -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,    43,    44,
-      45,    46,    47,    48,    -1,    -1,    -1,    -1,    53,    54,
-      55,    56,    57,    58,    -1,    60,    -1,    -1,    -1,    -1,
-      -1,    66,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    78,    79,    80,    -1,    -1,    -1,    -1,
-      85,    86,    -1,    88,    89,     5,    -1,     7,     8,     9,
-      10,    11,    12,    13,    -1,    15,    16,    17,    18,    19,
-      -1,    21,    22,    23,    -1,    -1,    -1,    27,    -1,    -1,
+      78,    79,    80,    -1,    -1,    -1,    -1,    85,    86,    -1,
+      88,    89,     5,    -1,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    17,    18,    19,    -1,    21,    22,
+      23,    -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,
+      43,    44,    45,    46,    47,    48,    -1,    -1,    -1,    -1,
+      53,    54,    55,    56,    57,    58,    -1,    60,    -1,    -1,
+      -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    78,    79,    80,    -1,    -1,
+      -1,    -1,    85,    86,    -1,    88,    89,     5,    -1,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    17,
+      18,    19,    -1,    21,    22,    23,    -1,    -1,    -1,    27,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    41,    -1,    43,    44,    45,    46,    47,    48,    -1,
-      -1,    -1,    -1,    53,    54,    55,    56,    57,    58,    -1,
-      60,    -1,    -1,    -1,    -1,    -1,    66,     6,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    14,    -1,    -1,    78,    79,
-      80,    -1,    -1,    -1,    -1,    85,    86,    -1,    -1,    89,
-      -1,    30,    31,    32,    33,    -1,    -1,    -1,    37,    -1,
-      -1,    -1,    -1,    42,    -1,    -1,    -1,    -1,    -1,    -1,
-      49,    50,    51,    52,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    63,    64,    65,    -1,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    -1,
-     355,    -1,   357,    82,    83,    84,   361,    -1,    87,    88,
+      -1,    -1,    -1,    41,    -1,    43,    44,    45,    46,    47,
+      48,    -1,    -1,    -1,    -1,    53,    54,    55,    56,    57,
+      58,    -1,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   377,   378,    -1,    -1,    -1,    -1,    -1,    -1,
-     385,   386,    -1,    -1,    -1,    -1,    -1,    42,    -1,   394,
-      -1,    -1,    -1,   398,    49,    50,    51,    52,    -1,    -1,
+      78,    79,    80,    -1,    -1,    -1,    -1,    85,    86,    -1,
+      88,    89,     5,    -1,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    17,    18,    19,    -1,    21,    22,
+      23,    -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,
+      43,    44,    45,    46,    47,    48,    -1,    -1,    -1,    -1,
+      53,    54,    55,    56,    57,    58,    -1,    60,    -1,    -1,
+      -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    78,    79,    80,    -1,    -1,
+      -1,    -1,    85,    86,    -1,    88,    89,     5,    -1,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    17,
+      18,    19,    -1,    21,    22,    23,    -1,    -1,    -1,    27,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     415,   416,    -1,    68,    69,    70,    71,    72,    73,    74,
-      75,    76,    77,    -1,    -1,    -1,    42,    82,    83,    84,
-      -1,    -1,    87,    49,    50,    51,    52,    -1,    -1,    -1,
+      -1,    -1,    -1,    41,    -1,    43,    44,    45,    46,    47,
+      48,    -1,    -1,    -1,    -1,    53,    54,    55,    56,    57,
+      58,    -1,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      78,    79,    80,    -1,    -1,    -1,    -1,    85,    86,    -1,
+      88,    89,     5,    -1,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    17,    18,    19,    -1,    21,    22,
+      23,    -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,
+      43,    44,    45,    46,    47,    48,    -1,    -1,    -1,    -1,
+      53,    54,    55,    56,    57,    58,    -1,    60,    -1,    -1,
+      -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    78,    79,    80,    -1,    -1,
+      -1,    -1,    85,    86,    -1,    88,    89,     5,    -1,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    17,
+      18,    19,    -1,    21,    22,    23,    -1,    -1,    -1,    27,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    41,    -1,    43,    44,    45,    46,    47,
+      48,    -1,    -1,    -1,    -1,    53,    54,    55,    56,    57,
+      58,    -1,    60,    -1,    -1,    -1,    -1,    -1,    66,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    68,    69,    -1,    71,    72,    73,    74,    75,
-      76,    77,    -1,    -1,    -1,    42,    82,    83,    84,    -1,
-      -1,    87,    49,    50,    51,    52,    -1,    -1,    -1,    -1,
+      78,    79,    80,    -1,    -1,    -1,    -1,    85,    86,    -1,
+      88,    89,     5,    -1,     7,     8,     9,    10,    11,    12,
+      13,    -1,    15,    16,    17,    18,    19,    -1,    21,    22,
+      23,    -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    41,    -1,
+      43,    44,    45,    46,    47,    48,    -1,    -1,    -1,    -1,
+      53,    54,    55,    56,    57,    58,    -1,    60,    -1,    -1,
+      -1,    -1,    -1,    66,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    78,    79,    80,    -1,    -1,
+      -1,    -1,    85,    86,    -1,    88,    89,     5,    -1,     7,
+       8,     9,    10,    11,    12,    13,    -1,    15,    16,    17,
+      18,    19,    -1,    21,    22,    23,    -1,    -1,    -1,    27,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    41,    -1,    43,    44,    45,    46,    47,
+      48,    -1,    -1,    -1,    -1,    53,    54,    55,    56,    57,
+      58,    -1,    60,    -1,    -1,    -1,    -1,    -1,    66,     6,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    14,    -1,    -1,
+      78,    79,    80,    -1,    -1,    -1,    -1,    85,    86,    -1,
+      -1,    89,    -1,    30,    31,    32,    33,    -1,    -1,    -1,
+      37,    -1,    39,    -1,    -1,    42,    -1,    -1,    -1,    -1,
+      -1,    -1,    49,    50,    51,    52,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    65,    -1,
+      67,    68,    69,    70,    71,    72,    73,    74,    75,    76,
+      77,    -1,   357,    -1,   359,    82,    83,    84,   363,    -1,
+      87,    88,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   379,   380,    -1,    -1,    -1,    -1,
+      -1,    -1,   387,   388,    -1,    -1,    -1,    -1,    -1,    42,
+      -1,   396,    -1,    -1,    -1,   400,    49,    50,    51,    52,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    69,    -1,    71,    72,    73,    74,    75,    76,
-      77,    -1,    -1,    -1,    42,    82,    83,    84,    -1,    -1,
-      87,    49,    50,    51,    52,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   417,   418,    -1,    68,    69,    70,    71,    72,
+      73,    74,    75,    76,    77,    -1,    -1,    -1,    42,    82,
+      83,    84,    -1,    -1,    87,    49,    50,    51,    52,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    68,    69,    -1,    71,    72,    73,
+      74,    75,    76,    77,    -1,    -1,    -1,    42,    82,    83,
+      84,    -1,    -1,    87,    49,    50,    51,    52,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    69,    -1,    71,    72,    73,    74,
+      75,    76,    77,    -1,    -1,    -1,    42,    82,    83,    84,
+      -1,    -1,    87,    49,    50,    51,    52,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    71,    72,    73,    74,    75,    76,    77,
-      -1,    -1,    -1,    -1,    82,    83,    84,    -1,    -1,    87
+      -1,    -1,    -1,    -1,    -1,    71,    72,    73,    74,    75,
+      76,    77,    -1,    -1,    -1,    -1,    82,    83,    84,    -1,
+      -1,    87
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -862,31 +866,32 @@ static const yytype_uint8 yystos[] =
       15,   134,   146,   150,   155,   155,    15,    93,   143,   150,
       14,   133,    15,   143,    89,   145,   150,   151,   152,   143,
      134,   143,   143,   143,   143,   143,    88,   133,    36,   105,
-      14,    30,    31,    32,    33,    37,    63,    64,    65,    67,
-       3,     5,    89,    42,    49,    50,    51,    52,    68,    69,
-      71,    72,    73,    74,    75,    76,    77,    82,    83,    84,
-      87,    89,     3,     5,     3,     5,     3,    93,    18,   126,
-      15,   126,    99,     6,   146,    89,   134,    93,   126,    94,
-      94,    94,    94,    94,    94,    89,    94,    94,    88,    88,
-     133,   133,   147,   155,   134,    89,    89,     4,    14,   146,
-      88,   133,    61,   128,     5,    88,    93,   133,   111,   133,
-     133,   133,   133,   133,   133,   133,   143,   133,   133,    88,
-     133,   143,   143,   143,   143,   143,   143,   143,   143,   143,
-     143,   143,   143,   143,   143,   143,     3,     5,    16,    89,
-     137,   150,    88,   133,   133,   133,   133,   133,   133,    61,
-     127,    15,   127,     4,   147,    88,   136,   127,   110,   133,
-     111,   112,   133,   111,   114,   148,   150,   101,   109,   112,
-     113,   133,    94,    95,   112,    88,    67,    88,   133,    88,
-     133,    88,   133,     4,    88,    18,   133,     5,    14,     6,
-      88,    70,   133,   133,    88,   133,    89,    88,    14,     6,
-      14,     6,    14,    18,    14,    93,   129,   146,   129,    88,
-     146,    93,    88,    88,    88,    88,    89,    88,    14,   112,
-     112,    88,    88,    88,    88,     6,   133,     4,   143,    14,
-       6,    88,   147,     4,     4,     4,    14,   108,   108,     3,
-      97,    97,   112,    97,   110,    88,    88,    97,     6,     4,
-      88,    97,    97,    98,    34,    35,   102,   102,    88,   105,
-      14,    97,    97,   105,   105,    99,    97,    89,    97,   108,
-     105,     4,   112,   105,   113,    88,    88,    97,    97,   102
+      14,    30,    31,    32,    33,    37,    39,    63,    64,    65,
+      67,     3,     5,    89,    42,    49,    50,    51,    52,    68,
+      69,    71,    72,    73,    74,    75,    76,    77,    82,    83,
+      84,    87,    89,     3,     5,     3,     5,     3,    93,    18,
+     126,    15,   126,    99,     6,   146,    89,   134,    93,   126,
+      94,    94,    94,    94,    94,    94,    89,    94,    94,    88,
+      88,   133,   133,   147,   155,   134,    89,    89,     4,    14,
+     146,    88,   133,    61,   128,     5,    88,    93,   133,   111,
+     133,   133,   133,   133,   133,   133,   133,   133,   143,   133,
+     133,    88,   133,   143,   143,   143,   143,   143,   143,   143,
+     143,   143,   143,   143,   143,   143,   143,   143,     3,     5,
+      16,    89,   137,   150,    88,   133,   133,   133,   133,   133,
+     133,    61,   127,    15,   127,     4,   147,    88,   136,   127,
+     110,   133,   111,   112,   133,   111,   114,   148,   150,   101,
+     109,   112,   113,   133,    94,    95,   112,    88,    67,    88,
+     133,    88,   133,    88,   133,     4,    88,    18,   133,     5,
+      14,     6,    88,    70,   133,   133,    88,   133,    89,    88,
+      14,     6,    14,     6,    14,    18,    14,    93,   129,   146,
+     129,    88,   146,    93,    88,    88,    88,    88,    89,    88,
+      14,   112,   112,    88,    88,    88,    88,     6,   133,     4,
+     143,    14,     6,    88,   147,     4,     4,     4,    14,   108,
+     108,     3,    97,    97,   112,    97,   110,    88,    88,    97,
+       6,     4,    88,    97,    97,    98,    34,    35,   102,   102,
+      88,   105,    14,    97,    97,   105,   105,    99,    97,    89,
+      97,   108,   105,     4,   112,   105,   113,    88,    88,    97,
+      97,   102
 };
 
 typedef enum {

diff --git a/perly.y b/perly.y
index aad4dd7..c07f48a 100644 (file)
--- a/perly.y
+++ b/perly.y
@@ -269,6 +269,8 @@ sideff      :       error
                                        (OP*)NULL, $3, $1, (OP*)NULL);
                          TOKEN_GETMAD($2,((LISTOP*)$$)->op_first->op_sibling,'w');
                        }
+       |       expr WHEN expr
+                       { $$ = newWHENOP($3, scope($1)); }
        ;
 
 /* else and elsif blocks */

diff --git a/t/op/switch.t b/t/op/switch.t
index 14cf98a..9fa5b08 100644 (file)
--- a/t/op/switch.t
+++ b/t/op/switch.t
@@ -8,7 +8,7 @@ BEGIN {
 use strict;
 use warnings;
 
-use Test::More tests => 111;
+use Test::More tests => 118;
 
 # The behaviour of the feature pragma should be tested by lib/switch.t
 # using the tests in t/lib/switch/*. This file tests the behaviour of
@@ -897,6 +897,65 @@ SKIP: {
        ok($obj->{reversed}, "$test: reversed");
     }
 }
+
+# Postfix when
+{
+    my $ok;
+    given (undef) {
+       $ok = 1 when undef;
+    }
+    is($ok, 1, "postfix undef");
+}
+{
+    my $ok;
+    given (2) {
+       $ok += 1 when 7;
+       $ok += 2 when 9.1685;
+       $ok += 4 when $_ > 4;
+       $ok += 8 when $_ < 2.5;
+    }
+    is($ok, 8, "postfix numeric");
+}
+{
+    my $ok;
+    given ("apple") {
+       $ok = 1, continue when $_ eq "apple";
+       $ok += 2;
+       $ok = 0 when "banana";
+    }
+    is($ok, 3, "postfix string");
+}
+{
+    my $ok;
+    given ("pear") {
+       do { $ok = 1; continue } when /pea/;
+       $ok += 2;
+       $ok = 0 when /pie/;
+       default { $ok += 4 }
+       $ok = 0;
+    }
+    is($ok, 7, "postfix regex");
+}
+# be_true is defined at the beginning of the file
+{
+    my $x = "what";
+    given(my $x = "foo") {
+       do {
+           is($x, "foo", "scope inside ... when my \$x = ...");
+           continue;
+       } when be_true(my $x = "bar");
+       is($x, "bar", "scope after ... when my \$x = ...");
+    }
+}
+{
+    my $x = 0;
+    given(my $x = 1) {
+       my $x = 2, continue when be_true();
+        is($x, undef, "scope after my \$x = ... when ...");
+    }
+}
+
+
 # Okay, that'll do for now. The intricacies of the smartmatch
 # semantics are tested in t/op/smartmatch.t
 __END__