Make ‘sub foo{}’ respect ‘our foo’

This commit switches all sub definitions, whether with ‘our’ or not,
to using S_force_ident_maybe_lex (formerly known as S_pending_ident).

This means that an unqualified (no our/my/state or package prefix)
‘sub foo’ declaration does a pad lookup, just like $foo.

It turns out that the vivification that I added to the then
S_pending_ident for CVs was unnecessary and actually buggy.  We
*don’t* want to autovivify GVs for CVs, because they might be con-
stants or forward declarations, which are stored in a simpler form.

I also had to change the subname rule used by MYSUB in perly.y, since
it can now be fed a PRIVATEREF, which it does not expect.  This may
prove to be temporary, but it keeps current tests passing.

diff --git a/perly.act b/perly.act
index dfa1d3a..303dae7 100644 (file)
--- a/perly.act
+++ b/perly.act
@@ -718,25 +718,25 @@ case 2:
                          (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 83:
-#line 691 "perly.y"
+  case 84:
+#line 692 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 85:
-#line 697 "perly.y"
+  case 86:
+#line 698 "perly.y"
     { (yyval.opval) = (OP*)NULL; ;}
     break;
 
-  case 86:
-#line 699 "perly.y"
+  case 87:
+#line 700 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
                        ;}
     break;
 
-  case 87:
-#line 703 "perly.y"
+  case 88:
+#line 704 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newOP(OP_NULL, 0),
                                    (OP*)NULL
@@ -745,15 +745,15 @@ case 2:
                        ;}
     break;
 
-  case 88:
-#line 713 "perly.y"
+  case 89:
+#line 714 "perly.y"
     { (yyval.opval) = (ps[(2) - (2)].val.opval);
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),':');
                        ;}
     break;
 
-  case 89:
-#line 717 "perly.y"
+  case 90:
+#line 718 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newOP(OP_NULL, 0),
                                    (OP*)NULL
@@ -762,13 +762,13 @@ case 2:
                        ;}
     break;
 
-  case 90:
-#line 726 "perly.y"
+  case 91:
+#line 727 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 91:
-#line 727 "perly.y"
+  case 92:
+#line 728 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newOP(OP_NULL,0),
                                    (OP*)NULL
@@ -778,29 +778,29 @@ case 2:
                        ;}
     break;
 
-  case 92:
-#line 738 "perly.y"
+  case 93:
+#line 739 "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 93:
-#line 742 "perly.y"
+  case 94:
+#line 743 "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 94:
-#line 746 "perly.y"
+  case 95:
+#line 747 "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 96:
-#line 754 "perly.y"
+  case 97:
+#line 755 "perly.y"
     {
 #ifdef MAD
                          OP* op = newNULLLIST();
@@ -812,8 +812,8 @@ case 2:
                        ;}
     break;
 
-  case 97:
-#line 764 "perly.y"
+  case 98:
+#line 765 "perly.y"
     { 
                          OP* term = (ps[(3) - (3)].val.opval);
                          DO_MAD(
@@ -824,16 +824,16 @@ case 2:
                        ;}
     break;
 
-  case 99:
-#line 777 "perly.y"
+  case 100:
+#line 778 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (3)].val.i_tkval)), OPf_STACKED,
                                op_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 100:
-#line 782 "perly.y"
+  case 101:
+#line 783 "perly.y"
     { (yyval.opval) = convert(IVAL((ps[(1) - (5)].val.i_tkval)), OPf_STACKED,
                                op_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');
@@ -842,8 +842,8 @@ case 2:
                        ;}
     break;
 
-  case 101:
-#line 789 "perly.y"
+  case 102:
+#line 790 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,
                                    op_prepend_elem(OP_LIST, scalar((ps[(1) - (6)].val.opval)), (ps[(5) - (6)].val.opval)),
@@ -854,8 +854,8 @@ case 2:
                        ;}
     break;
 
-  case 102:
-#line 798 "perly.y"
+  case 103:
+#line 799 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST, scalar((ps[(1) - (3)].val.opval)),
                                    newUNOP(OP_METHOD, 0, (ps[(3) - (3)].val.opval))));
@@ -863,8 +863,8 @@ case 2:
                        ;}
     break;
 
-  case 103:
-#line 804 "perly.y"
+  case 104:
+#line 805 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,
                                    op_prepend_elem(OP_LIST, (ps[(2) - (3)].val.opval), (ps[(3) - (3)].val.opval)),
@@ -872,8 +872,8 @@ case 2:
                        ;}
     break;
 
-  case 104:
-#line 810 "perly.y"
+  case 105:
+#line 811 "perly.y"
     { (yyval.opval) = convert(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST,
                                    op_prepend_elem(OP_LIST, (ps[(2) - (5)].val.opval), (ps[(4) - (5)].val.opval)),
@@ -883,15 +883,15 @@ case 2:
                        ;}
     break;
 
-  case 105:
-#line 818 "perly.y"
+  case 106:
+#line 819 "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 106:
-#line 822 "perly.y"
+  case 107:
+#line 823 "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),'(');
@@ -899,22 +899,22 @@ case 2:
                        ;}
     break;
 
-  case 107:
-#line 828 "perly.y"
+  case 108:
+#line 829 "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 108:
-#line 831 "perly.y"
+  case 109:
+#line 832 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                 op_append_elem(OP_LIST,
                                   op_prepend_elem(OP_LIST, (ps[(4) - (5)].val.opval), (ps[(5) - (5)].val.opval)), (ps[(1) - (5)].val.opval)));
                        ;}
     break;
 
-  case 111:
-#line 846 "perly.y"
+  case 112:
+#line 847 "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),'{');
@@ -923,16 +923,16 @@ case 2:
                        ;}
     break;
 
-  case 112:
-#line 853 "perly.y"
+  case 113:
+#line 854 "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 113:
-#line 858 "perly.y"
+  case 114:
+#line 859 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
                                        ref(newAVREF((ps[(1) - (5)].val.opval)),OP_RV2AV),
                                        scalar((ps[(4) - (5)].val.opval)));
@@ -942,8 +942,8 @@ case 2:
                        ;}
     break;
 
-  case 114:
-#line 866 "perly.y"
+  case 115:
+#line 867 "perly.y"
     { (yyval.opval) = newBINOP(OP_AELEM, 0,
                                        ref(newAVREF((ps[(1) - (4)].val.opval)),OP_RV2AV),
                                        scalar((ps[(3) - (4)].val.opval)));
@@ -952,8 +952,8 @@ case 2:
                        ;}
     break;
 
-  case 115:
-#line 873 "perly.y"
+  case 116:
+#line 874 "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),'{');
@@ -962,8 +962,8 @@ case 2:
                        ;}
     break;
 
-  case 116:
-#line 880 "perly.y"
+  case 117:
+#line 881 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF((ps[(1) - (6)].val.opval)),OP_RV2HV),
                                        jmaybe((ps[(4) - (6)].val.opval)));
@@ -975,8 +975,8 @@ case 2:
                        ;}
     break;
 
-  case 117:
-#line 890 "perly.y"
+  case 118:
+#line 891 "perly.y"
     { (yyval.opval) = newBINOP(OP_HELEM, 0,
                                        ref(newHVREF((ps[(1) - (5)].val.opval)),OP_RV2HV),
                                        jmaybe((ps[(3) - (5)].val.opval)));
@@ -987,8 +987,8 @@ case 2:
                        ;}
     break;
 
-  case 118:
-#line 899 "perly.y"
+  case 119:
+#line 900 "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');
@@ -997,8 +997,8 @@ case 2:
                        ;}
     break;
 
-  case 119:
-#line 906 "perly.y"
+  case 120:
+#line 907 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   op_append_elem(OP_LIST, (ps[(4) - (5)].val.opval),
                                       newCVREF(0, scalar((ps[(1) - (5)].val.opval)))));
@@ -1008,8 +1008,8 @@ case 2:
                        ;}
     break;
 
-  case 120:
-#line 915 "perly.y"
+  case 121:
+#line 916 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                   op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval),
                                               newCVREF(0, scalar((ps[(1) - (4)].val.opval)))));
@@ -1018,8 +1018,8 @@ case 2:
                        ;}
     break;
 
-  case 121:
-#line 922 "perly.y"
+  case 122:
+#line 923 "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),'(');
@@ -1027,8 +1027,8 @@ case 2:
                        ;}
     break;
 
-  case 122:
-#line 928 "perly.y"
+  case 123:
+#line 929 "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),')');
@@ -1037,16 +1037,16 @@ case 2:
                        ;}
     break;
 
-  case 123:
-#line 935 "perly.y"
+  case 124:
+#line 936 "perly.y"
     { (yyval.opval) = newSLICEOP(0, (ps[(3) - (4)].val.opval), (ps[(1) - (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 124:
-#line 940 "perly.y"
+  case 125:
+#line 941 "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),')');
@@ -1055,22 +1055,22 @@ case 2:
                        ;}
     break;
 
-  case 125:
-#line 950 "perly.y"
+  case 126:
+#line 951 "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 126:
-#line 954 "perly.y"
+  case 127:
+#line 955 "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 127:
-#line 958 "perly.y"
+  case 128:
+#line 959 "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)));
@@ -1078,50 +1078,50 @@ case 2:
                        ;}
     break;
 
-  case 128:
-#line 964 "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 129:
-#line 968 "perly.y"
+#line 965 "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 130:
-#line 972 "perly.y"
+#line 969 "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 131:
-#line 976 "perly.y"
+#line 973 "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 132:
-#line 980 "perly.y"
+#line 977 "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 133:
-#line 984 "perly.y"
+#line 981 "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 134:
-#line 988 "perly.y"
+#line 985 "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 135:
+#line 989 "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({
@@ -1135,29 +1135,29 @@ case 2:
                        ;}
     break;
 
-  case 135:
-#line 1000 "perly.y"
+  case 136:
+#line 1001 "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 136:
-#line 1004 "perly.y"
+  case 137:
+#line 1005 "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 137:
-#line 1008 "perly.y"
+  case 138:
+#line 1009 "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 138:
-#line 1012 "perly.y"
+  case 139:
+#line 1013 "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
@@ -1166,15 +1166,15 @@ case 2:
                        ;}
     break;
 
-  case 139:
-#line 1022 "perly.y"
+  case 140:
+#line 1023 "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 140:
-#line 1026 "perly.y"
+  case 141:
+#line 1027 "perly.y"
     { (yyval.opval) = IF_MAD(
                                    newUNOP(OP_NULL, 0, (ps[(2) - (2)].val.opval)),
                                    (ps[(2) - (2)].val.opval)
@@ -1183,70 +1183,70 @@ case 2:
                        ;}
     break;
 
-  case 141:
-#line 1033 "perly.y"
+  case 142:
+#line 1034 "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 142:
-#line 1037 "perly.y"
+  case 143:
+#line 1038 "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 143:
-#line 1041 "perly.y"
+  case 144:
+#line 1042 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTINC, 0,
                                        op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTINC));
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 144:
-#line 1046 "perly.y"
+  case 145:
+#line 1047 "perly.y"
     { (yyval.opval) = newUNOP(OP_POSTDEC, 0,
                                        op_lvalue(scalar((ps[(1) - (2)].val.opval)), OP_POSTDEC));
                          TOKEN_GETMAD((ps[(2) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 145:
-#line 1051 "perly.y"
+  case 146:
+#line 1052 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREINC, 0,
                                        op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREINC));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 146:
-#line 1056 "perly.y"
+  case 147:
+#line 1057 "perly.y"
     { (yyval.opval) = newUNOP(OP_PREDEC, 0,
                                        op_lvalue(scalar((ps[(2) - (2)].val.opval)), OP_PREDEC));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 147:
-#line 1065 "perly.y"
+  case 148:
+#line 1066 "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 148:
-#line 1070 "perly.y"
+  case 149:
+#line 1071 "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 149:
-#line 1075 "perly.y"
+  case 150:
+#line 1076 "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),';');
@@ -1254,8 +1254,8 @@ case 2:
                        ;}
     break;
 
-  case 150:
-#line 1081 "perly.y"
+  case 151:
+#line 1082 "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),';');
@@ -1263,8 +1263,8 @@ case 2:
                        ;}
     break;
 
-  case 151:
-#line 1087 "perly.y"
+  case 152:
+#line 1088 "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');
@@ -1273,22 +1273,22 @@ case 2:
                        ;}
     break;
 
-  case 152:
-#line 1098 "perly.y"
+  case 153:
+#line 1099 "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 153:
-#line 1102 "perly.y"
+  case 154:
+#line 1103 "perly.y"
     { (yyval.opval) = newUNOP(OP_NULL, OPf_SPECIAL, op_scope((ps[(2) - (2)].val.opval)));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'D');
                        ;}
     break;
 
-  case 154:
-#line 1106 "perly.y"
+  case 155:
+#line 1107 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
                            OPf_SPECIAL|OPf_STACKED,
                            op_prepend_elem(OP_LIST,
@@ -1302,8 +1302,8 @@ case 2:
                        ;}
     break;
 
-  case 155:
-#line 1118 "perly.y"
+  case 156:
+#line 1119 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB,
                            OPf_SPECIAL|OPf_STACKED,
                            op_append_elem(OP_LIST,
@@ -1318,8 +1318,8 @@ case 2:
                        ;}
     break;
 
-  case 156:
-#line 1131 "perly.y"
+  case 157:
+#line 1132 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
                            op_prepend_elem(OP_LIST,
                                scalar(newCVREF(0,scalar((ps[(2) - (4)].val.opval)))), (OP*)NULL)); dep();
@@ -1329,8 +1329,8 @@ case 2:
                        ;}
     break;
 
-  case 157:
-#line 1139 "perly.y"
+  case 158:
+#line 1140 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_SPECIAL|OPf_STACKED,
                            op_prepend_elem(OP_LIST,
                                (ps[(4) - (5)].val.opval),
@@ -1341,86 +1341,86 @@ case 2:
                        ;}
     break;
 
-  case 162:
-#line 1155 "perly.y"
+  case 163:
+#line 1156 "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 163:
-#line 1160 "perly.y"
+  case 164:
+#line 1161 "perly.y"
     { (yyval.opval) = newUNOP(OP_REFGEN, 0, op_lvalue((ps[(2) - (2)].val.opval),OP_REFGEN));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'o');
                        ;}
     break;
 
