PEP 343 -- the with-statement.
This was started by Mike Bland and completed by Guido
(with help from Neal).
This still needs a __future__ statement added;
Thomas is working on Michael's patch for that aspect.
There's a small amount of code cleanup and refactoring
in ast.c, compile.c and ceval.c (I fixed the lltrace
behavior when EXT_POP is used -- however I had to make
lltrace a static global).
diff --git a/Python/graminit.c b/Python/graminit.c
index faca879..c56d1a8 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -688,23 +688,24 @@
{1, arcs_34_3},
{1, arcs_34_4},
};
-static arc arcs_35_0[6] = {
+static arc arcs_35_0[7] = {
{84, 1},
{85, 1},
{86, 1},
{87, 1},
- {17, 1},
{88, 1},
+ {17, 1},
+ {89, 1},
};
static arc arcs_35_1[1] = {
{0, 1},
};
static state states_35[2] = {
- {6, arcs_35_0},
+ {7, arcs_35_0},
{1, arcs_35_1},
};
static arc arcs_36_0[1] = {
- {89, 1},
+ {90, 1},
};
static arc arcs_36_1[1] = {
{26, 2},
@@ -716,8 +717,8 @@
{22, 4},
};
static arc arcs_36_4[3] = {
- {90, 1},
- {91, 5},
+ {91, 1},
+ {92, 5},
{0, 4},
};
static arc arcs_36_5[1] = {
@@ -740,7 +741,7 @@
{1, arcs_36_7},
};
static arc arcs_37_0[1] = {
- {92, 1},
+ {93, 1},
};
static arc arcs_37_1[1] = {
{26, 2},
@@ -752,7 +753,7 @@
{22, 4},
};
static arc arcs_37_4[2] = {
- {91, 5},
+ {92, 5},
{0, 4},
};
static arc arcs_37_5[1] = {
@@ -775,7 +776,7 @@
{1, arcs_37_7},
};
static arc arcs_38_0[1] = {
- {93, 1},
+ {94, 1},
};
static arc arcs_38_1[1] = {
{59, 2},
@@ -793,7 +794,7 @@
{22, 6},
};
static arc arcs_38_6[2] = {
- {91, 7},
+ {92, 7},
{0, 6},
};
static arc arcs_38_7[1] = {
@@ -818,7 +819,7 @@
{1, arcs_38_9},
};
static arc arcs_39_0[1] = {
- {94, 1},
+ {95, 1},
};
static arc arcs_39_1[1] = {
{21, 2},
@@ -827,8 +828,8 @@
{22, 3},
};
static arc arcs_39_3[2] = {
- {95, 4},
- {96, 5},
+ {96, 4},
+ {97, 5},
};
static arc arcs_39_4[1] = {
{21, 6},
@@ -843,9 +844,9 @@
{22, 9},
};
static arc arcs_39_8[4] = {
- {95, 4},
- {91, 10},
- {96, 5},
+ {96, 4},
+ {92, 10},
+ {97, 5},
{0, 8},
};
static arc arcs_39_9[1] = {
@@ -858,7 +859,7 @@
{22, 12},
};
static arc arcs_39_12[2] = {
- {96, 5},
+ {97, 5},
{0, 12},
};
static state states_39[13] = {
@@ -877,179 +878,194 @@
{2, arcs_39_12},
};
static arc arcs_40_0[1] = {
- {97, 1},
+ {98, 1},
};
-static arc arcs_40_1[2] = {
+static arc arcs_40_1[1] = {
{26, 2},
- {0, 1},
};
static arc arcs_40_2[2] = {
- {27, 3},
- {0, 2},
+ {99, 3},
+ {21, 4},
};
static arc arcs_40_3[1] = {
- {26, 4},
+ {21, 4},
};
static arc arcs_40_4[1] = {
- {0, 4},
+ {22, 5},
};
-static state states_40[5] = {
+static arc arcs_40_5[1] = {
+ {0, 5},
+};
+static state states_40[6] = {
{1, arcs_40_0},
- {2, arcs_40_1},
+ {1, arcs_40_1},
{2, arcs_40_2},
{1, arcs_40_3},
{1, arcs_40_4},
+ {1, arcs_40_5},
};
-static arc arcs_41_0[2] = {
- {3, 1},
- {2, 2},
+static arc arcs_41_0[1] = {
+ {19, 1},
};
static arc arcs_41_1[1] = {
- {0, 1},
+ {81, 2},
};
static arc arcs_41_2[1] = {
- {98, 3},
+ {0, 2},
};
-static arc arcs_41_3[1] = {
- {6, 4},
-};
-static arc arcs_41_4[2] = {
- {6, 4},
- {99, 1},
-};
-static state states_41[5] = {
- {2, arcs_41_0},
+static state states_41[3] = {
+ {1, arcs_41_0},
{1, arcs_41_1},
{1, arcs_41_2},
- {1, arcs_41_3},
- {2, arcs_41_4},
};
static arc arcs_42_0[1] = {
- {101, 1},
+ {100, 1},
};
static arc arcs_42_1[2] = {
- {27, 2},
+ {26, 2},
{0, 1},
};
-static arc arcs_42_2[1] = {
- {101, 3},
+static arc arcs_42_2[2] = {
+ {27, 3},
+ {0, 2},
};
-static arc arcs_42_3[2] = {
- {27, 4},
- {0, 3},
+static arc arcs_42_3[1] = {
+ {26, 4},
};
-static arc arcs_42_4[2] = {
- {101, 3},
+static arc arcs_42_4[1] = {
{0, 4},
};
static state states_42[5] = {
{1, arcs_42_0},
{2, arcs_42_1},
- {1, arcs_42_2},
- {2, arcs_42_3},
- {2, arcs_42_4},
+ {2, arcs_42_2},
+ {1, arcs_42_3},
+ {1, arcs_42_4},
};
static arc arcs_43_0[2] = {
- {102, 1},
- {103, 1},
+ {3, 1},
+ {2, 2},
};
static arc arcs_43_1[1] = {
{0, 1},
};
-static state states_43[2] = {
+static arc arcs_43_2[1] = {
+ {101, 3},
+};
+static arc arcs_43_3[1] = {
+ {6, 4},
+};
+static arc arcs_43_4[2] = {
+ {6, 4},
+ {102, 1},
+};
+static state states_43[5] = {
{2, arcs_43_0},
{1, arcs_43_1},
+ {1, arcs_43_2},
+ {1, arcs_43_3},
+ {2, arcs_43_4},
};
static arc arcs_44_0[1] = {
{104, 1},
};
static arc arcs_44_1[2] = {
- {23, 2},
- {21, 3},
+ {27, 2},
+ {0, 1},
};
static arc arcs_44_2[1] = {
- {21, 3},
+ {104, 3},
};
-static arc arcs_44_3[1] = {
- {101, 4},
+static arc arcs_44_3[2] = {
+ {27, 4},
+ {0, 3},
};
-static arc arcs_44_4[1] = {
+static arc arcs_44_4[2] = {
+ {104, 3},
{0, 4},
};
static state states_44[5] = {
{1, arcs_44_0},
{2, arcs_44_1},
{1, arcs_44_2},
- {1, arcs_44_3},
- {1, arcs_44_4},
+ {2, arcs_44_3},
+ {2, arcs_44_4},
};
static arc arcs_45_0[2] = {
- {102, 1},
- {105, 2},
-};
-static arc arcs_45_1[2] = {
- {89, 3},
- {0, 1},
-};
-static arc arcs_45_2[1] = {
- {0, 2},
-};
-static arc arcs_45_3[1] = {
- {102, 4},
-};
-static arc arcs_45_4[1] = {
- {91, 5},
-};
-static arc arcs_45_5[1] = {
- {26, 2},
-};
-static state states_45[6] = {
- {2, arcs_45_0},
- {2, arcs_45_1},
- {1, arcs_45_2},
- {1, arcs_45_3},
- {1, arcs_45_4},
- {1, arcs_45_5},
-};
-static arc arcs_46_0[1] = {
+ {105, 1},
{106, 1},
};
-static arc arcs_46_1[2] = {
- {107, 0},
+static arc arcs_45_1[1] = {
{0, 1},
};
-static state states_46[2] = {
+static state states_45[2] = {
+ {2, arcs_45_0},
+ {1, arcs_45_1},
+};
+static arc arcs_46_0[1] = {
+ {107, 1},
+};
+static arc arcs_46_1[2] = {
+ {23, 2},
+ {21, 3},
+};
+static arc arcs_46_2[1] = {
+ {21, 3},
+};
+static arc arcs_46_3[1] = {
+ {104, 4},
+};
+static arc arcs_46_4[1] = {
+ {0, 4},
+};
+static state states_46[5] = {
{1, arcs_46_0},
{2, arcs_46_1},
+ {1, arcs_46_2},
+ {1, arcs_46_3},
+ {1, arcs_46_4},
};
-static arc arcs_47_0[1] = {
- {108, 1},
-};
-static arc arcs_47_1[2] = {
- {109, 0},
- {0, 1},
-};
-static state states_47[2] = {
- {1, arcs_47_0},
- {2, arcs_47_1},
-};
-static arc arcs_48_0[2] = {
- {110, 1},
- {111, 2},
-};
-static arc arcs_48_1[1] = {
+static arc arcs_47_0[2] = {
+ {105, 1},
{108, 2},
};
-static arc arcs_48_2[1] = {
+static arc arcs_47_1[2] = {
+ {90, 3},
+ {0, 1},
+};
+static arc arcs_47_2[1] = {
{0, 2},
};
-static state states_48[3] = {
- {2, arcs_48_0},
- {1, arcs_48_1},
- {1, arcs_48_2},
+static arc arcs_47_3[1] = {
+ {105, 4},
+};
+static arc arcs_47_4[1] = {
+ {92, 5},
+};
+static arc arcs_47_5[1] = {
+ {26, 2},
+};
+static state states_47[6] = {
+ {2, arcs_47_0},
+ {2, arcs_47_1},
+ {1, arcs_47_2},
+ {1, arcs_47_3},
+ {1, arcs_47_4},
+ {1, arcs_47_5},
+};
+static arc arcs_48_0[1] = {
+ {109, 1},
+};
+static arc arcs_48_1[2] = {
+ {110, 0},
+ {0, 1},
+};
+static state states_48[2] = {
+ {1, arcs_48_0},
+ {2, arcs_48_1},
};
static arc arcs_49_0[1] = {
- {81, 1},
+ {111, 1},
};
static arc arcs_49_1[2] = {
{112, 0},
@@ -1059,61 +1075,65 @@
{1, arcs_49_0},
{2, arcs_49_1},
};
-static arc arcs_50_0[10] = {
+static arc arcs_50_0[2] = {
{113, 1},
- {114, 1},
- {115, 1},
- {116, 1},
- {117, 1},
- {118, 1},
- {119, 1},
- {82, 1},
- {110, 2},
- {120, 3},
+ {114, 2},
};
static arc arcs_50_1[1] = {
- {0, 1},
+ {111, 2},
};
static arc arcs_50_2[1] = {
- {82, 1},
+ {0, 2},
};
-static arc arcs_50_3[2] = {
- {110, 1},
- {0, 3},
-};
-static state states_50[4] = {
- {10, arcs_50_0},
+static state states_50[3] = {
+ {2, arcs_50_0},
{1, arcs_50_1},
{1, arcs_50_2},
- {2, arcs_50_3},
};
static arc arcs_51_0[1] = {
- {121, 1},
+ {81, 1},
};
static arc arcs_51_1[2] = {
- {122, 0},
+ {115, 0},
{0, 1},
};
static state states_51[2] = {
{1, arcs_51_0},
{2, arcs_51_1},
};
-static arc arcs_52_0[1] = {
- {123, 1},
+static arc arcs_52_0[10] = {
+ {116, 1},
+ {117, 1},
+ {118, 1},
+ {119, 1},
+ {120, 1},
+ {121, 1},
+ {122, 1},
+ {82, 1},
+ {113, 2},
+ {123, 3},
};
-static arc arcs_52_1[2] = {
- {124, 0},
+static arc arcs_52_1[1] = {
{0, 1},
};
-static state states_52[2] = {
- {1, arcs_52_0},
- {2, arcs_52_1},
+static arc arcs_52_2[1] = {
+ {82, 1},
+};
+static arc arcs_52_3[2] = {
+ {113, 1},
+ {0, 3},
+};
+static state states_52[4] = {
+ {10, arcs_52_0},
+ {1, arcs_52_1},
+ {1, arcs_52_2},
+ {2, arcs_52_3},
};
static arc arcs_53_0[1] = {
- {125, 1},
+ {124, 1},
};
static arc arcs_53_1[2] = {
- {126, 0},
+ {125, 0},
{0, 1},
};
static state states_53[2] = {
@@ -1121,622 +1141,644 @@
{2, arcs_53_1},
};
static arc arcs_54_0[1] = {
- {127, 1},
+ {126, 1},
};
-static arc arcs_54_1[3] = {
- {128, 0},
- {57, 0},
+static arc arcs_54_1[2] = {
+ {127, 0},
{0, 1},
};
static state states_54[2] = {
{1, arcs_54_0},
- {3, arcs_54_1},
+ {2, arcs_54_1},
};
static arc arcs_55_0[1] = {
- {129, 1},
+ {128, 1},
};
-static arc arcs_55_1[3] = {
- {130, 0},
- {131, 0},
+static arc arcs_55_1[2] = {
+ {129, 0},
{0, 1},
};
static state states_55[2] = {
{1, arcs_55_0},
- {3, arcs_55_1},
+ {2, arcs_55_1},
};
static arc arcs_56_0[1] = {
- {132, 1},
+ {130, 1},
};
-static arc arcs_56_1[5] = {
- {28, 0},
- {133, 0},
- {134, 0},
- {135, 0},
+static arc arcs_56_1[3] = {
+ {131, 0},
+ {57, 0},
{0, 1},
};
static state states_56[2] = {
{1, arcs_56_0},
- {5, arcs_56_1},
+ {3, arcs_56_1},
};
-static arc arcs_57_0[4] = {
- {130, 1},
- {131, 1},
- {136, 1},
- {137, 2},
+static arc arcs_57_0[1] = {
+ {132, 1},
};
-static arc arcs_57_1[1] = {
- {132, 2},
+static arc arcs_57_1[3] = {
+ {133, 0},
+ {134, 0},
+ {0, 1},
};
-static arc arcs_57_2[1] = {
- {0, 2},
-};
-static state states_57[3] = {
- {4, arcs_57_0},
- {1, arcs_57_1},
- {1, arcs_57_2},
+static state states_57[2] = {
+ {1, arcs_57_0},
+ {3, arcs_57_1},
};
static arc arcs_58_0[1] = {
- {138, 1},
+ {135, 1},
};
-static arc arcs_58_1[3] = {
+static arc arcs_58_1[5] = {
+ {28, 0},
+ {136, 0},
+ {137, 0},
+ {138, 0},
+ {0, 1},
+};
+static state states_58[2] = {
+ {1, arcs_58_0},
+ {5, arcs_58_1},
+};
+static arc arcs_59_0[4] = {
+ {133, 1},
+ {134, 1},
{139, 1},
+ {140, 2},
+};
+static arc arcs_59_1[1] = {
+ {135, 2},
+};
+static arc arcs_59_2[1] = {
+ {0, 2},
+};
+static state states_59[3] = {
+ {4, arcs_59_0},
+ {1, arcs_59_1},
+ {1, arcs_59_2},
+};
+static arc arcs_60_0[1] = {
+ {141, 1},
+};
+static arc arcs_60_1[3] = {
+ {142, 1},
{29, 2},
{0, 1},
};
-static arc arcs_58_2[1] = {
- {132, 3},
-};
-static arc arcs_58_3[1] = {
- {0, 3},
-};
-static state states_58[4] = {
- {1, arcs_58_0},
- {3, arcs_58_1},
- {1, arcs_58_2},
- {1, arcs_58_3},
-};
-static arc arcs_59_0[7] = {
- {13, 1},
- {141, 2},
- {144, 3},
- {147, 4},
- {19, 5},
- {149, 5},
- {150, 6},
-};
-static arc arcs_59_1[3] = {
- {43, 7},
- {140, 7},
- {15, 5},
-};
-static arc arcs_59_2[2] = {
- {142, 8},
- {143, 5},
-};
-static arc arcs_59_3[2] = {
- {145, 9},
- {146, 5},
-};
-static arc arcs_59_4[1] = {
- {148, 10},
-};
-static arc arcs_59_5[1] = {
- {0, 5},
-};
-static arc arcs_59_6[2] = {
- {150, 6},
- {0, 6},
-};
-static arc arcs_59_7[1] = {
- {15, 5},
-};
-static arc arcs_59_8[1] = {
- {143, 5},
-};
-static arc arcs_59_9[1] = {
- {146, 5},
-};
-static arc arcs_59_10[1] = {
- {147, 5},
-};
-static state states_59[11] = {
- {7, arcs_59_0},
- {3, arcs_59_1},
- {2, arcs_59_2},
- {2, arcs_59_3},
- {1, arcs_59_4},
- {1, arcs_59_5},
- {2, arcs_59_6},
- {1, arcs_59_7},
- {1, arcs_59_8},
- {1, arcs_59_9},
- {1, arcs_59_10},
-};
-static arc arcs_60_0[1] = {
- {26, 1},
-};
-static arc arcs_60_1[3] = {
- {151, 2},
- {27, 3},
- {0, 1},
-};
static arc arcs_60_2[1] = {
- {0, 2},
+ {135, 3},
};
-static arc arcs_60_3[2] = {
- {26, 4},
+static arc arcs_60_3[1] = {
{0, 3},
};
-static arc arcs_60_4[2] = {
- {27, 3},
- {0, 4},
-};
-static state states_60[5] = {
+static state states_60[4] = {
{1, arcs_60_0},
{3, arcs_60_1},
{1, arcs_60_2},
- {2, arcs_60_3},
- {2, arcs_60_4},
+ {1, arcs_60_3},
};
-static arc arcs_61_0[1] = {
- {26, 1},
+static arc arcs_61_0[7] = {
+ {13, 1},
+ {144, 2},
+ {147, 3},
+ {150, 4},
+ {19, 5},
+ {152, 5},
+ {153, 6},
};
static arc arcs_61_1[3] = {
- {152, 2},
+ {43, 7},
+ {143, 7},
+ {15, 5},
+};
+static arc arcs_61_2[2] = {
+ {145, 8},
+ {146, 5},
+};
+static arc arcs_61_3[2] = {
+ {148, 9},
+ {149, 5},
+};
+static arc arcs_61_4[1] = {
+ {151, 10},
+};
+static arc arcs_61_5[1] = {
+ {0, 5},
+};
+static arc arcs_61_6[2] = {
+ {153, 6},
+ {0, 6},
+};
+static arc arcs_61_7[1] = {
+ {15, 5},
+};
+static arc arcs_61_8[1] = {
+ {146, 5},
+};
+static arc arcs_61_9[1] = {
+ {149, 5},
+};
+static arc arcs_61_10[1] = {
+ {150, 5},
+};
+static state states_61[11] = {
+ {7, arcs_61_0},
+ {3, arcs_61_1},
+ {2, arcs_61_2},
+ {2, arcs_61_3},
+ {1, arcs_61_4},
+ {1, arcs_61_5},
+ {2, arcs_61_6},
+ {1, arcs_61_7},
+ {1, arcs_61_8},
+ {1, arcs_61_9},
+ {1, arcs_61_10},
+};
+static arc arcs_62_0[1] = {
+ {26, 1},
+};
+static arc arcs_62_1[3] = {
+ {154, 2},
{27, 3},
{0, 1},
};
-static arc arcs_61_2[1] = {
+static arc arcs_62_2[1] = {
{0, 2},
};
-static arc arcs_61_3[2] = {
+static arc arcs_62_3[2] = {
{26, 4},
{0, 3},
};
-static arc arcs_61_4[2] = {
+static arc arcs_62_4[2] = {
{27, 3},
{0, 4},
};
-static state states_61[5] = {
- {1, arcs_61_0},
- {3, arcs_61_1},
- {1, arcs_61_2},
- {2, arcs_61_3},
- {2, arcs_61_4},
-};
-static arc arcs_62_0[1] = {
- {104, 1},
-};
-static arc arcs_62_1[2] = {
- {23, 2},
- {21, 3},
-};
-static arc arcs_62_2[1] = {
- {21, 3},
-};
-static arc arcs_62_3[1] = {
- {26, 4},
-};
-static arc arcs_62_4[1] = {
- {0, 4},
-};
static state states_62[5] = {
{1, arcs_62_0},
- {2, arcs_62_1},
+ {3, arcs_62_1},
{1, arcs_62_2},
- {1, arcs_62_3},
- {1, arcs_62_4},
+ {2, arcs_62_3},
+ {2, arcs_62_4},
};
-static arc arcs_63_0[3] = {
+static arc arcs_63_0[1] = {
+ {26, 1},
+};
+static arc arcs_63_1[3] = {
+ {155, 2},
+ {27, 3},
+ {0, 1},
+};
+static arc arcs_63_2[1] = {
+ {0, 2},
+};
+static arc arcs_63_3[2] = {
+ {26, 4},
+ {0, 3},
+};
+static arc arcs_63_4[2] = {
+ {27, 3},
+ {0, 4},
+};
+static state states_63[5] = {
+ {1, arcs_63_0},
+ {3, arcs_63_1},
+ {1, arcs_63_2},
+ {2, arcs_63_3},
+ {2, arcs_63_4},
+};
+static arc arcs_64_0[1] = {
+ {107, 1},
+};
+static arc arcs_64_1[2] = {
+ {23, 2},
+ {21, 3},
+};
+static arc arcs_64_2[1] = {
+ {21, 3},
+};
+static arc arcs_64_3[1] = {
+ {26, 4},
+};
+static arc arcs_64_4[1] = {
+ {0, 4},
+};
+static state states_64[5] = {
+ {1, arcs_64_0},
+ {2, arcs_64_1},
+ {1, arcs_64_2},
+ {1, arcs_64_3},
+ {1, arcs_64_4},
+};
+static arc arcs_65_0[3] = {
{13, 1},
- {141, 2},
+ {144, 2},
{75, 3},
};
-static arc arcs_63_1[2] = {
+static arc arcs_65_1[2] = {
{14, 4},
{15, 5},
};
-static arc arcs_63_2[1] = {
- {153, 6},
+static arc arcs_65_2[1] = {
+ {156, 6},
};
-static arc arcs_63_3[1] = {
+static arc arcs_65_3[1] = {
{19, 5},
};
-static arc arcs_63_4[1] = {
+static arc arcs_65_4[1] = {
{15, 5},
};
-static arc arcs_63_5[1] = {
- {0, 5},
-};
-static arc arcs_63_6[1] = {
- {143, 5},
-};
-static state states_63[7] = {
- {3, arcs_63_0},
- {2, arcs_63_1},
- {1, arcs_63_2},
- {1, arcs_63_3},
- {1, arcs_63_4},
- {1, arcs_63_5},
- {1, arcs_63_6},
-};
-static arc arcs_64_0[1] = {
- {154, 1},
-};
-static arc arcs_64_1[2] = {
- {27, 2},
- {0, 1},
-};
-static arc arcs_64_2[2] = {
- {154, 1},
- {0, 2},
-};
-static state states_64[3] = {
- {1, arcs_64_0},
- {2, arcs_64_1},
- {2, arcs_64_2},
-};
-static arc arcs_65_0[3] = {
- {75, 1},
- {26, 2},
- {21, 3},
-};
-static arc arcs_65_1[1] = {
- {75, 4},
-};
-static arc arcs_65_2[2] = {
- {21, 3},
- {0, 2},
-};
-static arc arcs_65_3[3] = {
- {26, 5},
- {155, 6},
- {0, 3},
-};
-static arc arcs_65_4[1] = {
- {75, 6},
-};
-static arc arcs_65_5[2] = {
- {155, 6},
+static arc arcs_65_5[1] = {
{0, 5},
};
static arc arcs_65_6[1] = {
- {0, 6},
+ {146, 5},
};
static state states_65[7] = {
{3, arcs_65_0},
- {1, arcs_65_1},
- {2, arcs_65_2},
- {3, arcs_65_3},
+ {2, arcs_65_1},
+ {1, arcs_65_2},
+ {1, arcs_65_3},
{1, arcs_65_4},
- {2, arcs_65_5},
+ {1, arcs_65_5},
{1, arcs_65_6},
};
static arc arcs_66_0[1] = {
- {21, 1},
+ {157, 1},
};
static arc arcs_66_1[2] = {
- {26, 2},
+ {27, 2},
{0, 1},
};
-static arc arcs_66_2[1] = {
+static arc arcs_66_2[2] = {
+ {157, 1},
{0, 2},
};
static state states_66[3] = {
{1, arcs_66_0},
{2, arcs_66_1},
- {1, arcs_66_2},
+ {2, arcs_66_2},
};
-static arc arcs_67_0[1] = {
- {81, 1},
+static arc arcs_67_0[3] = {
+ {75, 1},
+ {26, 2},
+ {21, 3},
};
-static arc arcs_67_1[2] = {
- {27, 2},
- {0, 1},
+static arc arcs_67_1[1] = {
+ {75, 4},
};
static arc arcs_67_2[2] = {
- {81, 1},
+ {21, 3},
{0, 2},
};
-static state states_67[3] = {
- {1, arcs_67_0},
- {2, arcs_67_1},
+static arc arcs_67_3[3] = {
+ {26, 5},
+ {158, 6},
+ {0, 3},
+};
+static arc arcs_67_4[1] = {
+ {75, 6},
+};
+static arc arcs_67_5[2] = {
+ {158, 6},
+ {0, 5},
+};
+static arc arcs_67_6[1] = {
+ {0, 6},
+};
+static state states_67[7] = {
+ {3, arcs_67_0},
+ {1, arcs_67_1},
{2, arcs_67_2},
+ {3, arcs_67_3},
+ {1, arcs_67_4},
+ {2, arcs_67_5},
+ {1, arcs_67_6},
};
static arc arcs_68_0[1] = {
- {26, 1},
+ {21, 1},
};
static arc arcs_68_1[2] = {
- {27, 2},
+ {26, 2},
{0, 1},
};
-static arc arcs_68_2[2] = {
- {26, 1},
+static arc arcs_68_2[1] = {
{0, 2},
};
static state states_68[3] = {
{1, arcs_68_0},
{2, arcs_68_1},
- {2, arcs_68_2},
+ {1, arcs_68_2},
};
static arc arcs_69_0[1] = {
+ {81, 1},
+};
+static arc arcs_69_1[2] = {
+ {27, 2},
+ {0, 1},
+};
+static arc arcs_69_2[2] = {
+ {81, 1},
+ {0, 2},
+};
+static state states_69[3] = {
+ {1, arcs_69_0},
+ {2, arcs_69_1},
+ {2, arcs_69_2},
+};
+static arc arcs_70_0[1] = {
{26, 1},
};
-static arc arcs_69_1[1] = {
+static arc arcs_70_1[2] = {
+ {27, 2},
+ {0, 1},
+};
+static arc arcs_70_2[2] = {
+ {26, 1},
+ {0, 2},
+};
+static state states_70[3] = {
+ {1, arcs_70_0},
+ {2, arcs_70_1},
+ {2, arcs_70_2},
+};
+static arc arcs_71_0[1] = {
+ {26, 1},
+};
+static arc arcs_71_1[1] = {
{21, 2},
};
-static arc arcs_69_2[1] = {
+static arc arcs_71_2[1] = {
{26, 3},
};
-static arc arcs_69_3[2] = {
+static arc arcs_71_3[2] = {
{27, 4},
{0, 3},
};
-static arc arcs_69_4[2] = {
+static arc arcs_71_4[2] = {
{26, 1},
{0, 4},
};
-static state states_69[5] = {
- {1, arcs_69_0},
- {1, arcs_69_1},
- {1, arcs_69_2},
- {2, arcs_69_3},
- {2, arcs_69_4},
+static state states_71[5] = {
+ {1, arcs_71_0},
+ {1, arcs_71_1},
+ {1, arcs_71_2},
+ {2, arcs_71_3},
+ {2, arcs_71_4},
};
-static arc arcs_70_0[1] = {
- {156, 1},
+static arc arcs_72_0[1] = {
+ {159, 1},
};
-static arc arcs_70_1[1] = {
+static arc arcs_72_1[1] = {
{19, 2},
};
-static arc arcs_70_2[2] = {
+static arc arcs_72_2[2] = {
{13, 3},
{21, 4},
};
-static arc arcs_70_3[2] = {
+static arc arcs_72_3[2] = {
{9, 5},
{15, 6},
};
-static arc arcs_70_4[1] = {
+static arc arcs_72_4[1] = {
{22, 7},
};
-static arc arcs_70_5[1] = {
+static arc arcs_72_5[1] = {
{15, 6},
};
-static arc arcs_70_6[1] = {
+static arc arcs_72_6[1] = {
{21, 4},
};
-static arc arcs_70_7[1] = {
+static arc arcs_72_7[1] = {
{0, 7},
};
-static state states_70[8] = {
- {1, arcs_70_0},
- {1, arcs_70_1},
- {2, arcs_70_2},
- {2, arcs_70_3},
- {1, arcs_70_4},
- {1, arcs_70_5},
- {1, arcs_70_6},
- {1, arcs_70_7},
+static state states_72[8] = {
+ {1, arcs_72_0},
+ {1, arcs_72_1},
+ {2, arcs_72_2},
+ {2, arcs_72_3},
+ {1, arcs_72_4},
+ {1, arcs_72_5},
+ {1, arcs_72_6},
+ {1, arcs_72_7},
};
-static arc arcs_71_0[3] = {
- {157, 1},
+static arc arcs_73_0[3] = {
+ {160, 1},
{28, 2},
{29, 3},
};
-static arc arcs_71_1[2] = {
+static arc arcs_73_1[2] = {
{27, 4},
{0, 1},
};
-static arc arcs_71_2[1] = {
+static arc arcs_73_2[1] = {
{26, 5},
};
-static arc arcs_71_3[1] = {
+static arc arcs_73_3[1] = {
{26, 6},
};
-static arc arcs_71_4[4] = {
- {157, 1},
+static arc arcs_73_4[4] = {
+ {160, 1},
{28, 2},
{29, 3},
{0, 4},
};
-static arc arcs_71_5[2] = {
+static arc arcs_73_5[2] = {
{27, 7},
{0, 5},
};
-static arc arcs_71_6[1] = {
+static arc arcs_73_6[1] = {
{0, 6},
};
-static arc arcs_71_7[1] = {
+static arc arcs_73_7[1] = {
{29, 3},
};
-static state states_71[8] = {
- {3, arcs_71_0},
- {2, arcs_71_1},
- {1, arcs_71_2},
- {1, arcs_71_3},
- {4, arcs_71_4},
- {2, arcs_71_5},
- {1, arcs_71_6},
- {1, arcs_71_7},
+static state states_73[8] = {
+ {3, arcs_73_0},
+ {2, arcs_73_1},
+ {1, arcs_73_2},
+ {1, arcs_73_3},
+ {4, arcs_73_4},
+ {2, arcs_73_5},
+ {1, arcs_73_6},
+ {1, arcs_73_7},
};
-static arc arcs_72_0[1] = {
+static arc arcs_74_0[1] = {
{26, 1},
};
-static arc arcs_72_1[3] = {
- {152, 2},
+static arc arcs_74_1[3] = {
+ {155, 2},
{25, 3},
{0, 1},
};
-static arc arcs_72_2[1] = {
- {0, 2},
-};
-static arc arcs_72_3[1] = {
- {26, 2},
-};
-static state states_72[4] = {
- {1, arcs_72_0},
- {3, arcs_72_1},
- {1, arcs_72_2},
- {1, arcs_72_3},
-};
-static arc arcs_73_0[2] = {
- {151, 1},
- {159, 1},
-};
-static arc arcs_73_1[1] = {
- {0, 1},
-};
-static state states_73[2] = {
- {2, arcs_73_0},
- {1, arcs_73_1},
-};
-static arc arcs_74_0[1] = {
- {93, 1},
-};
-static arc arcs_74_1[1] = {
- {59, 2},
-};
static arc arcs_74_2[1] = {
- {82, 3},
+ {0, 2},
};
static arc arcs_74_3[1] = {
- {100, 4},
+ {26, 2},
};
-static arc arcs_74_4[2] = {
- {158, 5},
- {0, 4},
-};
-static arc arcs_74_5[1] = {
- {0, 5},
-};
-static state states_74[6] = {
+static state states_74[4] = {
{1, arcs_74_0},
- {1, arcs_74_1},
+ {3, arcs_74_1},
{1, arcs_74_2},
{1, arcs_74_3},
- {2, arcs_74_4},
- {1, arcs_74_5},
};
-static arc arcs_75_0[1] = {
- {89, 1},
+static arc arcs_75_0[2] = {
+ {154, 1},
+ {162, 1},
};
static arc arcs_75_1[1] = {
- {26, 2},
-};
-static arc arcs_75_2[2] = {
- {158, 3},
- {0, 2},
-};
-static arc arcs_75_3[1] = {
- {0, 3},
-};
-static state states_75[4] = {
- {1, arcs_75_0},
- {1, arcs_75_1},
- {2, arcs_75_2},
- {1, arcs_75_3},
-};
-static arc arcs_76_0[2] = {
- {152, 1},
- {161, 1},
-};
-static arc arcs_76_1[1] = {
{0, 1},
};
-static state states_76[2] = {
- {2, arcs_76_0},
- {1, arcs_76_1},
+static state states_75[2] = {
+ {2, arcs_75_0},
+ {1, arcs_75_1},
};
-static arc arcs_77_0[1] = {
- {93, 1},
+static arc arcs_76_0[1] = {
+ {94, 1},
};
-static arc arcs_77_1[1] = {
+static arc arcs_76_1[1] = {
{59, 2},
};
-static arc arcs_77_2[1] = {
+static arc arcs_76_2[1] = {
{82, 3},
};
-static arc arcs_77_3[1] = {
- {102, 4},
+static arc arcs_76_3[1] = {
+ {103, 4},
};
-static arc arcs_77_4[2] = {
- {160, 5},
+static arc arcs_76_4[2] = {
+ {161, 5},
{0, 4},
};
-static arc arcs_77_5[1] = {
+static arc arcs_76_5[1] = {
{0, 5},
};
-static state states_77[6] = {
- {1, arcs_77_0},
- {1, arcs_77_1},
- {1, arcs_77_2},
- {1, arcs_77_3},
- {2, arcs_77_4},
- {1, arcs_77_5},
+static state states_76[6] = {
+ {1, arcs_76_0},
+ {1, arcs_76_1},
+ {1, arcs_76_2},
+ {1, arcs_76_3},
+ {2, arcs_76_4},
+ {1, arcs_76_5},
};
-static arc arcs_78_0[1] = {
- {89, 1},
+static arc arcs_77_0[1] = {
+ {90, 1},
};
-static arc arcs_78_1[1] = {
+static arc arcs_77_1[1] = {
{26, 2},
};
-static arc arcs_78_2[2] = {
- {160, 3},
+static arc arcs_77_2[2] = {
+ {161, 3},
{0, 2},
};
-static arc arcs_78_3[1] = {
+static arc arcs_77_3[1] = {
{0, 3},
};
-static state states_78[4] = {
- {1, arcs_78_0},
+static state states_77[4] = {
+ {1, arcs_77_0},
+ {1, arcs_77_1},
+ {2, arcs_77_2},
+ {1, arcs_77_3},
+};
+static arc arcs_78_0[2] = {
+ {155, 1},
+ {164, 1},
+};
+static arc arcs_78_1[1] = {
+ {0, 1},
+};
+static state states_78[2] = {
+ {2, arcs_78_0},
{1, arcs_78_1},
- {2, arcs_78_2},
- {1, arcs_78_3},
};
static arc arcs_79_0[1] = {
+ {94, 1},
+};
+static arc arcs_79_1[1] = {
+ {59, 2},
+};
+static arc arcs_79_2[1] = {
+ {82, 3},
+};
+static arc arcs_79_3[1] = {
+ {105, 4},
+};
+static arc arcs_79_4[2] = {
+ {163, 5},
+ {0, 4},
+};
+static arc arcs_79_5[1] = {
+ {0, 5},
+};
+static state states_79[6] = {
+ {1, arcs_79_0},
+ {1, arcs_79_1},
+ {1, arcs_79_2},
+ {1, arcs_79_3},
+ {2, arcs_79_4},
+ {1, arcs_79_5},
+};
+static arc arcs_80_0[1] = {
+ {90, 1},
+};
+static arc arcs_80_1[1] = {
+ {26, 2},
+};
+static arc arcs_80_2[2] = {
+ {163, 3},
+ {0, 2},
+};
+static arc arcs_80_3[1] = {
+ {0, 3},
+};
+static state states_80[4] = {
+ {1, arcs_80_0},
+ {1, arcs_80_1},
+ {2, arcs_80_2},
+ {1, arcs_80_3},
+};
+static arc arcs_81_0[1] = {
{26, 1},
};
-static arc arcs_79_1[2] = {
+static arc arcs_81_1[2] = {
{27, 0},
{0, 1},
};
-static state states_79[2] = {
- {1, arcs_79_0},
- {2, arcs_79_1},
+static state states_81[2] = {
+ {1, arcs_81_0},
+ {2, arcs_81_1},
};
-static arc arcs_80_0[1] = {
+static arc arcs_82_0[1] = {
{19, 1},
};
-static arc arcs_80_1[1] = {
+static arc arcs_82_1[1] = {
{0, 1},
};
-static state states_80[2] = {
- {1, arcs_80_0},
- {1, arcs_80_1},
+static state states_82[2] = {
+ {1, arcs_82_0},
+ {1, arcs_82_1},
};
-static arc arcs_81_0[1] = {
- {163, 1},
+static arc arcs_83_0[1] = {
+ {166, 1},
};
-static arc arcs_81_1[2] = {
+static arc arcs_83_1[2] = {
{9, 2},
{0, 1},
};
-static arc arcs_81_2[1] = {
+static arc arcs_83_2[1] = {
{0, 2},
};
-static state states_81[3] = {
- {1, arcs_81_0},
- {2, arcs_81_1},
- {1, arcs_81_2},
+static state states_83[3] = {
+ {1, arcs_83_0},
+ {2, arcs_83_1},
+ {1, arcs_83_2},
};
-static dfa dfas[82] = {
+static dfa dfas[84] = {
{256, "single_input", 0, 3, states_0,
- "\004\050\014\000\000\000\000\025\074\205\011\162\000\101\000\000\014\041\151\020\010"},
+ "\004\050\014\000\000\000\000\025\074\205\011\344\004\010\002\000\140\010\111\203\100"},
{257, "file_input", 0, 2, states_1,
- "\204\050\014\000\000\000\000\025\074\205\011\162\000\101\000\000\014\041\151\020\010"},
+ "\204\050\014\000\000\000\000\025\074\205\011\344\004\010\002\000\140\010\111\203\100"},
{258, "eval_input", 0, 3, states_2,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
{259, "decorator", 0, 7, states_3,
"\000\010\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,
@@ -1752,13 +1794,13 @@
{265, "fplist", 0, 3, states_9,
"\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{266, "stmt", 0, 2, states_10,
- "\000\050\014\000\000\000\000\025\074\205\011\162\000\101\000\000\014\041\151\020\010"},
+ "\000\050\014\000\000\000\000\025\074\205\011\344\004\010\002\000\140\010\111\203\100"},
{267, "simple_stmt", 0, 4, states_11,
- "\000\040\010\000\000\000\000\025\074\205\011\000\000\101\000\000\014\041\151\000\010"},
+ "\000\040\010\000\000\000\000\025\074\205\011\000\000\010\002\000\140\010\111\003\100"},
{268, "small_stmt", 0, 2, states_12,
- "\000\040\010\000\000\000\000\025\074\205\011\000\000\101\000\000\014\041\151\000\010"},
+ "\000\040\010\000\000\000\000\025\074\205\011\000\000\010\002\000\140\010\111\003\100"},
{269, "expr_stmt", 0, 6, states_13,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
{270, "augassign", 0, 2, states_14,
"\000\000\000\000\000\360\377\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{271, "print_stmt", 0, 9, states_15,
@@ -1768,7 +1810,7 @@
{273, "pass_stmt", 0, 2, states_17,
"\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{274, "flow_stmt", 0, 2, states_18,
- "\000\000\000\000\000\000\000\000\074\000\000\000\000\000\000\000\000\000\000\000\010"},
+ "\000\000\000\000\000\000\000\000\074\000\000\000\000\000\000\000\000\000\000\000\100"},
{275, "break_stmt", 0, 2, states_19,
"\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000"},
{276, "continue_stmt", 0, 2, states_20,
@@ -1776,7 +1818,7 @@
{277, "return_stmt", 0, 3, states_21,
"\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000"},
{278, "yield_stmt", 0, 2, states_22,
- "\000\000\000\000\000\000\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\000\000\000\000\000\000\000\000\000\000\100"},
{279, "raise_stmt", 0, 7, states_23,
"\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000"},
{280, "import_stmt", 0, 2, states_24,
@@ -1802,101 +1844,105 @@
{290, "assert_stmt", 0, 5, states_34,
"\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000"},
{291, "compound_stmt", 0, 2, states_35,
- "\000\010\004\000\000\000\000\000\000\000\000\162\000\000\000\000\000\000\000\020\000"},
+ "\000\010\004\000\000\000\000\000\000\000\000\344\004\000\000\000\000\000\000\200\000"},
{292, "if_stmt", 0, 8, states_36,
- "\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
{293, "while_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\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
{294, "for_stmt", 0, 10, states_38,
- "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
- {295, "try_stmt", 0, 13, states_39,
"\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
- {296, "except_clause", 0, 5, states_40,
- "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000"},
- {297, "suite", 0, 5, states_41,
- "\004\040\010\000\000\000\000\025\074\205\011\000\000\101\000\000\014\041\151\000\010"},
- {298, "testlist_safe", 0, 5, states_42,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {299, "old_test", 0, 2, states_43,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {300, "old_lambdef", 0, 5, states_44,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"},
- {301, "test", 0, 6, states_45,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {302, "or_test", 0, 2, states_46,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\100\000\000\014\041\151\000\000"},
- {303, "and_test", 0, 2, states_47,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\100\000\000\014\041\151\000\000"},
- {304, "not_test", 0, 3, states_48,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\100\000\000\014\041\151\000\000"},
- {305, "comparison", 0, 2, states_49,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\014\041\151\000\000"},
- {306, "comp_op", 0, 4, states_50,
- "\000\000\000\000\000\000\000\000\000\000\004\000\000\100\376\001\000\000\000\000\000"},
- {307, "expr", 0, 2, states_51,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\014\041\151\000\000"},
- {308, "xor_expr", 0, 2, states_52,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\014\041\151\000\000"},
- {309, "and_expr", 0, 2, states_53,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\014\041\151\000\000"},
- {310, "shift_expr", 0, 2, states_54,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\014\041\151\000\000"},
- {311, "arith_expr", 0, 2, states_55,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\014\041\151\000\000"},
- {312, "term", 0, 2, states_56,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\014\041\151\000\000"},
- {313, "factor", 0, 3, states_57,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\014\041\151\000\000"},
- {314, "power", 0, 4, states_58,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\040\151\000\000"},
- {315, "atom", 0, 11, states_59,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\040\151\000\000"},
- {316, "listmaker", 0, 5, states_60,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {317, "testlist_gexp", 0, 5, states_61,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {318, "lambdef", 0, 5, states_62,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"},
- {319, "trailer", 0, 7, states_63,
- "\000\040\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\040\000\000\000"},
- {320, "subscriptlist", 0, 3, states_64,
- "\000\040\050\000\000\000\000\000\000\010\000\000\000\101\000\000\014\041\151\000\000"},
- {321, "subscript", 0, 7, states_65,
- "\000\040\050\000\000\000\000\000\000\010\000\000\000\101\000\000\014\041\151\000\000"},
- {322, "sliceop", 0, 3, states_66,
- "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {323, "exprlist", 0, 3, states_67,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\014\041\151\000\000"},
- {324, "testlist", 0, 3, states_68,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {325, "dictmaker", 0, 5, states_69,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {326, "classdef", 0, 8, states_70,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000"},
- {327, "arglist", 0, 8, states_71,
- "\000\040\010\060\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {328, "argument", 0, 4, states_72,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {329, "list_iter", 0, 2, states_73,
- "\000\000\000\000\000\000\000\000\000\000\000\042\000\000\000\000\000\000\000\000\000"},
- {330, "list_for", 0, 6, states_74,
- "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
- {331, "list_if", 0, 4, states_75,
- "\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
- {332, "gen_iter", 0, 2, states_76,
- "\000\000\000\000\000\000\000\000\000\000\000\042\000\000\000\000\000\000\000\000\000"},
- {333, "gen_for", 0, 6, states_77,
- "\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
- {334, "gen_if", 0, 4, states_78,
- "\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000"},
- {335, "testlist1", 0, 2, states_79,
- "\000\040\010\000\000\000\000\000\000\000\000\000\000\101\000\000\014\041\151\000\000"},
- {336, "encoding_decl", 0, 2, states_80,
+ {295, "try_stmt", 0, 13, states_39,
+ "\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000"},
+ {296, "with_stmt", 0, 6, states_40,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000"},
+ {297, "with_var", 0, 3, states_41,
"\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {337, "yield_expr", 0, 3, states_81,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010"},
+ {298, "except_clause", 0, 5, states_42,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000"},
+ {299, "suite", 0, 5, states_43,
+ "\004\040\010\000\000\000\000\025\074\205\011\000\000\010\002\000\140\010\111\003\100"},
+ {300, "testlist_safe", 0, 5, states_44,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {301, "old_test", 0, 2, states_45,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {302, "old_lambdef", 0, 5, states_46,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000"},
+ {303, "test", 0, 6, states_47,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {304, "or_test", 0, 2, states_48,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\002\000\140\010\111\003\000"},
+ {305, "and_test", 0, 2, states_49,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\002\000\140\010\111\003\000"},
+ {306, "not_test", 0, 3, states_50,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\002\000\140\010\111\003\000"},
+ {307, "comparison", 0, 2, states_51,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"},
+ {308, "comp_op", 0, 4, states_52,
+ "\000\000\000\000\000\000\000\000\000\000\004\000\000\000\362\017\000\000\000\000\000"},
+ {309, "expr", 0, 2, states_53,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"},
+ {310, "xor_expr", 0, 2, states_54,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"},
+ {311, "and_expr", 0, 2, states_55,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"},
+ {312, "shift_expr", 0, 2, states_56,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"},
+ {313, "arith_expr", 0, 2, states_57,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"},
+ {314, "term", 0, 2, states_58,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"},
+ {315, "factor", 0, 3, states_59,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"},
+ {316, "power", 0, 4, states_60,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\111\003\000"},
+ {317, "atom", 0, 11, states_61,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\111\003\000"},
+ {318, "listmaker", 0, 5, states_62,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {319, "testlist_gexp", 0, 5, states_63,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {320, "lambdef", 0, 5, states_64,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000"},
+ {321, "trailer", 0, 7, states_65,
+ "\000\040\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\001\000\000"},
+ {322, "subscriptlist", 0, 3, states_66,
+ "\000\040\050\000\000\000\000\000\000\010\000\000\000\010\002\000\140\010\111\003\000"},
+ {323, "subscript", 0, 7, states_67,
+ "\000\040\050\000\000\000\000\000\000\010\000\000\000\010\002\000\140\010\111\003\000"},
+ {324, "sliceop", 0, 3, states_68,
+ "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {325, "exprlist", 0, 3, states_69,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\000\000\140\010\111\003\000"},
+ {326, "testlist", 0, 3, states_70,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {327, "dictmaker", 0, 5, states_71,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {328, "classdef", 0, 8, states_72,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000"},
+ {329, "arglist", 0, 8, states_73,
+ "\000\040\010\060\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {330, "argument", 0, 4, states_74,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {331, "list_iter", 0, 2, states_75,
+ "\000\000\000\000\000\000\000\000\000\000\000\104\000\000\000\000\000\000\000\000\000"},
+ {332, "list_for", 0, 6, states_76,
+ "\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
+ {333, "list_if", 0, 4, states_77,
+ "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
+ {334, "gen_iter", 0, 2, states_78,
+ "\000\000\000\000\000\000\000\000\000\000\000\104\000\000\000\000\000\000\000\000\000"},
+ {335, "gen_for", 0, 6, states_79,
+ "\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
+ {336, "gen_if", 0, 4, states_80,
+ "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
+ {337, "testlist1", 0, 2, states_81,
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\010\002\000\140\010\111\003\000"},
+ {338, "encoding_decl", 0, 2, states_82,
+ "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {339, "yield_expr", 0, 3, states_83,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"},
};
-static label labels[164] = {
+static label labels[167] = {
{0, "EMPTY"},
{256, 0},
{4, 0},
@@ -1906,12 +1952,12 @@
{266, 0},
{0, 0},
{258, 0},
- {324, 0},
+ {326, 0},
{259, 0},
{50, 0},
{287, 0},
{7, 0},
- {327, 0},
+ {329, 0},
{8, 0},
{260, 0},
{261, 0},
@@ -1919,11 +1965,11 @@
{1, 0},
{262, 0},
{11, 0},
- {297, 0},
+ {299, 0},
{263, 0},
{264, 0},
{22, 0},
- {301, 0},
+ {303, 0},
{12, 0},
{16, 0},
{36, 0},
@@ -1940,7 +1986,7 @@
{289, 0},
{290, 0},
{270, 0},
- {337, 0},
+ {339, 0},
{37, 0},
{38, 0},
{39, 0},
@@ -1956,7 +2002,7 @@
{1, "print"},
{35, 0},
{1, "del"},
- {323, 0},
+ {325, 0},
{1, "pass"},
{275, 0},
{276, 0},
@@ -1978,38 +2024,41 @@
{284, 0},
{1, "global"},
{1, "exec"},
- {307, 0},
+ {309, 0},
{1, "in"},
{1, "assert"},
{292, 0},
{293, 0},
{294, 0},
{295, 0},
- {326, 0},
+ {296, 0},
+ {328, 0},
{1, "if"},
{1, "elif"},
{1, "else"},
{1, "while"},
{1, "for"},
{1, "try"},
- {296, 0},
+ {298, 0},
{1, "finally"},
+ {1, "with"},
+ {297, 0},
{1, "except"},
{5, 0},
{6, 0},
- {298, 0},
- {299, 0},
- {302, 0},
{300, 0},
- {1, "lambda"},
- {318, 0},
- {303, 0},
- {1, "or"},
+ {301, 0},
{304, 0},
+ {302, 0},
+ {1, "lambda"},
+ {320, 0},
+ {305, 0},
+ {1, "or"},
+ {306, 0},
{1, "and"},
{1, "not"},
- {305, 0},
- {306, 0},
+ {307, 0},
+ {308, 0},
{20, 0},
{21, 0},
{28, 0},
@@ -2018,53 +2067,53 @@
{29, 0},
{29, 0},
{1, "is"},
- {308, 0},
- {18, 0},
- {309, 0},
- {33, 0},
{310, 0},
- {19, 0},
+ {18, 0},
{311, 0},
- {34, 0},
+ {33, 0},
{312, 0},
+ {19, 0},
+ {313, 0},
+ {34, 0},
+ {314, 0},
{14, 0},
{15, 0},
- {313, 0},
+ {315, 0},
{17, 0},
{24, 0},
{48, 0},
{32, 0},
- {314, 0},
- {315, 0},
- {319, 0},
- {317, 0},
- {9, 0},
{316, 0},
+ {317, 0},
+ {321, 0},
+ {319, 0},
+ {9, 0},
+ {318, 0},
{10, 0},
{26, 0},
- {325, 0},
+ {327, 0},
{27, 0},
{25, 0},
- {335, 0},
+ {337, 0},
{2, 0},
{3, 0},
- {330, 0},
- {333, 0},
- {320, 0},
- {321, 0},
- {322, 0},
- {1, "class"},
- {328, 0},
- {329, 0},
- {331, 0},
{332, 0},
+ {335, 0},
+ {322, 0},
+ {323, 0},
+ {324, 0},
+ {1, "class"},
+ {330, 0},
+ {331, 0},
+ {333, 0},
{334, 0},
{336, 0},
+ {338, 0},
{1, "yield"},
};
grammar _PyParser_Grammar = {
- 82,
+ 84,
dfas,
- {164, labels},
+ {167, labels},
256
};