Latest gramamr

diff --git a/Python/graminit.c b/Python/graminit.c
index 8a3cbd4b58d3f29fb900caa327d37c8ec3ac266a..571a835a4f8c4673fa35c25adcaa37b4a14e4d46 100644 (file)
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -102,10 +102,9 @@ static state states_5[4] = {
        {1, arcs_5_2},
        {1, arcs_5_3},
 };
-static arc arcs_6_0[3] = {
+static arc arcs_6_0[2] = {
        {20, 1},
        {22, 2},
-       {23, 2},
 };
 static arc arcs_6_1[2] = {
        {21, 3},
@@ -114,20 +113,19 @@ static arc arcs_6_1[2] = {
 static arc arcs_6_2[1] = {
        {13, 4},
 };
-static arc arcs_6_3[4] = {
+static arc arcs_6_3[3] = {
        {20, 1},
        {22, 2},
-       {23, 2},
        {0, 3},
 };
 static arc arcs_6_4[1] = {
        {0, 4},
 };
 static state states_6[5] = {
-       {3, arcs_6_0},
+       {2, arcs_6_0},
        {2, arcs_6_1},
        {1, arcs_6_2},
-       {4, arcs_6_3},
+       {3, arcs_6_3},
        {1, arcs_6_4},
 };
 static arc arcs_7_0[2] = {
@@ -138,7 +136,7 @@ static arc arcs_7_1[1] = {
        {0, 1},
 };
 static arc arcs_7_2[1] = {
-       {24, 3},
+       {23, 3},
 };
 static arc arcs_7_3[1] = {
        {19, 1},
@@ -177,14 +175,14 @@ static state states_9[2] = {
        {1, arcs_9_1},
 };
 static arc arcs_10_0[1] = {
-       {25, 1},
+       {24, 1},
 };
 static arc arcs_10_1[2] = {
-       {26, 2},
+       {25, 2},
        {2, 3},
 };
 static arc arcs_10_2[2] = {
-       {25, 1},
+       {24, 1},
        {2, 3},
 };
 static arc arcs_10_3[1] = {
@@ -197,13 +195,13 @@ static state states_10[4] = {
        {1, arcs_10_3},
 };
 static arc arcs_11_0[7] = {
+       {26, 1},
        {27, 1},
        {28, 1},
        {29, 1},
        {30, 1},
        {31, 1},
        {32, 1},
-       {33, 1},
 };
 static arc arcs_11_1[1] = {
        {0, 1},
@@ -213,10 +211,10 @@ static state states_11[2] = {
        {1, arcs_11_1},
 };
 static arc arcs_12_0[1] = {
-       {34, 1},
+       {33, 1},
 };
 static arc arcs_12_1[2] = {
-       {35, 0},
+       {34, 0},
        {0, 1},
 };
 static state states_12[2] = {
@@ -224,10 +222,10 @@ static state states_12[2] = {
        {2, arcs_12_1},
 };
 static arc arcs_13_0[1] = {
-       {36, 1},
+       {35, 1},
 };
 static arc arcs_13_1[2] = {
-       {37, 2},
+       {36, 2},
        {0, 1},
 };
 static arc arcs_13_2[2] = {
@@ -240,10 +238,10 @@ static state states_13[3] = {
        {2, arcs_13_2},
 };
 static arc arcs_14_0[1] = {
-       {38, 1},
+       {37, 1},
 };
 static arc arcs_14_1[1] = {
-       {34, 2},
+       {33, 2},
 };
 static arc arcs_14_2[1] = {
        {0, 2},
@@ -254,7 +252,7 @@ static state states_14[3] = {
        {1, arcs_14_2},
 };
 static arc arcs_15_0[1] = {
-       {39, 1},
+       {38, 1},
 };
 static arc arcs_15_1[1] = {
        {0, 1},
@@ -264,10 +262,10 @@ static state states_15[2] = {
        {1, arcs_15_1},
 };
 static arc arcs_16_0[4] = {
+       {39, 1},
        {40, 1},
        {41, 1},
        {42, 1},
-       {43, 1},
 };
 static arc arcs_16_1[1] = {
        {0, 1},
@@ -277,7 +275,7 @@ static state states_16[2] = {
        {1, arcs_16_1},
 };
 static arc arcs_17_0[1] = {
-       {44, 1},
+       {43, 1},
 };
 static arc arcs_17_1[1] = {
        {0, 1},
@@ -287,7 +285,7 @@ static state states_17[2] = {
        {1, arcs_17_1},
 };
 static arc arcs_18_0[1] = {
-       {45, 1},
+       {44, 1},
 };
 static arc arcs_18_1[1] = {
        {0, 1},
@@ -297,7 +295,7 @@ static state states_18[2] = {
        {1, arcs_18_1},
 };
 static arc arcs_19_0[1] = {
-       {46, 1},
+       {45, 1},
 };
 static arc arcs_19_1[2] = {
        {9, 2},
@@ -312,17 +310,17 @@ static state states_19[3] = {
        {1, arcs_19_2},
 };
 static arc arcs_20_0[1] = {
-       {47, 1},
+       {46, 1},
 };
 static arc arcs_20_1[1] = {
-       {37, 2},
+       {36, 2},
 };
 static arc arcs_20_2[2] = {
        {21, 3},
        {0, 2},
 };
 static arc arcs_20_3[1] = {
-       {37, 4},
+       {36, 4},
 };
 static arc arcs_20_4[1] = {
        {0, 4},
@@ -335,8 +333,8 @@ static state states_20[5] = {
        {1, arcs_20_4},
 };
 static arc arcs_21_0[2] = {
-       {48, 1},
-       {49, 2},
+       {47, 1},
+       {48, 2},
 };
 static arc arcs_21_1[1] = {
        {13, 3},
@@ -349,10 +347,10 @@ static arc arcs_21_3[2] = {
        {0, 3},
 };
 static arc arcs_21_4[1] = {
-       {48, 5},
+       {47, 5},
 };
 static arc arcs_21_5[2] = {
-       {23, 6},
+       {22, 6},
        {13, 7},
 };
 static arc arcs_21_6[1] = {
@@ -377,7 +375,7 @@ static state states_21[9] = {
        {1, arcs_21_8},
 };
 static arc arcs_22_0[1] = {
-       {50, 1},
+       {49, 1},
 };
 static arc arcs_22_1[1] = {
        {13, 2},
@@ -392,12 +390,12 @@ static state states_22[3] = {
        {2, arcs_22_2},
 };
 static arc arcs_23_0[6] = {
+       {50, 1},
        {51, 1},
        {52, 1},
        {53, 1},
-       {54, 1},
        {11, 1},
-       {55, 1},
+       {54, 1},
 };
 static arc arcs_23_1[1] = {
        {0, 1},
@@ -407,10 +405,10 @@ static state states_23[2] = {
        {1, arcs_23_1},
 };
 static arc arcs_24_0[1] = {
-       {56, 1},
+       {55, 1},
 };
 static arc arcs_24_1[1] = {
-       {37, 2},
+       {36, 2},
 };
 static arc arcs_24_2[1] = {
        {15, 3},
@@ -419,8 +417,8 @@ static arc arcs_24_3[1] = {
        {16, 4},
 };
 static arc arcs_24_4[3] = {
-       {57, 1},
-       {58, 5},
+       {56, 1},
+       {57, 5},
        {0, 4},
 };
 static arc arcs_24_5[1] = {
@@ -443,10 +441,10 @@ static state states_24[8] = {
        {1, arcs_24_7},
 };
 static arc arcs_25_0[1] = {
-       {59, 1},
+       {58, 1},
 };
 static arc arcs_25_1[1] = {
-       {37, 2},
+       {36, 2},
 };
 static arc arcs_25_2[1] = {
        {15, 3},
@@ -455,7 +453,7 @@ static arc arcs_25_3[1] = {
        {16, 4},
 };
 static arc arcs_25_4[2] = {
-       {58, 5},
+       {57, 5},
        {0, 4},
 };
 static arc arcs_25_5[1] = {
@@ -478,13 +476,13 @@ static state states_25[8] = {
        {1, arcs_25_7},
 };
 static arc arcs_26_0[1] = {
-       {60, 1},
+       {59, 1},
 };
 static arc arcs_26_1[1] = {
-       {34, 2},
+       {33, 2},
 };
 static arc arcs_26_2[1] = {
-       {61, 3},
+       {60, 3},
 };
 static arc arcs_26_3[1] = {
        {9, 4},
@@ -496,7 +494,7 @@ static arc arcs_26_5[1] = {
        {16, 6},
 };
 static arc arcs_26_6[2] = {
-       {58, 7},
+       {57, 7},
        {0, 6},
 };
 static arc arcs_26_7[1] = {
@@ -521,7 +519,7 @@ static state states_26[10] = {
        {1, arcs_26_9},
 };
 static arc arcs_27_0[1] = {
-       {62, 1},
+       {61, 1},
 };
 static arc arcs_27_1[1] = {
        {15, 2},
@@ -530,8 +528,8 @@ static arc arcs_27_2[1] = {
        {16, 3},
 };
 static arc arcs_27_3[2] = {
-       {63, 4},
-       {64, 5},
+       {62, 4},
+       {63, 5},
 };
 static arc arcs_27_4[1] = {
        {15, 6},
@@ -546,7 +544,7 @@ static arc arcs_27_7[1] = {
        {16, 9},
 };
 static arc arcs_27_8[2] = {
-       {63, 4},
+       {62, 4},
        {0, 8},
 };
 static arc arcs_27_9[1] = {
@@ -565,10 +563,10 @@ static state states_27[10] = {
        {1, arcs_27_9},
 };
 static arc arcs_28_0[1] = {
-       {65, 1},
+       {64, 1},
 };
 static arc arcs_28_1[2] = {
-       {37, 2},
+       {36, 2},
        {0, 1},
 };
 static arc arcs_28_2[2] = {
@@ -576,7 +574,7 @@ static arc arcs_28_2[2] = {
        {0, 2},
 };
 static arc arcs_28_3[1] = {
-       {37, 4},
+       {36, 4},
 };
 static arc arcs_28_4[1] = {
        {0, 4},
@@ -596,14 +594,14 @@ static arc arcs_29_1[1] = {
        {0, 1},
 };
 static arc arcs_29_2[1] = {
-       {66, 3},
+       {65, 3},
 };
 static arc arcs_29_3[1] = {
        {6, 4},
 };
 static arc arcs_29_4[2] = {
        {6, 4},
-       {67, 1},
+       {66, 1},
 };
 static state states_29[5] = {
        {2, arcs_29_0},
@@ -613,10 +611,10 @@ static state states_29[5] = {
        {2, arcs_29_4},
 };
 static arc arcs_30_0[1] = {
-       {68, 1},
+       {67, 1},
 };
 static arc arcs_30_1[2] = {
-       {69, 0},
+       {68, 0},
        {0, 1},
 };
 static state states_30[2] = {
@@ -624,10 +622,10 @@ static state states_30[2] = {
        {2, arcs_30_1},
 };
 static arc arcs_31_0[1] = {
-       {70, 1},
+       {69, 1},
 };
 static arc arcs_31_1[2] = {
-       {71, 0},
+       {70, 0},
        {0, 1},
 };
 static state states_31[2] = {
@@ -635,11 +633,11 @@ static state states_31[2] = {
        {2, arcs_31_1},
 };
 static arc arcs_32_0[2] = {
-       {72, 1},
-       {73, 2},
+       {71, 1},
+       {72, 2},
 };
 static arc arcs_32_1[1] = {
-       {70, 2},
+       {69, 2},
 };
 static arc arcs_32_2[1] = {
        {0, 2},
@@ -650,10 +648,10 @@ static state states_32[3] = {
        {1, arcs_32_2},
 };
 static arc arcs_33_0[1] = {
-       {74, 1},
+       {73, 1},
 };
 static arc arcs_33_1[2] = {
-       {75, 0},
+       {74, 0},
        {0, 1},
 };
 static state states_33[2] = {
@@ -661,25 +659,25 @@ static state states_33[2] = {
        {2, arcs_33_1},
 };
 static arc arcs_34_0[10] = {
+       {75, 1},
        {76, 1},
        {77, 1},
        {78, 1},
        {79, 1},
        {80, 1},
        {81, 1},
-       {82, 1},
-       {61, 1},
-       {72, 2},
-       {83, 3},
+       {60, 1},
+       {71, 2},
+       {82, 3},
 };
 static arc arcs_34_1[1] = {
        {0, 1},
 };
 static arc arcs_34_2[1] = {
-       {61, 1},
+       {60, 1},
 };
 static arc arcs_34_3[2] = {
-       {72, 1},
+       {71, 1},
        {0, 3},
 };
 static state states_34[4] = {
@@ -689,10 +687,10 @@ static state states_34[4] = {
        {2, arcs_34_3},
 };
 static arc arcs_35_0[1] = {
-       {84, 1},
+       {83, 1},
 };
 static arc arcs_35_1[2] = {
-       {85, 0},
+       {84, 0},
        {0, 1},
 };
 static state states_35[2] = {
@@ -700,10 +698,10 @@ static state states_35[2] = {
        {2, arcs_35_1},
 };
 static arc arcs_36_0[1] = {
-       {86, 1},
+       {85, 1},
 };
 static arc arcs_36_1[2] = {
-       {87, 0},
+       {86, 0},
        {0, 1},
 };
 static state states_36[2] = {
@@ -711,10 +709,10 @@ static state states_36[2] = {
        {2, arcs_36_1},
 };
 static arc arcs_37_0[1] = {
-       {88, 1},
+       {87, 1},
 };
 static arc arcs_37_1[2] = {
-       {89, 0},
+       {88, 0},
        {0, 1},
 };
 static state states_37[2] = {
@@ -722,11 +720,11 @@ static state states_37[2] = {
        {2, arcs_37_1},
 };
 static arc arcs_38_0[1] = {
-       {90, 1},
+       {89, 1},
 };
 static arc arcs_38_1[3] = {
+       {90, 0},
        {91, 0},
-       {92, 0},
        {0, 1},
 };
 static state states_38[2] = {
@@ -734,10 +732,10 @@ static state states_38[2] = {
        {3, arcs_38_1},
 };
 static arc arcs_39_0[1] = {
-       {93, 1},
+       {92, 1},
 };
 static arc arcs_39_1[3] = {
-       {22, 0},
+       {93, 0},
        {94, 0},
        {0, 1},
 };
@@ -749,7 +747,7 @@ static arc arcs_40_0[1] = {
        {95, 1},
 };
 static arc arcs_40_1[4] = {
-       {23, 0},
+       {22, 0},
        {96, 0},
        {97, 0},
        {0, 1},
@@ -759,7 +757,7 @@ static state states_40[2] = {
        {4, arcs_40_1},
 };
 static arc arcs_41_0[4] = {
-       {22, 1},
+       {93, 1},
        {94, 1},
        {98, 1},
        {99, 2},
@@ -865,7 +863,7 @@ static state states_43[7] = {
        {1, arcs_43_6},
 };
 static arc arcs_44_0[2] = {
-       {37, 1},
+       {36, 1},
        {15, 2},
 };
 static arc arcs_44_1[2] = {
@@ -873,7 +871,7 @@ static arc arcs_44_1[2] = {
        {0, 1},
 };
 static arc arcs_44_2[2] = {
-       {37, 3},
+       {36, 3},
        {0, 2},
 };
 static arc arcs_44_3[1] = {
@@ -886,14 +884,14 @@ static state states_44[4] = {
        {1, arcs_44_3},
 };
 static arc arcs_45_0[1] = {
-       {74, 1},
+       {73, 1},
 };
 static arc arcs_45_1[2] = {
        {21, 2},
        {0, 1},
 };
 static arc arcs_45_2[2] = {
-       {74, 1},
+       {73, 1},
        {0, 2},
 };
 static state states_45[3] = {
@@ -902,14 +900,14 @@ static state states_45[3] = {
        {2, arcs_45_2},
 };
 static arc arcs_46_0[1] = {
-       {37, 1},
+       {36, 1},
 };
 static arc arcs_46_1[2] = {
        {21, 2},
        {0, 1},
 };
 static arc arcs_46_2[2] = {
-       {37, 1},
+       {36, 1},
        {0, 2},
 };
 static state states_46[3] = {
@@ -918,20 +916,20 @@ static state states_46[3] = {
        {2, arcs_46_2},
 };
 static arc arcs_47_0[1] = {
-       {37, 1},
+       {36, 1},
 };
 static arc arcs_47_1[1] = {
        {15, 2},
 };
 static arc arcs_47_2[1] = {
-       {37, 3},
+       {36, 3},
 };
 static arc arcs_47_3[2] = {
        {21, 4},
        {0, 3},
 };
 static arc arcs_47_4[2] = {
-       {37, 1},
+       {36, 1},
        {0, 4},
 };
 static state states_47[5] = {
@@ -962,7 +960,7 @@ static arc arcs_48_5[1] = {
        {19, 8},
 };
 static arc arcs_48_6[2] = {
-       {35, 9},
+       {34, 9},
        {15, 4},
 };
 static arc arcs_48_7[1] = {
@@ -1017,101 +1015,101 @@ static state states_50[3] = {
 };
 static dfa dfas[51] = {
        {256, "single_input", 0, 3, states_0,
-        "\004\060\102\000\320\360\007\131\000\000\000\100\244\234\000"},
+        "\004\060\002\000\150\370\203\054\000\000\000\140\244\234\000"},
        {257, "file_input", 0, 2, states_1,
-        "\204\060\102\000\320\360\007\131\000\000\000\100\244\234\000"},
+        "\204\060\002\000\150\370\203\054\000\000\000\140\244\234\000"},
        {258, "expr_input", 0, 3, states_2,
-        "\000\040\102\000\000\000\000\000\000\001\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\200\000\000\140\244\034\000"},
        {259, "eval_input", 0, 3, states_3,
-        "\000\040\102\000\000\000\000\000\000\001\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\200\000\000\140\244\034\000"},
        {260, "funcdef", 0, 6, states_4,
         "\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000"},
        {261, "parameters", 0, 4, states_5,
         "\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000"},
        {262, "varargslist", 0, 5, states_6,
-        "\000\040\302\000\000\000\000\000\000\000\000\000\000\000\000"},
+        "\000\040\102\000\000\000\000\000\000\000\000\000\000\000\000"},
        {263, "fpdef", 0, 4, states_7,
         "\000\040\002\000\000\000\000\000\000\000\000\000\000\000\000"},
        {264, "fplist", 0, 3, states_8,
         "\000\040\002\000\000\000\000\000\000\000\000\000\000\000\000"},
        {265, "stmt", 0, 2, states_9,
-        "\000\060\102\000\320\360\007\131\000\000\000\100\244\234\000"},
+        "\000\060\002\000\150\370\203\054\000\000\000\140\244\234\000"},
        {266, "simple_stmt", 0, 4, states_10,
-        "\000\040\102\000\320\360\007\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\150\370\003\000\000\000\000\140\244\034\000"},
        {267, "small_stmt", 0, 2, states_11,
-        "\000\040\102\000\320\360\007\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\150\370\003\000\000\000\000\140\244\034\000"},
        {268, "expr_stmt", 0, 2, states_12,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {269, "print_stmt", 0, 3, states_13,
-        "\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000"},
        {270, "del_stmt", 0, 3, states_14,
-        "\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
        {271, "pass_stmt", 0, 2, states_15,
-        "\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000"},
        {272, "flow_stmt", 0, 2, states_16,
-        "\000\000\000\000\000\360\000\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\170\000\000\000\000\000\000\000\000\000"},
        {273, "break_stmt", 0, 2, states_17,
-        "\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"},
        {274, "continue_stmt", 0, 2, states_18,
-        "\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000"},
        {275, "return_stmt", 0, 3, states_19,
-        "\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
        {276, "raise_stmt", 0, 5, states_20,
-        "\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
        {277, "import_stmt", 0, 9, states_21,
-        "\000\000\000\000\000\000\003\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\200\001\000\000\000\000\000\000\000\000"},
        {278, "global_stmt", 0, 3, states_22,
-        "\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000"},
        {279, "compound_stmt", 0, 2, states_23,
-        "\000\020\000\000\000\000\000\131\000\000\000\000\000\200\000"},
+        "\000\020\000\000\000\000\200\054\000\000\000\000\000\200\000"},
        {280, "if_stmt", 0, 8, states_24,
-        "\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000"},
        {281, "while_stmt", 0, 8, states_25,
-        "\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000"},
        {282, "for_stmt", 0, 10, states_26,
-        "\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000"},
        {283, "try_stmt", 0, 10, states_27,
-        "\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000"},
+        "\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000"},
        {284, "except_clause", 0, 5, states_28,
-        "\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000"},
+        "\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000"},
        {285, "suite", 0, 5, states_29,
-        "\004\040\102\000\320\360\007\000\000\000\000\100\244\034\000"},
+        "\004\040\002\000\150\370\003\000\000\000\000\140\244\034\000"},
        {286, "test", 0, 2, states_30,
-        "\000\040\102\000\000\000\000\000\000\001\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\200\000\000\140\244\034\000"},
        {287, "and_test", 0, 2, states_31,
-        "\000\040\102\000\000\000\000\000\000\001\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\200\000\000\140\244\034\000"},
        {288, "not_test", 0, 3, states_32,
-        "\000\040\102\000\000\000\000\000\000\001\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\200\000\000\140\244\034\000"},
        {289, "comparison", 0, 2, states_33,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {290, "comp_op", 0, 4, states_34,
-        "\000\000\000\000\000\000\000\040\000\361\017\000\000\000\000"},
+        "\000\000\000\000\000\000\000\020\200\370\007\000\000\000\000"},
        {291, "expr", 0, 2, states_35,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {292, "xor_expr", 0, 2, states_36,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {293, "and_expr", 0, 2, states_37,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {294, "shift_expr", 0, 2, states_38,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {295, "arith_expr", 0, 2, states_39,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {296, "term", 0, 2, states_40,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {297, "factor", 0, 4, states_41,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {298, "atom", 0, 10, states_42,
         "\000\040\002\000\000\000\000\000\000\000\000\000\240\034\000"},
        {299, "trailer", 0, 7, states_43,
         "\000\000\002\000\000\000\000\000\000\000\000\000\040\100\000"},
        {300, "subscript", 0, 4, states_44,
-        "\000\240\102\000\000\000\000\000\000\001\000\100\244\034\000"},
+        "\000\240\002\000\000\000\000\000\200\000\000\140\244\034\000"},
        {301, "exprlist", 0, 3, states_45,
-        "\000\040\102\000\000\000\000\000\000\000\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\000\000\000\140\244\034\000"},
        {302, "testlist", 0, 3, states_46,
-        "\000\040\102\000\000\000\000\000\000\001\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\200\000\000\140\244\034\000"},
        {303, "dictmaker", 0, 5, states_47,
-        "\000\040\102\000\000\000\000\000\000\001\000\100\244\034\000"},
+        "\000\040\002\000\000\000\000\000\200\000\000\140\244\034\000"},
        {304, "classdef", 0, 10, states_48,
         "\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000"},
        {305, "baselist", 0, 3, states_49,
@@ -1142,7 +1140,6 @@ static label labels[114] = {
        {8, 0},
        {263, 0},
        {12, 0},
-       {14, 0},
        {16, 0},
        {264, 0},
        {267, 0},
@@ -1214,6 +1211,7 @@ static label labels[114] = {
        {34, 0},
        {35, 0},
        {296, 0},
+       {14, 0},
        {15, 0},
        {297, 0},
        {17, 0},