Checkpoint. 218 tests are okay; 53 are failing. Done so far:
- all classes are new-style (but ripping out classobject.[ch] isn't done)
- int/int -> float
- all exceptions must derive from BaseException
- absolute import
- 'as' and 'with' are keywords
diff --git a/Python/graminit.c b/Python/graminit.c
index 1853ca4..40f1770 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -556,9 +556,8 @@
static arc arcs_27_0[1] = {
{19, 1},
};
-static arc arcs_27_1[3] = {
+static arc arcs_27_1[2] = {
{78, 2},
- {19, 2},
{0, 1},
};
static arc arcs_27_2[1] = {
@@ -569,16 +568,15 @@
};
static state states_27[4] = {
{1, arcs_27_0},
- {3, arcs_27_1},
+ {2, arcs_27_1},
{1, arcs_27_2},
{1, arcs_27_3},
};
static arc arcs_28_0[1] = {
{12, 1},
};
-static arc arcs_28_1[3] = {
+static arc arcs_28_1[2] = {
{78, 2},
- {19, 2},
{0, 1},
};
static arc arcs_28_2[1] = {
@@ -589,7 +587,7 @@
};
static state states_28[4] = {
{1, arcs_28_0},
- {3, arcs_28_1},
+ {2, arcs_28_1},
{1, arcs_28_2},
{1, arcs_28_3},
};
@@ -917,9 +915,8 @@
{1, arcs_40_4},
{1, arcs_40_5},
};
-static arc arcs_41_0[2] = {
+static arc arcs_41_0[1] = {
{78, 1},
- {19, 1},
};
static arc arcs_41_1[1] = {
{82, 2},
@@ -928,7 +925,7 @@
{0, 2},
};
static state states_41[3] = {
- {2, arcs_41_0},
+ {1, arcs_41_0},
{1, arcs_41_1},
{1, arcs_41_2},
};
@@ -1870,7 +1867,7 @@
{296, "with_stmt", 0, 6, states_40,
"\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000"},
{297, "with_var", 0, 3, states_41,
- "\000\000\010\000\000\000\000\000\000\100\000\000\000\000\000\000\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\000"},
{298, "except_clause", 0, 5, states_42,
"\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000"},
{299, "suite", 0, 5, states_43,