bpo-36540: PEP 570 -- Implementation (GH-12701)

This commit contains the implementation of PEP570: Python positional-only parameters.

* Update Grammar/Grammar with new typedarglist and varargslist

* Regenerate grammar files

* Update and regenerate AST related files

* Update code object

* Update marshal.c

* Update compiler and symtable

* Regenerate importlib files

* Update callable objects

* Implement positional-only args logic in ceval.c

* Regenerate frozen data

* Update standard library to account for positional-only args

* Add test file for positional-only args

* Update other test files to account for positional-only args

* Add News entry

* Update inspect module and related tests

1 files changed, 418 insertions, 204 deletions

diff --git a/Python/graminit.c b/Python/graminit.c
index 96e32aa..0587b1c 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -216,15 +216,16 @@ static const arc arcs_9_7[3] = {
     {61, 5},
     {0, 7},
 };
-static const arc arcs_9_8[5] = {
+static const arc arcs_9_8[6] = {
     {6, 13},
     {64, 2},
-    {61, 14},
+    {68, 14},
+    {61, 15},
     {65, 3},
     {0, 8},
 };
 static const arc arcs_9_9[1] = {
-    {60, 15},
+    {60, 16},
 };
 static const arc arcs_9_10[3] = {
     {64, 2},
@@ -233,7 +234,7 @@ static const arc arcs_9_10[3] = {
 };
 static const arc arcs_9_11[4] = {
     {66, 4},
-    {67, 16},
+    {67, 17},
     {61, 5},
     {0, 11},
 };
@@ -242,51 +243,155 @@ static const arc arcs_9_12[2] = {
     {0, 12},
 };
 static const arc arcs_9_13[4] = {
-    {66, 17},
+    {66, 18},
     {61, 5},
-    {65, 18},
+    {65, 19},
     {0, 13},
 };
-static const arc arcs_9_14[4] = {
+static const arc arcs_9_14[2] = {
+    {66, 20},
+    {0, 14},
+};
+static const arc arcs_9_15[5] = {
     {6, 13},
     {64, 2},
+    {68, 14},
     {65, 3},
-    {0, 14},
+    {0, 15},
 };
-static const arc arcs_9_15[3] = {
+static const arc arcs_9_16[3] = {
     {66, 8},
     {61, 5},
-    {0, 15},
+    {0, 16},
 };
-static const arc arcs_9_16[1] = {
+static const arc arcs_9_17[1] = {
     {60, 6},
 };
-static const arc arcs_9_17[4] = {
+static const arc arcs_9_18[4] = {
     {64, 2},
-    {61, 19},
-    {65, 20},
-    {0, 17},
-};
-static const arc arcs_9_18[3] = {
-    {66, 17},
-    {61, 5},
+    {61, 21},
+    {65, 22},
     {0, 18},
 };
 static const arc arcs_9_19[3] = {
-    {64, 2},
-    {65, 20},
+    {66, 18},
+    {61, 5},
     {0, 19},
 };
-static const arc arcs_9_20[4] = {
-    {66, 17},
-    {67, 21},
-    {61, 5},
+static const arc arcs_9_20[5] = {
+    {6, 23},
+    {64, 2},
+    {61, 24},
+    {65, 25},
     {0, 20},
 };
-static const arc arcs_9_21[1] = {
-    {60, 18},
+static const arc arcs_9_21[3] = {
+    {64, 2},
+    {65, 22},
+    {0, 21},
+};
+static const arc arcs_9_22[4] = {
+    {66, 18},
+    {67, 26},
+    {61, 5},
+    {0, 22},
+};
+static const arc arcs_9_23[4] = {
+    {66, 27},
+    {61, 5},
+    {65, 28},
+    {0, 23},
+};
+static const arc arcs_9_24[1] = {
+    {65, 25},
+};
+static const arc arcs_9_25[4] = {
+    {66, 29},
+    {67, 30},
+    {61, 5},
+    {0, 25},
+};
+static const arc arcs_9_26[1] = {
+    {60, 19},
+};
+static const arc arcs_9_27[4] = {
+    {64, 2},
+    {61, 31},
+    {65, 32},
+    {0, 27},
+};
+static const arc arcs_9_28[3] = {
+    {66, 27},
+    {61, 5},
+    {0, 28},
+};
+static const arc arcs_9_29[5] = {
+    {6, 33},
+    {64, 2},
+    {61, 34},
+    {65, 25},
+    {0, 29},
+};
+static const arc arcs_9_30[1] = {
+    {60, 35},
+};
+static const arc arcs_9_31[3] = {
+    {64, 2},
+    {65, 32},
+    {0, 31},
+};
+static const arc arcs_9_32[4] = {
+    {66, 27},
+    {67, 36},
+    {61, 5},
+    {0, 32},
+};
+static const arc arcs_9_33[4] = {
+    {66, 37},
+    {61, 5},
+    {65, 38},
+    {0, 33},
 };
-static state states_9[22] = {
+static const arc arcs_9_34[4] = {
+    {6, 33},
+    {64, 2},
+    {65, 25},
+    {0, 34},
+};
+static const arc arcs_9_35[3] = {
+    {66, 29},
+    {61, 5},
+    {0, 35},
+};
+static const arc arcs_9_36[1] = {
+    {60, 28},
+};
+static const arc arcs_9_37[4] = {
+    {64, 2},
+    {61, 39},
+    {65, 40},
+    {0, 37},
+};
+static const arc arcs_9_38[3] = {
+    {66, 37},
+    {61, 5},
+    {0, 38},
+};
+static const arc arcs_9_39[3] = {
+    {64, 2},
+    {65, 40},
+    {0, 39},
+};
+static const arc arcs_9_40[4] = {
+    {66, 37},
+    {67, 41},
+    {61, 5},
+    {0, 40},
+};
+static const arc arcs_9_41[1] = {
+    {60, 38},
+};
+static state states_9[42] = {
     {3, arcs_9_0},
     {4, arcs_9_1},
     {1, arcs_9_2},
@@ -295,20 +400,40 @@ static state states_9[22] = {
     {1, arcs_9_5},
     {3, arcs_9_6},
     {3, arcs_9_7},
-    {5, arcs_9_8},
+    {6, arcs_9_8},
     {1, arcs_9_9},
     {3, arcs_9_10},
     {4, arcs_9_11},
     {2, arcs_9_12},
     {4, arcs_9_13},
-    {4, arcs_9_14},
-    {3, arcs_9_15},
-    {1, arcs_9_16},
-    {4, arcs_9_17},
-    {3, arcs_9_18},
+    {2, arcs_9_14},
+    {5, arcs_9_15},
+    {3, arcs_9_16},
+    {1, arcs_9_17},
+    {4, arcs_9_18},
     {3, arcs_9_19},
-    {4, arcs_9_20},
-    {1, arcs_9_21},
+    {5, arcs_9_20},
+    {3, arcs_9_21},
+    {4, arcs_9_22},
+    {4, arcs_9_23},
+    {1, arcs_9_24},
+    {4, arcs_9_25},
+    {1, arcs_9_26},
+    {4, arcs_9_27},
+    {3, arcs_9_28},
+    {5, arcs_9_29},
+    {1, arcs_9_30},
+    {3, arcs_9_31},
+    {4, arcs_9_32},
+    {4, arcs_9_33},
+    {4, arcs_9_34},
+    {3, arcs_9_35},
+    {1, arcs_9_36},
+    {4, arcs_9_37},
+    {3, arcs_9_38},
+    {3, arcs_9_39},
+    {4, arcs_9_40},
+    {1, arcs_9_41},
 };
 static const arc arcs_10_0[1] = {
     {40, 1},
@@ -332,15 +457,15 @@ static state states_10[4] = {
 static const arc arcs_11_0[3] = {
     {6, 1},
     {64, 2},
-    {69, 3},
+    {70, 3},
 };
 static const arc arcs_11_1[3] = {
     {66, 4},
-    {69, 5},
+    {70, 5},
     {0, 1},
 };
 static const arc arcs_11_2[1] = {
-    {69, 6},
+    {70, 6},
 };
 static const arc arcs_11_3[3] = {
     {66, 7},
@@ -349,7 +474,7 @@ static const arc arcs_11_3[3] = {
 };
 static const arc arcs_11_4[3] = {
     {64, 2},
-    {69, 9},
+    {70, 9},
     {0, 4},
 };
 static const arc arcs_11_5[2] = {
@@ -360,53 +485,126 @@ static const arc arcs_11_6[2] = {
     {66, 10},
     {0, 6},
 };
-static const arc arcs_11_7[4] = {
+static const arc arcs_11_7[5] = {
     {6, 11},
     {64, 2},
-    {69, 3},
+    {68, 12},
+    {70, 3},
     {0, 7},
 };
 static const arc arcs_11_8[1] = {
-    {60, 12},
+    {60, 13},
 };
 static const arc arcs_11_9[3] = {
     {66, 4},
-    {67, 13},
+    {67, 14},
     {0, 9},
 };
 static const arc arcs_11_10[1] = {
     {0, 10},
 };
 static const arc arcs_11_11[3] = {
-    {66, 14},
-    {69, 15},
+    {66, 15},
+    {70, 16},
     {0, 11},
 };
 static const arc arcs_11_12[2] = {
-    {66, 7},
+    {66, 17},
     {0, 12},
 };
-static const arc arcs_11_13[1] = {
+static const arc arcs_11_13[2] = {
+    {66, 7},
+    {0, 13},
+};
+static const arc arcs_11_14[1] = {
     {60, 5},
 };
-static const arc arcs_11_14[3] = {
+static const arc arcs_11_15[3] = {
     {64, 2},
-    {69, 16},
-    {0, 14},
-};
-static const arc arcs_11_15[2] = {
-    {66, 14},
+    {70, 18},
     {0, 15},
 };
-static const arc arcs_11_16[3] = {
-    {66, 14},
-    {67, 17},
+static const arc arcs_11_16[2] = {
+    {66, 15},
     {0, 16},
 };
-static const arc arcs_11_17[1] = {
-    {60, 15},
+static const arc arcs_11_17[4] = {
+    {6, 19},
+    {64, 2},
+    {70, 20},
+    {0, 17},
+};
+static const arc arcs_11_18[3] = {
+    {66, 15},
+    {67, 21},
+    {0, 18},
 };
-static state states_11[18] = {
+static const arc arcs_11_19[3] = {
+    {66, 22},
+    {70, 23},
+    {0, 19},
+};
+static const arc arcs_11_20[3] = {
+    {66, 24},
+    {67, 25},
+    {0, 20},
+};
+static const arc arcs_11_21[1] = {
+    {60, 16},
+};
+static const arc arcs_11_22[3] = {
+    {64, 2},
+    {70, 26},
+    {0, 22},
+};
+static const arc arcs_11_23[2] = {
+    {66, 22},
+    {0, 23},
+};
+static const arc arcs_11_24[4] = {
+    {6, 27},
+    {64, 2},
+    {70, 20},
+    {0, 24},
+};
+static const arc arcs_11_25[1] = {
+    {60, 28},
+};
+static const arc arcs_11_26[3] = {
+    {66, 22},
+    {67, 29},
+    {0, 26},
+};
+static const arc arcs_11_27[3] = {
+    {66, 30},
+    {70, 31},
+    {0, 27},
+};
+static const arc arcs_11_28[2] = {
+    {66, 24},
+    {0, 28},
+};
+static const arc arcs_11_29[1] = {
+    {60, 23},
+};
+static const arc arcs_11_30[3] = {
+    {64, 2},
+    {70, 32},
+    {0, 30},
+};
+static const arc arcs_11_31[2] = {
+    {66, 30},
+    {0, 31},
+};
+static const arc arcs_11_32[3] = {
+    {66, 30},
+    {67, 33},
+    {0, 32},
+};
+static const arc arcs_11_33[1] = {
+    {60, 31},
+};
+static state states_11[34] = {
     {3, arcs_11_0},
     {3, arcs_11_1},
     {1, arcs_11_2},
@@ -414,17 +612,33 @@ static state states_11[18] = {
     {3, arcs_11_4},
     {2, arcs_11_5},
     {2, arcs_11_6},
-    {4, arcs_11_7},
+    {5, arcs_11_7},
     {1, arcs_11_8},
     {3, arcs_11_9},
     {1, arcs_11_10},
     {3, arcs_11_11},
     {2, arcs_11_12},
-    {1, arcs_11_13},
-    {3, arcs_11_14},
-    {2, arcs_11_15},
-    {3, arcs_11_16},
-    {1, arcs_11_17},
+    {2, arcs_11_13},
+    {1, arcs_11_14},
+    {3, arcs_11_15},
+    {2, arcs_11_16},
+    {4, arcs_11_17},
+    {3, arcs_11_18},
+    {3, arcs_11_19},
+    {3, arcs_11_20},
+    {1, arcs_11_21},
+    {3, arcs_11_22},
+    {2, arcs_11_23},
+    {4, arcs_11_24},
+    {1, arcs_11_25},
+    {3, arcs_11_26},
+    {3, arcs_11_27},
+    {2, arcs_11_28},
+    {1, arcs_11_29},
+    {3, arcs_11_30},
+    {2, arcs_11_31},
+    {3, arcs_11_32},
+    {1, arcs_11_33},
 };
 static const arc arcs_12_0[1] = {
     {40, 1},
@@ -448,15 +662,15 @@ static state states_13[2] = {
     {1, arcs_13_1},
 };
 static const arc arcs_14_0[1] = {
-    {70, 1},
+    {71, 1},
 };
 static const arc arcs_14_1[2] = {
-    {71, 2},
+    {72, 2},
     {2, 3},
 };
 static const arc arcs_14_2[2] = {
     {2, 3},
-    {70, 1},
+    {71, 1},
 };
 static const arc arcs_14_3[1] = {
     {0, 3},
@@ -468,7 +682,6 @@ static state states_14[4] = {
     {1, arcs_14_3},
 };
 static const arc arcs_15_0[8] = {
-    {72, 1},
     {73, 1},
     {74, 1},
     {75, 1},
@@ -476,6 +689,7 @@ static const arc arcs_15_0[8] = {
     {77, 1},
     {78, 1},
     {79, 1},
+    {80, 1},
 };
 static const arc arcs_15_1[1] = {
     {0, 1},
@@ -485,24 +699,24 @@ static state states_15[2] = {
     {1, arcs_15_1},
 };
 static const arc arcs_16_0[1] = {
-    {80, 1},
+    {81, 1},
 };
 static const arc arcs_16_1[4] = {
     {67, 2},
-    {81, 3},
-    {82, 4},
+    {82, 3},
+    {83, 4},
     {0, 1},
 };
 static const arc arcs_16_2[2] = {
-    {80, 5},
-    {83, 5},
+    {81, 5},
+    {84, 5},
 };
 static const arc arcs_16_3[1] = {
     {0, 3},
 };
 static const arc arcs_16_4[2] = {
     {47, 3},
-    {83, 3},
+    {84, 3},
 };
 static const arc arcs_16_5[3] = {
     {67, 2},
@@ -529,7 +743,7 @@ static const arc arcs_17_2[2] = {
 };
 static const arc arcs_17_3[2] = {
     {47, 4},
-    {83, 4},
+    {84, 4},
 };
 static const arc arcs_17_4[1] = {
     {0, 4},
@@ -542,7 +756,7 @@ static state states_17[5] = {
     {1, arcs_17_4},
 };
 static const arc arcs_18_0[2] = {
-    {84, 1},
+    {85, 1},
     {60, 1},
 };
 static const arc arcs_18_1[2] = {
@@ -550,7 +764,7 @@ static const arc arcs_18_1[2] = {
     {0, 1},
 };
 static const arc arcs_18_2[3] = {
-    {84, 1},
+    {85, 1},
     {60, 1},
     {0, 2},
 };
@@ -560,7 +774,6 @@ static state states_18[3] = {
     {3, arcs_18_2},
 };
 static const arc arcs_19_0[13] = {
-    {85, 1},
     {86, 1},
     {87, 1},
     {88, 1},
@@ -573,6 +786,7 @@ static const arc arcs_19_0[13] = {
     {95, 1},
     {96, 1},
     {97, 1},
+    {98, 1},
 };
 static const arc arcs_19_1[1] = {
     {0, 1},
@@ -585,7 +799,7 @@ static const arc arcs_20_0[1] = {
     {20, 1},
 };
 static const arc arcs_20_1[1] = {
-    {98, 2},
+    {99, 2},
 };
 static const arc arcs_20_2[1] = {
     {0, 2},
@@ -606,11 +820,11 @@ static state states_21[2] = {
     {1, arcs_21_1},
 };
 static const arc arcs_22_0[5] = {
-    {99, 1},
     {100, 1},
     {101, 1},
     {102, 1},
     {103, 1},
+    {104, 1},
 };
 static const arc arcs_22_1[1] = {
     {0, 1},
@@ -643,7 +857,7 @@ static const arc arcs_25_0[1] = {
     {31, 1},
 };
 static const arc arcs_25_1[2] = {
-    {80, 2},
+    {81, 2},
     {0, 1},
 };
 static const arc arcs_25_2[1] = {
@@ -655,7 +869,7 @@ static state states_25[3] = {
     {1, arcs_25_2},
 };
 static const arc arcs_26_0[1] = {
-    {83, 1},
+    {84, 1},
 };
 static const arc arcs_26_1[1] = {
     {0, 1},
@@ -689,8 +903,8 @@ static state states_27[5] = {
     {1, arcs_27_4},
 };
 static const arc arcs_28_0[2] = {
-    {104, 1},
     {105, 1},
+    {106, 1},
 };
 static const arc arcs_28_1[1] = {
     {0, 1},
@@ -703,7 +917,7 @@ static const arc arcs_29_0[1] = {
     {25, 1},
 };
 static const arc arcs_29_1[1] = {
-    {106, 2},
+    {107, 2},
 };
 static const arc arcs_29_2[1] = {
     {0, 2},
@@ -717,12 +931,12 @@ static const arc arcs_30_0[1] = {
     {22, 1},
 };
 static const arc arcs_30_1[3] = {
-    {107, 2},
+    {108, 2},
     {9, 2},
     {49, 3},
 };
 static const arc arcs_30_2[4] = {
-    {107, 2},
+    {108, 2},
     {9, 2},
     {25, 4},
     {49, 3},
@@ -733,10 +947,10 @@ static const arc arcs_30_3[1] = {
 static const arc arcs_30_4[3] = {
     {5, 5},
     {6, 6},
-    {108, 6},
+    {109, 6},
 };
 static const arc arcs_30_5[1] = {
-    {108, 7},
+    {109, 7},
 };
 static const arc arcs_30_6[1] = {
     {0, 6},
@@ -758,7 +972,7 @@ static const arc arcs_31_0[1] = {
     {40, 1},
 };
 static const arc arcs_31_1[2] = {
-    {110, 2},
+    {111, 2},
     {0, 1},
 };
 static const arc arcs_31_2[1] = {
@@ -777,7 +991,7 @@ static const arc arcs_32_0[1] = {
     {49, 1},
 };
 static const arc arcs_32_1[2] = {
-    {110, 2},
+    {111, 2},
     {0, 1},
 };
 static const arc arcs_32_2[1] = {
@@ -793,14 +1007,14 @@ static state states_32[4] = {
     {1, arcs_32_3},
 };
 static const arc arcs_33_0[1] = {
-    {109, 1},
+    {110, 1},
 };
 static const arc arcs_33_1[2] = {
     {66, 2},
     {0, 1},
 };
 static const arc arcs_33_2[2] = {
-    {109, 1},
+    {110, 1},
     {0, 2},
 };
 static state states_33[3] = {
@@ -809,7 +1023,7 @@ static state states_33[3] = {
     {2, arcs_33_2},
 };
 static const arc arcs_34_0[1] = {
-    {111, 1},
+    {112, 1},
 };
 static const arc arcs_34_1[2] = {
     {66, 0},
@@ -823,7 +1037,7 @@ static const arc arcs_35_0[1] = {
     {40, 1},
 };
 static const arc arcs_35_1[2] = {
-    {107, 0},
+    {108, 0},
     {0, 1},
 };
 static state states_35[2] = {
@@ -884,15 +1098,15 @@ static state states_38[5] = {
     {1, arcs_38_4},
 };
 static const arc arcs_39_0[9] = {
-    {112, 1},
+    {113, 1},
     {55, 1},
     {53, 1},
-    {113, 1},
-    {56, 1},
     {114, 1},
+    {56, 1},
     {115, 1},
     {116, 1},
     {117, 1},
+    {118, 1},
 };
 static const arc arcs_39_1[1] = {
     {0, 1},
@@ -905,9 +1119,9 @@ static const arc arcs_40_0[1] = {
     {38, 1},
 };
 static const arc arcs_40_1[3] = {
-    {113, 2},
+    {114, 2},
     {56, 2},
-    {117, 2},
+    {118, 2},
 };
 static const arc arcs_40_2[1] = {
     {0, 2},
@@ -921,24 +1135,24 @@ static const arc arcs_41_0[1] = {
     {24, 1},
 };
 static const arc arcs_41_1[1] = {
-    {118, 2},
+    {119, 2},
 };
 static const arc arcs_41_2[1] = {
     {59, 3},
 };
 static const arc arcs_41_3[1] = {
-    {119, 4},
+    {120, 4},
 };
 static const arc arcs_41_4[3] = {
-    {120, 1},
-    {121, 5},
+    {121, 1},
+    {122, 5},
     {0, 4},
 };
 static const arc arcs_41_5[1] = {
     {59, 6},
 };
 static const arc arcs_41_6[1] = {
-    {119, 7},
+    {120, 7},
 };
 static const arc arcs_41_7[1] = {
     {0, 7},
@@ -957,23 +1171,23 @@ static const arc arcs_42_0[1] = {
     {33, 1},
 };
 static const arc arcs_42_1[1] = {
-    {118, 2},
+    {119, 2},
 };
 static const arc arcs_42_2[1] = {
     {59, 3},
 };
 static const arc arcs_42_3[1] = {
-    {119, 4},
+    {120, 4},
 };
 static const arc arcs_42_4[2] = {
-    {121, 5},
+    {122, 5},
     {0, 4},
 };
 static const arc arcs_42_5[1] = {
     {59, 6},
 };
 static const arc arcs_42_6[1] = {
-    {119, 7},
+    {120, 7},
 };
 static const arc arcs_42_7[1] = {
     {0, 7},
@@ -992,10 +1206,10 @@ static const arc arcs_43_0[1] = {
     {21, 1},
 };
 static const arc arcs_43_1[1] = {
-    {98, 2},
+    {99, 2},
 };
 static const arc arcs_43_2[1] = {
-    {122, 3},
+    {123, 3},
 };
 static const arc arcs_43_3[1] = {
     {47, 4},
@@ -1005,20 +1219,20 @@ static const arc arcs_43_4[1] = {
 };
 static const arc arcs_43_5[2] = {
     {61, 6},
-    {119, 7},
+    {120, 7},
 };
 static const arc arcs_43_6[1] = {
-    {119, 7},
+    {120, 7},
 };
 static const arc arcs_43_7[2] = {
-    {121, 8},
+    {122, 8},
     {0, 7},
 };
 static const arc arcs_43_8[1] = {
     {59, 9},
 };
 static const arc arcs_43_9[1] = {
-    {119, 10},
+    {120, 10},
 };
 static const arc arcs_43_10[1] = {
     {0, 10},
@@ -1043,11 +1257,11 @@ static const arc arcs_44_1[1] = {
     {59, 2},
 };
 static const arc arcs_44_2[1] = {
-    {119, 3},
+    {120, 3},
 };
 static const arc arcs_44_3[2] = {
-    {123, 4},
-    {124, 5},
+    {124, 4},
+    {125, 5},
 };
 static const arc arcs_44_4[1] = {
     {59, 6},
@@ -1056,28 +1270,28 @@ static const arc arcs_44_5[1] = {
     {59, 7},
 };
 static const arc arcs_44_6[1] = {
-    {119, 8},
+    {120, 8},
 };
 static const arc arcs_44_7[1] = {
-    {119, 9},
+    {120, 9},
 };
 static const arc arcs_44_8[1] = {
     {0, 8},
 };
 static const arc arcs_44_9[4] = {
-    {121, 10},
-    {123, 4},
-    {124, 5},
+    {122, 10},
+    {124, 4},
+    {125, 5},
     {0, 9},
 };
 static const arc arcs_44_10[1] = {
     {59, 11},
 };
 static const arc arcs_44_11[1] = {
-    {119, 12},
+    {120, 12},
 };
 static const arc arcs_44_12[2] = {
-    {123, 4},
+    {124, 4},
     {0, 12},
 };
 static state states_44[13] = {
@@ -1099,7 +1313,7 @@ static const arc arcs_45_0[1] = {
     {34, 1},
 };
 static const arc arcs_45_1[1] = {
-    {125, 2},
+    {126, 2},
 };
 static const arc arcs_45_2[2] = {
     {66, 1},
@@ -1107,10 +1321,10 @@ static const arc arcs_45_2[2] = {
 };
 static const arc arcs_45_3[2] = {
     {61, 4},
-    {119, 5},
+    {120, 5},
 };
 static const arc arcs_45_4[1] = {
-    {119, 5},
+    {120, 5},
 };
 static const arc arcs_45_5[1] = {
     {0, 5},
@@ -1127,11 +1341,11 @@ static const arc arcs_46_0[1] = {
     {60, 1},
 };
 static const arc arcs_46_1[2] = {
-    {110, 2},
+    {111, 2},
     {0, 1},
 };
 static const arc arcs_46_2[1] = {
-    {126, 3},
+    {127, 3},
 };
 static const arc arcs_46_3[1] = {
     {0, 3},
@@ -1143,14 +1357,14 @@ static state states_46[4] = {
     {1, arcs_46_3},
 };
 static const arc arcs_47_0[1] = {
-    {127, 1},
+    {128, 1},
 };
 static const arc arcs_47_1[2] = {
     {60, 2},
     {0, 1},
 };
 static const arc arcs_47_2[2] = {
-    {110, 3},
+    {111, 3},
     {0, 2},
 };
 static const arc arcs_47_3[1] = {
@@ -1171,7 +1385,7 @@ static const arc arcs_48_0[2] = {
     {4, 2},
 };
 static const arc arcs_48_1[1] = {
-    {128, 3},
+    {129, 3},
 };
 static const arc arcs_48_2[1] = {
     {0, 2},
@@ -1180,7 +1394,7 @@ static const arc arcs_48_3[1] = {
     {45, 4},
 };
 static const arc arcs_48_4[2] = {
-    {129, 2},
+    {130, 2},
     {45, 4},
 };
 static state states_48[5] = {
@@ -1194,7 +1408,7 @@ static const arc arcs_49_0[1] = {
     {60, 1},
 };
 static const arc arcs_49_1[2] = {
-    {130, 2},
+    {131, 2},
     {0, 1},
 };
 static const arc arcs_49_2[1] = {
@@ -1210,8 +1424,8 @@ static state states_49[4] = {
     {1, arcs_49_3},
 };
 static const arc arcs_50_0[2] = {
-    {131, 1},
-    {132, 2},
+    {132, 1},
+    {133, 2},
 };
 static const arc arcs_50_1[1] = {
     {0, 1},
@@ -1221,10 +1435,10 @@ static const arc arcs_50_2[2] = {
     {0, 2},
 };
 static const arc arcs_50_3[1] = {
-    {132, 4},
+    {133, 4},
 };
 static const arc arcs_50_4[1] = {
-    {121, 5},
+    {122, 5},
 };
 static const arc arcs_50_5[1] = {
     {60, 1},
@@ -1238,8 +1452,8 @@ static state states_50[6] = {
     {1, arcs_50_5},
 };
 static const arc arcs_51_0[2] = {
-    {134, 1},
-    {132, 1},
+    {135, 1},
+    {133, 1},
 };
 static const arc arcs_51_1[1] = {
     {0, 1},
@@ -1253,7 +1467,7 @@ static const arc arcs_52_0[1] = {
 };
 static const arc arcs_52_1[2] = {
     {59, 2},
-    {68, 3},
+    {69, 3},
 };
 static const arc arcs_52_2[1] = {
     {60, 4},
@@ -1276,10 +1490,10 @@ static const arc arcs_53_0[1] = {
 };
 static const arc arcs_53_1[2] = {
     {59, 2},
-    {68, 3},
+    {69, 3},
 };
 static const arc arcs_53_2[1] = {
-    {133, 4},
+    {134, 4},
 };
 static const arc arcs_53_3[1] = {
     {59, 2},
@@ -1295,10 +1509,10 @@ static state states_53[5] = {
     {1, arcs_53_4},
 };
 static const arc arcs_54_0[1] = {
-    {135, 1},
+    {136, 1},
 };
 static const arc arcs_54_1[2] = {
-    {136, 0},
+    {137, 0},
     {0, 1},
 };
 static state states_54[2] = {
@@ -1306,10 +1520,10 @@ static state states_54[2] = {
     {2, arcs_54_1},
 };
 static const arc arcs_55_0[1] = {
-    {137, 1},
+    {138, 1},
 };
 static const arc arcs_55_1[2] = {
-    {138, 0},
+    {139, 0},
     {0, 1},
 };
 static state states_55[2] = {
@@ -1318,10 +1532,10 @@ static state states_55[2] = {
 };
 static const arc arcs_56_0[2] = {
     {28, 1},
-    {139, 2},
+    {140, 2},
 };
 static const arc arcs_56_1[1] = {
-    {137, 2},
+    {138, 2},
 };
 static const arc arcs_56_2[1] = {
     {0, 2},
@@ -1332,10 +1546,10 @@ static state states_56[3] = {
     {1, arcs_56_2},
 };
 static const arc arcs_57_0[1] = {
-    {126, 1},
+    {127, 1},
 };
 static const arc arcs_57_1[2] = {
-    {140, 0},
+    {141, 0},
     {0, 1},
 };
 static state states_57[2] = {
@@ -1343,15 +1557,15 @@ static state states_57[2] = {
     {2, arcs_57_1},
 };
 static const arc arcs_58_0[10] = {
-    {141, 1},
     {142, 1},
     {143, 1},
-    {141, 1},
     {144, 1},
+    {142, 1},
     {145, 1},
     {146, 1},
-    {122, 1},
-    {147, 2},
+    {147, 1},
+    {123, 1},
+    {148, 2},
     {28, 3},
 };
 static const arc arcs_58_1[1] = {
@@ -1362,7 +1576,7 @@ static const arc arcs_58_2[2] = {
     {0, 2},
 };
 static const arc arcs_58_3[1] = {
-    {122, 1},
+    {123, 1},
 };
 static state states_58[4] = {
     {10, arcs_58_0},
@@ -1374,7 +1588,7 @@ static const arc arcs_59_0[1] = {
     {6, 1},
 };
 static const arc arcs_59_1[1] = {
-    {126, 2},
+    {127, 2},
 };
 static const arc arcs_59_2[1] = {
     {0, 2},
@@ -1385,10 +1599,10 @@ static state states_59[3] = {
     {1, arcs_59_2},
 };
 static const arc arcs_60_0[1] = {
-    {148, 1},
+    {149, 1},
 };
 static const arc arcs_60_1[2] = {
-    {149, 0},
+    {150, 0},
     {0, 1},
 };
 static state states_60[2] = {
@@ -1396,10 +1610,10 @@ static state states_60[2] = {
     {2, arcs_60_1},
 };
 static const arc arcs_61_0[1] = {
-    {150, 1},
+    {151, 1},
 };
 static const arc arcs_61_1[2] = {
-    {151, 0},
+    {152, 0},
     {0, 1},
 };
 static state states_61[2] = {
@@ -1407,10 +1621,10 @@ static state states_61[2] = {
     {2, arcs_61_1},
 };
 static const arc arcs_62_0[1] = {
-    {152, 1},
+    {153, 1},
 };
 static const arc arcs_62_1[2] = {
-    {153, 0},
+    {154, 0},
     {0, 1},
 };
 static state states_62[2] = {
@@ -1418,11 +1632,11 @@ static state states_62[2] = {
     {2, arcs_62_1},
 };
 static const arc arcs_63_0[1] = {
-    {154, 1},
+    {155, 1},
 };
 static const arc arcs_63_1[3] = {
-    {155, 0},
     {156, 0},
+    {157, 0},
     {0, 1},
 };
 static state states_63[2] = {
@@ -1430,7 +1644,7 @@ static state states_63[2] = {
     {3, arcs_63_1},
 };
 static const arc arcs_64_0[1] = {
-    {157, 1},
+    {158, 1},
 };
 static const arc arcs_64_1[3] = {
     {7, 0},
@@ -1442,12 +1656,12 @@ static state states_64[2] = {
     {3, arcs_64_1},
 };
 static const arc arcs_65_0[1] = {
-    {158, 1},
+    {159, 1},
 };
 static const arc arcs_65_1[6] = {
-    {159, 0},
-    {6, 0},
     {160, 0},
+    {6, 0},
+    {68, 0},
     {161, 0},
     {10, 0},
     {0, 1},
@@ -1463,7 +1677,7 @@ static const arc arcs_66_0[4] = {
     {162, 2},
 };
 static const arc arcs_66_1[1] = {
-    {158, 2},
+    {159, 2},
 };
 static const arc arcs_66_2[1] = {
     {0, 2},
@@ -1481,7 +1695,7 @@ static const arc arcs_67_1[2] = {
     {0, 1},
 };
 static const arc arcs_67_2[1] = {
-    {158, 3},
+    {159, 3},
 };
 static const arc arcs_67_3[1] = {
     {0, 3},
@@ -1523,7 +1737,7 @@ static const arc arcs_69_0[10] = {
 static const arc arcs_69_1[3] = {
     {50, 2},
     {166, 6},
-    {83, 6},
+    {84, 6},
 };
 static const arc arcs_69_2[1] = {
     {0, 2},
@@ -1561,8 +1775,8 @@ static state states_69[9] = {
     {1, arcs_69_8},
 };
 static const arc arcs_70_0[2] = {
-    {118, 1},
-    {84, 1},
+    {119, 1},
+    {85, 1},
 };
 static const arc arcs_70_1[3] = {
     {66, 2},
@@ -1570,8 +1784,8 @@ static const arc arcs_70_1[3] = {
     {0, 1},
 };
 static const arc arcs_70_2[3] = {
-    {118, 4},
-    {84, 4},
+    {119, 4},
+    {85, 4},
     {0, 2},
 };
 static const arc arcs_70_3[1] = {
@@ -1590,7 +1804,7 @@ static state states_70[5] = {
 };
 static const arc arcs_71_0[3] = {
     {5, 1},
-    {107, 2},
+    {108, 2},
     {14, 3},
 };
 static const arc arcs_71_1[2] = {
@@ -1680,16 +1894,16 @@ static state states_74[3] = {
     {1, arcs_74_2},
 };
 static const arc arcs_75_0[2] = {
-    {126, 1},
-    {84, 1},
+    {127, 1},
+    {85, 1},
 };
 static const arc arcs_75_1[2] = {
     {66, 2},
     {0, 1},
 };
 static const arc arcs_75_2[3] = {
-    {126, 1},
-    {84, 1},
+    {127, 1},
+    {85, 1},
     {0, 2},
 };
 static state states_75[3] = {
@@ -1715,11 +1929,11 @@ static state states_76[3] = {
 };
 static const arc arcs_77_0[3] = {
     {64, 1},
-    {84, 2},
+    {85, 2},
     {60, 3},
 };
 static const arc arcs_77_1[1] = {
-    {126, 4},
+    {127, 4},
 };
 static const arc arcs_77_2[3] = {
     {66, 5},
@@ -1738,7 +1952,7 @@ static const arc arcs_77_4[3] = {
     {0, 4},
 };
 static const arc arcs_77_5[3] = {
-    {84, 9},
+    {85, 9},
     {60, 9},
     {0, 5},
 };
@@ -1758,7 +1972,7 @@ static const arc arcs_77_9[2] = {
     {0, 9},
 };
 static const arc arcs_77_10[1] = {
-    {126, 12},
+    {127, 12},
 };
 static const arc arcs_77_11[1] = {
     {59, 13},
@@ -1801,7 +2015,7 @@ static const arc arcs_78_3[2] = {
     {51, 6},
 };
 static const arc arcs_78_4[1] = {
-    {119, 7},
+    {120, 7},
 };
 static const arc arcs_78_5[1] = {
     {59, 4},
@@ -1847,7 +2061,7 @@ static const arc arcs_80_1[1] = {
     {60, 3},
 };
 static const arc arcs_80_2[4] = {
-    {130, 1},
+    {131, 1},
     {67, 1},
     {170, 3},
     {0, 2},
@@ -1876,13 +2090,13 @@ static const arc arcs_82_0[1] = {
     {21, 1},
 };
 static const arc arcs_82_1[1] = {
-    {98, 2},
+    {99, 2},
 };
 static const arc arcs_82_2[1] = {
-    {122, 3},
+    {123, 3},
 };
 static const arc arcs_82_3[1] = {
-    {132, 4},
+    {133, 4},
 };
 static const arc arcs_82_4[2] = {
     {175, 5},
@@ -1918,7 +2132,7 @@ static const arc arcs_84_0[1] = {
     {24, 1},
 };
 static const arc arcs_84_1[1] = {
-    {133, 2},
+    {134, 2},
 };
 static const arc arcs_84_2[2] = {
     {175, 3},
@@ -1960,7 +2174,7 @@ static state states_86[3] = {
 };
 static const arc arcs_87_0[2] = {
     {22, 1},
-    {80, 2},
+    {81, 2},
 };
 static const arc arcs_87_1[1] = {
     {60, 2},
@@ -1978,7 +2192,7 @@ static const arc arcs_88_0[2] = {
     {4, 2},
 };
 static const arc arcs_88_1[2] = {
-    {128, 3},
+    {129, 3},
     {61, 4},
 };
 static const arc arcs_88_2[1] = {
@@ -1991,11 +2205,11 @@ static const arc arcs_88_4[1] = {
     {2, 6},
 };
 static const arc arcs_88_5[2] = {
-    {129, 2},
+    {130, 2},
     {45, 5},
 };
 static const arc arcs_88_6[1] = {
-    {128, 3},
+    {129, 3},
 };
 static state states_88[7] = {
     {2, arcs_88_0},
@@ -2127,11 +2341,11 @@ static const dfa dfas[92] = {
      "\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {264, "parameters", 4, states_8,
      "\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-    {265, "typedargslist", 22, states_9,
+    {265, "typedargslist", 42, states_9,
      "\100\000\000\000\000\001\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {266, "tfpdef", 4, states_10,
      "\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-    {267, "varargslist", 18, states_11,
+    {267, "varargslist", 34, states_11,
      "\100\000\000\000\000\001\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {268, "vfpdef", 2, states_12,
      "\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
@@ -2148,7 +2362,7 @@ static const dfa dfas[92] = {
     {274, "testlist_star_expr", 3, states_18,
      "\340\173\000\024\260\007\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {275, "augassign", 2, states_19,
-     "\000\000\000\000\000\000\000\000\000\000\340\377\003\000\000\000\000\000\000\000\000\000\000"},
+     "\000\000\000\000\000\000\000\000\000\000\300\377\007\000\000\000\000\000\000\000\000\000\000"},
     {276, "del_stmt", 3, states_20,
      "\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {277, "pass_stmt", 2, states_21,
@@ -2204,7 +2418,7 @@ static const dfa dfas[92] = {
     {302, "with_item", 4, states_46,
      "\240\173\000\024\260\007\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {303, "except_clause", 5, states_47,
-     "\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\000\000\000\001\000\000\000\000\000\000"},
     {304, "suite", 5, states_48,
      "\344\373\325\376\270\007\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {305, "namedexpr_test", 4, states_49,
@@ -2226,7 +2440,7 @@ static const dfa dfas[92] = {
     {313, "comparison", 2, states_57,
      "\240\173\000\000\260\007\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {314, "comp_op", 4, states_58,
-     "\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\004\000\340\017\000\000\000\000"},
+     "\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\010\000\300\037\000\000\000\000"},
     {315, "star_expr", 3, states_59,
      "\100\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {316, "expr", 2, states_60,
@@ -2252,7 +2466,7 @@ static const dfa dfas[92] = {
     {326, "testlist_comp", 5, states_70,
      "\340\173\000\024\260\007\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {327, "trailer", 7, states_71,
-     "\040\100\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"},
+     "\040\100\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000"},
     {328, "subscriptlist", 3, states_72,
      "\240\173\000\024\260\007\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
     {329, "subscript", 5, states_73,
@@ -2363,6 +2577,7 @@ static const label labels[183] = {
     {266, 0},
     {12, 0},
     {22, 0},
+    {17, 0},
     {267, 0},
     {268, 0},
     {271, 0},
@@ -2455,7 +2670,6 @@ static const label labels[183] = {
     {321, 0},
     {322, 0},
     {24, 0},
-    {17, 0},
     {47, 0},
     {323, 0},
     {324, 0},