Issue #2333: Backport set and dict comprehensions syntax.
diff --git a/Python/graminit.c b/Python/graminit.c
index 8c8fa38..7cd6ff2 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -1550,42 +1550,57 @@
static arc arcs_73_0[1] = {
{28, 1},
};
-static arc arcs_73_1[3] = {
+static arc arcs_73_1[4] = {
{23, 2},
- {29, 3},
+ {157, 3},
+ {29, 4},
{0, 1},
};
static arc arcs_73_2[1] = {
- {28, 4},
-};
-static arc arcs_73_3[2] = {
{28, 5},
+};
+static arc arcs_73_3[1] = {
{0, 3},
};
static arc arcs_73_4[2] = {
- {29, 6},
+ {28, 6},
{0, 4},
};
-static arc arcs_73_5[2] = {
- {29, 3},
+static arc arcs_73_5[3] = {
+ {157, 3},
+ {29, 7},
{0, 5},
};
static arc arcs_73_6[2] = {
- {28, 7},
+ {29, 4},
{0, 6},
};
-static arc arcs_73_7[1] = {
- {23, 2},
+static arc arcs_73_7[2] = {
+ {28, 8},
+ {0, 7},
};
-static state states_73[8] = {
+static arc arcs_73_8[1] = {
+ {23, 9},
+};
+static arc arcs_73_9[1] = {
+ {28, 10},
+};
+static arc arcs_73_10[2] = {
+ {29, 7},
+ {0, 10},
+};
+static state states_73[11] = {
{1, arcs_73_0},
- {3, arcs_73_1},
+ {4, arcs_73_1},
{1, arcs_73_2},
- {2, arcs_73_3},
+ {1, arcs_73_3},
{2, arcs_73_4},
- {2, arcs_73_5},
+ {3, arcs_73_5},
{2, arcs_73_6},
- {1, arcs_73_7},
+ {2, arcs_73_7},
+ {1, arcs_73_8},
+ {1, arcs_73_9},
+ {2, arcs_73_10},
};
static arc arcs_74_0[1] = {
{162, 1},
@@ -1964,7 +1979,7 @@
"\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"},
@@ -1982,7 +1997,7 @@
"\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, "dictorsetmaker", 0, 8, states_73,
+ {329, "dictorsetmaker", 0, 11, states_73,
"\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\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"},
@@ -1996,11 +2011,11 @@
"\000\000\000\000\000\000\000\000\000\000\000\000\001\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\020\000\000\000\000\000\000\000\000\000\000"},
- {336, "gen_iter", 0, 2, states_80,
+ {336, "comp_iter", 0, 2, states_80,
"\000\000\000\000\000\000\000\000\000\000\000\020\001\000\000\000\000\000\000\000\000\000"},
- {337, "gen_for", 0, 6, states_81,
+ {337, "comp_for", 0, 6, states_81,
"\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
- {338, "gen_if", 0, 4, states_82,
+ {338, "comp_if", 0, 4, states_82,
"\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"},
{339, "testlist1", 0, 2, states_83,
"\000\040\040\000\000\000\000\000\000\000\000\000\000\040\010\000\200\041\044\015\000\000"},