-  case 164:
-#line 1164 "perly.y"
+  case 165:
+#line 1165 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 165:
-#line 1166 "perly.y"
+  case 166:
+#line 1167 "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 166:
-#line 1170 "perly.y"
+  case 167:
+#line 1171 "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 167:
-#line 1175 "perly.y"
+  case 168:
+#line 1176 "perly.y"
     { (yyval.opval) = IF_MAD(newUNOP(OP_NULL,0,(ps[(1) - (1)].val.opval)), (ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 168:
-#line 1177 "perly.y"
+  case 169:
+#line 1178 "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 169:
-#line 1182 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
-    break;
-
   case 170:
-#line 1184 "perly.y"
+#line 1183 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 171:
-#line 1186 "perly.y"
+#line 1185 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 172:
-#line 1188 "perly.y"
+#line 1187 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 173:
-#line 1190 "perly.y"
-    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
+#line 1189 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 174:
-#line 1192 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1191 "perly.y"
+    { (yyval.opval) = newUNOP(OP_AV2ARYLEN, 0, ref((ps[(1) - (1)].val.opval), OP_AV2ARYLEN));;}
     break;
 
   case 175:
-#line 1194 "perly.y"
+#line 1193 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+    break;
+
+  case 176:
+#line 1195 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_ASLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_ASLICE, 0,
@@ -1431,8 +1431,8 @@ case 2:
                        ;}
     break;
 
-  case 176:
-#line 1203 "perly.y"
+  case 177:
+#line 1204 "perly.y"
     { (yyval.opval) = op_prepend_elem(OP_HSLICE,
                                newOP(OP_PUSHMARK, 0),
                                    newLISTOP(OP_HSLICE, 0,
@@ -1445,26 +1445,26 @@ case 2:
                        ;}
     break;
 
-  case 177:
-#line 1214 "perly.y"
+  case 178:
+#line 1215 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 178:
-#line 1216 "perly.y"
+  case 179:
+#line 1217 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, 0, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 179:
-#line 1218 "perly.y"
+  case 180:
+#line 1219 "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 180:
-#line 1223 "perly.y"
+  case 181:
+#line 1224 "perly.y"
     {
                          (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                op_append_elem(OP_LIST, (ps[(3) - (4)].val.opval), scalar((ps[(1) - (4)].val.opval))));
@@ -1479,91 +1479,91 @@ case 2:
                        ;}
     break;
 
-  case 181:
-#line 1236 "perly.y"
+  case 182:
+#line 1237 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                            op_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 182:
-#line 1241 "perly.y"
+  case 183:
+#line 1242 "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 183:
-#line 1246 "perly.y"
+  case 184:
+#line 1247 "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 184:
-#line 1250 "perly.y"
+  case 185:
+#line 1251 "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 185:
-#line 1254 "perly.y"
+  case 186:
+#line 1255 "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 186:
-#line 1258 "perly.y"
+  case 187:
+#line 1259 "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 187:
-#line 1262 "perly.y"
+  case 188:
+#line 1263 "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 188:
-#line 1266 "perly.y"
+  case 189:
+#line 1267 "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 189:
-#line 1270 "perly.y"
+  case 190:
+#line 1271 "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 190:
-#line 1274 "perly.y"
+  case 191:
+#line 1275 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED, scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 191:
-#line 1276 "perly.y"
+  case 192:
+#line 1277 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                            op_append_elem(OP_LIST, (ps[(2) - (2)].val.opval), scalar((ps[(1) - (2)].val.opval)))); ;}
     break;
 
-  case 192:
-#line 1279 "perly.y"
+  case 193:
+#line 1280 "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 193:
-#line 1283 "perly.y"
+  case 194:
+#line 1284 "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),'(');
@@ -1571,27 +1571,27 @@ case 2:
                        ;}
     break;
 
-  case 194:
-#line 1289 "perly.y"
+  case 195:
+#line 1290 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
-  case 195:
-#line 1291 "perly.y"
+  case 196:
+#line 1292 "perly.y"
     { (yyval.opval) = (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 196:
-#line 1296 "perly.y"
+  case 197:
+#line 1297 "perly.y"
     { (yyval.opval) = newUNOP(OP_ENTERSUB, OPf_STACKED,
                                scalar((ps[(1) - (1)].val.opval))); ;}
     break;
 
-  case 197:
-#line 1299 "perly.y"
+  case 198:
+#line 1300 "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);
@@ -1602,8 +1602,8 @@ case 2:
                        ;}
     break;
 
-  case 198:
-#line 1308 "perly.y"
+  case 199:
+#line 1309 "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),'(');
@@ -1611,8 +1611,8 @@ case 2:
                        ;}
     break;
 
-  case 199:
-#line 1314 "perly.y"
+  case 200:
+#line 1315 "perly.y"
     {
                            if (   (ps[(1) - (1)].val.opval)->op_type != OP_TRANS
                                && (ps[(1) - (1)].val.opval)->op_type != OP_TRANSR
@@ -1625,16 +1625,16 @@ case 2:
                        ;}
     break;
 
-  case 200:
-#line 1325 "perly.y"
+  case 201:
+#line 1326 "perly.y"
     { (yyval.opval) = pmruntime((ps[(1) - (5)].val.opval), (ps[(4) - (5)].val.opval), 1, (ps[(2) - (5)].val.ival));
                          TOKEN_GETMAD((ps[(3) - (5)].val.i_tkval),(yyval.opval),'(');
                          TOKEN_GETMAD((ps[(5) - (5)].val.i_tkval),(yyval.opval),')');
                        ;}
     break;
 
-  case 203:
-#line 1332 "perly.y"
+  case 204:
+#line 1333 "perly.y"
     {
                          (yyval.opval) = newLISTOP(OP_DIE, 0, newOP(OP_PUSHMARK, 0),
                                newSVOP(OP_CONST, 0, newSVpvs("Unimplemented")));
@@ -1642,8 +1642,8 @@ case 2:
                        ;}
     break;
 
-  case 205:
-#line 1342 "perly.y"
+  case 206:
+#line 1343 "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');
@@ -1653,128 +1653,128 @@ case 2:
                        ;}
     break;
 
-  case 206:
-#line 1350 "perly.y"
+  case 207:
+#line 1351 "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 207:
-#line 1357 "perly.y"
+  case 208:
+#line 1358 "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 208:
-#line 1362 "perly.y"
+  case 209:
+#line 1363 "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 209:
-#line 1367 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
-    break;
-
   case 210:
-#line 1369 "perly.y"
+#line 1368 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 211:
-#line 1371 "perly.y"
+#line 1370 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 212:
-#line 1376 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 1372 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 213:
-#line 1378 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1377 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 214:
-#line 1382 "perly.y"
-    { (yyval.opval) = (OP*)NULL; ;}
+#line 1379 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 215:
-#line 1384 "perly.y"
-    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
+#line 1383 "perly.y"
+    { (yyval.opval) = (OP*)NULL; ;}
     break;
 
   case 216:
-#line 1390 "perly.y"
-    { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
+#line 1385 "perly.y"
+    { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
   case 217:
-#line 1394 "perly.y"
+#line 1391 "perly.y"
+    { PL_parser->in_my = 0; (yyval.opval) = my((ps[(1) - (1)].val.opval)); ;}
+    break;
+
+  case 218:
+#line 1395 "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 218:
-#line 1400 "perly.y"
+  case 219:
+#line 1401 "perly.y"
     { (yyval.opval) = newSVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'$');
                        ;}
     break;
 
-  case 219:
-#line 1406 "perly.y"
+  case 220:
+#line 1407 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'@');
                        ;}
     break;
 
-  case 220:
-#line 1412 "perly.y"
+  case 221:
+#line 1413 "perly.y"
     { (yyval.opval) = newHVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'%');
                        ;}
     break;
 
-  case 221:
-#line 1418 "perly.y"
+  case 222:
+#line 1419 "perly.y"
     { (yyval.opval) = newAVREF((ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'l');
                        ;}
     break;
 
-  case 222:
-#line 1424 "perly.y"
+  case 223:
+#line 1425 "perly.y"
     { (yyval.opval) = newGVREF(0,(ps[(2) - (2)].val.opval));
                          TOKEN_GETMAD((ps[(1) - (2)].val.i_tkval),(yyval.opval),'*');
                        ;}
     break;
 
-  case 223:
-#line 1431 "perly.y"
+  case 224:
+#line 1432 "perly.y"
     { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 224:
-#line 1433 "perly.y"
+  case 225:
+#line 1434 "perly.y"
     { (yyval.opval) = scalar((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 225:
-#line 1435 "perly.y"
+  case 226:
+#line 1436 "perly.y"
     { (yyval.opval) = op_scope((ps[(1) - (1)].val.opval)); ;}
     break;
 
-  case 226:
-#line 1438 "perly.y"
+  case 227:
+#line 1439 "perly.y"
     { (yyval.opval) = (ps[(1) - (1)].val.opval); ;}
     break;
 
@@ -1785,6 +1785,6 @@ case 2:
     
 
 /* Generated from:
- * 3e01d5213d0f6a4dd26b90cfb22baf8eaf3c89d8ae0025fdc9e06ec1f871e826 perly.y
+ * d37e00fcfb1737df464a95af8f4a92c2518ee5b69cd05ffc577f253313aa81c3 perly.y
  * 4a3ced51fe6585f6ec59e65e1ffd74bc976c498b0e6992eaab337219fee72e51 regen_perly.pl
  * ex: set ro: */

diff --git a/perly.h b/perly.h
index eccc250..c531e48 100644 (file)
--- a/perly.h
+++ b/perly.h
@@ -268,6 +268,6 @@ typedef union YYSTYPE
 
 
 /* Generated from:
- * 3e01d5213d0f6a4dd26b90cfb22baf8eaf3c89d8ae0025fdc9e06ec1f871e826 perly.y
+ * d37e00fcfb1737df464a95af8f4a92c2518ee5b69cd05ffc577f253313aa81c3 perly.y
  * 4a3ced51fe6585f6ec59e65e1ffd74bc976c498b0e6992eaab337219fee72e51 regen_perly.pl
  * ex: set ro: */

diff --git a/perly.tab b/perly.tab
index cfd1c6d..f6add2d 100644 (file)
--- a/perly.tab
+++ b/perly.tab
@@ -6,16 +6,16 @@
 
 #define YYFINAL  14
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2819
+#define YYLAST   2817
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  105
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  66
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  226
+#define YYNRULES  227
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  459
+#define YYNSTATES  460
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -76,21 +76,21 @@ static const yytype_uint16 yyprhs[] =
      214,   217,   219,   222,   223,   227,   229,   231,   235,   239,
      243,   247,   251,   255,   256,   259,   266,   267,   270,   271,
      272,   274,   275,   277,   279,   281,   283,   285,   287,   288,
-     289,   290,   291,   293,   294,   296,   297,   300,   302,   305,
-     307,   309,   311,   315,   319,   323,   325,   328,   332,   334,
-     338,   344,   351,   355,   359,   365,   368,   373,   374,   380,
-     382,   384,   390,   395,   401,   406,   412,   419,   425,   430,
-     436,   441,   445,   452,   457,   463,   467,   471,   475,   479,
-     483,   487,   491,   495,   499,   503,   507,   511,   515,   519,
-     522,   525,   528,   531,   534,   537,   540,   543,   547,   550,
-     555,   559,   565,   568,   571,   576,   582,   587,   593,   595,
-     597,   599,   601,   607,   610,   612,   615,   619,   621,   624,
-     626,   628,   630,   632,   634,   636,   641,   647,   649,   651,
-     655,   660,   664,   666,   669,   672,   674,   677,   680,   682,
-     685,   687,   690,   692,   696,   698,   702,   704,   708,   713,
-     714,   720,   722,   724,   726,   728,   732,   735,   739,   742,
-     744,   746,   748,   749,   751,   752,   754,   756,   759,   762,
-     765,   768,   771,   774,   776,   778,   780
+     289,   290,   291,   293,   295,   296,   298,   299,   302,   304,
+     307,   309,   311,   313,   317,   321,   325,   327,   330,   334,
+     336,   340,   346,   353,   357,   361,   367,   370,   375,   376,
+     382,   384,   386,   392,   397,   403,   408,   414,   421,   427,
+     432,   438,   443,   447,   454,   459,   465,   469,   473,   477,
+     481,   485,   489,   493,   497,   501,   505,   509,   513,   517,
+     521,   524,   527,   530,   533,   536,   539,   542,   545,   549,
+     552,   557,   561,   567,   570,   573,   578,   584,   589,   595,
+     597,   599,   601,   603,   609,   612,   614,   617,   621,   623,
+     626,   628,   630,   632,   634,   636,   638,   643,   649,   651,
+     653,   657,   662,   666,   668,   671,   674,   676,   679,   682,
+     684,   687,   689,   692,   694,   698,   700,   704,   706,   710,
+     715,   716,   722,   724,   726,   728,   730,   734,   737,   741,
+     744,   746,   748,   750,   751,   753,   754,   756,   758,   761,
+     764,   767,   770,   773,   776,   778,   780,   782
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -125,56 +125,56 @@ static const yytype_int16 yyrhs[] =
      103,   135,   102,   116,   129,    -1,    -1,    48,   113,    -1,
       -1,    -1,   128,    -1,    -1,   147,    -1,   147,    -1,   147,
       -1,   132,    -1,   134,    -1,    23,    -1,    -1,    -1,    -1,
-      -1,    23,    -1,    -1,    26,    -1,    -1,    73,    26,    -1,
-      73,    -1,    73,    26,    -1,    73,    -1,   113,    -1,    20,
-      -1,   147,    79,   147,    -1,   147,    78,   147,    -1,   147,
-      77,   147,    -1,   148,    -1,   148,    81,    -1,   148,    81,
-     157,    -1,   157,    -1,    60,   170,   148,    -1,    58,   103,
-     170,   147,   102,    -1,   157,   101,   151,   103,   162,   102,
-      -1,   157,   101,   151,    -1,    24,   170,   161,    -1,    25,
-     170,   103,   162,   102,    -1,    60,   161,    -1,    58,   103,
-     162,   102,    -1,    -1,    33,   140,   113,   150,   161,    -1,
-      24,    -1,   165,    -1,   169,     9,   147,    20,    10,    -1,
-     165,    11,   147,    12,    -1,   157,   101,    11,   147,    12,
-      -1,   152,    11,   147,    12,    -1,   165,     9,   147,    20,
-      10,    -1,   157,   101,     9,   147,    20,    10,    -1,   152,
-       9,   147,    20,    10,    -1,   157,   101,   103,   102,    -1,
-     157,   101,   103,   147,   102,    -1,   152,   103,   147,   102,
-      -1,   152,   103,   102,    -1,   103,   147,   102,    11,   147,
-      12,    -1,    29,    11,   147,    12,    -1,   103,   102,    11,
-     147,    12,    -1,   157,    82,   157,    -1,   157,    96,   157,
-      -1,   157,    63,   157,    -1,   157,    64,   157,    -1,   157,
-      90,   157,    -1,   157,    61,   157,    -1,   157,    62,   157,
-      -1,   157,    89,   157,    -1,   157,    88,   157,    -1,   157,
-      54,   157,    -1,   157,    87,   157,    -1,   157,    86,   157,
-      -1,   157,    85,   157,    -1,   157,    91,   157,    -1,    13,
-     157,    -1,    14,   157,    -1,    92,   157,    -1,    93,   157,
-      -1,   157,    98,    -1,   157,    97,    -1,   100,   157,    -1,
-      99,   157,    -1,    11,   147,    12,    -1,    11,    12,    -1,
-      67,   147,    20,    10,    -1,    67,    20,    10,    -1,    39,
-     140,   143,   144,   113,    -1,    66,   157,    -1,    66,   113,
-      -1,    66,    23,   103,   102,    -1,    66,    23,   103,   147,
-     102,    -1,    66,   165,   103,   102,    -1,    66,   165,   103,
-     147,   102,    -1,   153,    -1,   154,    -1,   155,    -1,   156,
-      -1,   157,    83,   157,    84,   157,    -1,    94,   157,    -1,
-     159,    -1,    69,   157,    -1,   103,   147,   102,    -1,    29,
-      -1,   103,   102,    -1,   165,    -1,   169,    -1,   167,    -1,
-     166,    -1,   168,    -1,   152,    -1,   166,    11,   147,    12,
-      -1,   166,     9,   147,    20,    10,    -1,    26,    -1,   164,
-      -1,   164,   103,   102,    -1,   164,   103,   147,   102,    -1,
-      68,    23,   161,    -1,    53,    -1,    53,   157,    -1,    80,
-     148,    -1,    59,    -1,    59,   113,    -1,    59,   157,    -1,
-      72,    -1,    72,   157,    -1,    32,    -1,    32,   157,    -1,
-      56,    -1,    56,   103,   102,    -1,    30,    -1,    30,   103,
-     102,    -1,    31,    -1,    57,   103,   102,    -1,    57,   103,
-     147,   102,    -1,    -1,    27,   158,   103,   148,   102,    -1,
-      23,    -1,   149,    -1,    55,    -1,    34,    -1,    70,   160,
-     145,    -1,    70,   160,    -1,   103,   147,   102,    -1,   103,
-     102,    -1,   165,    -1,   167,    -1,   166,    -1,    -1,   148,
-      -1,    -1,   147,    -1,   165,    -1,    19,   170,    -1,    15,
-     170,    -1,    16,   170,    -1,    17,   170,    -1,    65,   170,
-      -1,    18,   170,    -1,    23,    -1,   165,    -1,   113,    -1,
-      28,    -1
+      -1,    23,    -1,    28,    -1,    -1,    26,    -1,    -1,    73,
+      26,    -1,    73,    -1,    73,    26,    -1,    73,    -1,   113,
+      -1,    20,    -1,   147,    79,   147,    -1,   147,    78,   147,
+      -1,   147,    77,   147,    -1,   148,    -1,   148,    81,    -1,
+     148,    81,   157,    -1,   157,    -1,    60,   170,   148,    -1,
+      58,   103,   170,   147,   102,    -1,   157,   101,   151,   103,
+     162,   102,    -1,   157,   101,   151,    -1,    24,   170,   161,
+      -1,    25,   170,   103,   162,   102,    -1,    60,   161,    -1,
+      58,   103,   162,   102,    -1,    -1,    33,   140,   113,   150,
+     161,    -1,    24,    -1,   165,    -1,   169,     9,   147,    20,
+      10,    -1,   165,    11,   147,    12,    -1,   157,   101,    11,
+     147,    12,    -1,   152,    11,   147,    12,    -1,   165,     9,
+     147,    20,    10,    -1,   157,   101,     9,   147,    20,    10,
+      -1,   152,     9,   147,    20,    10,    -1,   157,   101,   103,
+     102,    -1,   157,   101,   103,   147,   102,    -1,   152,   103,
+     147,   102,    -1,   152,   103,   102,    -1,   103,   147,   102,
+      11,   147,    12,    -1,    29,    11,   147,    12,    -1,   103,
+     102,    11,   147,    12,    -1,   157,    82,   157,    -1,   157,
+      96,   157,    -1,   157,    63,   157,    -1,   157,    64,   157,
+      -1,   157,    90,   157,    -1,   157,    61,   157,    -1,   157,
+      62,   157,    -1,   157,    89,   157,    -1,   157,    88,   157,
+      -1,   157,    54,   157,    -1,   157,    87,   157,    -1,   157,
+      86,   157,    -1,   157,    85,   157,    -1,   157,    91,   157,
+      -1,    13,   157,    -1,    14,   157,    -1,    92,   157,    -1,
+      93,   157,    -1,   157,    98,    -1,   157,    97,    -1,   100,
+     157,    -1,    99,   157,    -1,    11,   147,    12,    -1,    11,
+      12,    -1,    67,   147,    20,    10,    -1,    67,    20,    10,
+      -1,    39,   140,   143,   144,   113,    -1,    66,   157,    -1,
+      66,   113,    -1,    66,    23,   103,   102,    -1,    66,    23,
+     103,   147,   102,    -1,    66,   165,   103,   102,    -1,    66,
+     165,   103,   147,   102,    -1,   153,    -1,   154,    -1,   155,
+      -1,   156,    -1,   157,    83,   157,    84,   157,    -1,    94,
+     157,    -1,   159,    -1,    69,   157,    -1,   103,   147,   102,
+      -1,    29,    -1,   103,   102,    -1,   165,    -1,   169,    -1,
+     167,    -1,   166,    -1,   168,    -1,   152,    -1,   166,    11,
+     147,    12,    -1,   166,     9,   147,    20,    10,    -1,    26,
+      -1,   164,    -1,   164,   103,   102,    -1,   164,   103,   147,
+     102,    -1,    68,    23,   161,    -1,    53,    -1,    53,   157,
+      -1,    80,   148,    -1,    59,    -1,    59,   113,    -1,    59,
+     157,    -1,    72,    -1,    72,   157,    -1,    32,    -1,    32,
+     157,    -1,    56,    -1,    56,   103,   102,    -1,    30,    -1,
+      30,   103,   102,    -1,    31,    -1,    57,   103,   102,    -1,
+      57,   103,   147,   102,    -1,    -1,    27,   158,   103,   148,
+     102,    -1,    23,    -1,   149,    -1,    55,    -1,    34,    -1,
+      70,   160,   145,    -1,    70,   160,    -1,   103,   147,   102,
+      -1,   103,   102,    -1,   165,    -1,   167,    -1,   166,    -1,
+      -1,   148,    -1,    -1,   147,    -1,   165,    -1,    19,   170,
+      -1,    15,   170,    -1,    16,   170,    -1,    17,   170,    -1,
+      65,   170,    -1,    18,   170,    -1,    23,    -1,   165,    -1,
+     113,    -1,    28,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -188,21 +188,21 @@ static const yytype_uint16 yyrline[] =
      516,   522,   532,   556,   557,   562,   564,   566,   570,   574,
      578,   582,   587,   593,   594,   600,   614,   615,   624,   630,
      631,   636,   639,   643,   648,   652,   656,   660,   661,   665,
-     671,   676,   681,   691,   692,   697,   698,   702,   712,   716,
-     726,   727,   737,   741,   745,   749,   753,   763,   772,   776,
-     781,   788,   797,   803,   809,   817,   821,   828,   827,   838,
-     839,   843,   852,   857,   865,   872,   879,   889,   898,   905,
-     914,   921,   927,   934,   939,   949,   953,   957,   963,   967,
-     971,   975,   979,   983,   987,   999,  1003,  1007,  1011,  1021,
-    1025,  1032,  1036,  1040,  1045,  1050,  1055,  1064,  1069,  1074,
-    1080,  1086,  1097,  1101,  1105,  1117,  1130,  1138,  1150,  1151,
-    1152,  1153,  1154,  1159,  1163,  1165,  1169,  1174,  1176,  1181,
-    1183,  1185,  1187,  1189,  1191,  1193,  1202,  1213,  1215,  1217,
-    1222,  1235,  1240,  1245,  1249,  1253,  1257,  1261,  1265,  1269,
-    1273,  1275,  1278,  1282,  1288,  1290,  1295,  1298,  1307,  1314,
-    1313,  1329,  1330,  1331,  1337,  1341,  1349,  1356,  1361,  1366,
-    1368,  1370,  1375,  1377,  1382,  1383,  1389,  1393,  1399,  1405,
-    1411,  1417,  1423,  1430,  1432,  1434,  1437
+     671,   676,   681,   687,   692,   693,   698,   699,   703,   713,
+     717,   727,   728,   738,   742,   746,   750,   754,   764,   773,
+     777,   782,   789,   798,   804,   810,   818,   822,   829,   828,
+     839,   840,   844,   853,   858,   866,   873,   880,   890,   899,
+     906,   915,   922,   928,   935,   940,   950,   954,   958,   964,
+     968,   972,   976,   980,   984,   988,  1000,  1004,  1008,  1012,
+    1022,  1026,  1033,  1037,  1041,  1046,  1051,  1056,  1065,  1070,
+    1075,  1081,  1087,  1098,  1102,  1106,  1118,  1131,  1139,  1151,
+    1152,  1153,  1154,  1155,  1160,  1164,  1166,  1170,  1175,  1177,
+    1182,  1184,  1186,  1188,  1190,  1192,  1194,  1203,  1214,  1216,
+    1218,  1223,  1236,  1241,  1246,  1250,  1254,  1258,  1262,  1266,
+    1270,  1274,  1276,  1279,  1283,  1289,  1291,  1296,  1299,  1308,
+    1315,  1314,  1330,  1331,  1332,  1338,  1342,  1350,  1357,  1362,
+    1367,  1369,  1371,  1376,  1378,  1383,  1384,  1390,  1394,  1400,
+    1406,  1412,  1418,  1424,  1431,  1433,  1435,  1438
 };
 #endif
 
@@ -269,21 +269,21 @@ static const yytype_uint8 yyr1[] =
      122,   122,   126,   127,   127,   128,   128,   128,   128,   128,
      128,   128,   128,   129,   129,   129,   130,   130,   131,   132,
      132,   133,   133,   134,   135,   136,   137,   138,   138,   139,
-     140,   141,   142,   143,   143,   144,   144,   144,   145,   145,
-     146,   146,   147,   147,   147,   147,   148,   148,   148,   149,
-     149,   149,   149,   149,   149,   149,   149,   150,   149,   151,
-     151,   152,   152,   152,   152,   152,   152,   152,   152,   152,
-     152,   152,   152,   152,   152,   153,   153,   153,   153,   153,
-     153,   153,   153,   153,   153,   153,   153,   153,   153,   154,
-     154,   154,   154,   154,   154,   154,   154,   155,   155,   155,
-     155,   155,   156,   156,   156,   156,   156,   156,   157,   157,
+     140,   141,   142,   142,   143,   143,   144,   144,   144,   145,
+     145,   146,   146,   147,   147,   147,   147,   148,   148,   148,
+     149,   149,   149,   149,   149,   149,   149,   149,   150,   149,
+     151,   151,   152,   152,   152,   152,   152,   152,   152,   152,
+     152,   152,   152,   152,   152,   152,   153,   153,   153,   153,
+     153,   153,   153,   153,   153,   153,   153,   153,   153,   153,
+     154,   154,   154,   154,   154,   154,   154,   154,   155,   155,
+     155,   155,   155,   156,   156,   156,   156,   156,   156,   157,
      157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
      157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
      157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
-     157,   157,   157,   157,   157,   157,   157,   157,   157,   158,
-     157,   157,   157,   157,   157,   159,   159,   160,   160,   160,
-     160,   160,   161,   161,   162,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   170,   170,   170
+     157,   157,   157,   157,   157,   157,   157,   157,   157,   157,
+     158,   157,   157,   157,   157,   157,   159,   159,   160,   160,
+     160,   160,   160,   161,   161,   162,   162,   163,   164,   165,
+     166,   167,   168,   169,   170,   170,   170,   170
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -297,21 +297,21 @@ static const yytype_uint8 yyr2[] =
        2,     1,     2,     0,     3,     1,     1,     3,     3,     3,
        3,     3,     3,     0,     2,     6,     0,     2,     0,     0,
        1,     0,     1,     1,     1,     1,     1,     1,     0,     0,
-       0,     0,     1,     0,     1,     0,     2,     1,     2,     1,
-       1,     1,     3,     3,     3,     1,     2,     3,     1,     3,
-       5,     6,     3,     3,     5,     2,     4,     0,     5,     1,
-       1,     5,     4,     5,     4,     5,     6,     5,     4,     5,
-       4,     3,     6,     4,     5,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     2,
-       2,     2,     2,     2,     2,     2,     2,     3,     2,     4,
-       3,     5,     2,     2,     4,     5,     4,     5,     1,     1,
-       1,     1,     5,     2,     1,     2,     3,     1,     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,     1,     3,     4,     0,
-       5,     1,     1,     1,     1,     3,     2,     3,     2,     1,
-       1,     1,     0,     1,     0,     1,     1,     2,     2,     2,
-       2,     2,     2,     1,     1,     1,     1
+       0,     0,     1,     1,     0,     1,     0,     2,     1,     2,
+       1,     1,     1,     3,     3,     3,     1,     2,     3,     1,
+       3,     5,     6,     3,     3,     5,     2,     4,     0,     5,
+       1,     1,     5,     4,     5,     4,     5,     6,     5,     4,
+       5,     4,     3,     6,     4,     5,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     3,
+       2,     2,     2,     2,     2,     2,     2,     2,     3,     2,
+       4,     3,     5,     2,     2,     4,     5,     4,     5,     1,
+       1,     1,     1,     5,     2,     1,     2,     3,     1,     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,     1,     3,     4,
+       0,     5,     1,     1,     1,     1,     3,     2,     3,     2,
+       1,     1,     1,     0,     1,     0,     1,     1,     2,     2,
+       2,     2,     2,     2,     1,     1,     1,     1
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -319,349 +319,377 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       0,     2,     4,     6,     8,    10,    12,     0,    16,   214,
+       0,     2,     4,     6,     8,    10,    12,     0,    16,   215,
        0,     0,     0,    19,     1,    19,     0,     0,     0,     0,
-       0,     0,     0,     0,   201,     0,     0,   177,   199,   167,
-     194,   196,   190,    80,   204,    80,   182,   203,   192,     0,
-       0,   185,   212,     0,     0,     0,     0,     0,     0,   188,
-       0,     0,     0,     0,     0,     0,     0,   215,    95,   202,
-     174,   158,   159,   160,   161,    98,   164,     5,   178,   169,
-     172,   171,   173,   170,    16,     7,    55,    51,    27,    81,
+       0,     0,     0,     0,   202,     0,     0,   178,   200,   168,
+     195,   197,   191,    80,   205,    80,   183,   204,   193,     0,
+       0,   186,   213,     0,     0,     0,     0,     0,     0,   189,
+       0,     0,     0,     0,     0,     0,     0,   216,    96,   203,
+     175,   159,   160,   161,   162,    99,   165,     5,   179,   170,
+     173,   172,   174,   171,    16,     7,    55,    51,    27,    81,
        0,     0,    79,     0,     0,     0,     0,     0,     0,     0,
        0,    79,    28,    66,     9,     0,    56,     0,    11,    24,
-      23,     0,     0,   148,     0,   139,   140,   223,   226,   225,
-     224,   218,   219,   220,   222,   217,   212,     0,     0,     0,
-       0,   191,     0,    83,   183,     0,     0,   214,   186,   187,
-     223,   213,   105,   224,     0,   221,   201,   153,   152,   169,
-       0,     0,   212,   165,     0,   206,   209,   211,   210,   189,
-     184,   141,   142,   163,   146,   145,   168,     0,     0,     0,
-       0,    96,     0,     0,     0,     0,     0,     0,     0,     0,
+      23,     0,     0,   149,     0,   140,   141,   224,   227,   226,
+     225,   219,   220,   221,   223,   218,   213,     0,     0,     0,
+       0,   192,     0,    84,   184,     0,     0,   215,   187,   188,
+     224,   214,   106,   225,     0,   222,   202,   154,   153,   170,
+       0,     0,   213,   166,     0,   207,   210,   212,   211,   190,
+     185,   142,   143,   164,   147,   146,   169,     0,     0,     0,
+       0,    97,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     144,   143,     0,     0,     0,     0,     0,     0,     0,    19,
+     145,   144,     0,     0,     0,     0,     0,     0,     0,    19,
       78,    79,     0,    34,    16,    16,    16,    16,    16,    16,
        0,    16,    16,    40,     0,     0,    47,    50,     0,     0,
-       0,     0,     0,     0,    26,    25,    20,   147,   103,   214,
-       0,     0,   195,   107,    84,    85,   193,   197,     0,     0,
-       0,    99,     0,     0,   150,     0,   181,   208,     0,    89,
-     205,     0,   166,    94,    93,    92,    97,     0,     0,   121,
-       0,   134,   130,   131,   127,   128,   125,     0,   137,   136,
-     135,   133,   132,   129,   138,   126,     0,     0,   109,     0,
-     102,   110,   179,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    26,    25,    20,   148,   104,   215,
+       0,     0,   196,   108,    85,    86,   194,   198,     0,     0,
+       0,   100,     0,     0,   151,     0,   182,   209,     0,    90,
+     206,     0,   167,    95,    94,    93,    98,     0,     0,   122,
+       0,   135,   131,   132,   128,   129,   126,     0,   138,   137,
+     136,   134,   133,   130,   139,   127,     0,     0,   110,     0,
+     103,   111,   180,     0,     0,     0,     0,     0,     0,     0,
       77,     0,    30,     0,     0,    71,     0,     0,     0,     0,
-       0,    16,     0,     0,    82,    83,    67,    59,    60,    73,
-      57,    58,    61,    62,     0,     0,   123,   212,    87,     0,
-     198,   106,     0,   154,     0,   156,     0,   149,   207,    88,
-       0,     0,     0,   114,   120,     0,     0,     0,   118,     0,
-     214,   180,     0,   112,     0,   175,     0,    14,    16,    29,
-      83,    16,    33,     0,     0,    72,     0,     0,    74,    76,
-       0,     0,   216,    70,    75,     0,     0,    56,     0,     0,
-       0,    85,   104,   200,   108,    86,   151,   100,   155,   157,
-     124,     0,   117,   162,     0,   113,   119,     0,   115,   176,
-     111,     0,    85,    48,   212,    68,    68,     0,     0,     0,
-       0,    71,     0,     0,     0,     0,   122,   116,   101,     0,
-       0,    19,     0,     0,     0,    18,    63,    63,     0,    66,
-       0,     0,    38,    39,    91,    90,    32,    21,    31,     0,
-      35,    66,    66,    19,     0,     0,    36,    37,     0,    46,
-      68,    66,     0,    49,    41,    42,     0,    64,     0,    66,
-       0,    45,     0,    53,    22,    17,     0,    44,     0,    15,
-      19,    52,     0,     0,     0,    63,    43,    54,    65
+       0,    16,     0,     0,    82,    83,    84,    67,    59,    60,
+      73,    57,    58,    61,    62,     0,     0,   124,   213,    88,
+       0,   199,   107,     0,   155,     0,   157,     0,   150,   208,
+      89,     0,     0,     0,   115,   121,     0,     0,     0,   119,
+       0,   215,   181,     0,   113,     0,   176,     0,    14,    16,
+      29,    84,    16,    33,     0,     0,    72,     0,     0,    74,
+      76,     0,     0,   217,    70,    75,     0,     0,    56,     0,
+       0,     0,    86,   105,   201,   109,    87,   152,   101,   156,
+     158,   125,     0,   118,   163,     0,   114,   120,     0,   116,
+     177,   112,     0,    86,    48,   213,    68,    68,     0,     0,
+       0,     0,    71,     0,     0,     0,     0,   123,   117,   102,
+       0,     0,    19,     0,     0,     0,    18,    63,    63,     0,
+      66,     0,     0,    38,    39,    92,    91,    32,    21,    31,
+       0,    35,    66,    66,    19,     0,     0,    36,    37,     0,
+      46,    68,    66,     0,    49,    41,    42,     0,    64,     0,
+      66,     0,    45,     0,    53,    22,    17,     0,    44,     0,
+      15,    19,    52,     0,     0,     0,    63,    43,    54,    65
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     7,     8,     9,    10,    11,    12,    13,   109,   339,
-      15,   406,   423,   101,   432,   216,    99,   100,   340,   284,
-     401,   444,   451,    95,   426,   206,   403,   354,   344,   298,
-     347,   356,   350,   281,   193,   122,   190,   295,   225,   309,
-     240,   416,    96,    58,    59,   307,   270,    60,    61,    62,
-      63,    64,    65,   118,    66,   145,   132,    67,   351,    68,
+      -1,     7,     8,     9,    10,    11,    12,    13,   109,   340,
+      15,   407,   424,   101,   433,   216,    99,   100,   341,   284,
+     402,   445,   452,    95,   427,   206,   404,   355,   345,   299,
+     348,   357,   351,   281,   193,   122,   190,   296,   225,   310,
+     240,   417,    96,    58,    59,   308,   270,    60,    61,    62,
+      63,    64,    65,   118,    66,   145,   132,    67,   352,    68,
       69,    70,    71,    72,    73,   111
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -391
+#define YYPACT_NINF -396
 static const yytype_int16 yypact[] =
 {
-     696,  -391,  -391,  -391,  -391,  -391,  -391,    30,  -391,  2655,
-      39,  1106,  1010,  -391,  -391,  -391,  1729,  2655,  2655,   390,
-     390,   390,   390,   390,  -391,   390,   390,  -391,  -391,    28,
-     -45,  -391,  2655,  -391,  -391,  -391,  2655,  -391,   -37,   -29,
-     -24,  1543,  1450,   390,  1636,  1820,    80,  2655,    21,  2655,
-    2655,  2655,  2655,  2655,  2655,  2655,  1911,   141,    23,  -391,
-      24,  -391,  -391,  -391,  -391,  2718,  -391,  -391,     7,   127,
-     185,  -391,  -391,   107,  -391,  -391,  -391,  -391,  -391,  -391,
-     123,   133,  -391,    90,    99,   109,   110,    -2,   126,   131,
-      39,  -391,  -391,   162,  -391,   218,  2002,  1010,  -391,  -391,
-    -391,   434,   530,  -391,     6,   507,   507,  -391,  -391,  -391,
-    -391,  -391,  -391,  -391,  -391,  -391,  2655,   138,   139,  2655,
-     158,  1896,    39,   237,  2718,   166,  2004,  1450,  -391,  1896,
-     277,    23,  -391,  1356,  2655,  -391,   170,  -391,  1896,    32,
-     274,    73,  2655,  1896,  2097,   203,  -391,  -391,  -391,  1896,
-      23,   507,   507,   507,   226,   226,   284,   -16,  2655,  2655,
-    2655,  2655,  2655,  2655,  2190,  2655,  2655,  2655,  2655,  2655,
-    2655,  2655,  2655,  2655,  2655,  2655,  2655,  2655,  2655,  2655,
-    -391,  -391,     5,  2283,  2655,  2655,  2655,  2655,  2655,  -391,
-     273,  -391,   287,  -391,  -391,  -391,  -391,  -391,  -391,  -391,
-     208,  -391,  -391,  -391,   292,    39,  -391,  -391,  2655,  2655,
-    2655,  2655,  2655,  2655,  -391,  -391,  -391,  -391,  -391,  2655,
-    2655,    40,  -391,  -391,  -391,   245,  -391,  -391,   122,   227,
-    2655,    23,  2376,  2469,  -391,   320,  -391,  -391,   269,   316,
-    -391,  2655,   339,   272,   272,  -391,  2718,   215,    63,  -391,
-     338,  1438,  1805,   125,   515,   216,  2718,  2677,  1282,  1282,
-    1528,  1621,  1714,   207,   507,   507,  2655,  2655,  -391,  2562,
-     249,  -391,  -391,   344,   223,    66,   255,    70,   258,   626,
-    -391,   336,  -391,    93,   346,  2655,  2655,  2655,  2655,   357,
-    1200,  -391,  2655,  2655,  -391,   237,  -391,   141,  -391,   141,
-     141,   141,   141,   141,   275,   -55,  -391,  2655,   350,    39,
-    -391,  -391,   418,  -391,   430,  -391,   433,  -391,  -391,  -391,
-      94,  2655,   370,  -391,  -391,  2655,   266,    97,  -391,   438,
-    2655,  -391,   371,  -391,   377,  -391,   378,  -391,  -391,  -391,
-     237,  -391,  -391,   372,   296,   141,   299,   300,   141,  -391,
-     301,   291,  -391,  -391,  -391,   306,   392,   188,  2655,   308,
-     317,   245,  -391,  -391,  -391,  -391,  -391,  -391,  -391,  -391,
-    -391,   113,  -391,  1188,   410,  -391,  -391,   322,  -391,  -391,
-    -391,   405,   245,  -391,  2655,  -391,  -391,   419,   419,  2655,
-     419,  2655,   327,   419,   419,   189,  -391,  -391,  -391,   355,
-     189,  -391,   412,   419,   419,  -391,    48,    48,   334,   162,
-     417,   419,  -391,  -391,  -391,  -391,  -391,  -391,  -391,   722,
-    -391,   162,   162,  -391,   419,   359,  -391,  -391,   419,  -391,
-    -391,   162,    47,  -391,  -391,  -391,   818,  -391,  2655,   162,
-    1294,  -391,   420,   365,  -391,  -391,   379,  -391,   380,  -391,
-    -391,  -391,   419,   419,   914,    48,  -391,  -391,  -391
+     601,  -396,  -396,  -396,  -396,  -396,  -396,    26,  -396,  2656,
+      81,  1107,  1011,  -396,  -396,  -396,  1730,  2656,  2656,   315,
+     315,   315,   315,   315,  -396,   315,   315,  -396,  -396,    68,
+      -8,  -396,  2656,  -396,  -396,  -396,  2656,  -396,    10,    38,
+      42,  1544,  1451,   315,  1637,  1821,    75,  2656,    21,  2656,
+    2656,  2656,  2656,  2656,  2656,  2656,  1912,   274,    29,  -396,
+       1,  -396,  -396,  -396,  -396,  2716,  -396,  -396,    43,   127,
+     254,  -396,  -396,   131,  -396,  -396,  -396,  -396,  -396,  -396,
+     148,   170,  -396,    91,   107,   108,   129,     3,   130,   157,
+      81,  -396,  -396,   151,  -396,   266,  2003,  1011,  -396,  -396,
+    -396,   435,   531,  -396,     7,   415,   415,  -396,  -396,  -396,
+    -396,  -396,  -396,  -396,  -396,  -396,  2656,   171,   173,  2656,
+     187,  1897,    81,   269,  2716,   197,  2005,  1451,  -396,  1897,
+     278,    29,  -396,  1357,  2656,  -396,   198,  -396,  1897,    24,
+     292,    73,  2656,  1897,  2098,   235,  -396,  -396,  -396,  1897,
+      29,   415,   415,   415,     4,     4,   298,   -30,  2656,  2656,
+    2656,  2656,  2656,  2656,  2191,  2656,  2656,  2656,  2656,  2656,
+    2656,  2656,  2656,  2656,  2656,  2656,  2656,  2656,  2656,  2656,
+    -396,  -396,     5,  2284,  2656,  2656,  2656,  2656,  2656,  -396,
+     293,  -396,   295,  -396,  -396,  -396,  -396,  -396,  -396,  -396,
+     212,  -396,  -396,  -396,    41,    81,  -396,  -396,  2656,  2656,
+    2656,  2656,  2656,  2656,  -396,  -396,  -396,  -396,  -396,  2656,
+    2656,    40,  -396,  -396,  -396,   246,  -396,  -396,   226,   223,
+    2656,    29,  2377,  2470,  -396,   321,  -396,  -396,   234,   311,
+    -396,  2656,   333,   270,   270,  -396,  2716,    96,    65,  -396,
+     256,  1532,  1806,   125,   301,   310,  2716,  2699,   332,   332,
+    1282,  1622,  1715,   133,   415,   415,  2656,  2656,  -396,  2563,
+     245,  -396,  -396,   268,   141,    70,   189,   113,   193,   627,
+    -396,   350,  -396,    58,   349,  2656,  2656,  2656,  2656,   362,
+    1201,  -396,  2656,  2656,  -396,  -396,   269,  -396,   274,  -396,
+     274,   274,   274,   274,   274,   276,   -42,  -396,  2656,   355,
+      81,  -396,  -396,   336,  -396,   339,  -396,   419,  -396,  -396,
+    -396,   123,  2656,   372,  -396,  -396,  2656,   215,   160,  -396,
+     431,  2656,  -396,   373,  -396,   374,  -396,   378,  -396,  -396,
+    -396,   269,  -396,  -396,   366,   302,   274,   307,   322,   274,
+    -396,   323,   297,  -396,  -396,  -396,   324,   383,  1200,  2656,
+     329,   330,   246,  -396,  -396,  -396,  -396,  -396,  -396,  -396,
+    -396,  -396,   164,  -396,  1439,   427,  -396,  -396,   338,  -396,
+    -396,  -396,   422,   246,  -396,  2656,  -396,  -396,   434,   434,
+    2656,   434,  2656,   345,   434,   434,    74,  -396,  -396,  -396,
+     381,    74,  -396,   437,   434,   434,  -396,    19,    19,   361,
+     151,   461,   434,  -396,  -396,  -396,  -396,  -396,  -396,  -396,
+     723,  -396,   151,   151,  -396,   434,   379,  -396,  -396,   434,
+    -396,  -396,   151,    37,  -396,  -396,  -396,   819,  -396,  2656,
+     151,  1295,  -396,   467,   409,  -396,  -396,   397,  -396,   412,
+    -396,  -396,  -396,   434,   434,   915,    19,  -396,  -396,  -396
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -391,  -391,  -391,  -391,  -391,  -391,  -391,  -391,   -10,  -391,
-     -32,     3,  -391,   -12,  -391,   429,   383,     1,  -391,  -391,
-    -391,  -391,  -391,  -280,  -390,   -39,  -377,  -391,   128,  -198,
-    -221,    58,  -391,  -391,   -86,   453,  -391,  -391,  -276,  -312,
-    -391,   118,    -5,   -35,  -391,  -391,  -391,  -391,  -391,  -391,
-    -391,  -391,    79,  -391,  -391,  -391,  -110,  -119,  -391,  -391,
-       2,   465,   473,  -391,  -391,    34
+    -396,  -396,  -396,  -396,  -396,  -396,  -396,  -396,   -10,  -396,
+     -32,  2340,  -396,   -12,  -396,   505,   421,     6,  -396,  -396,
+    -396,  -396,  -396,  -285,  -395,  -126,  -357,  -396,   128,    -9,
+    -222,    78,  -396,  -396,   -82,   487,  -396,  -396,  -253,  -321,
+    -396,   122,    -5,   -35,  -396,  -396,  -396,  -396,  -396,  -396,
+    -396,  -396,    79,  -396,  -396,  -396,  -110,  -119,  -396,  -396,
+       2,   476,   477,  -396,  -396,    33
 };
 
 /* 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 -202
+#define YYTABLE_NINF -203
 static const yytype_int16 yytable[] =
 {
-      75,    93,    93,   102,    57,   204,   218,   131,   229,   404,
-     353,   104,    94,    19,   266,   150,   267,   427,   217,   361,
-      19,   110,   110,   110,   110,   110,   161,   110,   110,   268,
-      14,   128,   236,   162,   137,   163,    19,    20,    21,   119,
-     141,   184,   189,   185,   133,   110,   139,   363,    74,   395,
-     146,   157,   306,   440,   112,   113,   114,   115,   120,   116,
-     117,   158,   159,   160,   382,   458,   125,   442,   198,   355,
-     400,   359,   360,   443,   126,   323,   134,   135,   333,   127,
-     203,   131,   335,   158,   159,   160,   242,    93,   346,   200,
-     349,    93,    93,   235,   424,   425,   105,   106,   215,   231,
-     304,   199,   341,   142,   161,   282,   370,   131,   269,   375,
-     183,   121,   223,   342,   221,   124,   188,   158,   159,   160,
-     129,   228,    57,   138,   144,   396,   143,   164,   149,   133,
-     151,   152,   153,   154,   155,   233,   184,   392,   185,   238,
-     158,   159,   160,   158,   159,   160,   191,   158,   159,   160,
-     158,   159,   160,   243,   244,   245,   192,   247,   248,   250,
-     353,   230,   285,   286,   287,   288,   289,   290,   408,   292,
-     293,   158,   159,   160,   158,   159,   160,   279,   273,   274,
-     275,   276,   277,   278,   271,   305,   166,  -202,   168,   169,
-     158,   159,   160,   194,   186,   296,   187,   364,    74,   158,
-     159,   160,   195,   297,   299,   300,   301,   302,   303,   414,
-     205,   377,   196,   197,    57,   177,   178,   446,   158,   159,
-     160,   179,   180,   181,   310,   312,   182,   314,   316,   201,
-     208,   209,   210,   211,   202,   322,   320,   212,   207,   213,
-     246,   219,   220,   332,   251,   252,   253,   254,   255,   256,
-     257,   258,   259,   260,   261,   262,   263,   264,   265,   358,
-     222,   326,   327,   224,   329,   158,   159,   160,   226,    93,
-     168,   169,   131,   232,   402,   334,   239,  -201,   336,   168,
-     345,   299,   348,   299,   234,   357,   374,   348,   348,  -201,
-     -74,   352,   158,   159,   160,   241,   280,  -201,   178,   366,
-     158,   159,   160,   179,   180,   181,   381,   178,   182,   383,
-     283,   291,   179,   180,   181,   294,   371,   182,   308,  -201,
-    -201,  -201,  -201,  -202,  -202,    57,  -201,   182,  -201,   311,
-     317,  -201,   158,   159,   160,   158,   159,   160,  -201,  -201,
-    -201,  -201,   319,   158,   159,   160,   158,   159,   160,   131,
-     321,   160,   330,   348,  -201,  -201,  -201,   338,  -201,  -201,
-    -201,  -201,  -201,  -201,  -201,  -201,  -201,  -201,  -201,   343,
-     429,   318,    19,  -201,  -201,  -201,   365,   362,  -201,  -201,
-     372,   378,   434,   435,   348,   415,   345,   379,   380,   419,
-     415,   407,   441,   409,   389,   384,   412,   413,   385,    74,
-     447,   386,   387,   388,   373,    19,   421,   422,   390,    93,
-     393,   436,   391,   107,   431,   158,   159,   160,   108,   394,
-     397,   158,   159,   160,   398,   399,    93,   437,   405,   411,
-     417,   439,   420,   348,   -13,    76,   428,   430,   454,   450,
-     324,    98,   449,    74,    93,    16,   331,    17,    18,    19,
-      20,    21,    22,    23,    77,   455,   456,    24,    25,    26,
-      27,    28,   438,    29,    30,    31,    32,    33,    34,    78,
-      97,    79,    80,    35,    81,    82,    83,    84,    85,    86,
-     214,   452,   453,    87,    88,    89,    90,    36,   123,    37,
-      38,    39,    40,    41,    42,   158,   159,   160,   448,    43,
-      44,    45,    46,    47,    48,    91,    49,   158,   159,   160,
-     158,   159,   160,   147,    50,   158,   159,   160,   418,   410,
-     367,   148,     0,     0,     0,     0,    51,    52,    53,     0,
-      -3,    76,   368,    54,    55,   369,     0,    56,    92,    74,
-     376,    16,     0,    17,    18,    19,    20,    21,    22,    23,
-      77,     0,     0,    24,    25,    26,    27,    28,     0,    29,
-      30,    31,    32,    33,    34,    78,    97,    79,    80,    35,
-      81,    82,    83,    84,    85,    86,     0,     0,     0,    87,
-      88,    89,    90,    36,     0,    37,    38,    39,    40,    41,
-      42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
-      48,    91,    49,   179,   180,   181,   178,     0,   182,     0,
-      50,   179,   180,   181,     0,     0,   182,     0,     0,     0,
-       0,     0,    51,    52,    53,     0,     0,    76,     0,    54,
-      55,     0,     0,    56,    92,    74,   337,    16,     0,    17,
-      18,    19,    20,    21,    22,    23,    77,     0,     0,    24,
-      25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
-      34,    78,    97,    79,    80,    35,    81,    82,    83,    84,
-      85,    86,     0,     0,     0,    87,    88,    89,    90,    36,
-       0,    37,    38,    39,    40,    41,    42,     0,     0,     0,
-       0,    43,    44,    45,    46,    47,    48,    91,    49,     1,
-       2,     3,     4,     5,     6,     0,    50,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    51,    52,
-      53,     0,     0,    76,     0,    54,    55,     0,     0,    56,
-      92,    74,   433,    16,     0,    17,    18,    19,    20,    21,
-      22,    23,    77,     0,     0,    24,    25,    26,    27,    28,
-       0,    29,    30,    31,    32,    33,    34,    78,    97,    79,
-      80,    35,    81,    82,    83,    84,    85,    86,     0,     0,
-       0,    87,    88,    89,    90,    36,     0,    37,    38,    39,
-      40,    41,    42,     0,     0,     0,     0,    43,    44,    45,
-      46,    47,    48,    91,    49,     0,     0,     0,     0,     0,
-       0,     0,    50,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    51,    52,    53,     0,     0,    76,
-       0,    54,    55,     0,     0,    56,    92,    74,   445,    16,
-       0,    17,    18,    19,    20,    21,    22,    23,    77,     0,
-       0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
-      32,    33,    34,    78,    97,    79,    80,    35,    81,    82,
-      83,    84,    85,    86,     0,     0,     0,    87,    88,    89,
-      90,    36,     0,    37,    38,    39,    40,    41,    42,     0,
-       0,     0,     0,    43,    44,    45,    46,    47,    48,    91,
-      49,     0,     0,     0,     0,     0,     0,     0,    50,     0,
+      75,    93,    93,   102,    57,   354,   218,   131,   229,   204,
+     162,   104,   163,   428,   266,   150,   267,    94,    19,   217,
+      19,   110,   110,   110,   110,   110,    14,   110,   110,   268,
+     405,   128,   236,   184,   137,   185,    19,    20,    21,   161,
+     141,   396,   189,   362,   133,   110,   139,   158,   159,   160,
+     146,   157,   307,   112,   113,   114,   115,   443,   116,   117,
+     364,   459,   401,   444,   294,   425,   426,   342,   356,   295,
+     360,   361,   242,   198,   441,   134,   135,   324,   343,   119,
+     203,   131,   334,    74,   158,   159,   160,    93,   383,   200,
+      74,    93,    93,   235,   415,   120,   105,   106,   142,   231,
+     305,  -203,  -203,   215,   164,   182,   199,   131,   269,   282,
+     161,   121,   223,   125,   221,   124,   323,   158,   159,   160,
+     129,   228,    57,   138,   144,   336,   143,   233,   149,   133,
+     151,   152,   153,   154,   155,   371,   184,   393,   185,   238,
+     188,   126,   158,   159,   160,   127,   183,   158,   159,   160,
+     158,   159,   160,   243,   244,   245,   354,   247,   248,   250,
+     230,   333,   285,   286,   287,   288,   289,   290,   409,   292,
+     293,   191,   376,   158,   159,   160,   397,   279,   273,   274,
+     275,   276,   277,   278,   271,   306,   166,  -203,   168,   169,
+     158,   159,   160,   192,   194,   297,   168,   169,   365,   205,
+     158,   159,   160,   298,   300,   301,   302,   303,   304,   335,
+     195,   196,   378,   337,    57,   177,   178,   447,   158,   159,
+     160,   179,   180,   181,   178,   313,   182,   315,   317,   179,
+     180,   181,   197,   201,   182,   375,   321,   158,   159,   160,
+     246,   158,   159,   160,   251,   252,   253,   254,   255,   256,
+     257,   258,   259,   260,   261,   262,   263,   264,   265,   359,
+     202,   327,   328,   186,   330,   187,   158,   159,   160,    93,
+     158,   159,   160,   131,   219,   403,   220,   347,  -202,   350,
+     346,   300,   349,   300,   430,   358,   207,   349,   349,   222,
+    -202,   353,   158,   159,   160,   224,   435,   436,  -202,   226,
+     367,   232,   234,   158,   159,   160,   442,   382,   239,   241,
+     384,   158,   159,   160,   448,   291,   280,   372,   283,   309,
+    -202,  -202,  -202,  -202,    74,   312,    57,  -202,   311,  -202,
+      19,   318,  -202,   158,   159,   160,   319,   320,   107,  -202,
+    -202,  -202,  -202,   108,   322,   158,   159,   160,   331,   160,
+     131,   158,   159,   160,   349,  -202,  -202,  -202,   325,  -202,
+    -202,  -202,  -202,  -202,  -202,  -202,  -202,  -202,  -202,  -202,
+     332,   339,   344,   168,  -202,  -202,  -202,    19,   363,  -202,
+    -202,   366,   373,   379,   380,   349,   416,   346,   381,   385,
+     420,   416,   178,   166,   167,   168,   169,   179,   180,   181,
+     390,   178,   182,   392,   386,   374,   179,   180,   181,   387,
+      93,   182,   437,   158,   159,   160,   158,   159,   160,   174,
+     175,   176,   177,   178,   388,   389,   391,    93,   179,   180,
+     181,   394,   395,   182,   349,   -13,    76,   398,   368,   455,
+     399,   369,   400,   406,    74,    93,    16,   412,    17,    18,
+      19,    20,    21,    22,    23,    77,   418,   421,    24,    25,
+      26,    27,    28,   429,    29,    30,    31,    32,    33,    34,
+      78,    97,    79,    80,    35,    81,    82,    83,    84,    85,
+      86,   431,   439,   451,    87,    88,    89,    90,    36,   450,
+      37,    38,    39,    40,    41,    42,   158,   159,   160,   453,
+      43,    44,    45,    46,    47,    48,    91,    49,   158,   159,
+     160,   179,   180,   181,   454,    50,   182,    98,   214,   449,
+     411,   370,   123,   419,   147,   148,     0,    51,    52,    53,
+       0,    -3,    76,   377,    54,    55,     0,     0,    56,    92,
+      74,     0,    16,     0,    17,    18,    19,    20,    21,    22,
+      23,    77,     0,     0,    24,    25,    26,    27,    28,     0,
+      29,    30,    31,    32,    33,    34,    78,    97,    79,    80,
+      35,    81,    82,    83,    84,    85,    86,     0,     0,     0,
+      87,    88,    89,    90,    36,     0,    37,    38,    39,    40,
+      41,    42,     0,     0,     0,     0,    43,    44,    45,    46,
+      47,    48,    91,    49,     1,     2,     3,     4,     5,     6,
+       0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    51,    52,    53,     0,     0,    76,     0,
+      54,    55,     0,     0,    56,    92,    74,   338,    16,     0,
+      17,    18,    19,    20,    21,    22,    23,    77,     0,     0,
+      24,    25,    26,    27,    28,     0,    29,    30,    31,    32,
+      33,    34,    78,    97,    79,    80,    35,    81,    82,    83,
+      84,    85,    86,     0,     0,     0,    87,    88,    89,    90,
+      36,     0,    37,    38,    39,    40,    41,    42,     0,     0,
+       0,     0,    43,    44,    45,    46,    47,    48,    91,    49,
+       0,     0,     0,     0,     0,     0,     0,    50,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    51,
+      52,    53,     0,     0,    76,     0,    54,    55,     0,     0,
+      56,    92,    74,   434,    16,     0,    17,    18,    19,    20,
+      21,    22,    23,    77,     0,     0,    24,    25,    26,    27,
+      28,     0,    29,    30,    31,    32,    33,    34,    78,    97,
+      79,    80,    35,    81,    82,    83,    84,    85,    86,     0,
+       0,     0,    87,    88,    89,    90,    36,     0,    37,    38,
+      39,    40,    41,    42,     0,     0,     0,     0,    43,    44,
+      45,    46,    47,    48,    91,    49,     0,     0,     0,     0,
+       0,     0,     0,    50,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    51,    52,    53,     0,     0,
+      76,     0,    54,    55,     0,     0,    56,    92,    74,   446,
+      16,     0,    17,    18,    19,    20,    21,    22,    23,    77,
+       0,     0,    24,    25,    26,    27,    28,     0,    29,    30,
+      31,    32,    33,    34,    78,    97,    79,    80,    35,    81,
+      82,    83,    84,    85,    86,     0,     0,     0,    87,    88,
+      89,    90,    36,     0,    37,    38,    39,    40,    41,    42,
+       0,     0,     0,     0,    43,    44,    45,    46,    47,    48,
+      91,    49,     0,     0,     0,     0,     0,     0,     0,    50,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      51,    52,    53,     0,     0,    76,     0,    54,    55,     0,
-       0,    56,    92,    74,     0,    16,     0,    17,    18,    19,
-      20,    21,    22,    23,    77,     0,     0,    24,    25,    26,
-      27,    28,     0,    29,    30,    31,    32,    33,    34,    78,
-      97,    79,    80,    35,    81,    82,    83,    84,    85,    86,
-       0,     0,     0,    87,    88,    89,    90,    36,     0,    37,
-      38,    39,    40,    41,    42,     0,     0,     0,     0,    43,
-      44,    45,    46,    47,    48,    91,    49,     0,     0,   457,
-       0,     0,     0,     0,    50,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    51,    52,    53,     0,
-       0,    76,     0,    54,    55,     0,     0,    56,    92,    74,
-       0,    16,     0,    17,    18,    19,    20,    21,    22,    23,
-      77,     0,     0,    24,    25,    26,    27,    28,     0,    29,
-      30,    31,    32,    33,    34,    78,    97,    79,    80,    35,
-      81,    82,    83,    84,    85,    86,     0,     0,     0,    87,
-      88,    89,    90,    36,     0,    37,    38,    39,    40,    41,
-      42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
-      48,    91,    49,     0,     0,     0,     0,     0,     0,     0,
-      50,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    51,    52,    53,     0,     0,    76,     0,    54,
-      55,     0,     0,    56,    92,    74,     0,    16,     0,    17,
-      18,    19,    20,    21,    22,    23,    77,     0,     0,    24,
-      25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
-      34,    78,     0,    79,    80,    35,    81,    82,    83,    84,
-      85,    86,     0,     0,     0,    87,    88,    89,    90,    36,
-       0,    37,    38,    39,    40,    41,    42,     0,     0,     0,
-       0,    43,    44,    45,    46,    47,    48,    91,    49,     0,
-       0,     0,     0,     0,     0,     0,    50,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    51,    52,
-      53,    76,     0,     0,     0,    54,    55,     0,     0,    56,
-      92,    16,     0,    17,    18,    19,    20,    21,    22,    23,
-     -69,     0,     0,    24,    25,    26,    27,    28,     0,    29,
-      30,    31,    32,    33,    34,     0,     0,     0,     0,    35,
-       0,     0,   165,     0,     0,     0,     0,     0,     0,   166,
-     167,   168,   169,    36,     0,    37,    38,    39,    40,    41,
-      42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
-      48,   171,    49,   172,   173,   174,   175,   176,   177,   178,
-      50,     0,     0,     0,   179,   180,   181,     0,     0,   182,
-       0,     0,    51,    52,    53,    76,     0,     0,     0,    54,
-      55,     0,     0,    56,     0,    16,     0,    17,    18,    19,
+       0,    51,    52,    53,     0,     0,    76,     0,    54,    55,
+       0,     0,    56,    92,    74,     0,    16,     0,    17,    18,
+      19,    20,    21,    22,    23,    77,     0,     0,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
+      78,    97,    79,    80,    35,    81,    82,    83,    84,    85,
+      86,     0,     0,     0,    87,    88,    89,    90,    36,     0,
+      37,    38,    39,    40,    41,    42,     0,     0,     0,     0,
+      43,    44,    45,    46,    47,    48,    91,    49,     0,     0,
+     458,     0,     0,     0,     0,    50,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    51,    52,    53,
+       0,     0,    76,     0,    54,    55,     0,     0,    56,    92,
+      74,     0,    16,     0,    17,    18,    19,    20,    21,    22,
+      23,    77,     0,     0,    24,    25,    26,    27,    28,     0,
+      29,    30,    31,    32,    33,    34,    78,    97,    79,    80,
+      35,    81,    82,    83,    84,    85,    86,     0,     0,     0,
+      87,    88,    89,    90,    36,     0,    37,    38,    39,    40,
+      41,    42,     0,     0,     0,     0,    43,    44,    45,    46,
+      47,    48,    91,    49,     0,     0,     0,     0,     0,     0,
+       0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    51,    52,    53,     0,     0,    76,     0,
+      54,    55,     0,     0,    56,    92,    74,     0,    16,     0,
+      17,    18,    19,    20,    21,    22,    23,    77,     0,     0,
+      24,    25,    26,    27,    28,     0,    29,    30,    31,    32,
+      33,    34,    78,     0,    79,    80,    35,    81,    82,    83,
+      84,    85,    86,     0,     0,     0,    87,    88,    89,    90,
+      36,     0,    37,    38,    39,    40,    41,    42,     0,     0,
+       0,     0,    43,    44,    45,    46,    47,    48,    91,    49,
+       0,     0,     0,     0,     0,     0,     0,    50,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    51,
+      52,    53,    76,     0,     0,     0,    54,    55,     0,     0,
+      56,    92,    16,     0,    17,    18,    19,    20,    21,    22,
+      23,   -69,     0,     0,    24,    25,    26,    27,    28,     0,
+      29,    30,    31,    32,    33,    34,     0,     0,     0,     0,
+      35,     0,   208,   209,   210,   211,     0,     0,     0,   212,
+       0,   213,     0,     0,    36,     0,    37,    38,    39,    40,
+      41,    42,     0,     0,     0,     0,    43,    44,    45,    46,
+      47,    48,     0,    49,     0,     0,     0,   158,   159,   160,
+       0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    51,    52,    53,    76,     0,     0,     0,
+      54,    55,   -74,     0,    56,     0,    16,     0,    17,    18,
+      19,    20,    21,    22,    23,     0,     0,     0,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
+       0,     0,     0,     0,    35,     0,     0,     0,     0,     0,
+       0,     0,     0,   166,   167,   168,   169,     0,    36,     0,
+      37,    38,    39,    40,    41,    42,     0,  -170,     0,     0,
+      43,    44,    45,    46,    47,    48,   184,    49,   185,  -170,
+     175,   176,   177,   178,     0,    50,     0,  -170,   179,   180,
+     181,     0,     0,   182,     0,     0,     0,    51,    52,    53,
+       0,     0,     0,     0,    54,    55,     0,   -69,    56,  -170,
+    -170,  -170,  -170,     0,     0,     0,  -170,     0,  -170,     0,
+       0,  -170,     0,     0,     0,     0,     0,     0,  -170,  -170,
+    -170,  -170,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  -170,  -170,  -170,     0,  -170,  -170,
+    -170,  -170,  -170,  -170,  -170,  -170,  -170,  -170,  -170,     0,
+       0,     0,     0,  -170,  -170,  -170,     0,     0,  -170,  -170,
+      74,     0,    16,     0,    17,    18,    19,    20,    21,    22,
+      23,     0,     0,     0,   130,    25,    26,    27,    28,   108,
+      29,    30,    31,    32,    33,    34,     0,     0,     0,     0,
+      35,     0,     0,   165,     0,     0,     0,     0,     0,     0,
+     166,   167,   168,   169,    36,     0,    37,    38,    39,    40,
+      41,    42,     0,     0,     0,     0,    43,    44,    45,    46,
+      47,    48,   171,    49,   172,   173,   174,   175,   176,   177,
+     178,    50,     0,     0,     0,   179,   180,   181,     0,     0,
+     182,     0,     0,    51,    52,    53,     0,     0,     0,     0,
+      54,    55,     0,    74,    56,    16,     0,    17,    18,    19,
       20,    21,    22,    23,     0,     0,     0,    24,    25,    26,
       27,    28,     0,    29,    30,    31,    32,    33,    34,     0,
-       0,     0,     0,    35,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    35,     0,     0,  -203,     0,     0,     0,
        0,     0,     0,   166,   167,   168,   169,    36,     0,    37,
-      38,    39,    40,    41,    42,     0,  -169,     0,     0,    43,
-      44,    45,    46,    47,    48,   184,    49,   185,  -169,   174,
-     175,   176,   177,   178,    50,     0,  -169,     0,   179,   180,
+      38,    39,    40,    41,    42,     0,     0,     0,     0,    43,
+      44,    45,    46,    47,    48,     0,    49,   172,   173,   174,
+     175,   176,   177,   178,    50,     0,     0,     0,   179,   180,
      181,     0,     0,   182,     0,     0,    51,    52,    53,     0,
-       0,     0,     0,    54,    55,     0,   -69,    56,  -169,  -169,
-    -169,  -169,     0,     0,     0,  -169,     0,  -169,     0,     0,
-    -169,     0,     0,     0,     0,     0,     0,  -169,  -169,  -169,
-    -169,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  -169,  -169,  -169,     0,  -169,  -169,  -169,
-    -169,  -169,  -169,  -169,  -169,  -169,  -169,  -169,     0,     0,
-       0,     0,  -169,  -169,  -169,     0,     0,  -169,  -169,    74,
-       0,    16,     0,    17,    18,    19,    20,    21,    22,    23,
-       0,     0,     0,   130,    25,    26,    27,    28,   108,    29,
-      30,    31,    32,    33,    34,     0,     0,     0,     0,    35,
-       0,     0,  -202,     0,     0,     0,     0,     0,     0,   166,
-     167,   168,   169,    36,     0,    37,    38,    39,    40,    41,
-      42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
-      48,     0,    49,   172,   173,   174,   175,   176,   177,   178,
-      50,     0,     0,     0,   179,   180,   181,     0,     0,   182,
-       0,     0,    51,    52,    53,     0,     0,     0,     0,    54,
-      55,     0,    74,    56,    16,     0,    17,    18,    19,    20,
-      21,    22,    23,     0,     0,     0,    24,    25,    26,    27,
-      28,     0,    29,    30,    31,    32,    33,    34,     0,     0,
-       0,     0,    35,     0,     0,     0,     0,     0,     0,   166,
-     167,   168,   169,     0,     0,     0,    36,     0,    37,    38,
-      39,    40,    41,    42,     0,     0,     0,     0,    43,    44,
-      45,    46,    47,    48,     0,    49,   175,   176,   177,   178,
-       0,     0,     0,    50,   179,   180,   181,     0,     0,   182,
-       0,     0,     0,     0,     0,    51,    52,    53,     0,     0,
-       0,     0,    54,    55,     0,    74,    56,    16,     0,    17,
-      18,    19,    20,    21,    22,    23,     0,     0,     0,   136,
-      25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
-      34,     0,     0,     0,     0,    35,     0,     0,     0,     0,
-       0,     0,   166,   167,   168,   169,     0,     0,     0,    36,
-       0,    37,    38,    39,    40,    41,    42,     0,     0,     0,
-       0,    43,    44,    45,    46,    47,    48,     0,    49,     0,
-     176,   177,   178,     0,     0,     0,    50,   179,   180,   181,
-       0,     0,   182,     0,     0,     0,     0,     0,    51,    52,
-      53,     0,     0,     0,     0,    54,    55,     0,     0,    56,
-      16,   103,    17,    18,    19,    20,    21,    22,    23,     0,
-       0,     0,    24,    25,    26,    27,    28,     0,    29,    30,
-      31,    32,    33,    34,     0,     0,     0,     0,    35,     0,
-       0,     0,     0,     0,     0,   166,   167,   168,   169,     0,
-       0,     0,    36,     0,    37,    38,    39,    40,    41,    42,
-       0,     0,     0,     0,    43,    44,    45,    46,    47,    48,
-       0,    49,     0,     0,   177,   178,     0,     0,     0,    50,
-     179,   180,   181,     0,     0,   182,     0,     0,     0,     0,
-       0,    51,    52,    53,     0,     0,     0,     0,    54,    55,
-       0,    16,    56,    17,    18,    19,    20,    21,    22,    23,
-     140,     0,     0,    24,    25,    26,    27,    28,     0,    29,
+       0,     0,     0,    54,    55,     0,    74,    56,    16,     0,
+      17,    18,    19,    20,    21,    22,    23,     0,     0,     0,
+     136,    25,    26,    27,    28,     0,    29,    30,    31,    32,
+      33,    34,     0,     0,     0,     0,    35,     0,     0,     0,
+       0,     0,     0,   166,   167,   168,   169,     0,     0,     0,
+      36,     0,    37,    38,    39,    40,    41,    42,     0,     0,
+       0,     0,    43,    44,    45,    46,    47,    48,     0,    49,
+       0,   176,   177,   178,     0,     0,     0,    50,   179,   180,
+     181,     0,     0,   182,     0,     0,     0,     0,     0,    51,
+      52,    53,     0,     0,     0,     0,    54,    55,     0,     0,
+      56,    16,   103,    17,    18,    19,    20,    21,    22,    23,
+       0,     0,     0,    24,    25,    26,    27,    28,     0,    29,
       30,    31,    32,    33,    34,     0,     0,     0,     0,    35,
-       0,     0,     0,     0,     0,     0,  -202,     0,   168,   169,
+       0,     0,     0,     0,     0,     0,   166,   167,   168,   169,
        0,     0,     0,    36,     0,    37,    38,    39,    40,    41,
       42,     0,     0,     0,     0,    43,    44,    45,    46,    47,
       48,     0,    49,     0,     0,   177,   178,     0,     0,     0,
       50,   179,   180,   181,     0,     0,   182,     0,     0,     0,
        0,     0,    51,    52,    53,     0,     0,     0,     0,    54,
       55,     0,    16,    56,    17,    18,    19,    20,    21,    22,
-      23,     0,     0,     0,    24,    25,    26,    27,    28,     0,
+      23,   140,     0,     0,    24,    25,    26,    27,    28,     0,
       29,    30,    31,    32,    33,    34,     0,     0,     0,     0,
-      35,     0,     0,     0,     0,     0,     0,     0,     0,   168,
+      35,     0,     0,     0,     0,     0,     0,  -203,     0,   168,
      169,     0,     0,     0,    36,     0,    37,    38,    39,    40,
       41,    42,     0,     0,     0,     0,    43,    44,    45,    46,
       47,    48,     0,    49,     0,     0,   177,   178,     0,     0,
        0,    50,   179,   180,   181,     0,     0,   182,     0,     0,
        0,     0,     0,    51,    52,    53,     0,     0,     0,     0,
-      54,    55,     0,   156,    56,    16,     0,    17,    18,    19,
+      54,    55,     0,    16,    56,    17,    18,    19,    20,    21,
+      22,    23,     0,     0,     0,    24,    25,    26,    27,    28,
+       0,    29,    30,    31,    32,    33,    34,     0,     0,     0,
+       0,    35,     0,     0,     0,     0,     0,     0,     0,     0,
+     168,   169,     0,     0,     0,    36,     0,    37,    38,    39,
+      40,    41,    42,     0,     0,     0,     0,    43,    44,    45,
+      46,    47,    48,     0,    49,     0,     0,   177,   178,     0,
+       0,     0,    50,   179,   180,   181,     0,     0,   182,     0,
+       0,     0,     0,     0,    51,    52,    53,     0,     0,     0,
+       0,    54,    55,     0,   156,    56,    16,     0,    17,    18,
+      19,    20,    21,    22,    23,     0,     0,     0,    24,    25,
+      26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
+       0,     0,     0,     0,    35,   208,   209,   210,   211,     0,
+       0,     0,   212,     0,   213,     0,     0,     0,    36,     0,
+      37,    38,    39,    40,    41,    42,     0,     0,     0,     0,
+      43,    44,    45,    46,    47,    48,     0,    49,     0,     0,
+     158,   159,   160,     0,     0,    50,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    51,    52,    53,
+       0,     0,     0,     0,    54,    55,     0,   227,    56,    16,
+       0,    17,    18,    19,    20,    21,    22,    23,     0,     0,
+       0,    24,    25,    26,    27,    28,     0,    29,    30,    31,
+      32,    33,    34,     0,     0,     0,     0,    35,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    36,     0,    37,    38,    39,    40,    41,    42,     0,
+       0,     0,     0,    43,    44,    45,    46,    47,    48,     0,
+      49,     0,     0,     0,     0,     0,     0,     0,    50,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      51,    52,    53,     0,     0,     0,     0,    54,    55,     0,
+     237,    56,    16,     0,    17,    18,    19,    20,    21,    22,
+      23,     0,     0,     0,    24,    25,    26,    27,    28,     0,
+      29,    30,    31,    32,    33,    34,     0,     0,     0,     0,
+      35,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    36,     0,    37,    38,    39,    40,
+      41,    42,     0,     0,     0,     0,    43,    44,    45,    46,
+      47,    48,     0,    49,     0,     0,     0,     0,     0,     0,
+       0,    50,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,    51,    52,    53,     0,     0,     0,     0,
+      54,    55,     0,   249,    56,    16,     0,    17,    18,    19,
       20,    21,    22,    23,     0,     0,     0,    24,    25,    26,
       27,    28,     0,    29,    30,    31,    32,    33,    34,     0,
-       0,     0,     0,    35,   208,   209,   210,   211,     0,     0,
-       0,   212,     0,   213,     0,     0,     0,    36,     0,    37,
+       0,     0,     0,    35,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    36,     0,    37,
       38,    39,    40,    41,    42,     0,     0,     0,     0,    43,
-      44,    45,    46,    47,    48,     0,    49,     0,     0,   158,
-     159,   160,     0,     0,    50,     0,     0,     0,     0,     0,
+      44,    45,    46,    47,    48,     0,    49,     0,     0,     0,
+       0,     0,     0,     0,    50,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    51,    52,    53,     0,
-       0,     0,     0,    54,    55,     0,   227,    56,    16,     0,
+       0,     0,     0,    54,    55,     0,   272,    56,    16,     0,
       17,    18,    19,    20,    21,    22,    23,     0,     0,     0,
       24,    25,    26,    27,    28,     0,    29,    30,    31,    32,
       33,    34,     0,     0,     0,     0,    35,     0,     0,     0,
@@ -670,7 +698,7 @@ static const yytype_int16 yytable[] =
        0,     0,    43,    44,    45,    46,    47,    48,     0,    49,
        0,     0,     0,     0,     0,     0,     0,    50,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    51,
-      52,    53,     0,     0,     0,     0,    54,    55,     0,   237,
+      52,    53,     0,     0,     0,     0,    54,    55,     0,   314,
       56,    16,     0,    17,    18,    19,    20,    21,    22,    23,
        0,     0,     0,    24,    25,    26,    27,    28,     0,    29,
       30,    31,    32,    33,    34,     0,     0,     0,     0,    35,
@@ -680,7 +708,7 @@ static const yytype_int16 yytable[] =
       48,     0,    49,     0,     0,     0,     0,     0,     0,     0,
       50,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,    51,    52,    53,     0,     0,     0,     0,    54,
-      55,     0,   249,    56,    16,     0,    17,    18,    19,    20,
+      55,     0,   316,    56,    16,     0,    17,    18,    19,    20,
       21,    22,    23,     0,     0,     0,    24,    25,    26,    27,
       28,     0,    29,    30,    31,    32,    33,    34,     0,     0,
        0,     0,    35,     0,     0,     0,     0,     0,     0,     0,
@@ -689,263 +717,263 @@ static const yytype_int16 yytable[] =
       45,    46,    47,    48,     0,    49,     0,     0,     0,     0,
        0,     0,     0,    50,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    51,    52,    53,     0,     0,
-       0,     0,    54,    55,     0,   272,    56,    16,     0,    17,
+       0,     0,    54,    55,     0,   329,    56,    16,     0,    17,
       18,    19,    20,    21,    22,    23,     0,     0,     0,    24,
       25,    26,    27,    28,     0,    29,    30,    31,    32,    33,
       34,     0,     0,     0,     0,    35,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    36,
        0,    37,    38,    39,    40,    41,    42,     0,     0,     0,
-       0,    43,    44,    45,    46,    47,    48,     0,    49,     0,
-       0,     0,     0,     0,     0,     0,    50,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    51,    52,
-      53,     0,     0,     0,     0,    54,    55,     0,   313,    56,
-      16,     0,    17,    18,    19,    20,    21,    22,    23,     0,
-       0,     0,    24,    25,    26,    27,    28,     0,    29,    30,
-      31,    32,    33,    34,     0,     0,     0,     0,    35,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,    36,     0,    37,    38,    39,    40,    41,    42,
-       0,     0,     0,     0,    43,    44,    45,    46,    47,    48,
-       0,    49,     0,     0,     0,     0,     0,     0,     0,    50,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    51,    52,    53,     0,     0,     0,     0,    54,    55,
-       0,   315,    56,    16,     0,    17,    18,    19,    20,    21,
-      22,    23,     0,     0,     0,    24,    25,    26,    27,    28,
-       0,    29,    30,    31,    32,    33,    34,     0,     0,     0,
-       0,    35,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    36,     0,    37,    38,    39,
-      40,    41,    42,     0,     0,     0,     0,    43,    44,    45,
-      46,    47,    48,     0,    49,     0,     0,     0,     0,     0,
-       0,     0,    50,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    51,    52,    53,     0,     0,     0,
-       0,    54,    55,     0,   328,    56,    16,     0,    17,    18,
-      19,    20,    21,    22,    23,     0,     0,     0,    24,    25,
-      26,    27,    28,     0,    29,    30,    31,    32,    33,    34,
-       0,     0,     0,     0,    35,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    36,     0,
-      37,    38,    39,    40,    41,    42,     0,     0,     0,     0,
-      43,    44,    45,    46,    47,    48,     0,    49,     0,     0,
-       0,   165,     0,     0,     0,    50,     0,     0,   166,   167,
-     168,   169,     0,     0,     0,     0,     0,    51,    52,    53,
-       0,     0,     0,     0,    54,    55,     0,     0,    56,   170,
-     171,   325,   172,   173,   174,   175,   176,   177,   178,     0,
-       0,     0,   165,   179,   180,   181,     0,     0,   182,   166,
-     167,   168,   169,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     170,   171,     0,   172,   173,   174,   175,   176,   177,   178,
-       0,     0,     0,     0,   179,   180,   181,     0,     0,   182
+       0,    43,    44,    45,    46,    47,    48,     0,    49,   408,
+       0,   410,     0,     0,   413,   414,    50,     0,     0,     0,
+       0,     0,     0,     0,   422,   423,     0,     0,    51,    52,
+      53,     0,   432,   165,     0,    54,    55,     0,     0,    56,
+     166,   167,   168,   169,     0,   438,     0,     0,     0,   440,
+     165,     0,     0,     0,     0,     0,     0,   166,   167,   168,
+     169,   170,   171,   326,   172,   173,   174,   175,   176,   177,
+     178,     0,     0,   456,   457,   179,   180,   181,   170,   171,
+     182,   172,   173,   174,   175,   176,   177,   178,     0,     0,
+       0,     0,   179,   180,   181,     0,     0,   182
 };
 
 static const yytype_int16 yycheck[] =
 {
-      10,    11,    12,    15,     9,    91,   116,    42,   127,   386,
-     290,    16,    11,    15,     9,    50,    11,   407,    12,   295,
-      15,    19,    20,    21,    22,    23,    81,    25,    26,    24,
-       0,    41,   142,     9,    44,    11,    15,    16,    17,    11,
-      45,     9,    74,    11,    42,    43,    44,   102,     9,   361,
-      48,    56,    12,   430,    20,    21,    22,    23,   103,    25,
-      26,    77,    78,    79,   340,   455,   103,    20,    70,   290,
-     382,   292,   293,    26,   103,    12,    42,    43,    12,   103,
-      90,   116,    12,    77,    78,    79,   102,    97,   286,    87,
-     288,   101,   102,    20,    46,    47,    17,    18,    97,   134,
-     219,   103,     9,    23,    81,   191,    12,   142,   103,    12,
-     103,    32,   122,    20,   119,    36,     9,    77,    78,    79,
+      10,    11,    12,    15,     9,   290,   116,    42,   127,    91,
+       9,    16,    11,   408,     9,    50,    11,    11,    15,    12,
+      15,    19,    20,    21,    22,    23,     0,    25,    26,    24,
+     387,    41,   142,     9,    44,    11,    15,    16,    17,    81,
+      45,   362,    74,   296,    42,    43,    44,    77,    78,    79,
+      48,    56,    12,    20,    21,    22,    23,    20,    25,    26,
+     102,   456,   383,    26,    23,    46,    47,     9,   290,    28,
+     292,   293,   102,    70,   431,    42,    43,    12,    20,    11,
+      90,   116,    12,     9,    77,    78,    79,    97,   341,    87,
+       9,   101,   102,    20,    20,   103,    17,    18,    23,   134,
+     219,    97,    98,    97,   103,   101,   103,   142,   103,   191,
+      81,    32,   122,   103,   119,    36,    20,    77,    78,    79,
       41,   126,   127,    44,   103,    12,    47,   103,    49,   127,
-      51,    52,    53,    54,    55,   103,     9,   358,    11,   144,
-      77,    78,    79,    77,    78,    79,    23,    77,    78,    79,
-      77,    78,    79,   158,   159,   160,    23,   162,   163,   164,
-     440,   127,   194,   195,   196,   197,   198,   199,   389,   201,
-     202,    77,    78,    79,    77,    78,    79,   189,   183,   184,
+      51,    52,    53,    54,    55,    12,     9,   359,    11,   144,
+       9,   103,    77,    78,    79,   103,   103,    77,    78,    79,
+      77,    78,    79,   158,   159,   160,   441,   162,   163,   164,
+     127,    20,   194,   195,   196,   197,   198,   199,   390,   201,
+     202,    23,    12,    77,    78,    79,    12,   189,   183,   184,
      185,   186,   187,   188,   182,   220,    61,    62,    63,    64,
-      77,    78,    79,   103,     9,   205,    11,   307,     9,    77,
-      78,    79,   103,   208,   209,   210,   211,   212,   213,    20,
-      48,   330,   103,   103,   219,    90,    91,   438,    77,    78,
-      79,    96,    97,    98,   102,   230,   101,   232,   233,   103,
-      42,    43,    44,    45,   103,    20,   241,    49,    20,    51,
-     161,   103,   103,    20,   165,   166,   167,   168,   169,   170,
+      77,    78,    79,    23,   103,   205,    63,    64,   308,    48,
+      77,    78,    79,   208,   209,   210,   211,   212,   213,    20,
+     103,   103,   331,    20,   219,    90,    91,   439,    77,    78,
+      79,    96,    97,    98,    91,   230,   101,   232,   233,    96,
+      97,    98,   103,   103,   101,    20,   241,    77,    78,    79,
+     161,    77,    78,    79,   165,   166,   167,   168,   169,   170,
      171,   172,   173,   174,   175,   176,   177,   178,   179,   291,
-     102,   266,   267,    26,   269,    77,    78,    79,   102,   279,
-      63,    64,   307,   103,   384,    20,    73,     0,    20,    63,
-     285,   286,   287,   288,    10,   290,    20,   292,   293,    12,
-     102,   289,    77,    78,    79,    11,    23,    20,    91,   309,
-      77,    78,    79,    96,    97,    98,   338,    91,   101,   341,
-      23,   103,    96,    97,    98,    23,   321,   101,    73,    42,
-      43,    44,    45,    97,    98,   330,    49,   101,    51,   102,
-      10,    54,    77,    78,    79,    77,    78,    79,    61,    62,
-      63,    64,    26,    77,    78,    79,    77,    78,    79,   384,
-      11,    79,   103,   358,    77,    78,    79,    21,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    23,
-     409,   102,    15,    96,    97,    98,    26,   102,   101,   102,
-      10,    10,   421,   422,   389,   395,   391,    10,    10,   401,
-     400,   388,   431,   390,   103,    23,   393,   394,   102,     9,
-     439,   102,   102,   102,   325,    15,   403,   404,   102,   419,
-     102,   423,    20,    23,   411,    77,    78,    79,    28,   102,
-      10,    77,    78,    79,   102,    20,   436,   424,     9,   102,
-      75,   428,    20,   438,     0,     1,   102,    20,   450,    74,
-     102,    12,    22,     9,   454,    11,   102,    13,    14,    15,
-      16,    17,    18,    19,    20,   452,   453,    23,    24,    25,
-      26,    27,   103,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      97,   102,   102,    49,    50,    51,    52,    53,    35,    55,
-      56,    57,    58,    59,    60,    77,    78,    79,   440,    65,
-      66,    67,    68,    69,    70,    71,    72,    77,    78,    79,
-      77,    78,    79,    48,    80,    77,    78,    79,   400,   391,
-     102,    48,    -1,    -1,    -1,    -1,    92,    93,    94,    -1,
-       0,     1,   102,    99,   100,   102,    -1,   103,   104,     9,
-     102,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
-      20,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
-      50,    51,    52,    53,    -1,    55,    56,    57,    58,    59,
-      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
-      70,    71,    72,    96,    97,    98,    91,    -1,   101,    -1,
-      80,    96,    97,    98,    -1,    -1,   101,    -1,    -1,    -1,
-      -1,    -1,    92,    93,    94,    -1,    -1,     1,    -1,    99,
-     100,    -1,    -1,   103,   104,     9,    10,    11,    -1,    13,
-      14,    15,    16,    17,    18,    19,    20,    -1,    -1,    23,
-      24,    25,    26,    27,    -1,    29,    30,    31,    32,    33,
-      34,    35,    36,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    -1,    -1,    -1,    49,    50,    51,    52,    53,
-      -1,    55,    56,    57,    58,    59,    60,    -1,    -1,    -1,
-      -1,    65,    66,    67,    68,    69,    70,    71,    72,     3,
-       4,     5,     6,     7,     8,    -1,    80,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,
-      94,    -1,    -1,     1,    -1,    99,   100,    -1,    -1,   103,
-     104,     9,    10,    11,    -1,    13,    14,    15,    16,    17,
-      18,    19,    20,    -1,    -1,    23,    24,    25,    26,    27,
-      -1,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    50,    51,    52,    53,    -1,    55,    56,    57,
-      58,    59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,
-      68,    69,    70,    71,    72,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    92,    93,    94,    -1,    -1,     1,
-      -1,    99,   100,    -1,    -1,   103,   104,     9,    10,    11,
-      -1,    13,    14,    15,    16,    17,    18,    19,    20,    -1,
-      -1,    23,    24,    25,    26,    27,    -1,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    -1,    -1,    -1,    49,    50,    51,
-      52,    53,    -1,    55,    56,    57,    58,    59,    60,    -1,
-      -1,    -1,    -1,    65,    66,    67,    68,    69,    70,    71,
-      72,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    80,    -1,
+     103,   266,   267,     9,   269,    11,    77,    78,    79,   279,
+      77,    78,    79,   308,   103,   385,   103,   286,     0,   288,
+     285,   286,   287,   288,   410,   290,    20,   292,   293,   102,
+      12,   289,    77,    78,    79,    26,   422,   423,    20,   102,
+     310,   103,    10,    77,    78,    79,   432,   339,    73,    11,
+     342,    77,    78,    79,   440,   103,    23,   322,    23,    73,
+      42,    43,    44,    45,     9,   102,   331,    49,   102,    51,
+      15,    10,    54,    77,    78,    79,   102,    26,    23,    61,
+      62,    63,    64,    28,    11,    77,    78,    79,   103,    79,
+     385,    77,    78,    79,   359,    77,    78,    79,   102,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+     102,    21,    23,    63,    96,    97,    98,    15,   102,   101,
+     102,    26,    10,    10,    10,   390,   396,   392,    10,    23,
+     402,   401,    91,    61,    62,    63,    64,    96,    97,    98,
+     103,    91,   101,    20,   102,   326,    96,    97,    98,   102,
+     420,   101,   424,    77,    78,    79,    77,    78,    79,    87,
+      88,    89,    90,    91,   102,   102,   102,   437,    96,    97,
+      98,   102,   102,   101,   439,     0,     1,    10,   102,   451,
+     102,   102,    20,     9,     9,   455,    11,   102,    13,    14,
+      15,    16,    17,    18,    19,    20,    75,    20,    23,    24,
+      25,    26,    27,   102,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    20,   103,    74,    49,    50,    51,    52,    53,    22,
+      55,    56,    57,    58,    59,    60,    77,    78,    79,   102,
+      65,    66,    67,    68,    69,    70,    71,    72,    77,    78,
+      79,    96,    97,    98,   102,    80,   101,    12,    97,   441,
+     392,   102,    35,   401,    48,    48,    -1,    92,    93,    94,
+      -1,     0,     1,   102,    99,   100,    -1,    -1,   103,   104,
+       9,    -1,    11,    -1,    13,    14,    15,    16,    17,    18,
+      19,    20,    -1,    -1,    23,    24,    25,    26,    27,    -1,
+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    -1,    -1,    -1,
+      49,    50,    51,    52,    53,    -1,    55,    56,    57,    58,
+      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
+      69,    70,    71,    72,     3,     4,     5,     6,     7,     8,
+      -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    92,    93,    94,    -1,    -1,     1,    -1,
+      99,   100,    -1,    -1,   103,   104,     9,    10,    11,    -1,
+      13,    14,    15,    16,    17,    18,    19,    20,    -1,    -1,
+      23,    24,    25,    26,    27,    -1,    29,    30,    31,    32,
+      33,    34,    35,    36,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    -1,    -1,    -1,    49,    50,    51,    52,
+      53,    -1,    55,    56,    57,    58,    59,    60,    -1,    -1,
+      -1,    -1,    65,    66,    67,    68,    69,    70,    71,    72,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    80,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,
+      93,    94,    -1,    -1,     1,    -1,    99,   100,    -1,    -1,
+     103,   104,     9,    10,    11,    -1,    13,    14,    15,    16,
+      17,    18,    19,    20,    -1,    -1,    23,    24,    25,    26,
+      27,    -1,    29,    30,    31,    32,    33,    34,    35,    36,
+      37,    38,    39,    40,    41,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    50,    51,    52,    53,    -1,    55,    56,
+      57,    58,    59,    60,    -1,    -1,    -1,    -1,    65,    66,
+      67,    68,    69,    70,    71,    72,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    92,    93,    94,    -1,    -1,
+       1,    -1,    99,   100,    -1,    -1,   103,   104,     9,    10,
+      11,    -1,    13,    14,    15,    16,    17,    18,    19,    20,
+      -1,    -1,    23,    24,    25,    26,    27,    -1,    29,    30,
+      31,    32,    33,    34,    35,    36,    37,    38,    39,    40,
+      41,    42,    43,    44,    45,    -1,    -1,    -1,    49,    50,
+      51,    52,    53,    -1,    55,    56,    57,    58,    59,    60,
+      -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,    70,
+      71,    72,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    80,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      92,    93,    94,    -1,    -1,     1,    -1,    99,   100,    -1,
-      -1,   103,   104,     9,    -1,    11,    -1,    13,    14,    15,
-      16,    17,    18,    19,    20,    -1,    -1,    23,    24,    25,
-      26,    27,    -1,    29,    30,    31,    32,    33,    34,    35,
-      36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-      -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,    55,
-      56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,    65,
-      66,    67,    68,    69,    70,    71,    72,    -1,    -1,    75,
-      -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,    -1,
-      -1,     1,    -1,    99,   100,    -1,    -1,   103,   104,     9,
-      -1,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
-      20,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
-      30,    31,    32,    33,    34,    35,    36,    37,    38,    39,
-      40,    41,    42,    43,    44,    45,    -1,    -1,    -1,    49,
-      50,    51,    52,    53,    -1,    55,    56,    57,    58,    59,
-      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
-      70,    71,    72,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    92,    93,    94,    -1,    -1,     1,    -1,    99,
-     100,    -1,    -1,   103,   104,     9,    -1,    11,    -1,    13,
-      14,    15,    16,    17,    18,    19,    20,    -1,    -1,    23,
-      24,    25,    26,    27,    -1,    29,    30,    31,    32,    33,
-      34,    35,    -1,    37,    38,    39,    40,    41,    42,    43,
-      44,    45,    -1,    -1,    -1,    49,    50,    51,    52,    53,
-      -1,    55,    56,    57,    58,    59,    60,    -1,    -1,    -1,
-      -1,    65,    66,    67,    68,    69,    70,    71,    72,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,
-      94,     1,    -1,    -1,    -1,    99,   100,    -1,    -1,   103,
-     104,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
-      20,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
-      30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    39,
-      -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,    -1,    61,
-      62,    63,    64,    53,    -1,    55,    56,    57,    58,    59,
-      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
-      70,    83,    72,    85,    86,    87,    88,    89,    90,    91,
-      80,    -1,    -1,    -1,    96,    97,    98,    -1,    -1,   101,
-      -1,    -1,    92,    93,    94,     1,    -1,    -1,    -1,    99,
-     100,    -1,    -1,   103,    -1,    11,    -1,    13,    14,    15,
+      -1,    92,    93,    94,    -1,    -1,     1,    -1,    99,   100,
+      -1,    -1,   103,   104,     9,    -1,    11,    -1,    13,    14,
+      15,    16,    17,    18,    19,    20,    -1,    -1,    23,    24,
+      25,    26,    27,    -1,    29,    30,    31,    32,    33,    34,
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45,    -1,    -1,    -1,    49,    50,    51,    52,    53,    -1,
+      55,    56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,    70,    71,    72,    -1,    -1,
+      75,    -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,
+      -1,    -1,     1,    -1,    99,   100,    -1,    -1,   103,   104,
+       9,    -1,    11,    -1,    13,    14,    15,    16,    17,    18,
+      19,    20,    -1,    -1,    23,    24,    25,    26,    27,    -1,
+      29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
+      39,    40,    41,    42,    43,    44,    45,    -1,    -1,    -1,
+      49,    50,    51,    52,    53,    -1,    55,    56,    57,    58,
+      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
+      69,    70,    71,    72,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    92,    93,    94,    -1,    -1,     1,    -1,
+      99,   100,    -1,    -1,   103,   104,     9,    -1,    11,    -1,
+      13,    14,    15,    16,    17,    18,    19,    20,    -1,    -1,
+      23,    24,    25,    26,    27,    -1,    29,    30,    31,    32,
+      33,    34,    35,    -1,    37,    38,    39,    40,    41,    42,
+      43,    44,    45,    -1,    -1,    -1,    49,    50,    51,    52,
+      53,    -1,    55,    56,    57,    58,    59,    60,    -1,    -1,
+      -1,    -1,    65,    66,    67,    68,    69,    70,    71,    72,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    80,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,
+      93,    94,     1,    -1,    -1,    -1,    99,   100,    -1,    -1,
+     103,   104,    11,    -1,    13,    14,    15,    16,    17,    18,
+      19,    20,    -1,    -1,    23,    24,    25,    26,    27,    -1,
+      29,    30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
+      39,    -1,    42,    43,    44,    45,    -1,    -1,    -1,    49,
+      -1,    51,    -1,    -1,    53,    -1,    55,    56,    57,    58,
+      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
+      69,    70,    -1,    72,    -1,    -1,    -1,    77,    78,    79,
+      -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    92,    93,    94,     1,    -1,    -1,    -1,
+      99,   100,   102,    -1,   103,    -1,    11,    -1,    13,    14,
+      15,    16,    17,    18,    19,    -1,    -1,    -1,    23,    24,
+      25,    26,    27,    -1,    29,    30,    31,    32,    33,    34,
+      -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    61,    62,    63,    64,    -1,    53,    -1,
+      55,    56,    57,    58,    59,    60,    -1,     0,    -1,    -1,
+      65,    66,    67,    68,    69,    70,     9,    72,    11,    12,
+      88,    89,    90,    91,    -1,    80,    -1,    20,    96,    97,
+      98,    -1,    -1,   101,    -1,    -1,    -1,    92,    93,    94,
+      -1,    -1,    -1,    -1,    99,   100,    -1,   102,   103,    42,
+      43,    44,    45,    -1,    -1,    -1,    49,    -1,    51,    -1,
+      -1,    54,    -1,    -1,    -1,    -1,    -1,    -1,    61,    62,
+      63,    64,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    77,    78,    79,    -1,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    -1,
+      -1,    -1,    -1,    96,    97,    98,    -1,    -1,   101,   102,
+       9,    -1,    11,    -1,    13,    14,    15,    16,    17,    18,
+      19,    -1,    -1,    -1,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
+      39,    -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,    -1,
+      61,    62,    63,    64,    53,    -1,    55,    56,    57,    58,
+      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
+      69,    70,    83,    72,    85,    86,    87,    88,    89,    90,
+      91,    80,    -1,    -1,    -1,    96,    97,    98,    -1,    -1,
+     101,    -1,    -1,    92,    93,    94,    -1,    -1,    -1,    -1,
+      99,   100,    -1,     9,   103,    11,    -1,    13,    14,    15,
       16,    17,    18,    19,    -1,    -1,    -1,    23,    24,    25,
       26,    27,    -1,    29,    30,    31,    32,    33,    34,    -1,
-      -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    39,    -1,    -1,    54,    -1,    -1,    -1,
       -1,    -1,    -1,    61,    62,    63,    64,    53,    -1,    55,
-      56,    57,    58,    59,    60,    -1,     0,    -1,    -1,    65,
-      66,    67,    68,    69,    70,     9,    72,    11,    12,    87,
-      88,    89,    90,    91,    80,    -1,    20,    -1,    96,    97,
+      56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,    65,
+      66,    67,    68,    69,    70,    -1,    72,    85,    86,    87,
+      88,    89,    90,    91,    80,    -1,    -1,    -1,    96,    97,
       98,    -1,    -1,   101,    -1,    -1,    92,    93,    94,    -1,
-      -1,    -1,    -1,    99,   100,    -1,   102,   103,    42,    43,
-      44,    45,    -1,    -1,    -1,    49,    -1,    51,    -1,    -1,
-      54,    -1,    -1,    -1,    -1,    -1,    -1,    61,    62,    63,
-      64,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    77,    78,    79,    -1,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    91,    -1,    -1,
-      -1,    -1,    96,    97,    98,    -1,    -1,   101,   102,     9,
-      -1,    11,    -1,    13,    14,    15,    16,    17,    18,    19,
-      -1,    -1,    -1,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    39,
-      -1,    -1,    54,    -1,    -1,    -1,    -1,    -1,    -1,    61,
-      62,    63,    64,    53,    -1,    55,    56,    57,    58,    59,
-      60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
-      70,    -1,    72,    85,    86,    87,    88,    89,    90,    91,
-      80,    -1,    -1,    -1,    96,    97,    98,    -1,    -1,   101,
-      -1,    -1,    92,    93,    94,    -1,    -1,    -1,    -1,    99,
-     100,    -1,     9,   103,    11,    -1,    13,    14,    15,    16,
-      17,    18,    19,    -1,    -1,    -1,    23,    24,    25,    26,
-      27,    -1,    29,    30,    31,    32,    33,    34,    -1,    -1,
-      -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    61,
-      62,    63,    64,    -1,    -1,    -1,    53,    -1,    55,    56,
-      57,    58,    59,    60,    -1,    -1,    -1,    -1,    65,    66,
-      67,    68,    69,    70,    -1,    72,    88,    89,    90,    91,
-      -1,    -1,    -1,    80,    96,    97,    98,    -1,    -1,   101,
-      -1,    -1,    -1,    -1,    -1,    92,    93,    94,    -1,    -1,
-      -1,    -1,    99,   100,    -1,     9,   103,    11,    -1,    13,
-      14,    15,    16,    17,    18,    19,    -1,    -1,    -1,    23,
-      24,    25,    26,    27,    -1,    29,    30,    31,    32,    33,
-      34,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,
-      -1,    -1,    61,    62,    63,    64,    -1,    -1,    -1,    53,
-      -1,    55,    56,    57,    58,    59,    60,    -1,    -1,    -1,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    -1,
-      89,    90,    91,    -1,    -1,    -1,    80,    96,    97,    98,
-      -1,    -1,   101,    -1,    -1,    -1,    -1,    -1,    92,    93,
-      94,    -1,    -1,    -1,    -1,    99,   100,    -1,    -1,   103,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
-      -1,    -1,    23,    24,    25,    26,    27,    -1,    29,    30,
-      31,    32,    33,    34,    -1,    -1,    -1,    -1,    39,    -1,
-      -1,    -1,    -1,    -1,    -1,    61,    62,    63,    64,    -1,
-      -1,    -1,    53,    -1,    55,    56,    57,    58,    59,    60,
-      -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,    70,
-      -1,    72,    -1,    -1,    90,    91,    -1,    -1,    -1,    80,
-      96,    97,    98,    -1,    -1,   101,    -1,    -1,    -1,    -1,
-      -1,    92,    93,    94,    -1,    -1,    -1,    -1,    99,   100,
-      -1,    11,   103,    13,    14,    15,    16,    17,    18,    19,
-      20,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
+      -1,    -1,    -1,    99,   100,    -1,     9,   103,    11,    -1,
+      13,    14,    15,    16,    17,    18,    19,    -1,    -1,    -1,
+      23,    24,    25,    26,    27,    -1,    29,    30,    31,    32,
+      33,    34,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,
+      -1,    -1,    -1,    61,    62,    63,    64,    -1,    -1,    -1,
+      53,    -1,    55,    56,    57,    58,    59,    60,    -1,    -1,
+      -1,    -1,    65,    66,    67,    68,    69,    70,    -1,    72,
+      -1,    89,    90,    91,    -1,    -1,    -1,    80,    96,    97,
+      98,    -1,    -1,   101,    -1,    -1,    -1,    -1,    -1,    92,
+      93,    94,    -1,    -1,    -1,    -1,    99,   100,    -1,    -1,
+     103,    11,    12,    13,    14,    15,    16,    17,    18,    19,
+      -1,    -1,    -1,    23,    24,    25,    26,    27,    -1,    29,
       30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    39,
-      -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,    63,    64,
+      -1,    -1,    -1,    -1,    -1,    -1,    61,    62,    63,    64,
       -1,    -1,    -1,    53,    -1,    55,    56,    57,    58,    59,
       60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,
       70,    -1,    72,    -1,    -1,    90,    91,    -1,    -1,    -1,
       80,    96,    97,    98,    -1,    -1,   101,    -1,    -1,    -1,
       -1,    -1,    92,    93,    94,    -1,    -1,    -1,    -1,    99,
      100,    -1,    11,   103,    13,    14,    15,    16,    17,    18,
-      19,    -1,    -1,    -1,    23,    24,    25,    26,    27,    -1,
+      19,    20,    -1,    -1,    23,    24,    25,    26,    27,    -1,
       29,    30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
-      39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    63,
+      39,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,    63,
       64,    -1,    -1,    -1,    53,    -1,    55,    56,    57,    58,
       59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
       69,    70,    -1,    72,    -1,    -1,    90,    91,    -1,    -1,
       -1,    80,    96,    97,    98,    -1,    -1,   101,    -1,    -1,
       -1,    -1,    -1,    92,    93,    94,    -1,    -1,    -1,    -1,
+      99,   100,    -1,    11,   103,    13,    14,    15,    16,    17,
+      18,    19,    -1,    -1,    -1,    23,    24,    25,    26,    27,
+      -1,    29,    30,    31,    32,    33,    34,    -1,    -1,    -1,
+      -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      63,    64,    -1,    -1,    -1,    53,    -1,    55,    56,    57,
+      58,    59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,
+      68,    69,    70,    -1,    72,    -1,    -1,    90,    91,    -1,
+      -1,    -1,    80,    96,    97,    98,    -1,    -1,   101,    -1,
+      -1,    -1,    -1,    -1,    92,    93,    94,    -1,    -1,    -1,
+      -1,    99,   100,    -1,   102,   103,    11,    -1,    13,    14,
+      15,    16,    17,    18,    19,    -1,    -1,    -1,    23,    24,
+      25,    26,    27,    -1,    29,    30,    31,    32,    33,    34,
+      -1,    -1,    -1,    -1,    39,    42,    43,    44,    45,    -1,
+      -1,    -1,    49,    -1,    51,    -1,    -1,    -1,    53,    -1,
+      55,    56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,
+      65,    66,    67,    68,    69,    70,    -1,    72,    -1,    -1,
+      77,    78,    79,    -1,    -1,    80,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,
+      -1,    -1,    -1,    -1,    99,   100,    -1,   102,   103,    11,
+      -1,    13,    14,    15,    16,    17,    18,    19,    -1,    -1,
+      -1,    23,    24,    25,    26,    27,    -1,    29,    30,    31,
+      32,    33,    34,    -1,    -1,    -1,    -1,    39,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    53,    -1,    55,    56,    57,    58,    59,    60,    -1,
+      -1,    -1,    -1,    65,    66,    67,    68,    69,    70,    -1,
+      72,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    80,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      92,    93,    94,    -1,    -1,    -1,    -1,    99,   100,    -1,
+     102,   103,    11,    -1,    13,    14,    15,    16,    17,    18,
+      19,    -1,    -1,    -1,    23,    24,    25,    26,    27,    -1,
+      29,    30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
+      39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    53,    -1,    55,    56,    57,    58,
+      59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,    68,
+      69,    70,    -1,    72,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    92,    93,    94,    -1,    -1,    -1,    -1,
       99,   100,    -1,   102,   103,    11,    -1,    13,    14,    15,
       16,    17,    18,    19,    -1,    -1,    -1,    23,    24,    25,
       26,    27,    -1,    29,    30,    31,    32,    33,    34,    -1,
-      -1,    -1,    -1,    39,    42,    43,    44,    45,    -1,    -1,
-      -1,    49,    -1,    51,    -1,    -1,    -1,    53,    -1,    55,
+      -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,    55,
       56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,    65,
-      66,    67,    68,    69,    70,    -1,    72,    -1,    -1,    77,
-      78,    79,    -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,
+      66,    67,    68,    69,    70,    -1,    72,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,    -1,
       -1,    -1,    -1,    99,   100,    -1,   102,   103,    11,    -1,
       13,    14,    15,    16,    17,    18,    19,    -1,    -1,    -1,
@@ -981,44 +1009,16 @@ static const yytype_int16 yycheck[] =
       34,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,
       -1,    55,    56,    57,    58,    59,    60,    -1,    -1,    -1,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,    93,
-      94,    -1,    -1,    -1,    -1,    99,   100,    -1,   102,   103,
-      11,    -1,    13,    14,    15,    16,    17,    18,    19,    -1,
-      -1,    -1,    23,    24,    25,    26,    27,    -1,    29,    30,
-      31,    32,    33,    34,    -1,    -1,    -1,    -1,    39,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    53,    -1,    55,    56,    57,    58,    59,    60,
-      -1,    -1,    -1,    -1,    65,    66,    67,    68,    69,    70,
-      -1,    72,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    80,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    92,    93,    94,    -1,    -1,    -1,    -1,    99,   100,
-      -1,   102,   103,    11,    -1,    13,    14,    15,    16,    17,
-      18,    19,    -1,    -1,    -1,    23,    24,    25,    26,    27,
-      -1,    29,    30,    31,    32,    33,    34,    -1,    -1,    -1,
-      -1,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    53,    -1,    55,    56,    57,
-      58,    59,    60,    -1,    -1,    -1,    -1,    65,    66,    67,
-      68,    69,    70,    -1,    72,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    92,    93,    94,    -1,    -1,    -1,
-      -1,    99,   100,    -1,   102,   103,    11,    -1,    13,    14,
-      15,    16,    17,    18,    19,    -1,    -1,    -1,    23,    24,
-      25,    26,    27,    -1,    29,    30,    31,    32,    33,    34,
-      -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    53,    -1,
-      55,    56,    57,    58,    59,    60,    -1,    -1,    -1,    -1,
-      65,    66,    67,    68,    69,    70,    -1,    72,    -1,    -1,
-      -1,    54,    -1,    -1,    -1,    80,    -1,    -1,    61,    62,
-      63,    64,    -1,    -1,    -1,    -1,    -1,    92,    93,    94,
-      -1,    -1,    -1,    -1,    99,   100,    -1,    -1,   103,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    -1,
-      -1,    -1,    54,    96,    97,    98,    -1,    -1,   101,    61,
-      62,    63,    64,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      82,    83,    -1,    85,    86,    87,    88,    89,    90,    91,
-      -1,    -1,    -1,    -1,    96,    97,    98,    -1,    -1,   101
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,   389,
+      -1,   391,    -1,    -1,   394,   395,    80,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   404,   405,    -1,    -1,    92,    93,
+      94,    -1,   412,    54,    -1,    99,   100,    -1,    -1,   103,
+      61,    62,    63,    64,    -1,   425,    -1,    -1,    -1,   429,
+      54,    -1,    -1,    -1,    -1,    -1,    -1,    61,    62,    63,
+      64,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    -1,    -1,   453,   454,    96,    97,    98,    82,    83,
+     101,    85,    86,    87,    88,    89,    90,    91,    -1,    -1,
+      -1,    -1,    96,    97,    98,    -1,    -1,   101
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1054,23 +1054,23 @@ static const yytype_uint8 yystos[] =
      157,   157,   157,   157,   157,   157,     9,    11,    24,   103,
      151,   165,   102,   147,   147,   147,   147,   147,   147,   118,
       23,   138,   139,    23,   124,   115,   115,   115,   115,   115,
-     115,   103,   115,   115,    23,   142,   113,   147,   134,   147,
-     147,   147,   147,   147,   162,   148,    12,   150,    73,   144,
-     102,   102,   147,   102,   147,   102,   147,    10,   102,    26,
-     147,    11,    20,    12,   102,    84,   147,   147,   102,   147,
-     103,   102,    20,    12,    20,    12,    20,    10,    21,   114,
-     123,     9,    20,    23,   133,   147,   134,   135,   147,   134,
-     137,   163,   165,   128,   132,   135,   136,   147,   115,   135,
-     135,   143,   102,   102,   161,    26,   113,   102,   102,   102,
-      12,   147,    10,   157,    20,    12,   102,   162,    10,    10,
-      10,   115,   143,   115,    23,   102,   102,   102,   102,   103,
-     102,    20,   135,   102,   102,   144,    12,    10,   102,    20,
-     144,   125,   161,   131,   131,     9,   116,   116,   135,   116,
-     133,   102,   116,   116,    20,   113,   146,    75,   146,   118,
-      20,   116,   116,   117,    46,    47,   129,   129,   102,   130,
-      20,   116,   119,    10,   130,   130,   118,   116,   103,   116,
-     131,   130,    20,    26,   126,    10,   135,   130,   136,    22,
-      74,   127,   102,   102,   118,   116,   116,    75,   129
+     115,   103,   115,   115,    23,    28,   142,   113,   147,   134,
+     147,   147,   147,   147,   147,   162,   148,    12,   150,    73,
+     144,   102,   102,   147,   102,   147,   102,   147,    10,   102,
+      26,   147,    11,    20,    12,   102,    84,   147,   147,   102,
+     147,   103,   102,    20,    12,    20,    12,    20,    10,    21,
+     114,   123,     9,    20,    23,   133,   147,   134,   135,   147,
+     134,   137,   163,   165,   128,   132,   135,   136,   147,   115,
+     135,   135,   143,   102,   102,   161,    26,   113,   102,   102,
+     102,    12,   147,    10,   157,    20,    12,   102,   162,    10,
+      10,    10,   115,   143,   115,    23,   102,   102,   102,   102,
+     103,   102,    20,   135,   102,   102,   144,    12,    10,   102,
+      20,   144,   125,   161,   131,   131,     9,   116,   116,   135,
+     116,   133,   102,   116,   116,    20,   113,   146,    75,   146,
+     118,    20,   116,   116,   117,    46,    47,   129,   129,   102,
+     130,    20,   116,   119,    10,   130,   130,   118,   116,   103,
+     116,   131,   130,    20,    26,   126,    10,   135,   130,   136,
+      22,    74,   127,   102,   102,   118,   116,   116,    75,   129
 };
 
 typedef enum {
@@ -1108,6 +1108,6 @@ static const toketypes yy_type_tab[] =
 };
 
 /* Generated from:
- * 3e01d5213d0f6a4dd26b90cfb22baf8eaf3c89d8ae0025fdc9e06ec1f871e826 perly.y
+ * d37e00fcfb1737df464a95af8f4a92c2518ee5b69cd05ffc577f253313aa81c3 perly.y
  * 4a3ced51fe6585f6ec59e65e1ffd74bc976c498b0e6992eaab337219fee72e51 regen_perly.pl
  * ex: set ro: */

diff --git a/perly.y b/perly.y
index 2634605..a091d3d 100644 (file)
--- a/perly.y
+++ b/perly.y
@@ -684,6 +684,7 @@ subname     :       WORD    { const char *const name = SvPV_nolen_const(((SVOP*)$1)->op_sv);
                              || strEQ(name, "UNITCHECK"))
                              CvSPECIAL_on(PL_compcv);
                          $$ = $1; }
+       |       PRIVATEREF
        ;
 
 /* Subroutine prototype */

diff --git a/t/cmd/lexsub.t b/t/cmd/lexsub.t
index c21190b..cef8070 100644 (file)
--- a/t/cmd/lexsub.t
+++ b/t/cmd/lexsub.t
@@ -70,9 +70,7 @@ sub bar::c { 43 }
   sub bar::d { 'd43' }
   package bar;
   sub d { 'd42' }
-  { local $::TODO = ' ';
-    is eval { ::d },'d42', 'our sub foo; applies to subsequent sub foo {}';
-  }
+  is eval ::d, 'd42', 'our sub foo; applies to subsequent sub foo {}';
 }
 {
   our sub e ($);

diff --git a/toke.c b/toke.c
index e258bf6..8f5475c 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -8242,21 +8242,15 @@ Perl_yylex(pTHX)
                         SvUTF8_on(PL_subname);
                    have_name = TRUE;
 
-                   if (key == KEY_our) {
-                       *PL_tokenbuf = '&';
-                       Copy(tmpbuf, PL_tokenbuf+1, len, char);
-                       PL_tokenbuf[len+1] = '\0';
-                   }
+                   *PL_tokenbuf = '&';
+                   Copy(tmpbuf, PL_tokenbuf+1, len, char);
+                   PL_tokenbuf[len+1] = '\0';
 
 #ifdef PERL_MAD
                    start_force(0);
                    CURMAD('X', nametoke);
                    CURMAD('_', tmpwhite);
-                   if (key == KEY_our)
-                       force_ident_maybe_lex('&');
-                   else
-                       (void) force_word(PL_oldbufptr + tboffset, WORD,
-                                     FALSE, TRUE, TRUE);
+                   force_ident_maybe_lex('&');
 
                    s = SKIPSPACE2(d,tmpwhite);
 #else
@@ -8418,13 +8412,8 @@ Perl_yylex(pTHX)
                        sv_setpvs(PL_subname, "__ANON__::__ANON__");
                    TOKEN(ANONSUB);
                }
-               if (key == KEY_our) {
-                   force_ident_maybe_lex('&');
-               }
 #ifndef PERL_MAD
-               else
-                   (void) force_word(PL_oldbufptr + tboffset, WORD,
-                                 FALSE, TRUE, TRUE);
+               force_ident_maybe_lex('&');
 #endif
                if (key == KEY_my)
                    TOKEN(MYSUB);
@@ -8648,14 +8637,14 @@ S_force_ident_maybe_lex(pTHX_ char pit)
                 sv_catpvn_flags(sym, PL_tokenbuf+1, tokenbuf_len - 1, (UTF ? SV_CATUTF8 : SV_CATBYTES ));
                 o = (OP*)newSVOP(OP_CONST, 0, sym);
                 o->op_private = OPpCONST_ENTERED;
-                gv_fetchsv(sym,
+                if (pit != '&')
+                  gv_fetchsv(sym,
                     (PL_in_eval
                         ? (GV_ADDMULTI | GV_ADDINEVAL)
                         : GV_ADDMULTI
                     ),
                     ((PL_tokenbuf[0] == '$') ? SVt_PV
                      : (PL_tokenbuf[0] == '@') ? SVt_PVAV
-                     : (PL_tokenbuf[0] == '&') ? SVt_PVGV
                      : SVt_PVHV));
                 force_type = WORD;
                 goto doforce;
@@ -8696,12 +8685,12 @@ S_force_ident_maybe_lex(pTHX_ char pit)
                                                      tokenbuf_len - 1,
                                                       UTF ? SVf_UTF8 : 0 ));
     o->op_private = OPpCONST_ENTERED;
-    gv_fetchpvn_flags(PL_tokenbuf+1, tokenbuf_len - 1,
+    if (pit != '&')
+       gv_fetchpvn_flags(PL_tokenbuf+1, tokenbuf_len - 1,
                     (PL_in_eval ? (GV_ADDMULTI | GV_ADDINEVAL) : GV_ADD)
                      | ( UTF ? SVf_UTF8 : 0 ),
                     ((PL_tokenbuf[0] == '$') ? SVt_PV
                      : (PL_tokenbuf[0] == '@') ? SVt_PVAV
-                     : (PL_tokenbuf[0] == '&') ? SVt_PVGV
                      : SVt_PVHV));
     force_type = WORD;