1 files changed, 64 insertions, 32 deletions
diff --git a/Python/graminit.c b/Python/graminit.c
index c8cf35a74a..5db6bb5e53 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -901,42 +901,43 @@ static arc arcs_41_0[1] = {
     {100, 1},
 };
 static arc arcs_41_1[1] = {
-    {28, 2},
+    {101, 2},
 };
 static arc arcs_41_2[2] = {
-    {101, 3},
-    {23, 4},
+    {29, 1},
+    {23, 3},
 };
 static arc arcs_41_3[1] = {
-    {23, 4},
+    {24, 4},
 };
 static arc arcs_41_4[1] = {
-    {24, 5},
-};
-static arc arcs_41_5[1] = {
-    {0, 5},
+    {0, 4},
 };
-static state states_41[6] = {
+static state states_41[5] = {
     {1, arcs_41_0},
     {1, arcs_41_1},
     {2, arcs_41_2},
     {1, arcs_41_3},
     {1, arcs_41_4},
-    {1, arcs_41_5},
 };
 static arc arcs_42_0[1] = {
-    {80, 1},
+    {28, 1},
 };
-static arc arcs_42_1[1] = {
-    {84, 2},
+static arc arcs_42_1[2] = {
+    {80, 2},
+    {0, 1},
 };
 static arc arcs_42_2[1] = {
-    {0, 2},
+    {84, 3},
 };
-static state states_42[3] = {
+static arc arcs_42_3[1] = {
+    {0, 3},
+};
+static state states_42[4] = {
     {1, arcs_42_0},
-    {1, arcs_42_1},
+    {2, arcs_42_1},
     {1, arcs_42_2},
+    {1, arcs_42_3},
 };
 static arc arcs_43_0[1] = {
     {102, 1},
@@ -1525,26 +1526,57 @@ static state states_71[3] = {
 static arc arcs_72_0[1] = {
     {28, 1},
 };
-static arc arcs_72_1[1] = {
+static arc arcs_72_1[4] = {
     {23, 2},
+    {157, 3},
+    {29, 4},
+    {0, 1},
 };
 static arc arcs_72_2[1] = {
-    {28, 3},
+    {28, 5},
 };
-static arc arcs_72_3[2] = {
-    {29, 4},
+static arc arcs_72_3[1] = {
     {0, 3},
 };
 static arc arcs_72_4[2] = {
-    {28, 1},
+    {28, 6},
     {0, 4},
 };
-static state states_72[5] = {
+static arc arcs_72_5[3] = {
+    {157, 3},
+    {29, 7},
+    {0, 5},
+};
+static arc arcs_72_6[2] = {
+    {29, 4},
+    {0, 6},
+};
+static arc arcs_72_7[2] = {
+    {28, 8},
+    {0, 7},
+};
+static arc arcs_72_8[1] = {
+    {23, 9},
+};
+static arc arcs_72_9[1] = {
+    {28, 10},
+};
+static arc arcs_72_10[2] = {
+    {29, 7},
+    {0, 10},
+};
+static state states_72[11] = {
     {1, arcs_72_0},
-    {1, arcs_72_1},
+    {4, arcs_72_1},
     {1, arcs_72_2},
-    {2, arcs_72_3},
+    {1, arcs_72_3},
     {2, arcs_72_4},
+    {3, arcs_72_5},
+    {2, arcs_72_6},
+    {2, arcs_72_7},
+    {1, arcs_72_8},
+    {1, arcs_72_9},
+    {2, arcs_72_10},
 };
 static arc arcs_73_0[1] = {
     {161, 1},
@@ -1877,10 +1909,10 @@ static dfa dfas[85] = {
      "\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,
      "\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,
+    {297, "with_stmt", 0, 5, 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"},
+    {298, "with_item", 0, 4, states_42,
+     "\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\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,
@@ -1923,7 +1955,7 @@ static dfa dfas[85] = {
      "\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,
+    {320, "testlist_comp", 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"},
@@ -1939,7 +1971,7 @@ static dfa dfas[85] = {
      "\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,
+    {328, "dictorsetmaker", 0, 11, 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"},
@@ -1953,11 +1985,11 @@ static dfa dfas[85] = {
      "\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,
+    {335, "comp_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,
+    {336, "comp_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,
+    {337, "comp_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"},