Killed the <> operator. You must now use !=.
Opportunistically also fixed one or two places where '<> None' should be
'is not None' and where 'type(x) <> y' should be 'not isinstance(x, y)'.
diff --git a/Python/ast.c b/Python/ast.c
index b356192..f472d96 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -478,7 +478,7 @@
static cmpop_ty
ast_for_comp_op(const node *n)
{
- /* comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'
+ /* comp_op: '<'|'>'|'=='|'>='|'<='|'!='|'in'|'not' 'in'|'is'
|'is' 'not'
*/
REQ(n, comp_op);
diff --git a/Python/graminit.c b/Python/graminit.c
index 33ef64b..8299563 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -1107,17 +1107,16 @@
{1, arcs_51_0},
{2, arcs_51_1},
};
-static arc arcs_52_0[10] = {
+static arc arcs_52_0[9] = {
{117, 1},
{118, 1},
{119, 1},
{120, 1},
{121, 1},
{122, 1},
- {123, 1},
{83, 1},
{114, 2},
- {124, 3},
+ {123, 3},
};
static arc arcs_52_1[1] = {
{0, 1},
@@ -1130,16 +1129,16 @@
{0, 3},
};
static state states_52[4] = {
- {10, arcs_52_0},
+ {9, 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] = {
@@ -1147,10 +1146,10 @@
{2, arcs_53_1},
};
static arc arcs_54_0[1] = {
- {127, 1},
+ {126, 1},
};
static arc arcs_54_1[2] = {
- {128, 0},
+ {127, 0},
{0, 1},
};
static state states_54[2] = {
@@ -1158,10 +1157,10 @@
{2, arcs_54_1},
};
static arc arcs_55_0[1] = {
- {129, 1},
+ {128, 1},
};
static arc arcs_55_1[2] = {
- {130, 0},
+ {129, 0},
{0, 1},
};
static state states_55[2] = {
@@ -1169,10 +1168,10 @@
{2, arcs_55_1},
};
static arc arcs_56_0[1] = {
- {131, 1},
+ {130, 1},
};
static arc arcs_56_1[3] = {
- {132, 0},
+ {131, 0},
{57, 0},
{0, 1},
};
@@ -1181,11 +1180,11 @@
{3, arcs_56_1},
};
static arc arcs_57_0[1] = {
- {133, 1},
+ {132, 1},
};
static arc arcs_57_1[3] = {
+ {133, 0},
{134, 0},
- {135, 0},
{0, 1},
};
static state states_57[2] = {
@@ -1193,13 +1192,13 @@
{3, arcs_57_1},
};
static arc arcs_58_0[1] = {
- {136, 1},
+ {135, 1},
};
static arc arcs_58_1[5] = {
{28, 0},
+ {136, 0},
{137, 0},
{138, 0},
- {139, 0},
{0, 1},
};
static state states_58[2] = {
@@ -1207,13 +1206,13 @@
{5, arcs_58_1},
};
static arc arcs_59_0[4] = {
+ {133, 1},
{134, 1},
- {135, 1},
- {140, 1},
- {141, 2},
+ {139, 1},
+ {140, 2},
};
static arc arcs_59_1[1] = {
- {136, 2},
+ {135, 2},
};
static arc arcs_59_2[1] = {
{0, 2},
@@ -1224,15 +1223,15 @@
{1, arcs_59_2},
};
static arc arcs_60_0[1] = {
- {142, 1},
+ {141, 1},
};
static arc arcs_60_1[3] = {
- {143, 1},
+ {142, 1},
{29, 2},
{0, 1},
};
static arc arcs_60_2[1] = {
- {136, 3},
+ {135, 3},
};
static arc arcs_60_3[1] = {
{0, 3},
@@ -1245,47 +1244,47 @@
};
static arc arcs_61_0[7] = {
{13, 1},
- {145, 2},
- {148, 3},
- {151, 4},
+ {144, 2},
+ {147, 3},
+ {150, 4},
{19, 5},
- {153, 5},
- {154, 6},
+ {152, 5},
+ {153, 6},
};
static arc arcs_61_1[3] = {
{43, 7},
- {144, 7},
+ {143, 7},
{15, 5},
};
static arc arcs_61_2[2] = {
- {146, 8},
- {147, 5},
+ {145, 8},
+ {146, 5},
};
static arc arcs_61_3[2] = {
- {149, 9},
- {150, 5},
+ {148, 9},
+ {149, 5},
};
static arc arcs_61_4[1] = {
- {152, 10},
+ {151, 10},
};
static arc arcs_61_5[1] = {
{0, 5},
};
static arc arcs_61_6[2] = {
- {154, 6},
+ {153, 6},
{0, 6},
};
static arc arcs_61_7[1] = {
{15, 5},
};
static arc arcs_61_8[1] = {
- {147, 5},
+ {146, 5},
};
static arc arcs_61_9[1] = {
- {150, 5},
+ {149, 5},
};
static arc arcs_61_10[1] = {
- {151, 5},
+ {150, 5},
};
static state states_61[11] = {
{7, arcs_61_0},
@@ -1304,7 +1303,7 @@
{26, 1},
};
static arc arcs_62_1[3] = {
- {155, 2},
+ {154, 2},
{27, 3},
{0, 1},
};
@@ -1330,7 +1329,7 @@
{26, 1},
};
static arc arcs_63_1[3] = {
- {156, 2},
+ {155, 2},
{27, 3},
{0, 1},
};
@@ -1377,7 +1376,7 @@
};
static arc arcs_65_0[3] = {
{13, 1},
- {145, 2},
+ {144, 2},
{75, 3},
};
static arc arcs_65_1[2] = {
@@ -1385,7 +1384,7 @@
{15, 5},
};
static arc arcs_65_2[1] = {
- {157, 6},
+ {156, 6},
};
static arc arcs_65_3[1] = {
{19, 5},
@@ -1397,7 +1396,7 @@
{0, 5},
};
static arc arcs_65_6[1] = {
- {147, 5},
+ {146, 5},
};
static state states_65[7] = {
{3, arcs_65_0},
@@ -1409,14 +1408,14 @@
{1, arcs_65_6},
};
static arc arcs_66_0[1] = {
- {158, 1},
+ {157, 1},
};
static arc arcs_66_1[2] = {
{27, 2},
{0, 1},
};
static arc arcs_66_2[2] = {
- {158, 1},
+ {157, 1},
{0, 2},
};
static state states_66[3] = {
@@ -1438,14 +1437,14 @@
};
static arc arcs_67_3[3] = {
{26, 5},
- {159, 6},
+ {158, 6},
{0, 3},
};
static arc arcs_67_4[1] = {
{75, 6},
};
static arc arcs_67_5[2] = {
- {159, 6},
+ {158, 6},
{0, 5},
};
static arc arcs_67_6[1] = {
@@ -1532,7 +1531,7 @@
{2, arcs_71_4},
};
static arc arcs_72_0[1] = {
- {160, 1},
+ {159, 1},
};
static arc arcs_72_1[1] = {
{19, 2},
@@ -1568,7 +1567,7 @@
{1, arcs_72_7},
};
static arc arcs_73_0[3] = {
- {161, 1},
+ {160, 1},
{28, 2},
{29, 3},
};
@@ -1583,7 +1582,7 @@
{26, 6},
};
static arc arcs_73_4[4] = {
- {161, 1},
+ {160, 1},
{28, 2},
{29, 3},
{0, 4},
@@ -1612,7 +1611,7 @@
{26, 1},
};
static arc arcs_74_1[3] = {
- {156, 2},
+ {155, 2},
{25, 3},
{0, 1},
};
@@ -1629,8 +1628,8 @@
{1, arcs_74_3},
};
static arc arcs_75_0[2] = {
- {155, 1},
- {163, 1},
+ {154, 1},
+ {162, 1},
};
static arc arcs_75_1[1] = {
{0, 1},
@@ -1652,7 +1651,7 @@
{104, 4},
};
static arc arcs_76_4[2] = {
- {162, 5},
+ {161, 5},
{0, 4},
};
static arc arcs_76_5[1] = {
@@ -1673,7 +1672,7 @@
{105, 2},
};
static arc arcs_77_2[2] = {
- {162, 3},
+ {161, 3},
{0, 2},
};
static arc arcs_77_3[1] = {
@@ -1686,8 +1685,8 @@
{1, arcs_77_3},
};
static arc arcs_78_0[2] = {
- {156, 1},
- {165, 1},
+ {155, 1},
+ {164, 1},
};
static arc arcs_78_1[1] = {
{0, 1},
@@ -1709,7 +1708,7 @@
{106, 4},
};
static arc arcs_79_4[2] = {
- {164, 5},
+ {163, 5},
{0, 4},
};
static arc arcs_79_5[1] = {
@@ -1730,7 +1729,7 @@
{105, 2},
};
static arc arcs_80_2[2] = {
- {164, 3},
+ {163, 3},
{0, 2},
};
static arc arcs_80_3[1] = {
@@ -1764,7 +1763,7 @@
{1, arcs_82_1},
};
static arc arcs_83_0[1] = {
- {167, 1},
+ {166, 1},
};
static arc arcs_83_1[2] = {
{9, 2},
@@ -1780,11 +1779,11 @@
};
static dfa dfas[84] = {
{256, "single_input", 0, 3, states_0,
- "\004\050\014\000\000\000\000\025\074\005\023\310\011\020\004\000\300\020\222\006\201"},
+ "\004\050\014\000\000\000\000\025\074\005\023\310\011\020\004\000\140\010\111\203\100"},
{257, "file_input", 0, 2, states_1,
- "\204\050\014\000\000\000\000\025\074\005\023\310\011\020\004\000\300\020\222\006\201"},
+ "\204\050\014\000\000\000\000\025\074\005\023\310\011\020\004\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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,
@@ -1800,13 +1799,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\005\023\310\011\020\004\000\300\020\222\006\201"},
+ "\000\050\014\000\000\000\000\025\074\005\023\310\011\020\004\000\140\010\111\203\100"},
{267, "simple_stmt", 0, 4, states_11,
- "\000\040\010\000\000\000\000\025\074\005\023\000\000\020\004\000\300\020\222\006\200"},
+ "\000\040\010\000\000\000\000\025\074\005\023\000\000\020\004\000\140\010\111\003\100"},
{268, "small_stmt", 0, 2, states_12,
- "\000\040\010\000\000\000\000\025\074\005\023\000\000\020\004\000\300\020\222\006\200"},
+ "\000\040\010\000\000\000\000\025\074\005\023\000\000\020\004\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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,
@@ -1816,7 +1815,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\200"},
+ "\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,
@@ -1824,7 +1823,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\200"},
+ "\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,
@@ -1850,7 +1849,7 @@
{290, "assert_stmt", 0, 5, states_34,
"\000\000\000\000\000\000\000\000\000\000\020\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\310\011\000\000\000\000\000\000\000\001"},
+ "\000\010\004\000\000\000\000\000\000\000\000\310\011\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\010\000\000\000\000\000\000\000\000\000"},
{293, "while_stmt", 0, 8, states_37,
@@ -1866,69 +1865,69 @@
{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,
- "\004\040\010\000\000\000\000\025\074\005\023\000\000\020\004\000\300\020\222\006\200"},
+ "\004\040\010\000\000\000\000\025\074\005\023\000\000\020\004\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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\020\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\004\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\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\004\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\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\000\004\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\300\020\222\006\000"},
+ "\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\010\000\000\000\344\037\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\000\000\010\000\000\000\344\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\300\020\222\006\000"},
+ "\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\300\020\222\006\000"},
+ "\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\300\020\222\006\000"},
+ "\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\300\020\222\006\000"},
+ "\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\300\020\222\006\000"},
+ "\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\300\020\222\006\000"},
+ "\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\300\020\222\006\000"},
+ "\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\222\006\000"},
+ "\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\222\006\000"},
+ "\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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\020\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\002\000\000"},
+ "\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\020\004\000\300\020\222\006\000"},
+ "\000\040\050\000\000\000\000\000\000\010\000\000\000\020\004\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\020\004\000\300\020\222\006\000"},
+ "\000\040\050\000\000\000\000\000\000\010\000\000\000\020\004\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\300\020\222\006\000"},
+ "\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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\000\001"},
+ "\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\060\000\000\000\000\000\000\000\000\000\020\004\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\000\140\010\111\003\000"},
{331, "list_iter", 0, 2, states_75,
"\000\000\000\000\000\000\000\000\000\000\000\210\000\000\000\000\000\000\000\000\000"},
{332, "list_for", 0, 6, states_76,
@@ -1942,13 +1941,13 @@
{336, "gen_if", 0, 4, states_80,
"\000\000\000\000\000\000\000\000\000\000\000\010\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\020\004\000\300\020\222\006\000"},
+ "\000\040\010\000\000\000\000\000\000\000\000\000\000\020\004\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\200"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100"},
};
-static label labels[168] = {
+static label labels[167] = {
{0, "EMPTY"},
{256, 0},
{4, 0},
@@ -2072,7 +2071,6 @@
{31, 0},
{30, 0},
{29, 0},
- {29, 0},
{1, "is"},
{310, 0},
{18, 0},
@@ -2121,6 +2119,6 @@
grammar _PyParser_Grammar = {
84,
dfas,
- {168, labels},
+ {167, labels},
256
};