Index: Python/graminit.c
===================================================================
--- Python/graminit.c	(revision 67472)
+++ Python/graminit.c	(working copy)
@@ -49,224 +49,233 @@
 	{11, 1},
 };
 static arc arcs_3_1[1] = {
-	{12, 2},
+	{0, 1},
 };
-static arc arcs_3_2[2] = {
-	{13, 3},
+static state states_3[2] = {
+	{1, arcs_3_0},
+	{1, arcs_3_1},
+};
+static arc arcs_4_0[1] = {
+	{13, 1},
+};
+static arc arcs_4_1[1] = {
+	{14, 2},
+};
+static arc arcs_4_2[2] = {
+	{15, 3},
 	{2, 4},
 };
-static arc arcs_3_3[2] = {
-	{14, 5},
-	{15, 6},
+static arc arcs_4_3[2] = {
+	{16, 5},
+	{17, 6},
 };
-static arc arcs_3_4[1] = {
+static arc arcs_4_4[1] = {
 	{0, 4},
 };
-static arc arcs_3_5[1] = {
-	{15, 6},
+static arc arcs_4_5[1] = {
+	{17, 6},
 };
-static arc arcs_3_6[1] = {
+static arc arcs_4_6[1] = {
 	{2, 4},
 };
-static state states_3[7] = {
-	{1, arcs_3_0},
-	{1, arcs_3_1},
-	{2, arcs_3_2},
-	{2, arcs_3_3},
-	{1, arcs_3_4},
-	{1, arcs_3_5},
-	{1, arcs_3_6},
-};
-static arc arcs_4_0[1] = {
-	{10, 1},
-};
-static arc arcs_4_1[2] = {
-	{10, 1},
-	{0, 1},
-};
-static state states_4[2] = {
+static state states_4[7] = {
 	{1, arcs_4_0},
-	{2, arcs_4_1},
+	{1, arcs_4_1},
+	{2, arcs_4_2},
+	{2, arcs_4_3},
+	{1, arcs_4_4},
+	{1, arcs_4_5},
+	{1, arcs_4_6},
 };
 static arc arcs_5_0[1] = {
-	{16, 1},
+	{12, 1},
 };
 static arc arcs_5_1[2] = {
-	{18, 2},
-	{19, 2},
+	{12, 1},
+	{0, 1},
 };
-static arc arcs_5_2[1] = {
-	{0, 2},
-};
-static state states_5[3] = {
+static state states_5[2] = {
 	{1, arcs_5_0},
 	{2, arcs_5_1},
-	{1, arcs_5_2},
 };
 static arc arcs_6_0[1] = {
-	{20, 1},
+	{18, 1},
 };
-static arc arcs_6_1[1] = {
+static arc arcs_6_1[2] = {
+	{20, 2},
 	{21, 2},
 };
 static arc arcs_6_2[1] = {
-	{22, 3},
+	{0, 2},
 };
-static arc arcs_6_3[1] = {
-	{23, 4},
-};
-static arc arcs_6_4[1] = {
-	{24, 5},
-};
-static arc arcs_6_5[1] = {
-	{0, 5},
-};
-static state states_6[6] = {
+static state states_6[3] = {
 	{1, arcs_6_0},
-	{1, arcs_6_1},
+	{2, arcs_6_1},
 	{1, arcs_6_2},
-	{1, arcs_6_3},
-	{1, arcs_6_4},
-	{1, arcs_6_5},
 };
 static arc arcs_7_0[1] = {
-	{13, 1},
+	{22, 1},
 };
-static arc arcs_7_1[2] = {
-	{25, 2},
-	{15, 3},
+static arc arcs_7_1[1] = {
+	{11, 2},
 };
 static arc arcs_7_2[1] = {
-	{15, 3},
+	{23, 3},
 };
 static arc arcs_7_3[1] = {
-	{0, 3},
+	{24, 4},
 };
-static state states_7[4] = {
+static arc arcs_7_4[1] = {
+	{25, 5},
+};
+static arc arcs_7_5[1] = {
+	{0, 5},
+};
+static state states_7[6] = {
 	{1, arcs_7_0},
-	{2, arcs_7_1},
+	{1, arcs_7_1},
 	{1, arcs_7_2},
 	{1, arcs_7_3},
+	{1, arcs_7_4},
+	{1, arcs_7_5},
 };
-static arc arcs_8_0[3] = {
-	{26, 1},
-	{30, 2},
-	{31, 3},
+static arc arcs_8_0[1] = {
+	{15, 1},
 };
-static arc arcs_8_1[3] = {
-	{27, 4},
-	{29, 5},
-	{0, 1},
+static arc arcs_8_1[2] = {
+	{26, 2},
+	{17, 3},
 };
 static arc arcs_8_2[1] = {
-	{21, 6},
+	{17, 3},
 };
 static arc arcs_8_3[1] = {
-	{21, 7},
+	{0, 3},
 };
-static arc arcs_8_4[1] = {
-	{28, 8},
+static state states_8[4] = {
+	{1, arcs_8_0},
+	{2, arcs_8_1},
+	{1, arcs_8_2},
+	{1, arcs_8_3},
 };
-static arc arcs_8_5[4] = {
-	{26, 1},
-	{30, 2},
-	{31, 3},
+static arc arcs_9_0[3] = {
+	{27, 1},
+	{31, 2},
+	{32, 3},
+};
+static arc arcs_9_1[3] = {
+	{28, 4},
+	{30, 5},
+	{0, 1},
+};
+static arc arcs_9_2[1] = {
+	{11, 6},
+};
+static arc arcs_9_3[1] = {
+	{11, 7},
+};
+static arc arcs_9_4[1] = {
+	{29, 8},
+};
+static arc arcs_9_5[4] = {
+	{27, 1},
+	{31, 2},
+	{32, 3},
 	{0, 5},
 };
-static arc arcs_8_6[2] = {
-	{29, 9},
+static arc arcs_9_6[2] = {
+	{30, 9},
 	{0, 6},
 };
-static arc arcs_8_7[1] = {
+static arc arcs_9_7[1] = {
 	{0, 7},
 };
-static arc arcs_8_8[2] = {
-	{29, 5},
+static arc arcs_9_8[2] = {
+	{30, 5},
 	{0, 8},
 };
-static arc arcs_8_9[1] = {
-	{31, 3},
+static arc arcs_9_9[1] = {
+	{32, 3},
 };
-static state states_8[10] = {
-	{3, arcs_8_0},
-	{3, arcs_8_1},
-	{1, arcs_8_2},
-	{1, arcs_8_3},
-	{1, arcs_8_4},
-	{4, arcs_8_5},
-	{2, arcs_8_6},
-	{1, arcs_8_7},
-	{2, arcs_8_8},
-	{1, arcs_8_9},
+static state states_9[10] = {
+	{3, arcs_9_0},
+	{3, arcs_9_1},
+	{1, arcs_9_2},
+	{1, arcs_9_3},
+	{1, arcs_9_4},
+	{4, arcs_9_5},
+	{2, arcs_9_6},
+	{1, arcs_9_7},
+	{2, arcs_9_8},
+	{1, arcs_9_9},
 };
-static arc arcs_9_0[2] = {
-	{21, 1},
-	{13, 2},
+static arc arcs_10_0[2] = {
+	{11, 1},
+	{15, 2},
 };
-static arc arcs_9_1[1] = {
+static arc arcs_10_1[1] = {
 	{0, 1},
 };
-static arc arcs_9_2[1] = {
-	{32, 3},
+static arc arcs_10_2[1] = {
+	{33, 3},
 };
-static arc arcs_9_3[1] = {
-	{15, 1},
+static arc arcs_10_3[1] = {
+	{17, 1},
 };
-static state states_9[4] = {
-	{2, arcs_9_0},
-	{1, arcs_9_1},
-	{1, arcs_9_2},
-	{1, arcs_9_3},
+static state states_10[4] = {
+	{2, arcs_10_0},
+	{1, arcs_10_1},
+	{1, arcs_10_2},
+	{1, arcs_10_3},
 };
-static arc arcs_10_0[1] = {
-	{26, 1},
+static arc arcs_11_0[1] = {
+	{27, 1},
 };
-static arc arcs_10_1[2] = {
-	{29, 2},
+static arc arcs_11_1[2] = {
+	{30, 2},
 	{0, 1},
 };
-static arc arcs_10_2[2] = {
-	{26, 1},
+static arc arcs_11_2[2] = {
+	{27, 1},
 	{0, 2},
 };
-static state states_10[3] = {
-	{1, arcs_10_0},
-	{2, arcs_10_1},
-	{2, arcs_10_2},
+static state states_11[3] = {
+	{1, arcs_11_0},
+	{2, arcs_11_1},
+	{2, arcs_11_2},
 };
-static arc arcs_11_0[2] = {
+static arc arcs_12_0[2] = {
 	{3, 1},
 	{4, 1},
 };
-static arc arcs_11_1[1] = {
+static arc arcs_12_1[1] = {
 	{0, 1},
 };
-static state states_11[2] = {
-	{2, arcs_11_0},
-	{1, arcs_11_1},
+static state states_12[2] = {
+	{2, arcs_12_0},
+	{1, arcs_12_1},
 };
-static arc arcs_12_0[1] = {
-	{33, 1},
+static arc arcs_13_0[1] = {
+	{34, 1},
 };
-static arc arcs_12_1[2] = {
-	{34, 2},
+static arc arcs_13_1[2] = {
+	{35, 2},
 	{2, 3},
 };
-static arc arcs_12_2[2] = {
-	{33, 1},
+static arc arcs_13_2[2] = {
+	{34, 1},
 	{2, 3},
 };
-static arc arcs_12_3[1] = {
+static arc arcs_13_3[1] = {
 	{0, 3},
 };
-static state states_12[4] = {
-	{1, arcs_12_0},
-	{2, arcs_12_1},
-	{2, arcs_12_2},
-	{1, arcs_12_3},
+static state states_13[4] = {
+	{1, arcs_13_0},
+	{2, arcs_13_1},
+	{2, arcs_13_2},
+	{1, arcs_13_3},
 };
-static arc arcs_13_0[9] = {
-	{35, 1},
+static arc arcs_14_0[9] = {
 	{36, 1},
 	{37, 1},
 	{38, 1},
@@ -275,47 +284,47 @@
 	{41, 1},
 	{42, 1},
 	{43, 1},
+	{44, 1},
 };
-static arc arcs_13_1[1] = {
+static arc arcs_14_1[1] = {
 	{0, 1},
 };
-static state states_13[2] = {
-	{9, arcs_13_0},
-	{1, arcs_13_1},
+static state states_14[2] = {
+	{9, arcs_14_0},
+	{1, arcs_14_1},
 };
-static arc arcs_14_0[1] = {
+static arc arcs_15_0[1] = {
 	{9, 1},
 };
-static arc arcs_14_1[3] = {
-	{44, 2},
-	{27, 3},
+static arc arcs_15_1[3] = {
+	{45, 2},
+	{28, 3},
 	{0, 1},
 };
-static arc arcs_14_2[2] = {
-	{45, 4},
+static arc arcs_15_2[2] = {
+	{46, 4},
 	{9, 4},
 };
-static arc arcs_14_3[2] = {
-	{45, 5},
+static arc arcs_15_3[2] = {
+	{46, 5},
 	{9, 5},
 };
-static arc arcs_14_4[1] = {
+static arc arcs_15_4[1] = {
 	{0, 4},
 };
-static arc arcs_14_5[2] = {
-	{27, 3},
+static arc arcs_15_5[2] = {
+	{28, 3},
 	{0, 5},
 };
-static state states_14[6] = {
-	{1, arcs_14_0},
-	{3, arcs_14_1},
-	{2, arcs_14_2},
-	{2, arcs_14_3},
-	{1, arcs_14_4},
-	{2, arcs_14_5},
+static state states_15[6] = {
+	{1, arcs_15_0},
+	{3, arcs_15_1},
+	{2, arcs_15_2},
+	{2, arcs_15_3},
+	{1, arcs_15_4},
+	{2, arcs_15_5},
 };
-static arc arcs_15_0[12] = {
-	{46, 1},
+static arc arcs_16_0[12] = {
 	{47, 1},
 	{48, 1},
 	{49, 1},
@@ -327,105 +336,96 @@
 	{55, 1},
 	{56, 1},
 	{57, 1},
+	{58, 1},
 };
-static arc arcs_15_1[1] = {
+static arc arcs_16_1[1] = {
 	{0, 1},
 };
-static state states_15[2] = {
-	{12, arcs_15_0},
-	{1, arcs_15_1},
+static state states_16[2] = {
+	{12, arcs_16_0},
+	{1, arcs_16_1},
 };
-static arc arcs_16_0[1] = {
-	{58, 1},
+static arc arcs_17_0[1] = {
+	{59, 1},
 };
-static arc arcs_16_1[3] = {
-	{28, 2},
-	{59, 3},
+static arc arcs_17_1[3] = {
+	{29, 2},
+	{60, 3},
 	{0, 1},
 };
-static arc arcs_16_2[2] = {
-	{29, 4},
+static arc arcs_17_2[2] = {
+	{30, 4},
 	{0, 2},
 };
-static arc arcs_16_3[1] = {
-	{28, 5},
+static arc arcs_17_3[1] = {
+	{29, 5},
 };
-static arc arcs_16_4[2] = {
-	{28, 2},
+static arc arcs_17_4[2] = {
+	{29, 2},
 	{0, 4},
 };
-static arc arcs_16_5[2] = {
-	{29, 6},
+static arc arcs_17_5[2] = {
+	{30, 6},
 	{0, 5},
 };
-static arc arcs_16_6[1] = {
-	{28, 7},
+static arc arcs_17_6[1] = {
+	{29, 7},
 };
-static arc arcs_16_7[2] = {
-	{29, 8},
+static arc arcs_17_7[2] = {
+	{30, 8},
 	{0, 7},
 };
-static arc arcs_16_8[2] = {
-	{28, 7},
+static arc arcs_17_8[2] = {
+	{29, 7},
 	{0, 8},
 };
-static state states_16[9] = {
-	{1, arcs_16_0},
-	{3, arcs_16_1},
-	{2, arcs_16_2},
-	{1, arcs_16_3},
-	{2, arcs_16_4},
-	{2, arcs_16_5},
-	{1, arcs_16_6},
-	{2, arcs_16_7},
-	{2, arcs_16_8},
-};
-static arc arcs_17_0[1] = {
-	{60, 1},
-};
-static arc arcs_17_1[1] = {
-	{61, 2},
-};
-static arc arcs_17_2[1] = {
-	{0, 2},
-};
-static state states_17[3] = {
+static state states_17[9] = {
 	{1, arcs_17_0},
-	{1, arcs_17_1},
-	{1, arcs_17_2},
+	{3, arcs_17_1},
+	{2, arcs_17_2},
+	{1, arcs_17_3},
+	{2, arcs_17_4},
+	{2, arcs_17_5},
+	{1, arcs_17_6},
+	{2, arcs_17_7},
+	{2, arcs_17_8},
 };
 static arc arcs_18_0[1] = {
-	{62, 1},
+	{61, 1},
 };
 static arc arcs_18_1[1] = {
-	{0, 1},
+	{62, 2},
 };
-static state states_18[2] = {
+static arc arcs_18_2[1] = {
+	{0, 2},
+};
+static state states_18[3] = {
 	{1, arcs_18_0},
 	{1, arcs_18_1},
+	{1, arcs_18_2},
 };
-static arc arcs_19_0[5] = {
+static arc arcs_19_0[1] = {
 	{63, 1},
-	{64, 1},
-	{65, 1},
-	{66, 1},
-	{67, 1},
 };
 static arc arcs_19_1[1] = {
 	{0, 1},
 };
 static state states_19[2] = {
-	{5, arcs_19_0},
+	{1, arcs_19_0},
 	{1, arcs_19_1},
 };
-static arc arcs_20_0[1] = {
+static arc arcs_20_0[5] = {
+	{64, 1},
+	{65, 1},
+	{66, 1},
+	{67, 1},
 	{68, 1},
 };
 static arc arcs_20_1[1] = {
 	{0, 1},
 };
 static state states_20[2] = {
-	{1, arcs_20_0},
+	{5, arcs_20_0},
 	{1, arcs_20_1},
 };
 static arc arcs_21_0[1] = {
@@ -441,153 +441,144 @@
 static arc arcs_22_0[1] = {
 	{70, 1},
 };
-static arc arcs_22_1[2] = {
-	{9, 2},
+static arc arcs_22_1[1] = {
 	{0, 1},
 };
-static arc arcs_22_2[1] = {
-	{0, 2},
-};
-static state states_22[3] = {
+static state states_22[2] = {
 	{1, arcs_22_0},
-	{2, arcs_22_1},
-	{1, arcs_22_2},
+	{1, arcs_22_1},
 };
 static arc arcs_23_0[1] = {
-	{45, 1},
+	{71, 1},
 };
-static arc arcs_23_1[1] = {
+static arc arcs_23_1[2] = {
+	{9, 2},
 	{0, 1},
 };
-static state states_23[2] = {
+static arc arcs_23_2[1] = {
+	{0, 2},
+};
+static state states_23[3] = {
 	{1, arcs_23_0},
-	{1, arcs_23_1},
+	{2, arcs_23_1},
+	{1, arcs_23_2},
 };
 static arc arcs_24_0[1] = {
-	{71, 1},
+	{46, 1},
 };
-static arc arcs_24_1[2] = {
-	{28, 2},
+static arc arcs_24_1[1] = {
 	{0, 1},
 };
-static arc arcs_24_2[2] = {
-	{29, 3},
+static state states_24[2] = {
+	{1, arcs_24_0},
+	{1, arcs_24_1},
+};
+static arc arcs_25_0[1] = {
+	{72, 1},
+};
+static arc arcs_25_1[2] = {
+	{29, 2},
+	{0, 1},
+};
+static arc arcs_25_2[2] = {
+	{30, 3},
 	{0, 2},
 };
-static arc arcs_24_3[1] = {
-	{28, 4},
+static arc arcs_25_3[1] = {
+	{29, 4},
 };
-static arc arcs_24_4[2] = {
-	{29, 5},
+static arc arcs_25_4[2] = {
+	{30, 5},
 	{0, 4},
 };
-static arc arcs_24_5[1] = {
-	{28, 6},
+static arc arcs_25_5[1] = {
+	{29, 6},
 };
-static arc arcs_24_6[1] = {
+static arc arcs_25_6[1] = {
 	{0, 6},
 };
-static state states_24[7] = {
-	{1, arcs_24_0},
-	{2, arcs_24_1},
-	{2, arcs_24_2},
-	{1, arcs_24_3},
-	{2, arcs_24_4},
-	{1, arcs_24_5},
-	{1, arcs_24_6},
+static state states_25[7] = {
+	{1, arcs_25_0},
+	{2, arcs_25_1},
+	{2, arcs_25_2},
+	{1, arcs_25_3},
+	{2, arcs_25_4},
+	{1, arcs_25_5},
+	{1, arcs_25_6},
 };
-static arc arcs_25_0[2] = {
-	{72, 1},
+static arc arcs_26_0[2] = {
 	{73, 1},
-};
-static arc arcs_25_1[1] = {
-	{0, 1},
-};
-static state states_25[2] = {
-	{2, arcs_25_0},
-	{1, arcs_25_1},
-};
-static arc arcs_26_0[1] = {
 	{74, 1},
 };
 static arc arcs_26_1[1] = {
-	{75, 2},
+	{0, 1},
 };
-static arc arcs_26_2[1] = {
-	{0, 2},
-};
-static state states_26[3] = {
-	{1, arcs_26_0},
+static state states_26[2] = {
+	{2, arcs_26_0},
 	{1, arcs_26_1},
-	{1, arcs_26_2},
 };
 static arc arcs_27_0[1] = {
-	{76, 1},
+	{75, 1},
 };
-static arc arcs_27_1[2] = {
-	{77, 2},
-	{12, 3},
+static arc arcs_27_1[1] = {
+	{76, 2},
 };
-static arc arcs_27_2[3] = {
-	{77, 2},
-	{12, 3},
-	{74, 4},
+static arc arcs_27_2[1] = {
+	{0, 2},
 };
-static arc arcs_27_3[1] = {
-	{74, 4},
+static state states_27[3] = {
+	{1, arcs_27_0},
+	{1, arcs_27_1},
+	{1, arcs_27_2},
 };
-static arc arcs_27_4[3] = {
-	{30, 5},
-	{13, 6},
-	{78, 5},
+static arc arcs_28_0[1] = {
+	{77, 1},
 };
-static arc arcs_27_5[1] = {
-	{0, 5},
+static arc arcs_28_1[2] = {
+	{78, 2},
+	{14, 3},
 };
-static arc arcs_27_6[1] = {
-	{78, 7},
+static arc arcs_28_2[3] = {
+	{78, 2},
+	{14, 3},
+	{75, 4},
 };
-static arc arcs_27_7[1] = {
-	{15, 5},
+static arc arcs_28_3[1] = {
+	{75, 4},
 };
-static state states_27[8] = {
-	{1, arcs_27_0},
-	{2, arcs_27_1},
-	{3, arcs_27_2},
-	{1, arcs_27_3},
-	{3, arcs_27_4},
-	{1, arcs_27_5},
-	{1, arcs_27_6},
-	{1, arcs_27_7},
+static arc arcs_28_4[3] = {
+	{31, 5},
+	{15, 6},
+	{79, 5},
 };
-static arc arcs_28_0[1] = {
-	{21, 1},
+static arc arcs_28_5[1] = {
+	{0, 5},
 };
-static arc arcs_28_1[2] = {
-	{80, 2},
-	{0, 1},
+static arc arcs_28_6[1] = {
+	{79, 7},
 };
-static arc arcs_28_2[1] = {
-	{21, 3},
+static arc arcs_28_7[1] = {
+	{17, 5},
 };
-static arc arcs_28_3[1] = {
-	{0, 3},
-};
-static state states_28[4] = {
+static state states_28[8] = {
 	{1, arcs_28_0},
 	{2, arcs_28_1},
-	{1, arcs_28_2},
+	{3, arcs_28_2},
 	{1, arcs_28_3},
+	{3, arcs_28_4},
+	{1, arcs_28_5},
+	{1, arcs_28_6},
+	{1, arcs_28_7},
 };
 static arc arcs_29_0[1] = {
-	{12, 1},
+	{11, 1},
 };
 static arc arcs_29_1[2] = {
-	{80, 2},
+	{81, 2},
 	{0, 1},
 };
 static arc arcs_29_2[1] = {
-	{21, 3},
+	{11, 3},
 };
 static arc arcs_29_3[1] = {
 	{0, 3},
@@ -599,37 +590,45 @@
 	{1, arcs_29_3},
 };
 static arc arcs_30_0[1] = {
-	{79, 1},
+	{14, 1},
 };
 static arc arcs_30_1[2] = {
-	{29, 2},
+	{81, 2},
 	{0, 1},
 };
-static arc arcs_30_2[2] = {
-	{79, 1},
-	{0, 2},
+static arc arcs_30_2[1] = {
+	{11, 3},
 };
-static state states_30[3] = {
+static arc arcs_30_3[1] = {
+	{0, 3},
+};
+static state states_30[4] = {
 	{1, arcs_30_0},
 	{2, arcs_30_1},
-	{2, arcs_30_2},
+	{1, arcs_30_2},
+	{1, arcs_30_3},
 };
 static arc arcs_31_0[1] = {
-	{81, 1},
+	{80, 1},
 };
 static arc arcs_31_1[2] = {
-	{29, 0},
+	{30, 2},
 	{0, 1},
 };
-static state states_31[2] = {
+static arc arcs_31_2[2] = {
+	{80, 1},
+	{0, 2},
+};
+static state states_31[3] = {
 	{1, arcs_31_0},
 	{2, arcs_31_1},
+	{2, arcs_31_2},
 };
 static arc arcs_32_0[1] = {
-	{21, 1},
+	{82, 1},
 };
 static arc arcs_32_1[2] = {
-	{77, 0},
+	{30, 0},
 	{0, 1},
 };
 static state states_32[2] = {
@@ -637,149 +636,125 @@
 	{2, arcs_32_1},
 };
 static arc arcs_33_0[1] = {
-	{82, 1},
+	{11, 1},
 };
-static arc arcs_33_1[1] = {
-	{21, 2},
+static arc arcs_33_1[2] = {
+	{78, 0},
+	{0, 1},
 };
-static arc arcs_33_2[2] = {
-	{29, 1},
-	{0, 2},
-};
-static state states_33[3] = {
+static state states_33[2] = {
 	{1, arcs_33_0},
-	{1, arcs_33_1},
-	{2, arcs_33_2},
+	{2, arcs_33_1},
 };
 static arc arcs_34_0[1] = {
 	{83, 1},
 };
 static arc arcs_34_1[1] = {
-	{84, 2},
+	{11, 2},
 };
 static arc arcs_34_2[2] = {
-	{85, 3},
+	{30, 1},
 	{0, 2},
 };
-static arc arcs_34_3[1] = {
-	{28, 4},
-};
-static arc arcs_34_4[2] = {
-	{29, 5},
-	{0, 4},
-};
-static arc arcs_34_5[1] = {
-	{28, 6},
-};
-static arc arcs_34_6[1] = {
-	{0, 6},
-};
-static state states_34[7] = {
+static state states_34[3] = {
 	{1, arcs_34_0},
 	{1, arcs_34_1},
 	{2, arcs_34_2},
-	{1, arcs_34_3},
-	{2, arcs_34_4},
-	{1, arcs_34_5},
-	{1, arcs_34_6},
 };
 static arc arcs_35_0[1] = {
-	{86, 1},
+	{84, 1},
 };
 static arc arcs_35_1[1] = {
-	{28, 2},
+	{85, 2},
 };
 static arc arcs_35_2[2] = {
-	{29, 3},
+	{86, 3},
 	{0, 2},
 };
 static arc arcs_35_3[1] = {
-	{28, 4},
+	{29, 4},
 };
-static arc arcs_35_4[1] = {
+static arc arcs_35_4[2] = {
+	{30, 5},
 	{0, 4},
 };
-static state states_35[5] = {
+static arc arcs_35_5[1] = {
+	{29, 6},
+};
+static arc arcs_35_6[1] = {
+	{0, 6},
+};
+static state states_35[7] = {
 	{1, arcs_35_0},
 	{1, arcs_35_1},
 	{2, arcs_35_2},
 	{1, arcs_35_3},
-	{1, arcs_35_4},
+	{2, arcs_35_4},
+	{1, arcs_35_5},
+	{1, arcs_35_6},
 };
-static arc arcs_36_0[8] = {
+static arc arcs_36_0[1] = {
 	{87, 1},
-	{88, 1},
-	{89, 1},
-	{90, 1},
-	{91, 1},
-	{19, 1},
-	{18, 1},
-	{17, 1},
 };
 static arc arcs_36_1[1] = {
-	{0, 1},
+	{29, 2},
 };
-static state states_36[2] = {
-	{8, arcs_36_0},
-	{1, arcs_36_1},
+static arc arcs_36_2[2] = {
+	{30, 3},
+	{0, 2},
 };
-static arc arcs_37_0[1] = {
-	{92, 1},
+static arc arcs_36_3[1] = {
+	{29, 4},
 };
-static arc arcs_37_1[1] = {
-	{28, 2},
-};
-static arc arcs_37_2[1] = {
-	{23, 3},
-};
-static arc arcs_37_3[1] = {
-	{24, 4},
-};
-static arc arcs_37_4[3] = {
-	{93, 1},
-	{94, 5},
+static arc arcs_36_4[1] = {
 	{0, 4},
 };
-static arc arcs_37_5[1] = {
-	{23, 6},
+static state states_36[5] = {
+	{1, arcs_36_0},
+	{1, arcs_36_1},
+	{2, arcs_36_2},
+	{1, arcs_36_3},
+	{1, arcs_36_4},
 };
-static arc arcs_37_6[1] = {
-	{24, 7},
+static arc arcs_37_0[8] = {
+	{88, 1},
+	{89, 1},
+	{90, 1},
+	{91, 1},
+	{92, 1},
+	{21, 1},
+	{20, 1},
+	{19, 1},
 };
-static arc arcs_37_7[1] = {
-	{0, 7},
+static arc arcs_37_1[1] = {
+	{0, 1},
 };
-static state states_37[8] = {
-	{1, arcs_37_0},
+static state states_37[2] = {
+	{8, arcs_37_0},
 	{1, arcs_37_1},
-	{1, arcs_37_2},
-	{1, arcs_37_3},
-	{3, arcs_37_4},
-	{1, arcs_37_5},
-	{1, arcs_37_6},
-	{1, arcs_37_7},
 };
 static arc arcs_38_0[1] = {
-	{95, 1},
+	{93, 1},
 };
 static arc arcs_38_1[1] = {
-	{28, 2},
+	{29, 2},
 };
 static arc arcs_38_2[1] = {
-	{23, 3},
+	{24, 3},
 };
 static arc arcs_38_3[1] = {
-	{24, 4},
+	{25, 4},
 };
-static arc arcs_38_4[2] = {
-	{94, 5},
+static arc arcs_38_4[3] = {
+	{94, 1},
+	{95, 5},
 	{0, 4},
 };
 static arc arcs_38_5[1] = {
-	{23, 6},
+	{24, 6},
 };
 static arc arcs_38_6[1] = {
-	{24, 7},
+	{25, 7},
 };
 static arc arcs_38_7[1] = {
 	{0, 7},
@@ -789,7 +764,7 @@
 	{1, arcs_38_1},
 	{1, arcs_38_2},
 	{1, arcs_38_3},
-	{2, arcs_38_4},
+	{3, arcs_38_4},
 	{1, arcs_38_5},
 	{1, arcs_38_6},
 	{1, arcs_38_7},
@@ -798,373 +773,397 @@
 	{96, 1},
 };
 static arc arcs_39_1[1] = {
-	{61, 2},
+	{29, 2},
 };
 static arc arcs_39_2[1] = {
-	{85, 3},
+	{24, 3},
 };
 static arc arcs_39_3[1] = {
-	{9, 4},
+	{25, 4},
 };
-static arc arcs_39_4[1] = {
-	{23, 5},
+static arc arcs_39_4[2] = {
+	{95, 5},
+	{0, 4},
 };
 static arc arcs_39_5[1] = {
 	{24, 6},
 };
-static arc arcs_39_6[2] = {
-	{94, 7},
-	{0, 6},
+static arc arcs_39_6[1] = {
+	{25, 7},
 };
 static arc arcs_39_7[1] = {
-	{23, 8},
+	{0, 7},
 };
-static arc arcs_39_8[1] = {
-	{24, 9},
-};
-static arc arcs_39_9[1] = {
-	{0, 9},
-};
-static state states_39[10] = {
+static state states_39[8] = {
 	{1, arcs_39_0},
 	{1, arcs_39_1},
 	{1, arcs_39_2},
 	{1, arcs_39_3},
-	{1, arcs_39_4},
+	{2, arcs_39_4},
 	{1, arcs_39_5},
-	{2, arcs_39_6},
+	{1, arcs_39_6},
 	{1, arcs_39_7},
-	{1, arcs_39_8},
-	{1, arcs_39_9},
 };
 static arc arcs_40_0[1] = {
 	{97, 1},
 };
 static arc arcs_40_1[1] = {
-	{23, 2},
+	{62, 2},
 };
 static arc arcs_40_2[1] = {
-	{24, 3},
+	{86, 3},
 };
-static arc arcs_40_3[2] = {
-	{98, 4},
-	{99, 5},
+static arc arcs_40_3[1] = {
+	{9, 4},
 };
 static arc arcs_40_4[1] = {
-	{23, 6},
+	{24, 5},
 };
 static arc arcs_40_5[1] = {
-	{23, 7},
+	{25, 6},
 };
-static arc arcs_40_6[1] = {
-	{24, 8},
+static arc arcs_40_6[2] = {
+	{95, 7},
+	{0, 6},
 };
 static arc arcs_40_7[1] = {
-	{24, 9},
+	{24, 8},
 };
-static arc arcs_40_8[4] = {
-	{98, 4},
-	{94, 10},
-	{99, 5},
-	{0, 8},
+static arc arcs_40_8[1] = {
+	{25, 9},
 };
 static arc arcs_40_9[1] = {
 	{0, 9},
 };
-static arc arcs_40_10[1] = {
-	{23, 11},
-};
-static arc arcs_40_11[1] = {
-	{24, 12},
-};
-static arc arcs_40_12[2] = {
-	{99, 5},
-	{0, 12},
-};
-static state states_40[13] = {
+static state states_40[10] = {
 	{1, arcs_40_0},
 	{1, arcs_40_1},
 	{1, arcs_40_2},
-	{2, arcs_40_3},
+	{1, arcs_40_3},
 	{1, arcs_40_4},
 	{1, arcs_40_5},
-	{1, arcs_40_6},
+	{2, arcs_40_6},
 	{1, arcs_40_7},
-	{4, arcs_40_8},
+	{1, arcs_40_8},
 	{1, arcs_40_9},
-	{1, arcs_40_10},
-	{1, arcs_40_11},
-	{2, arcs_40_12},
 };
 static arc arcs_41_0[1] = {
-	{100, 1},
+	{98, 1},
 };
 static arc arcs_41_1[1] = {
-	{28, 2},
+	{24, 2},
 };
-static arc arcs_41_2[2] = {
-	{101, 3},
-	{23, 4},
+static arc arcs_41_2[1] = {
+	{25, 3},
 };
-static arc arcs_41_3[1] = {
-	{23, 4},
+static arc arcs_41_3[2] = {
+	{99, 4},
+	{100, 5},
 };
 static arc arcs_41_4[1] = {
-	{24, 5},
+	{24, 6},
 };
 static arc arcs_41_5[1] = {
-	{0, 5},
+	{24, 7},
 };
-static state states_41[6] = {
+static arc arcs_41_6[1] = {
+	{25, 8},
+};
+static arc arcs_41_7[1] = {
+	{25, 9},
+};
+static arc arcs_41_8[4] = {
+	{99, 4},
+	{95, 10},
+	{100, 5},
+	{0, 8},
+};
+static arc arcs_41_9[1] = {
+	{0, 9},
+};
+static arc arcs_41_10[1] = {
+	{24, 11},
+};
+static arc arcs_41_11[1] = {
+	{25, 12},
+};
+static arc arcs_41_12[2] = {
+	{100, 5},
+	{0, 12},
+};
+static state states_41[13] = {
 	{1, arcs_41_0},
 	{1, arcs_41_1},
-	{2, arcs_41_2},
-	{1, arcs_41_3},
+	{1, arcs_41_2},
+	{2, arcs_41_3},
 	{1, arcs_41_4},
 	{1, arcs_41_5},
+	{1, arcs_41_6},
+	{1, arcs_41_7},
+	{4, arcs_41_8},
+	{1, arcs_41_9},
+	{1, arcs_41_10},
+	{1, arcs_41_11},
+	{2, arcs_41_12},
 };
 static arc arcs_42_0[1] = {
-	{80, 1},
+	{101, 1},
 };
 static arc arcs_42_1[1] = {
-	{84, 2},
+	{29, 2},
 };
-static arc arcs_42_2[1] = {
-	{0, 2},
+static arc arcs_42_2[2] = {
+	{102, 3},
+	{24, 4},
 };
-static state states_42[3] = {
+static arc arcs_42_3[1] = {
+	{24, 4},
+};
+static arc arcs_42_4[1] = {
+	{25, 5},
+};
+static arc arcs_42_5[1] = {
+	{0, 5},
+};
+static state states_42[6] = {
 	{1, arcs_42_0},
 	{1, arcs_42_1},
-	{1, arcs_42_2},
+	{2, arcs_42_2},
+	{1, arcs_42_3},
+	{1, arcs_42_4},
+	{1, arcs_42_5},
 };
 static arc arcs_43_0[1] = {
-	{102, 1},
+	{81, 1},
 };
-static arc arcs_43_1[2] = {
-	{28, 2},
-	{0, 1},
+static arc arcs_43_1[1] = {
+	{85, 2},
 };
-static arc arcs_43_2[3] = {
-	{80, 3},
-	{29, 3},
+static arc arcs_43_2[1] = {
 	{0, 2},
 };
-static arc arcs_43_3[1] = {
-	{28, 4},
-};
-static arc arcs_43_4[1] = {
-	{0, 4},
-};
-static state states_43[5] = {
+static state states_43[3] = {
 	{1, arcs_43_0},
-	{2, arcs_43_1},
-	{3, arcs_43_2},
-	{1, arcs_43_3},
-	{1, arcs_43_4},
+	{1, arcs_43_1},
+	{1, arcs_43_2},
 };
-static arc arcs_44_0[2] = {
-	{3, 1},
-	{2, 2},
+static arc arcs_44_0[1] = {
+	{103, 1},
 };
-static arc arcs_44_1[1] = {
+static arc arcs_44_1[2] = {
+	{29, 2},
 	{0, 1},
 };
-static arc arcs_44_2[1] = {
-	{103, 3},
+static arc arcs_44_2[3] = {
+	{81, 3},
+	{30, 3},
+	{0, 2},
 };
 static arc arcs_44_3[1] = {
-	{6, 4},
+	{29, 4},
 };
-static arc arcs_44_4[2] = {
-	{6, 4},
-	{104, 1},
+static arc arcs_44_4[1] = {
+	{0, 4},
 };
 static state states_44[5] = {
-	{2, arcs_44_0},
-	{1, arcs_44_1},
-	{1, arcs_44_2},
+	{1, arcs_44_0},
+	{2, arcs_44_1},
+	{3, arcs_44_2},
 	{1, arcs_44_3},
-	{2, arcs_44_4},
+	{1, arcs_44_4},
 };
-static arc arcs_45_0[1] = {
-	{106, 1},
+static arc arcs_45_0[2] = {
+	{3, 1},
+	{2, 2},
 };
-static arc arcs_45_1[2] = {
-	{29, 2},
+static arc arcs_45_1[1] = {
 	{0, 1},
 };
 static arc arcs_45_2[1] = {
-	{106, 3},
+	{104, 3},
 };
-static arc arcs_45_3[2] = {
-	{29, 4},
-	{0, 3},
+static arc arcs_45_3[1] = {
+	{6, 4},
 };
 static arc arcs_45_4[2] = {
-	{106, 3},
-	{0, 4},
+	{6, 4},
+	{105, 1},
 };
 static state states_45[5] = {
-	{1, arcs_45_0},
-	{2, arcs_45_1},
+	{2, arcs_45_0},
+	{1, arcs_45_1},
 	{1, arcs_45_2},
-	{2, arcs_45_3},
+	{1, arcs_45_3},
 	{2, arcs_45_4},
 };
-static arc arcs_46_0[2] = {
+static arc arcs_46_0[1] = {
 	{107, 1},
-	{108, 1},
 };
-static arc arcs_46_1[1] = {
+static arc arcs_46_1[2] = {
+	{30, 2},
 	{0, 1},
 };
-static state states_46[2] = {
-	{2, arcs_46_0},
-	{1, arcs_46_1},
+static arc arcs_46_2[1] = {
+	{107, 3},
 };
-static arc arcs_47_0[1] = {
-	{109, 1},
+static arc arcs_46_3[2] = {
+	{30, 4},
+	{0, 3},
 };
-static arc arcs_47_1[2] = {
-	{25, 2},
-	{23, 3},
+static arc arcs_46_4[2] = {
+	{107, 3},
+	{0, 4},
 };
-static arc arcs_47_2[1] = {
-	{23, 3},
+static state states_46[5] = {
+	{1, arcs_46_0},
+	{2, arcs_46_1},
+	{1, arcs_46_2},
+	{2, arcs_46_3},
+	{2, arcs_46_4},
 };
-static arc arcs_47_3[1] = {
-	{106, 4},
+static arc arcs_47_0[2] = {
+	{108, 1},
+	{109, 1},
 };
-static arc arcs_47_4[1] = {
-	{0, 4},
+static arc arcs_47_1[1] = {
+	{0, 1},
 };
-static state states_47[5] = {
-	{1, arcs_47_0},
-	{2, arcs_47_1},
-	{1, arcs_47_2},
-	{1, arcs_47_3},
-	{1, arcs_47_4},
+static state states_47[2] = {
+	{2, arcs_47_0},
+	{1, arcs_47_1},
 };
-static arc arcs_48_0[2] = {
-	{107, 1},
-	{110, 2},
+static arc arcs_48_0[1] = {
+	{110, 1},
 };
 static arc arcs_48_1[2] = {
-	{92, 3},
-	{0, 1},
+	{26, 2},
+	{24, 3},
 };
 static arc arcs_48_2[1] = {
-	{0, 2},
+	{24, 3},
 };
 static arc arcs_48_3[1] = {
 	{107, 4},
 };
 static arc arcs_48_4[1] = {
-	{94, 5},
+	{0, 4},
 };
-static arc arcs_48_5[1] = {
-	{28, 2},
-};
-static state states_48[6] = {
-	{2, arcs_48_0},
+static state states_48[5] = {
+	{1, arcs_48_0},
 	{2, arcs_48_1},
 	{1, arcs_48_2},
 	{1, arcs_48_3},
 	{1, arcs_48_4},
-	{1, arcs_48_5},
 };
-static arc arcs_49_0[1] = {
-	{111, 1},
+static arc arcs_49_0[2] = {
+	{108, 1},
+	{111, 2},
 };
 static arc arcs_49_1[2] = {
-	{112, 0},
+	{93, 3},
 	{0, 1},
 };
-static state states_49[2] = {
-	{1, arcs_49_0},
+static arc arcs_49_2[1] = {
+	{0, 2},
+};
+static arc arcs_49_3[1] = {
+	{108, 4},
+};
+static arc arcs_49_4[1] = {
+	{95, 5},
+};
+static arc arcs_49_5[1] = {
+	{29, 2},
+};
+static state states_49[6] = {
+	{2, arcs_49_0},
 	{2, arcs_49_1},
+	{1, arcs_49_2},
+	{1, arcs_49_3},
+	{1, arcs_49_4},
+	{1, arcs_49_5},
 };
 static arc arcs_50_0[1] = {
-	{113, 1},
+	{112, 1},
 };
 static arc arcs_50_1[2] = {
-	{114, 0},
+	{113, 0},
 	{0, 1},
 };
 static state states_50[2] = {
 	{1, arcs_50_0},
 	{2, arcs_50_1},
 };
-static arc arcs_51_0[2] = {
-	{115, 1},
-	{116, 2},
+static arc arcs_51_0[1] = {
+	{114, 1},
 };
-static arc arcs_51_1[1] = {
-	{113, 2},
+static arc arcs_51_1[2] = {
+	{115, 0},
+	{0, 1},
 };
-static arc arcs_51_2[1] = {
+static state states_51[2] = {
+	{1, arcs_51_0},
+	{2, arcs_51_1},
+};
+static arc arcs_52_0[2] = {
+	{116, 1},
+	{117, 2},
+};
+static arc arcs_52_1[1] = {
+	{114, 2},
+};
+static arc arcs_52_2[1] = {
 	{0, 2},
 };
-static state states_51[3] = {
-	{2, arcs_51_0},
-	{1, arcs_51_1},
-	{1, arcs_51_2},
+static state states_52[3] = {
+	{2, arcs_52_0},
+	{1, arcs_52_1},
+	{1, arcs_52_2},
 };
-static arc arcs_52_0[1] = {
-	{84, 1},
+static arc arcs_53_0[1] = {
+	{85, 1},
 };
-static arc arcs_52_1[2] = {
-	{117, 0},
+static arc arcs_53_1[2] = {
+	{118, 0},
 	{0, 1},
 };
-static state states_52[2] = {
-	{1, arcs_52_0},
-	{2, arcs_52_1},
+static state states_53[2] = {
+	{1, arcs_53_0},
+	{2, arcs_53_1},
 };
-static arc arcs_53_0[10] = {
-	{118, 1},
+static arc arcs_54_0[10] = {
 	{119, 1},
 	{120, 1},
 	{121, 1},
 	{122, 1},
 	{123, 1},
 	{124, 1},
-	{85, 1},
-	{115, 2},
-	{125, 3},
+	{125, 1},
+	{86, 1},
+	{116, 2},
+	{126, 3},
 };
-static arc arcs_53_1[1] = {
+static arc arcs_54_1[1] = {
 	{0, 1},
 };
-static arc arcs_53_2[1] = {
-	{85, 1},
+static arc arcs_54_2[1] = {
+	{86, 1},
 };
-static arc arcs_53_3[2] = {
-	{115, 1},
+static arc arcs_54_3[2] = {
+	{116, 1},
 	{0, 3},
 };
-static state states_53[4] = {
-	{10, arcs_53_0},
-	{1, arcs_53_1},
-	{1, arcs_53_2},
-	{2, arcs_53_3},
+static state states_54[4] = {
+	{10, arcs_54_0},
+	{1, arcs_54_1},
+	{1, arcs_54_2},
+	{2, arcs_54_3},
 };
-static arc arcs_54_0[1] = {
-	{126, 1},
-};
-static arc arcs_54_1[2] = {
-	{127, 0},
-	{0, 1},
-};
-static state states_54[2] = {
-	{1, arcs_54_0},
-	{2, arcs_54_1},
-};
 static arc arcs_55_0[1] = {
-	{128, 1},
+	{127, 1},
 };
 static arc arcs_55_1[2] = {
-	{129, 0},
+	{128, 0},
 	{0, 1},
 };
 static state states_55[2] = {
@@ -1172,10 +1171,10 @@
 	{2, arcs_55_1},
 };
 static arc arcs_56_0[1] = {
-	{130, 1},
+	{129, 1},
 };
 static arc arcs_56_1[2] = {
-	{131, 0},
+	{130, 0},
 	{0, 1},
 };
 static state states_56[2] = {
@@ -1183,23 +1182,22 @@
 	{2, arcs_56_1},
 };
 static arc arcs_57_0[1] = {
-	{132, 1},
+	{131, 1},
 };
-static arc arcs_57_1[3] = {
-	{133, 0},
-	{59, 0},
+static arc arcs_57_1[2] = {
+	{132, 0},
 	{0, 1},
 };
 static state states_57[2] = {
 	{1, arcs_57_0},
-	{3, arcs_57_1},
+	{2, arcs_57_1},
 };
 static arc arcs_58_0[1] = {
-	{134, 1},
+	{133, 1},
 };
 static arc arcs_58_1[3] = {
-	{135, 0},
-	{136, 0},
+	{134, 0},
+	{60, 0},
 	{0, 1},
 };
 static state states_58[2] = {
@@ -1207,156 +1205,142 @@
 	{3, arcs_58_1},
 };
 static arc arcs_59_0[1] = {
-	{137, 1},
+	{135, 1},
 };
-static arc arcs_59_1[5] = {
-	{30, 0},
-	{138, 0},
-	{139, 0},
-	{140, 0},
+static arc arcs_59_1[3] = {
+	{136, 0},
+	{137, 0},
 	{0, 1},
 };
 static state states_59[2] = {
 	{1, arcs_59_0},
-	{5, arcs_59_1},
+	{3, arcs_59_1},
 };
-static arc arcs_60_0[4] = {
-	{135, 1},
+static arc arcs_60_0[1] = {
+	{138, 1},
+};
+static arc arcs_60_1[5] = {
+	{31, 0},
+	{139, 0},
+	{140, 0},
+	{141, 0},
+	{0, 1},
+};
+static state states_60[2] = {
+	{1, arcs_60_0},
+	{5, arcs_60_1},
+};
+static arc arcs_61_0[4] = {
 	{136, 1},
-	{141, 1},
-	{142, 2},
+	{137, 1},
+	{142, 1},
+	{143, 2},
 };
-static arc arcs_60_1[1] = {
-	{137, 2},
+static arc arcs_61_1[1] = {
+	{138, 2},
 };
-static arc arcs_60_2[1] = {
+static arc arcs_61_2[1] = {
 	{0, 2},
 };
-static state states_60[3] = {
-	{4, arcs_60_0},
-	{1, arcs_60_1},
-	{1, arcs_60_2},
+static state states_61[3] = {
+	{4, arcs_61_0},
+	{1, arcs_61_1},
+	{1, arcs_61_2},
 };
-static arc arcs_61_0[1] = {
-	{143, 1},
+static arc arcs_62_0[1] = {
+	{144, 1},
 };
-static arc arcs_61_1[3] = {
-	{144, 1},
-	{31, 2},
+static arc arcs_62_1[3] = {
+	{145, 1},
+	{32, 2},
 	{0, 1},
 };
-static arc arcs_61_2[1] = {
-	{137, 3},
+static arc arcs_62_2[1] = {
+	{138, 3},
 };
-static arc arcs_61_3[1] = {
+static arc arcs_62_3[1] = {
 	{0, 3},
 };
-static state states_61[4] = {
-	{1, arcs_61_0},
-	{3, arcs_61_1},
-	{1, arcs_61_2},
-	{1, arcs_61_3},
+static state states_62[4] = {
+	{1, arcs_62_0},
+	{3, arcs_62_1},
+	{1, arcs_62_2},
+	{1, arcs_62_3},
 };
-static arc arcs_62_0[7] = {
-	{13, 1},
-	{146, 2},
-	{149, 3},
-	{152, 4},
-	{21, 5},
-	{154, 5},
-	{155, 6},
+static arc arcs_63_0[7] = {
+	{15, 1},
+	{147, 2},
+	{150, 3},
+	{153, 4},
+	{11, 5},
+	{155, 5},
+	{156, 6},
 };
-static arc arcs_62_1[3] = {
-	{45, 7},
-	{145, 7},
-	{15, 5},
+static arc arcs_63_1[3] = {
+	{46, 7},
+	{146, 7},
+	{17, 5},
 };
-static arc arcs_62_2[2] = {
-	{147, 8},
-	{148, 5},
+static arc arcs_63_2[2] = {
+	{148, 8},
+	{149, 5},
 };
-static arc arcs_62_3[2] = {
-	{150, 9},
-	{151, 5},
+static arc arcs_63_3[2] = {
+	{151, 9},
+	{152, 5},
 };
-static arc arcs_62_4[1] = {
-	{153, 10},
+static arc arcs_63_4[1] = {
+	{154, 10},
 };
-static arc arcs_62_5[1] = {
+static arc arcs_63_5[1] = {
 	{0, 5},
 };
-static arc arcs_62_6[2] = {
-	{155, 6},
+static arc arcs_63_6[2] = {
+	{156, 6},
 	{0, 6},
 };
-static arc arcs_62_7[1] = {
-	{15, 5},
+static arc arcs_63_7[1] = {
+	{17, 5},
 };
-static arc arcs_62_8[1] = {
-	{148, 5},
+static arc arcs_63_8[1] = {
+	{149, 5},
 };
-static arc arcs_62_9[1] = {
-	{151, 5},
-};
-static arc arcs_62_10[1] = {
+static arc arcs_63_9[1] = {
 	{152, 5},
 };
-static state states_62[11] = {
-	{7, arcs_62_0},
-	{3, arcs_62_1},
-	{2, arcs_62_2},
-	{2, arcs_62_3},
-	{1, arcs_62_4},
-	{1, arcs_62_5},
-	{2, arcs_62_6},
-	{1, arcs_62_7},
-	{1, arcs_62_8},
-	{1, arcs_62_9},
-	{1, arcs_62_10},
+static arc arcs_63_10[1] = {
+	{153, 5},
 };
-static arc arcs_63_0[1] = {
-	{28, 1},
-};
-static arc arcs_63_1[3] = {
-	{156, 2},
-	{29, 3},
-	{0, 1},
-};
-static arc arcs_63_2[1] = {
-	{0, 2},
-};
-static arc arcs_63_3[2] = {
-	{28, 4},
-	{0, 3},
-};
-static arc arcs_63_4[2] = {
-	{29, 3},
-	{0, 4},
-};
-static state states_63[5] = {
-	{1, arcs_63_0},
+static state states_63[11] = {
+	{7, arcs_63_0},
 	{3, arcs_63_1},
-	{1, arcs_63_2},
+	{2, arcs_63_2},
 	{2, arcs_63_3},
-	{2, arcs_63_4},
+	{1, arcs_63_4},
+	{1, arcs_63_5},
+	{2, arcs_63_6},
+	{1, arcs_63_7},
+	{1, arcs_63_8},
+	{1, arcs_63_9},
+	{1, arcs_63_10},
 };
 static arc arcs_64_0[1] = {
-	{28, 1},
+	{29, 1},
 };
 static arc arcs_64_1[3] = {
 	{157, 2},
-	{29, 3},
+	{30, 3},
 	{0, 1},
 };
 static arc arcs_64_2[1] = {
 	{0, 2},
 };
 static arc arcs_64_3[2] = {
-	{28, 4},
+	{29, 4},
 	{0, 3},
 };
 static arc arcs_64_4[2] = {
-	{29, 3},
+	{30, 3},
 	{0, 4},
 };
 static state states_64[5] = {
@@ -1367,153 +1351,163 @@
 	{2, arcs_64_4},
 };
 static arc arcs_65_0[1] = {
-	{109, 1},
+	{29, 1},
 };
-static arc arcs_65_1[2] = {
-	{25, 2},
-	{23, 3},
+static arc arcs_65_1[3] = {
+	{158, 2},
+	{30, 3},
+	{0, 1},
 };
 static arc arcs_65_2[1] = {
-	{23, 3},
+	{0, 2},
 };
-static arc arcs_65_3[1] = {
-	{28, 4},
+static arc arcs_65_3[2] = {
+	{29, 4},
+	{0, 3},
 };
-static arc arcs_65_4[1] = {
+static arc arcs_65_4[2] = {
+	{30, 3},
 	{0, 4},
 };
 static state states_65[5] = {
 	{1, arcs_65_0},
-	{2, arcs_65_1},
+	{3, arcs_65_1},
 	{1, arcs_65_2},
-	{1, arcs_65_3},
-	{1, arcs_65_4},
+	{2, arcs_65_3},
+	{2, arcs_65_4},
 };
-static arc arcs_66_0[3] = {
-	{13, 1},
-	{146, 2},
-	{77, 3},
+static arc arcs_66_0[1] = {
+	{110, 1},
 };
 static arc arcs_66_1[2] = {
-	{14, 4},
-	{15, 5},
+	{26, 2},
+	{24, 3},
 };
 static arc arcs_66_2[1] = {
-	{158, 6},
+	{24, 3},
 };
 static arc arcs_66_3[1] = {
-	{21, 5},
+	{29, 4},
 };
 static arc arcs_66_4[1] = {
-	{15, 5},
+	{0, 4},
 };
-static arc arcs_66_5[1] = {
-	{0, 5},
-};
-static arc arcs_66_6[1] = {
-	{148, 5},
-};
-static state states_66[7] = {
-	{3, arcs_66_0},
+static state states_66[5] = {
+	{1, arcs_66_0},
 	{2, arcs_66_1},
 	{1, arcs_66_2},
 	{1, arcs_66_3},
 	{1, arcs_66_4},
-	{1, arcs_66_5},
-	{1, arcs_66_6},
 };
-static arc arcs_67_0[1] = {
-	{159, 1},
+static arc arcs_67_0[3] = {
+	{15, 1},
+	{147, 2},
+	{78, 3},
 };
 static arc arcs_67_1[2] = {
-	{29, 2},
-	{0, 1},
+	{16, 4},
+	{17, 5},
 };
-static arc arcs_67_2[2] = {
-	{159, 1},
-	{0, 2},
+static arc arcs_67_2[1] = {
+	{159, 6},
 };
-static state states_67[3] = {
-	{1, arcs_67_0},
+static arc arcs_67_3[1] = {
+	{11, 5},
+};
+static arc arcs_67_4[1] = {
+	{17, 5},
+};
+static arc arcs_67_5[1] = {
+	{0, 5},
+};
+static arc arcs_67_6[1] = {
+	{149, 5},
+};
+static state states_67[7] = {
+	{3, arcs_67_0},
 	{2, arcs_67_1},
-	{2, arcs_67_2},
+	{1, arcs_67_2},
+	{1, arcs_67_3},
+	{1, arcs_67_4},
+	{1, arcs_67_5},
+	{1, arcs_67_6},
 };
-static arc arcs_68_0[3] = {
-	{77, 1},
-	{28, 2},
-	{23, 3},
+static arc arcs_68_0[1] = {
+	{160, 1},
 };
-static arc arcs_68_1[1] = {
-	{77, 4},
+static arc arcs_68_1[2] = {
+	{30, 2},
+	{0, 1},
 };
 static arc arcs_68_2[2] = {
-	{23, 3},
+	{160, 1},
 	{0, 2},
 };
-static arc arcs_68_3[3] = {
-	{28, 5},
-	{160, 6},
-	{0, 3},
+static state states_68[3] = {
+	{1, arcs_68_0},
+	{2, arcs_68_1},
+	{2, arcs_68_2},
 };
-static arc arcs_68_4[1] = {
-	{77, 6},
+static arc arcs_69_0[3] = {
+	{78, 1},
+	{29, 2},
+	{24, 3},
 };
-static arc arcs_68_5[2] = {
-	{160, 6},
-	{0, 5},
+static arc arcs_69_1[1] = {
+	{78, 4},
 };
-static arc arcs_68_6[1] = {
-	{0, 6},
+static arc arcs_69_2[2] = {
+	{24, 3},
+	{0, 2},
 };
-static state states_68[7] = {
-	{3, arcs_68_0},
-	{1, arcs_68_1},
-	{2, arcs_68_2},
-	{3, arcs_68_3},
-	{1, arcs_68_4},
-	{2, arcs_68_5},
-	{1, arcs_68_6},
+static arc arcs_69_3[3] = {
+	{29, 5},
+	{161, 6},
+	{0, 3},
 };
-static arc arcs_69_0[1] = {
-	{23, 1},
+static arc arcs_69_4[1] = {
+	{78, 6},
 };
-static arc arcs_69_1[2] = {
-	{28, 2},
-	{0, 1},
+static arc arcs_69_5[2] = {
+	{161, 6},
+	{0, 5},
 };
-static arc arcs_69_2[1] = {
-	{0, 2},
+static arc arcs_69_6[1] = {
+	{0, 6},
 };
-static state states_69[3] = {
-	{1, arcs_69_0},
-	{2, arcs_69_1},
-	{1, arcs_69_2},
+static state states_69[7] = {
+	{3, arcs_69_0},
+	{1, arcs_69_1},
+	{2, arcs_69_2},
+	{3, arcs_69_3},
+	{1, arcs_69_4},
+	{2, arcs_69_5},
+	{1, arcs_69_6},
 };
 static arc arcs_70_0[1] = {
-	{84, 1},
+	{24, 1},
 };
 static arc arcs_70_1[2] = {
 	{29, 2},
 	{0, 1},
 };
-static arc arcs_70_2[2] = {
-	{84, 1},
+static arc arcs_70_2[1] = {
 	{0, 2},
 };
 static state states_70[3] = {
 	{1, arcs_70_0},
 	{2, arcs_70_1},
-	{2, arcs_70_2},
+	{1, arcs_70_2},
 };
 static arc arcs_71_0[1] = {
-	{28, 1},
+	{85, 1},
 };
 static arc arcs_71_1[2] = {
-	{29, 2},
+	{30, 2},
 	{0, 1},
 };
 static arc arcs_71_2[2] = {
-	{28, 1},
+	{85, 1},
 	{0, 2},
 };
 static state states_71[3] = {
@@ -1522,261 +1516,267 @@
 	{2, arcs_71_2},
 };
 static arc arcs_72_0[1] = {
-	{28, 1},
+	{29, 1},
 };
-static arc arcs_72_1[1] = {
-	{23, 2},
+static arc arcs_72_1[2] = {
+	{30, 2},
+	{0, 1},
 };
-static arc arcs_72_2[1] = {
-	{28, 3},
+static arc arcs_72_2[2] = {
+	{29, 1},
+	{0, 2},
 };
-static arc arcs_72_3[2] = {
-	{29, 4},
-	{0, 3},
-};
-static arc arcs_72_4[2] = {
-	{28, 1},
-	{0, 4},
-};
-static state states_72[5] = {
+static state states_72[3] = {
 	{1, arcs_72_0},
-	{1, arcs_72_1},
-	{1, arcs_72_2},
-	{2, arcs_72_3},
-	{2, arcs_72_4},
+	{2, arcs_72_1},
+	{2, arcs_72_2},
 };
 static arc arcs_73_0[1] = {
-	{161, 1},
+	{29, 1},
 };
 static arc arcs_73_1[1] = {
-	{21, 2},
+	{24, 2},
 };
-static arc arcs_73_2[2] = {
-	{13, 3},
-	{23, 4},
+static arc arcs_73_2[1] = {
+	{29, 3},
 };
 static arc arcs_73_3[2] = {
-	{9, 5},
-	{15, 6},
+	{30, 4},
+	{0, 3},
 };
-static arc arcs_73_4[1] = {
-	{24, 7},
+static arc arcs_73_4[2] = {
+	{29, 1},
+	{0, 4},
 };
-static arc arcs_73_5[1] = {
-	{15, 6},
-};
-static arc arcs_73_6[1] = {
-	{23, 4},
-};
-static arc arcs_73_7[1] = {
-	{0, 7},
-};
-static state states_73[8] = {
+static state states_73[5] = {
 	{1, arcs_73_0},
 	{1, arcs_73_1},
-	{2, arcs_73_2},
+	{1, arcs_73_2},
 	{2, arcs_73_3},
-	{1, arcs_73_4},
-	{1, arcs_73_5},
-	{1, arcs_73_6},
-	{1, arcs_73_7},
+	{2, arcs_73_4},
 };
-static arc arcs_74_0[3] = {
+static arc arcs_74_0[1] = {
 	{162, 1},
-	{30, 2},
-	{31, 3},
 };
-static arc arcs_74_1[2] = {
-	{29, 4},
-	{0, 1},
+static arc arcs_74_1[1] = {
+	{11, 2},
 };
-static arc arcs_74_2[1] = {
-	{28, 5},
+static arc arcs_74_2[2] = {
+	{15, 3},
+	{24, 4},
 };
-static arc arcs_74_3[1] = {
-	{28, 6},
+static arc arcs_74_3[2] = {
+	{9, 5},
+	{17, 6},
 };
-static arc arcs_74_4[4] = {
-	{162, 1},
-	{30, 2},
-	{31, 3},
-	{0, 4},
+static arc arcs_74_4[1] = {
+	{25, 7},
 };
-static arc arcs_74_5[2] = {
-	{29, 7},
-	{0, 5},
+static arc arcs_74_5[1] = {
+	{17, 6},
 };
 static arc arcs_74_6[1] = {
-	{0, 6},
+	{24, 4},
 };
-static arc arcs_74_7[2] = {
-	{162, 5},
-	{31, 3},
+static arc arcs_74_7[1] = {
+	{0, 7},
 };
 static state states_74[8] = {
-	{3, arcs_74_0},
-	{2, arcs_74_1},
-	{1, arcs_74_2},
-	{1, arcs_74_3},
-	{4, arcs_74_4},
-	{2, arcs_74_5},
+	{1, arcs_74_0},
+	{1, arcs_74_1},
+	{2, arcs_74_2},
+	{2, arcs_74_3},
+	{1, arcs_74_4},
+	{1, arcs_74_5},
 	{1, arcs_74_6},
-	{2, arcs_74_7},
+	{1, arcs_74_7},
 };
-static arc arcs_75_0[1] = {
-	{28, 1},
+static arc arcs_75_0[3] = {
+	{163, 1},
+	{31, 2},
+	{32, 3},
 };
-static arc arcs_75_1[3] = {
-	{157, 2},
-	{27, 3},
+static arc arcs_75_1[2] = {
+	{30, 4},
 	{0, 1},
 };
 static arc arcs_75_2[1] = {
-	{0, 2},
+	{29, 5},
 };
 static arc arcs_75_3[1] = {
-	{28, 2},
+	{29, 6},
 };
-static state states_75[4] = {
-	{1, arcs_75_0},
-	{3, arcs_75_1},
+static arc arcs_75_4[4] = {
+	{163, 1},
+	{31, 2},
+	{32, 3},
+	{0, 4},
+};
+static arc arcs_75_5[2] = {
+	{30, 7},
+	{0, 5},
+};
+static arc arcs_75_6[1] = {
+	{0, 6},
+};
+static arc arcs_75_7[2] = {
+	{163, 5},
+	{32, 3},
+};
+static state states_75[8] = {
+	{3, arcs_75_0},
+	{2, arcs_75_1},
 	{1, arcs_75_2},
 	{1, arcs_75_3},
+	{4, arcs_75_4},
+	{2, arcs_75_5},
+	{1, arcs_75_6},
+	{2, arcs_75_7},
 };
-static arc arcs_76_0[2] = {
-	{156, 1},
-	{164, 1},
+static arc arcs_76_0[1] = {
+	{29, 1},
 };
-static arc arcs_76_1[1] = {
+static arc arcs_76_1[3] = {
+	{158, 2},
+	{28, 3},
 	{0, 1},
 };
-static state states_76[2] = {
-	{2, arcs_76_0},
-	{1, arcs_76_1},
+static arc arcs_76_2[1] = {
+	{0, 2},
 };
-static arc arcs_77_0[1] = {
-	{96, 1},
+static arc arcs_76_3[1] = {
+	{29, 2},
 };
-static arc arcs_77_1[1] = {
-	{61, 2},
+static state states_76[4] = {
+	{1, arcs_76_0},
+	{3, arcs_76_1},
+	{1, arcs_76_2},
+	{1, arcs_76_3},
 };
-static arc arcs_77_2[1] = {
-	{85, 3},
+static arc arcs_77_0[2] = {
+	{157, 1},
+	{165, 1},
 };
-static arc arcs_77_3[1] = {
-	{105, 4},
+static arc arcs_77_1[1] = {
+	{0, 1},
 };
-static arc arcs_77_4[2] = {
-	{163, 5},
-	{0, 4},
-};
-static arc arcs_77_5[1] = {
-	{0, 5},
-};
-static state states_77[6] = {
-	{1, arcs_77_0},
+static state states_77[2] = {
+	{2, arcs_77_0},
 	{1, arcs_77_1},
-	{1, arcs_77_2},
-	{1, arcs_77_3},
-	{2, arcs_77_4},
-	{1, arcs_77_5},
 };
 static arc arcs_78_0[1] = {
-	{92, 1},
+	{97, 1},
 };
 static arc arcs_78_1[1] = {
-	{106, 2},
+	{62, 2},
 };
-static arc arcs_78_2[2] = {
-	{163, 3},
-	{0, 2},
+static arc arcs_78_2[1] = {
+	{86, 3},
 };
 static arc arcs_78_3[1] = {
-	{0, 3},
+	{106, 4},
 };
-static state states_78[4] = {
+static arc arcs_78_4[2] = {
+	{164, 5},
+	{0, 4},
+};
+static arc arcs_78_5[1] = {
+	{0, 5},
+};
+static state states_78[6] = {
 	{1, arcs_78_0},
 	{1, arcs_78_1},
-	{2, arcs_78_2},
+	{1, arcs_78_2},
 	{1, arcs_78_3},
+	{2, arcs_78_4},
+	{1, arcs_78_5},
 };
-static arc arcs_79_0[2] = {
-	{157, 1},
-	{166, 1},
+static arc arcs_79_0[1] = {
+	{93, 1},
 };
 static arc arcs_79_1[1] = {
-	{0, 1},
+	{107, 2},
 };
-static state states_79[2] = {
-	{2, arcs_79_0},
+static arc arcs_79_2[2] = {
+	{164, 3},
+	{0, 2},
+};
+static arc arcs_79_3[1] = {
+	{0, 3},
+};
+static state states_79[4] = {
+	{1, arcs_79_0},
 	{1, arcs_79_1},
+	{2, arcs_79_2},
+	{1, arcs_79_3},
 };
-static arc arcs_80_0[1] = {
-	{96, 1},
+static arc arcs_80_0[2] = {
+	{158, 1},
+	{167, 1},
 };
 static arc arcs_80_1[1] = {
-	{61, 2},
+	{0, 1},
 };
-static arc arcs_80_2[1] = {
-	{85, 3},
-};
-static arc arcs_80_3[1] = {
-	{107, 4},
-};
-static arc arcs_80_4[2] = {
-	{165, 5},
-	{0, 4},
-};
-static arc arcs_80_5[1] = {
-	{0, 5},
-};
-static state states_80[6] = {
-	{1, arcs_80_0},
+static state states_80[2] = {
+	{2, arcs_80_0},
 	{1, arcs_80_1},
-	{1, arcs_80_2},
-	{1, arcs_80_3},
-	{2, arcs_80_4},
-	{1, arcs_80_5},
 };
 static arc arcs_81_0[1] = {
-	{92, 1},
+	{97, 1},
 };
 static arc arcs_81_1[1] = {
-	{106, 2},
+	{62, 2},
 };
-static arc arcs_81_2[2] = {
-	{165, 3},
-	{0, 2},
+static arc arcs_81_2[1] = {
+	{86, 3},
 };
 static arc arcs_81_3[1] = {
-	{0, 3},
+	{108, 4},
 };
-static state states_81[4] = {
+static arc arcs_81_4[2] = {
+	{166, 5},
+	{0, 4},
+};
+static arc arcs_81_5[1] = {
+	{0, 5},
+};
+static state states_81[6] = {
 	{1, arcs_81_0},
 	{1, arcs_81_1},
-	{2, arcs_81_2},
+	{1, arcs_81_2},
 	{1, arcs_81_3},
+	{2, arcs_81_4},
+	{1, arcs_81_5},
 };
 static arc arcs_82_0[1] = {
-	{28, 1},
+	{93, 1},
 };
-static arc arcs_82_1[2] = {
-	{29, 0},
-	{0, 1},
+static arc arcs_82_1[1] = {
+	{107, 2},
 };
-static state states_82[2] = {
+static arc arcs_82_2[2] = {
+	{166, 3},
+	{0, 2},
+};
+static arc arcs_82_3[1] = {
+	{0, 3},
+};
+static state states_82[4] = {
 	{1, arcs_82_0},
-	{2, arcs_82_1},
+	{1, arcs_82_1},
+	{2, arcs_82_2},
+	{1, arcs_82_3},
 };
 static arc arcs_83_0[1] = {
-	{21, 1},
+	{29, 1},
 };
-static arc arcs_83_1[1] = {
+static arc arcs_83_1[2] = {
+	{30, 0},
 	{0, 1},
 };
 static state states_83[2] = {
 	{1, arcs_83_0},
-	{1, arcs_83_1},
+	{2, arcs_83_1},
 };
 static arc arcs_84_0[1] = {
 	{168, 1},
@@ -1795,173 +1795,173 @@
 };
 static dfa dfas[85] = {
 	{256, "single_input", 0, 3, states_0,
-	 "\004\050\060\000\000\000\000\124\360\024\114\220\023\040\010\000\200\041\044\015\002\001"},
+	 "\004\250\100\000\000\000\000\250\340\051\230\040\047\100\020\000\000\103\110\032\004\001"},
 	{257, "file_input", 0, 2, states_1,
-	 "\204\050\060\000\000\000\000\124\360\024\114\220\023\040\010\000\200\041\044\015\002\001"},
+	 "\204\250\100\000\000\000\000\250\340\051\230\040\047\100\020\000\000\103\110\032\004\001"},
 	{258, "eval_input", 0, 3, states_2,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{259, "decorator", 0, 7, states_3,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{259, "encoding_decl", 0, 2, states_3,
 	 "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{260, "decorators", 0, 2, states_4,
-	 "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{261, "decorated", 0, 3, states_5,
-	 "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{262, "funcdef", 0, 6, states_6,
-	 "\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{263, "parameters", 0, 4, states_7,
+	{260, "decorator", 0, 7, states_4,
 	 "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{264, "varargslist", 0, 10, states_8,
-	 "\000\040\040\300\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{265, "fpdef", 0, 4, states_9,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{266, "fplist", 0, 3, states_10,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{267, "stmt", 0, 2, states_11,
-	 "\000\050\060\000\000\000\000\124\360\024\114\220\023\040\010\000\200\041\044\015\002\001"},
-	{268, "simple_stmt", 0, 4, states_12,
-	 "\000\040\040\000\000\000\000\124\360\024\114\000\000\040\010\000\200\041\044\015\000\001"},
-	{269, "small_stmt", 0, 2, states_13,
-	 "\000\040\040\000\000\000\000\124\360\024\114\000\000\040\010\000\200\041\044\015\000\001"},
-	{270, "expr_stmt", 0, 6, states_14,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{271, "augassign", 0, 2, states_15,
-	 "\000\000\000\000\000\300\377\003\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{272, "print_stmt", 0, 9, states_16,
-	 "\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{273, "del_stmt", 0, 3, states_17,
-	 "\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{274, "pass_stmt", 0, 2, states_18,
-	 "\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{275, "flow_stmt", 0, 2, states_19,
-	 "\000\000\000\000\000\000\000\000\360\000\000\000\000\000\000\000\000\000\000\000\000\001"},
-	{276, "break_stmt", 0, 2, states_20,
-	 "\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{277, "continue_stmt", 0, 2, states_21,
+	{261, "decorators", 0, 2, states_5,
+	 "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{262, "decorated", 0, 3, states_6,
+	 "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{263, "funcdef", 0, 6, states_7,
+	 "\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{264, "parameters", 0, 4, states_8,
+	 "\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{265, "varargslist", 0, 10, states_9,
+	 "\000\210\000\200\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{266, "fpdef", 0, 4, states_10,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{267, "fplist", 0, 3, states_11,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{268, "stmt", 0, 2, states_12,
+	 "\000\250\100\000\000\000\000\250\340\051\230\040\047\100\020\000\000\103\110\032\004\001"},
+	{269, "simple_stmt", 0, 4, states_13,
+	 "\000\210\000\000\000\000\000\250\340\051\230\000\000\100\020\000\000\103\110\032\000\001"},
+	{270, "small_stmt", 0, 2, states_14,
+	 "\000\210\000\000\000\000\000\250\340\051\230\000\000\100\020\000\000\103\110\032\000\001"},
+	{271, "expr_stmt", 0, 6, states_15,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{272, "augassign", 0, 2, states_16,
+	 "\000\000\000\000\000\200\377\007\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{273, "print_stmt", 0, 9, states_17,
+	 "\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{274, "del_stmt", 0, 3, states_18,
+	 "\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{275, "pass_stmt", 0, 2, states_19,
+	 "\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{276, "flow_stmt", 0, 2, states_20,
+	 "\000\000\000\000\000\000\000\000\340\001\000\000\000\000\000\000\000\000\000\000\000\001"},
+	{277, "break_stmt", 0, 2, states_21,
 	 "\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{278, "return_stmt", 0, 3, states_22,
+	{278, "continue_stmt", 0, 2, states_22,
 	 "\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{279, "yield_stmt", 0, 2, states_23,
+	{279, "return_stmt", 0, 3, states_23,
+	 "\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{280, "yield_stmt", 0, 2, states_24,
 	 "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"},
-	{280, "raise_stmt", 0, 7, states_24,
-	 "\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{281, "import_stmt", 0, 2, states_25,
-	 "\000\000\000\000\000\000\000\000\000\024\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{282, "import_name", 0, 3, states_26,
-	 "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{283, "import_from", 0, 8, states_27,
-	 "\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{284, "import_as_name", 0, 4, states_28,
-	 "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{285, "dotted_as_name", 0, 4, states_29,
-	 "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{286, "import_as_names", 0, 3, states_30,
-	 "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{287, "dotted_as_names", 0, 2, states_31,
-	 "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{288, "dotted_name", 0, 2, states_32,
-	 "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{289, "global_stmt", 0, 3, states_33,
-	 "\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000"},
-	{290, "exec_stmt", 0, 7, states_34,
+	{281, "raise_stmt", 0, 7, states_25,
+	 "\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{282, "import_stmt", 0, 2, states_26,
+	 "\000\000\000\000\000\000\000\000\000\050\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{283, "import_name", 0, 3, states_27,
+	 "\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{284, "import_from", 0, 8, states_28,
+	 "\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{285, "import_as_name", 0, 4, states_29,
+	 "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{286, "dotted_as_name", 0, 4, states_30,
+	 "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{287, "import_as_names", 0, 3, states_31,
+	 "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{288, "dotted_as_names", 0, 2, states_32,
+	 "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{289, "dotted_name", 0, 2, states_33,
+	 "\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{290, "global_stmt", 0, 3, states_34,
 	 "\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000"},
-	{291, "assert_stmt", 0, 5, states_35,
-	 "\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000\000"},
-	{292, "compound_stmt", 0, 2, states_36,
-	 "\000\010\020\000\000\000\000\000\000\000\000\220\023\000\000\000\000\000\000\000\002\000"},
-	{293, "if_stmt", 0, 8, states_37,
-	 "\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"},
-	{294, "while_stmt", 0, 8, states_38,
-	 "\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000"},
-	{295, "for_stmt", 0, 10, states_39,
+	{291, "exec_stmt", 0, 7, states_35,
+	 "\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000"},
+	{292, "assert_stmt", 0, 5, states_36,
+	 "\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000\000"},
+	{293, "compound_stmt", 0, 2, states_37,
+	 "\000\040\100\000\000\000\000\000\000\000\000\040\047\000\000\000\000\000\000\000\004\000"},
+	{294, "if_stmt", 0, 8, states_38,
+	 "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
+	{295, "while_stmt", 0, 8, states_39,
 	 "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
-	{296, "try_stmt", 0, 13, states_40,
+	{296, "for_stmt", 0, 10, states_40,
 	 "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
-	{297, "with_stmt", 0, 6, states_41,
-	 "\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000"},
-	{298, "with_var", 0, 3, states_42,
-	 "\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000"},
-	{299, "except_clause", 0, 5, states_43,
-	 "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
-	{300, "suite", 0, 5, states_44,
-	 "\004\040\040\000\000\000\000\124\360\024\114\000\000\040\010\000\200\041\044\015\000\001"},
-	{301, "testlist_safe", 0, 5, states_45,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{302, "old_test", 0, 2, states_46,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{303, "old_lambdef", 0, 5, states_47,
-	 "\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000"},
-	{304, "test", 0, 6, states_48,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{305, "or_test", 0, 2, states_49,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\010\000\200\041\044\015\000\000"},
-	{306, "and_test", 0, 2, states_50,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\010\000\200\041\044\015\000\000"},
-	{307, "not_test", 0, 3, states_51,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\010\000\200\041\044\015\000\000"},
-	{308, "comparison", 0, 2, states_52,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\200\041\044\015\000\000"},
-	{309, "comp_op", 0, 4, states_53,
-	 "\000\000\000\000\000\000\000\000\000\000\040\000\000\000\310\077\000\000\000\000\000\000"},
-	{310, "expr", 0, 2, states_54,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\200\041\044\015\000\000"},
-	{311, "xor_expr", 0, 2, states_55,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\200\041\044\015\000\000"},
-	{312, "and_expr", 0, 2, states_56,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\200\041\044\015\000\000"},
-	{313, "shift_expr", 0, 2, states_57,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\200\041\044\015\000\000"},
-	{314, "arith_expr", 0, 2, states_58,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\200\041\044\015\000\000"},
-	{315, "term", 0, 2, states_59,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\200\041\044\015\000\000"},
-	{316, "factor", 0, 3, states_60,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\200\041\044\015\000\000"},
-	{317, "power", 0, 4, states_61,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\044\015\000\000"},
-	{318, "atom", 0, 11, states_62,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\044\015\000\000"},
-	{319, "listmaker", 0, 5, states_63,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{320, "testlist_gexp", 0, 5, states_64,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{321, "lambdef", 0, 5, states_65,
-	 "\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000"},
-	{322, "trailer", 0, 7, states_66,
-	 "\000\040\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\004\000\000\000"},
-	{323, "subscriptlist", 0, 3, states_67,
-	 "\000\040\240\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{324, "subscript", 0, 7, states_68,
-	 "\000\040\240\000\000\000\000\000\000\040\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{325, "sliceop", 0, 3, states_69,
-	 "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-	{326, "exprlist", 0, 3, states_70,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\000\000\000\200\041\044\015\000\000"},
-	{327, "testlist", 0, 3, states_71,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{328, "dictmaker", 0, 5, states_72,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{329, "classdef", 0, 8, states_73,
-	 "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000"},
-	{330, "arglist", 0, 8, states_74,
-	 "\000\040\040\300\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{331, "argument", 0, 4, states_75,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{332, "list_iter", 0, 2, states_76,
-	 "\000\000\000\000\000\000\000\000\000\000\000\020\001\000\000\000\000\000\000\000\000\000"},
-	{333, "list_for", 0, 6, states_77,
-	 "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
-	{334, "list_if", 0, 4, states_78,
-	 "\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"},
-	{335, "gen_iter", 0, 2, states_79,
-	 "\000\000\000\000\000\000\000\000\000\000\000\020\001\000\000\000\000\000\000\000\000\000"},
-	{336, "gen_for", 0, 6, states_80,
-	 "\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
-	{337, "gen_if", 0, 4, states_81,
-	 "\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"},
-	{338, "testlist1", 0, 2, states_82,
-	 "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},
-	{339, "encoding_decl", 0, 2, states_83,
-	 "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{297, "try_stmt", 0, 13, states_41,
+	 "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
+	{298, "with_stmt", 0, 6, states_42,
+	 "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
+	{299, "with_var", 0, 3, states_43,
+	 "\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000"},
+	{300, "except_clause", 0, 5, states_44,
+	 "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000"},
+	{301, "suite", 0, 5, states_45,
+	 "\004\210\000\000\000\000\000\250\340\051\230\000\000\100\020\000\000\103\110\032\000\001"},
+	{302, "testlist_safe", 0, 5, states_46,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{303, "old_test", 0, 2, states_47,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{304, "old_lambdef", 0, 5, states_48,
+	 "\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
+	{305, "test", 0, 6, states_49,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{306, "or_test", 0, 2, states_50,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\103\110\032\000\000"},
+	{307, "and_test", 0, 2, states_51,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\103\110\032\000\000"},
+	{308, "not_test", 0, 3, states_52,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\103\110\032\000\000"},
+	{309, "comparison", 0, 2, states_53,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\103\110\032\000\000"},
+	{310, "comp_op", 0, 4, states_54,
+	 "\000\000\000\000\000\000\000\000\000\000\100\000\000\000\220\177\000\000\000\000\000\000"},
+	{311, "expr", 0, 2, states_55,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\103\110\032\000\000"},
+	{312, "xor_expr", 0, 2, states_56,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\103\110\032\000\000"},
+	{313, "and_expr", 0, 2, states_57,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\103\110\032\000\000"},
+	{314, "shift_expr", 0, 2, states_58,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\103\110\032\000\000"},
+	{315, "arith_expr", 0, 2, states_59,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\103\110\032\000\000"},
+	{316, "term", 0, 2, states_60,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\103\110\032\000\000"},
+	{317, "factor", 0, 3, states_61,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\103\110\032\000\000"},
+	{318, "power", 0, 4, states_62,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\110\032\000\000"},
+	{319, "atom", 0, 11, states_63,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\110\032\000\000"},
+	{320, "listmaker", 0, 5, states_64,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{321, "testlist_gexp", 0, 5, states_65,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{322, "lambdef", 0, 5, states_66,
+	 "\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
+	{323, "trailer", 0, 7, states_67,
+	 "\000\200\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\010\000\000\000"},
+	{324, "subscriptlist", 0, 3, states_68,
+	 "\000\210\000\001\000\000\000\000\000\100\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{325, "subscript", 0, 7, states_69,
+	 "\000\210\000\001\000\000\000\000\000\100\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{326, "sliceop", 0, 3, states_70,
+	 "\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+	{327, "exprlist", 0, 3, states_71,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\103\110\032\000\000"},
+	{328, "testlist", 0, 3, states_72,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{329, "dictmaker", 0, 5, states_73,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{330, "classdef", 0, 8, states_74,
+	 "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\004\000"},
+	{331, "arglist", 0, 8, states_75,
+	 "\000\210\000\200\001\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{332, "argument", 0, 4, states_76,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
+	{333, "list_iter", 0, 2, states_77,
+	 "\000\000\000\000\000\000\000\000\000\000\000\040\002\000\000\000\000\000\000\000\000\000"},
+	{334, "list_for", 0, 6, states_78,
+	 "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
+	{335, "list_if", 0, 4, states_79,
+	 "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
+	{336, "gen_iter", 0, 2, states_80,
+	 "\000\000\000\000\000\000\000\000\000\000\000\040\002\000\000\000\000\000\000\000\000\000"},
+	{337, "gen_for", 0, 6, states_81,
+	 "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
+	{338, "gen_if", 0, 4, states_82,
+	 "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
+	{339, "testlist1", 0, 2, states_83,
+	 "\000\210\000\000\000\000\000\000\000\000\000\000\000\100\020\000\000\103\110\032\000\000"},
 	{340, "yield_expr", 0, 3, states_84,
 	 "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001"},
 };
@@ -1969,48 +1969,49 @@
 	{0, "EMPTY"},
 	{256, 0},
 	{4, 0},
+	{269, 0},
+	{293, 0},
+	{257, 0},
 	{268, 0},
-	{292, 0},
-	{257, 0},
-	{267, 0},
 	{0, 0},
 	{258, 0},
-	{327, 0},
+	{328, 0},
 	{259, 0},
+	{1, 0},
+	{260, 0},
 	{50, 0},
-	{288, 0},
+	{289, 0},
 	{7, 0},
-	{330, 0},
+	{331, 0},
 	{8, 0},
-	{260, 0},
 	{261, 0},
-	{329, 0},
 	{262, 0},
+	{330, 0},
+	{263, 0},
 	{1, "def"},
-	{1, 0},
-	{263, 0},
+	{264, 0},
 	{11, 0},
-	{300, 0},
-	{264, 0},
+	{301, 0},
 	{265, 0},
+	{266, 0},
 	{22, 0},
-	{304, 0},
+	{305, 0},
 	{12, 0},
 	{16, 0},
 	{36, 0},
-	{266, 0},
-	{269, 0},
+	{267, 0},
+	{270, 0},
 	{13, 0},
-	{270, 0},
-	{272, 0},
+	{271, 0},
 	{273, 0},
 	{274, 0},
 	{275, 0},
-	{281, 0},
-	{289, 0},
+	{276, 0},
+	{282, 0},
 	{290, 0},
 	{291, 0},
-	{271, 0},
+	{292, 0},
+	{272, 0},
 	{340, 0},
 	{37, 0},
 	{38, 0},
@@ -2027,63 +2028,63 @@
 	{1, "print"},
 	{35, 0},
 	{1, "del"},
-	{326, 0},
+	{327, 0},
 	{1, "pass"},
-	{276, 0},
 	{277, 0},
 	{278, 0},
+	{279, 0},
+	{281, 0},
 	{280, 0},
-	{279, 0},
 	{1, "break"},
 	{1, "continue"},
 	{1, "return"},
 	{1, "raise"},
-	{282, 0},
 	{283, 0},
+	{284, 0},
 	{1, "import"},
-	{287, 0},
+	{288, 0},
 	{1, "from"},
 	{23, 0},
+	{287, 0},
+	{285, 0},
+	{1, "as"},
 	{286, 0},
-	{284, 0},
-	{1, "as"},
-	{285, 0},
 	{1, "global"},
 	{1, "exec"},
-	{310, 0},
+	{311, 0},
 	{1, "in"},
 	{1, "assert"},
-	{293, 0},
 	{294, 0},
 	{295, 0},
 	{296, 0},
 	{297, 0},
+	{298, 0},
 	{1, "if"},
 	{1, "elif"},
 	{1, "else"},
 	{1, "while"},
 	{1, "for"},
 	{1, "try"},
-	{299, 0},
+	{300, 0},
 	{1, "finally"},
 	{1, "with"},
-	{298, 0},
+	{299, 0},
 	{1, "except"},
 	{5, 0},
 	{6, 0},
-	{301, 0},
 	{302, 0},
-	{305, 0},
 	{303, 0},
+	{306, 0},
+	{304, 0},
 	{1, "lambda"},
-	{321, 0},
-	{306, 0},
+	{322, 0},
+	{307, 0},
 	{1, "or"},
-	{307, 0},
+	{308, 0},
 	{1, "and"},
 	{1, "not"},
-	{308, 0},
 	{309, 0},
+	{310, 0},
 	{20, 0},
 	{21, 0},
 	{28, 0},
@@ -2092,48 +2093,47 @@
 	{29, 0},
 	{29, 0},
 	{1, "is"},
-	{311, 0},
+	{312, 0},
 	{18, 0},
-	{312, 0},
+	{313, 0},
 	{33, 0},
-	{313, 0},
+	{314, 0},
 	{19, 0},
-	{314, 0},
+	{315, 0},
 	{34, 0},
-	{315, 0},
+	{316, 0},
 	{14, 0},
 	{15, 0},
-	{316, 0},
+	{317, 0},
 	{17, 0},
 	{24, 0},
 	{48, 0},
 	{32, 0},
-	{317, 0},
 	{318, 0},
-	{322, 0},
+	{319, 0},
+	{323, 0},
+	{321, 0},
+	{9, 0},
 	{320, 0},
-	{9, 0},
-	{319, 0},
 	{10, 0},
 	{26, 0},
-	{328, 0},
+	{329, 0},
 	{27, 0},
 	{25, 0},
-	{338, 0},
+	{339, 0},
 	{2, 0},
 	{3, 0},
-	{333, 0},
-	{336, 0},
-	{323, 0},
+	{334, 0},
+	{337, 0},
 	{324, 0},
 	{325, 0},
+	{326, 0},
 	{1, "class"},
-	{331, 0},
 	{332, 0},
-	{334, 0},
+	{333, 0},
 	{335, 0},
-	{337, 0},
-	{339, 0},
+	{336, 0},
+	{338, 0},
 	{1, "yield"},
 };
 grammar _PyParser_Grammar = {
Index: Include/graminit.h
===================================================================
--- Include/graminit.h	(revision 67472)
+++ Include/graminit.h	(working copy)
@@ -3,85 +3,85 @@
 #define single_input 256
 #define file_input 257
 #define eval_input 258
-#define decorator 259
-#define decorators 260
-#define decorated 261
-#define funcdef 262
-#define parameters 263
-#define varargslist 264
-#define fpdef 265
-#define fplist 266
-#define stmt 267
-#define simple_stmt 268
-#define small_stmt 269
-#define expr_stmt 270
-#define augassign 271
-#define print_stmt 272
-#define del_stmt 273
-#define pass_stmt 274
-#define flow_stmt 275
-#define break_stmt 276
-#define continue_stmt 277
-#define return_stmt 278
-#define yield_stmt 279
-#define raise_stmt 280
-#define import_stmt 281
-#define import_name 282
-#define import_from 283
-#define import_as_name 284
-#define dotted_as_name 285
-#define import_as_names 286
-#define dotted_as_names 287
-#define dotted_name 288
-#define global_stmt 289
-#define exec_stmt 290
-#define assert_stmt 291
-#define compound_stmt 292
-#define if_stmt 293
-#define while_stmt 294
-#define for_stmt 295
-#define try_stmt 296
-#define with_stmt 297
-#define with_var 298
-#define except_clause 299
-#define suite 300
-#define testlist_safe 301
-#define old_test 302
-#define old_lambdef 303
-#define test 304
-#define or_test 305
-#define and_test 306
-#define not_test 307
-#define comparison 308
-#define comp_op 309
-#define expr 310
-#define xor_expr 311
-#define and_expr 312
-#define shift_expr 313
-#define arith_expr 314
-#define term 315
-#define factor 316
-#define power 317
-#define atom 318
-#define listmaker 319
-#define testlist_gexp 320
-#define lambdef 321
-#define trailer 322
-#define subscriptlist 323
-#define subscript 324
-#define sliceop 325
-#define exprlist 326
-#define testlist 327
-#define dictmaker 328
-#define classdef 329
-#define arglist 330
-#define argument 331
-#define list_iter 332
-#define list_for 333
-#define list_if 334
-#define gen_iter 335
-#define gen_for 336
-#define gen_if 337
-#define testlist1 338
-#define encoding_decl 339
+#define encoding_decl 259
+#define decorator 260
+#define decorators 261
+#define decorated 262
+#define funcdef 263
+#define parameters 264
+#define varargslist 265
+#define fpdef 266
+#define fplist 267
+#define stmt 268
+#define simple_stmt 269
+#define small_stmt 270
+#define expr_stmt 271
+#define augassign 272
+#define print_stmt 273
+#define del_stmt 274
+#define pass_stmt 275
+#define flow_stmt 276
+#define break_stmt 277
+#define continue_stmt 278
+#define return_stmt 279
+#define yield_stmt 280
+#define raise_stmt 281
+#define import_stmt 282
+#define import_name 283
+#define import_from 284
+#define import_as_name 285
+#define dotted_as_name 286
+#define import_as_names 287
+#define dotted_as_names 288
+#define dotted_name 289
+#define global_stmt 290
+#define exec_stmt 291
+#define assert_stmt 292
+#define compound_stmt 293
+#define if_stmt 294
+#define while_stmt 295
+#define for_stmt 296
+#define try_stmt 297
+#define with_stmt 298
+#define with_var 299
+#define except_clause 300
+#define suite 301
+#define testlist_safe 302
+#define old_test 303
+#define old_lambdef 304
+#define test 305
+#define or_test 306
+#define and_test 307
+#define not_test 308
+#define comparison 309
+#define comp_op 310
+#define expr 311
+#define xor_expr 312
+#define and_expr 313
+#define shift_expr 314
+#define arith_expr 315
+#define term 316
+#define factor 317
+#define power 318
+#define atom 319
+#define listmaker 320
+#define testlist_gexp 321
+#define lambdef 322
+#define trailer 323
+#define subscriptlist 324
+#define subscript 325
+#define sliceop 326
+#define exprlist 327
+#define testlist 328
+#define dictmaker 329
+#define classdef 330
+#define arglist 331
+#define argument 332
+#define list_iter 333
+#define list_for 334
+#define list_if 335
+#define gen_iter 336
+#define gen_for 337
+#define gen_if 338
+#define testlist1 339
 #define yield_expr 340
Index: Grammar/Grammar
===================================================================
--- Grammar/Grammar	(revision 67472)
+++ Grammar/Grammar	(working copy)
@@ -31,6 +31,14 @@
 file_input: (NEWLINE | stmt)* ENDMARKER
 eval_input: testlist NEWLINE* ENDMARKER
 
+#
+# not used in grammar, but may appear in "node" passed from Parser to Compiler
+#
+# XXX: this should always be the first non-terminal declaration, or new syntax
+#      may cause a SystemError in PyAST_FromNode ...
+#
+encoding_decl: NAME
+
 decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
 decorators: decorator+
 decorated: decorators (classdef | funcdef)
@@ -145,7 +153,5 @@
 
 testlist1: test (',' test)*
 
-# not used in grammar, but may appear in "node" passed from Parser to Compiler
-encoding_decl: NAME
+yield_expr: 'yield' [testlist]
 
-yield_expr: 'yield' [testlist]
Index: Makefile.pre.in
===================================================================
--- Makefile.pre.in	(revision 67472)
+++ Makefile.pre.in	(working copy)
@@ -248,9 +248,12 @@
 
 ##########################################################################
 # Python
+# XXX: it is important for graminit.o to be built before ast.o and Python-ast.o to ensure
+#      graminit.h (a dependency of ast.o) is built first!
 PYTHON_OBJS=	\
+		Python/graminit.o \
+		Python/Python-ast.o \
 		Python/_warnings.o \
-		Python/Python-ast.o \
 		Python/asdl.o \
 		Python/ast.o \
 		Python/bltinmodule.o \
@@ -267,7 +270,6 @@
 		Python/getmtime.o \
 		Python/getplatform.o \
 		Python/getversion.o \
-		Python/graminit.o \
 		Python/import.o \
 		Python/importdl.o \
 		Python/marshal.o \
@@ -1195,6 +1197,12 @@
 
 # Dependencies
 
+$(srcdir)/Modules/cPickle.c: $(GRAMMAR_H)
+
+$(srcdir)/Python/compile.c $(srcdir)/Python/bltinmodule.c $(srcdir)/Python/symtable.c $(srcdir)/Python/pythonrun.c $(srcdir)/Python/import.c $(srcdir)/Python/peephole.c $(srcdir)/Modules/symtablemodule.c: $(AST_H)
+
+$(srcdir)/Python/ast.c $(srcdir)/Python/future.c $(srcdir)/Modules/parsermodule.c: $(AST_H) $(GRAMMAR_H)
+
 Python/thread.o: @THREADHEADERS@
 
 # Declare targets that aren't real files