Merge remote-tracking branch 'origin/master' into ast-type-comments

Grammar changes merged:
- PEP 572 (assignment expessions)
- GH-10370 (slightly more lenient r.h.s. for annotated assignments)

diff --cc Doc/library/token-list.inc
index 290d8f2cd89a75528f17affb41fb91ca61a01fed,3ea9439be859a2de2a7bb805afd2e8ed063c2754..cb9fcd79effc98be1c479562db53e82e3911cb47
--- 1/Doc/library/token-list.inc
--- 2/Doc/library/token-list.inc
+++ b/Doc/library/token-list.inc
@@@ -197,12 -197,12 +197,16 @@@
  
     Token value for ``"..."``.
  
+ .. data:: COLONEQUAL
+ 
+    Token value for ``":="``.
+ 
  .. data:: OP
  
 +.. data:: TYPE_IGNORE
 +
 +.. data:: TYPE_COMMENT
 +
  .. data:: ERRORTOKEN
  
  .. data:: N_TOKENS

diff --cc Grammar/Grammar
index e72de02b68eda62aebf815113df6bdc0068f6ce7,8455c12592594bdca55d38c2bc21239ddc665152..9965b3bb9f52539513ab9076a403397dbd1f816d
--- 1/Grammar/Grammar
--- 2/Grammar/Grammar
+++ b/Grammar/Grammar
@@@ -42,8 -39,8 +42,8 @@@ simple_stmt: small_stmt (';' small_stmt
  small_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt |
               import_stmt | global_stmt | nonlocal_stmt | assert_stmt)
  expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) |
 -                     ('=' (yield_expr|testlist_star_expr))*)
 +                     ('=' (yield_expr|testlist_star_expr))* [TYPE_COMMENT])
- annassign: ':' test ['=' test]
+ annassign: ':' test ['=' (yield_expr|testlist)]
  testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [',']
  augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' |
              '<<=' | '>>=' | '**=' | '//=')
@@@ -72,9 -69,9 +72,9 @@@ assert_stmt: 'assert' test [',' test
  
  compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated | async_stmt
  async_stmt: 'async' (funcdef | with_stmt | for_stmt)
- if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
+ if_stmt: 'if' namedexpr_test ':' suite ('elif' namedexpr_test ':' suite)* ['else' ':' suite]
  while_stmt: 'while' test ':' suite ['else' ':' suite]
 -for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite]
 +for_stmt: 'for' exprlist 'in' testlist ':' [TYPE_COMMENT] suite ['else' ':' suite]
  try_stmt: ('try' ':' suite
             ((except_clause ':' suite)+
              ['else' ':' suite]
@@@ -84,11 -81,9 +84,11 @@@ with_stmt: 'with' with_item (',' with_i
  with_item: test ['as' expr]
  # NB compile.c makes sure that the default except clause is last
  except_clause: 'except' [test ['as' NAME]]
 +# the TYPE_COMMENT in suites is only parsed for funcdefs, but can't go elsewhere due to ambiguity
 +func_body_suite: simple_stmt | NEWLINE [TYPE_COMMENT NEWLINE] INDENT stmt+ DEDENT
  suite: simple_stmt | NEWLINE INDENT stmt+ DEDENT
  
- 
+ namedexpr_test: test [':=' test]
  test: or_test ['if' or_test 'else' test] | lambdef
  test_nocond: or_test | lambdef_nocond
  lambdef: 'lambda' [varargslist] ':' test

diff --cc Grammar/Tokens
index d6c6ee47745672f7ae7bfe90edd5093589d438a0,f6f303bd5292aa4134365f7ebfc7715660563e3a..1d45e05ea21ddb316bec1ac1270081a0981db45f
--- 1/Grammar/Tokens
--- 2/Grammar/Tokens
+++ b/Grammar/Tokens
@@@ -52,10 -52,9 +52,11 @@@ AT                      '@
  ATEQUAL                 '@='
  RARROW                  '->'
  ELLIPSIS                '...'
+ COLONEQUAL              ':='
  
  OP
 +TYPE_IGNORE
 +TYPE_COMMENT
  ERRORTOKEN
  
  # These aren't used by the C tokenizer but are needed for tokenize.py

diff --cc Include/Python-ast.h
Simple merge

diff --cc Include/graminit.h
index 920c04784286b8b97d304fcdf1450560cb7ad2d7,e3acff8a1e835152869db173838ec6778cf6789b..c85e31b84bb65f771e308a5399ea2c9ff158d78c
--- 1/Include/graminit.h
--- 2/Include/graminit.h
+++ b/Include/graminit.h
@@@ -48,46 -48,43 +48,47 @@@
  #define with_stmt 301
  #define with_item 302
  #define except_clause 303
 -#define suite 304
 -#define namedexpr_test 305
 -#define test 306
 -#define test_nocond 307
 -#define lambdef 308
 -#define lambdef_nocond 309
 -#define or_test 310
 -#define and_test 311
 -#define not_test 312
 -#define comparison 313
 -#define comp_op 314
 -#define star_expr 315
 -#define expr 316
 -#define xor_expr 317
 -#define and_expr 318
 -#define shift_expr 319
 -#define arith_expr 320
 -#define term 321
 -#define factor 322
 -#define power 323
 -#define atom_expr 324
 -#define atom 325
 -#define testlist_comp 326
 -#define trailer 327
 -#define subscriptlist 328
 -#define subscript 329
 -#define sliceop 330
 -#define exprlist 331
 -#define testlist 332
 -#define dictorsetmaker 333
 -#define classdef 334
 -#define arglist 335
 -#define argument 336
 -#define comp_iter 337
 -#define sync_comp_for 338
 -#define comp_for 339
 -#define comp_if 340
 -#define encoding_decl 341
 -#define yield_expr 342
 -#define yield_arg 343
 +#define func_body_suite 304
 +#define suite 305
- #define test 306
- #define test_nocond 307
- #define lambdef 308
- #define lambdef_nocond 309
- #define or_test 310
- #define and_test 311
- #define not_test 312
- #define comparison 313
- #define comp_op 314
- #define star_expr 315
- #define expr 316
- #define xor_expr 317
- #define and_expr 318
- #define shift_expr 319
- #define arith_expr 320
- #define term 321
- #define factor 322
- #define power 323
- #define atom_expr 324
- #define atom 325
- #define testlist_comp 326
- #define trailer 327
- #define subscriptlist 328
- #define subscript 329
- #define sliceop 330
- #define exprlist 331
- #define testlist 332
- #define dictorsetmaker 333
- #define classdef 334
- #define arglist 335
- #define argument 336
- #define comp_iter 337
- #define sync_comp_for 338
- #define comp_for 339
- #define comp_if 340
- #define encoding_decl 341
- #define yield_expr 342
- #define yield_arg 343
- #define func_type_input 344
- #define func_type 345
- #define typelist 346
++#define namedexpr_test 306
++#define test 307
++#define test_nocond 308
++#define lambdef 309
++#define lambdef_nocond 310
++#define or_test 311
++#define and_test 312
++#define not_test 313
++#define comparison 314
++#define comp_op 315
++#define star_expr 316
++#define expr 317
++#define xor_expr 318
++#define and_expr 319
++#define shift_expr 320
++#define arith_expr 321
++#define term 322
++#define factor 323
++#define power 324
++#define atom_expr 325
++#define atom 326
++#define testlist_comp 327
++#define trailer 328
++#define subscriptlist 329
++#define subscript 330
++#define sliceop 331
++#define exprlist 332
++#define testlist 333
++#define dictorsetmaker 334
++#define classdef 335
++#define arglist 336
++#define argument 337
++#define comp_iter 338
++#define sync_comp_for 339
++#define comp_for 340
++#define comp_if 341
++#define encoding_decl 342
++#define yield_expr 343
++#define yield_arg 344
++#define func_type_input 345
++#define func_type 346
++#define typelist 347

diff --cc Include/token.h
index 6a1fa2cb9b824330d5042f139b0313d70395ec03,b87b84cd966d01fb1362a0353e121ed0b833bb22..ef6bf969b7c986c156c5b06cf1b9f8e3cfd85980
--- 1/Include/token.h
--- 2/Include/token.h
+++ b/Include/token.h
@@@ -63,11 -63,10 +63,12 @@@ extern "C" 
  #define ATEQUAL         50
  #define RARROW          51
  #define ELLIPSIS        52
- #define OP              53
- #define TYPE_IGNORE     54
- #define TYPE_COMMENT    55
- #define ERRORTOKEN      56
- #define N_TOKENS        60
+ #define COLONEQUAL      53
+ #define OP              54
 -#define ERRORTOKEN      55
 -#define N_TOKENS        59
++#define TYPE_IGNORE     55
++#define TYPE_COMMENT    56
++#define ERRORTOKEN      57
++#define N_TOKENS        61
  #define NT_OFFSET       256
  
  /* Special definitions for cooperation with parser */

diff --cc Lib/token.py
index 43eb246c3f04123f523257279b36db790af9ab15,7224eca32fe0a4e5b9bbc7dae5f61eca596968ab..9bf80a5950a2b87b7ba3932820d1ed6b154b706b
--- 1/Lib/token.py
--- 2/Lib/token.py
+++ b/Lib/token.py
@@@ -56,15 -56,14 +56,16 @@@ AT = 4
  ATEQUAL = 50
  RARROW = 51
  ELLIPSIS = 52
- OP = 53
- TYPE_IGNORE = 54
- TYPE_COMMENT = 55
+ COLONEQUAL = 53
+ OP = 54
++TYPE_IGNORE = 55
++TYPE_COMMENT = 56
  # These aren't used by the C tokenizer but are needed for tokenize.py
- ERRORTOKEN = 56
- COMMENT = 57
- NL = 58
- ENCODING = 59
- N_TOKENS = 60
 -ERRORTOKEN = 55
 -COMMENT = 56
 -NL = 57
 -ENCODING = 58
 -N_TOKENS = 59
++ERRORTOKEN = 57
++COMMENT = 58
++NL = 59
++ENCODING = 60
++N_TOKENS = 61
  # Special definitions for cooperation with parser
  NT_OFFSET = 256
  

diff --cc Parser/Python.asdl
Simple merge

diff --cc Parser/token.c
index 9404fe63d611c2ea45516487c5490041327213be,d27f98a34d55d1f6b6984dcda856269ff3c2fbfa..228ecffc8415ad97d834771003169a82d701c127
--- 1/Parser/token.c
--- 2/Parser/token.c
+++ b/Parser/token.c
@@@ -59,9 -59,8 +59,10 @@@ const char * const _PyParser_TokenNames
      "ATEQUAL",
      "RARROW",
      "ELLIPSIS",
+     "COLONEQUAL",
      "OP",
 +    "TYPE_IGNORE",
 +    "TYPE_COMMENT",
      "<ERRORTOKEN>",
      "<COMMENT>",
      "<NL>",

diff --cc Python/Python-ast.c
Simple merge

diff --cc Python/ast.c
Simple merge

diff --cc Python/graminit.c
index e15b3855d19ffee5a650d611f2bc3d5c1b7ade9e,225d327939061648aa67d9cdc685d4f4768aa3f4..c58231000d9d54abf792f4c646ce047834c3afd6
--- 1/Python/graminit.c
--- 2/Python/graminit.c
+++ b/Python/graminit.c
@@@ -539,11 -495,12 +539,12 @@@ static arc arcs_17_1[1] = 
      {26, 2},
  };
  static arc arcs_17_2[2] = {
 -    {31, 3},
 +    {32, 3},
      {0, 2},
  };
- static arc arcs_17_3[1] = {
-     {26, 4},
+ static arc arcs_17_3[2] = {
 -    {50, 4},
++    {51, 4},
+     {9, 4},
  };
  static arc arcs_17_4[1] = {
      {0, 4},
@@@ -932,27 -889,27 +933,27 @@@ static state states_40[3] = 
      {1, arcs_40_2},
  };
  static arc arcs_41_0[1] = {
 -    {97, 1},
 +    {98, 1},
  };
  static arc arcs_41_1[1] = {
-     {26, 2},
 -    {98, 2},
++    {99, 2},
  };
  static arc arcs_41_2[1] = {
      {27, 3},
  };
  static arc arcs_41_3[1] = {
-     {99, 4},
 -    {28, 4},
++    {100, 4},
  };
  static arc arcs_41_4[3] = {
-     {100, 1},
-     {101, 5},
 -    {99, 1},
 -    {100, 5},
++    {101, 1},
++    {102, 5},
      {0, 4},
  };
  static arc arcs_41_5[1] = {
      {27, 6},
  };
  static arc arcs_41_6[1] = {
-     {99, 7},
 -    {28, 7},
++    {100, 7},
  };
  static arc arcs_41_7[1] = {
      {0, 7},
@@@ -968,7 -925,7 +969,7 @@@ static state states_41[8] = 
      {1, arcs_41_7},
  };
  static arc arcs_42_0[1] = {
-     {102, 1},
 -    {101, 1},
++    {103, 1},
  };
  static arc arcs_42_1[1] = {
      {26, 2},
@@@ -977,17 -934,17 +978,17 @@@ static arc arcs_42_2[1] = 
      {27, 3},
  };
  static arc arcs_42_3[1] = {
-     {99, 4},
 -    {28, 4},
++    {100, 4},
  };
  static arc arcs_42_4[2] = {
-     {101, 5},
 -    {100, 5},
++    {102, 5},
      {0, 4},
  };
  static arc arcs_42_5[1] = {
      {27, 6},
  };
  static arc arcs_42_6[1] = {
-     {99, 7},
 -    {28, 7},
++    {100, 7},
  };
  static arc arcs_42_7[1] = {
      {0, 7},
@@@ -1003,13 -960,13 +1004,13 @@@ static state states_42[8] = 
      {1, arcs_42_7},
  };
  static arc arcs_43_0[1] = {
-     {103, 1},
 -    {102, 1},
++    {104, 1},
  };
  static arc arcs_43_1[1] = {
 -    {66, 2},
 +    {67, 2},
  };
  static arc arcs_43_2[1] = {
-     {104, 3},
 -    {103, 3},
++    {105, 3},
  };
  static arc arcs_43_3[1] = {
      {9, 4},
@@@ -1017,51 -974,46 +1018,51 @@@
  static arc arcs_43_4[1] = {
      {27, 5},
  };
 -static arc arcs_43_5[1] = {
 +static arc arcs_43_5[2] = {
      {28, 6},
-     {99, 7},
++    {100, 7},
  };
 -static arc arcs_43_6[2] = {
 +static arc arcs_43_6[1] = {
-     {99, 7},
+     {100, 7},
 -    {0, 6},
  };
 -static arc arcs_43_7[1] = {
 -    {27, 8},
 +static arc arcs_43_7[2] = {
-     {101, 8},
++    {102, 8},
 +    {0, 7},
  };
  static arc arcs_43_8[1] = {
 -    {28, 9},
 +    {27, 9},
  };
  static arc arcs_43_9[1] = {
-     {99, 10},
 -    {0, 9},
++    {100, 10},
 +};
 +static arc arcs_43_10[1] = {
 +    {0, 10},
  };
 -static state states_43[10] = {
 +static state states_43[11] = {
      {1, arcs_43_0},
      {1, arcs_43_1},
      {1, arcs_43_2},
      {1, arcs_43_3},
      {1, arcs_43_4},
 -    {1, arcs_43_5},
 -    {2, arcs_43_6},
 -    {1, arcs_43_7},
 +    {2, arcs_43_5},
 +    {1, arcs_43_6},
 +    {2, arcs_43_7},
      {1, arcs_43_8},
      {1, arcs_43_9},
 +    {1, arcs_43_10},
  };
  static arc arcs_44_0[1] = {
-     {105, 1},
 -    {104, 1},
++    {106, 1},
  };
  static arc arcs_44_1[1] = {
      {27, 2},
  };
  static arc arcs_44_2[1] = {
-     {99, 3},
 -    {28, 3},
++    {100, 3},
  };
  static arc arcs_44_3[2] = {
-     {106, 4},
-     {107, 5},
 -    {105, 4},
 -    {106, 5},
++    {107, 4},
++    {108, 5},
  };
  static arc arcs_44_4[1] = {
      {27, 6},
@@@ -1070,15 -1022,15 +1071,15 @@@ static arc arcs_44_5[1] = 
      {27, 7},
  };
  static arc arcs_44_6[1] = {
-     {99, 8},
 -    {28, 8},
++    {100, 8},
  };
  static arc arcs_44_7[1] = {
-     {99, 9},
 -    {28, 9},
++    {100, 9},
  };
  static arc arcs_44_8[4] = {
-     {106, 4},
-     {101, 10},
-     {107, 5},
 -    {105, 4},
 -    {100, 10},
 -    {106, 5},
++    {107, 4},
++    {102, 10},
++    {108, 5},
      {0, 8},
  };
  static arc arcs_44_9[1] = {
@@@ -1088,10 -1040,10 +1089,10 @@@ static arc arcs_44_10[1] = 
      {27, 11},
  };
  static arc arcs_44_11[1] = {
-     {99, 12},
 -    {28, 12},
++    {100, 12},
  };
  static arc arcs_44_12[2] = {
-     {107, 5},
 -    {106, 5},
++    {108, 5},
      {0, 12},
  };
  static state states_44[13] = {
@@@ -1110,26 -1062,22 +1111,26 @@@
      {2, arcs_44_12},
  };
  static arc arcs_45_0[1] = {
-     {108, 1},
 -    {107, 1},
++    {109, 1},
  };
  static arc arcs_45_1[1] = {
-     {109, 2},
 -    {108, 2},
++    {110, 2},
  };
  static arc arcs_45_2[2] = {
 -    {32, 1},
 +    {33, 1},
      {27, 3},
  };
 -static arc arcs_45_3[1] = {
 +static arc arcs_45_3[2] = {
      {28, 4},
-     {99, 5},
++    {100, 5},
  };
  static arc arcs_45_4[1] = {
-     {99, 5},
 -    {0, 4},
++    {100, 5},
 +};
 +static arc arcs_45_5[1] = {
 +    {0, 5},
  };
 -static state states_45[5] = {
 +static state states_45[6] = {
      {1, arcs_45_0},
      {1, arcs_45_1},
      {2, arcs_45_2},
@@@ -1145,7 -1092,7 +1146,7 @@@ static arc arcs_46_1[2] = 
      {0, 1},
  };
  static arc arcs_46_2[1] = {
-     {110, 3},
 -    {109, 3},
++    {111, 3},
  };
  static arc arcs_46_3[1] = {
      {0, 3},
@@@ -1157,7 -1104,7 +1158,7 @@@ static state states_46[4] = 
      {1, arcs_46_3},
  };
  static arc arcs_47_0[1] = {
-     {111, 1},
 -    {110, 1},
++    {112, 1},
  };
  static arc arcs_47_1[2] = {
      {26, 2},
@@@ -1187,130 -1134,116 +1188,126 @@@ static arc arcs_48_0[2] = 
  static arc arcs_48_1[1] = {
      {0, 1},
  };
 -static arc arcs_48_2[1] = {
 -    {111, 3},
 +static arc arcs_48_2[2] = {
 +    {28, 3},
-     {112, 4},
++    {113, 4},
  };
  static arc arcs_48_3[1] = {
 -    {6, 4},
 +    {2, 5},
  };
 -static arc arcs_48_4[2] = {
 -    {6, 4},
 -    {112, 1},
 +static arc arcs_48_4[1] = {
 +    {6, 6},
  };
 -static state states_48[5] = {
 +static arc arcs_48_5[1] = {
-     {112, 4},
++    {113, 4},
 +};
 +static arc arcs_48_6[2] = {
 +    {6, 6},
-     {113, 1},
++    {114, 1},
 +};
 +static state states_48[7] = {
      {2, arcs_48_0},
      {1, arcs_48_1},
 -    {1, arcs_48_2},
 +    {2, arcs_48_2},
      {1, arcs_48_3},
 -    {2, arcs_48_4},
 +    {1, arcs_48_4},
 +    {1, arcs_48_5},
 +    {2, arcs_48_6},
  };
 -static arc arcs_49_0[1] = {
 -    {26, 1},
 +static arc arcs_49_0[2] = {
 +    {3, 1},
 +    {2, 2},
  };
 -static arc arcs_49_1[2] = {
 -    {113, 2},
 +static arc arcs_49_1[1] = {
      {0, 1},
  };
  static arc arcs_49_2[1] = {
-     {112, 3},
 -    {26, 3},
++    {113, 3},
  };
  static arc arcs_49_3[1] = {
 -    {0, 3},
 +    {6, 4},
  };
 -static state states_49[4] = {
 -    {1, arcs_49_0},
 -    {2, arcs_49_1},
 +static arc arcs_49_4[2] = {
 +    {6, 4},
-     {113, 1},
++    {114, 1},
 +};
 +static state states_49[5] = {
 +    {2, arcs_49_0},
 +    {1, arcs_49_1},
      {1, arcs_49_2},
      {1, arcs_49_3},
 +    {2, arcs_49_4},
  };
--static arc arcs_50_0[2] = {
--    {114, 1},
--    {115, 2},
++static arc arcs_50_0[1] = {
++    {26, 1},
  };
  static arc arcs_50_1[2] = {
-     {98, 3},
 -    {97, 3},
++    {115, 2},
      {0, 1},
  };
  static arc arcs_50_2[1] = {
--    {0, 2},
++    {26, 3},
  };
  static arc arcs_50_3[1] = {
--    {114, 4},
--};
--static arc arcs_50_4[1] = {
-     {101, 5},
 -    {100, 5},
--};
--static arc arcs_50_5[1] = {
--    {26, 2},
++    {0, 3},
  };
--static state states_50[6] = {
--    {2, arcs_50_0},
++static state states_50[4] = {
++    {1, arcs_50_0},
      {2, arcs_50_1},
      {1, arcs_50_2},
      {1, arcs_50_3},
--    {1, arcs_50_4},
--    {1, arcs_50_5},
  };
  static arc arcs_51_0[2] = {
--    {114, 1},
--    {117, 1},
++    {116, 1},
++    {117, 2},
  };
--static arc arcs_51_1[1] = {
++static arc arcs_51_1[2] = {
++    {98, 3},
      {0, 1},
  };
--static state states_51[2] = {
--    {2, arcs_51_0},
--    {1, arcs_51_1},
++static arc arcs_51_2[1] = {
++    {0, 2},
  };
--static arc arcs_52_0[1] = {
--    {118, 1},
++static arc arcs_51_3[1] = {
++    {116, 4},
  };
--static arc arcs_52_1[2] = {
-     {36, 2},
 -    {35, 2},
--    {27, 3},
++static arc arcs_51_4[1] = {
++    {102, 5},
  };
--static arc arcs_52_2[1] = {
--    {27, 3},
++static arc arcs_51_5[1] = {
++    {26, 2},
  };
--static arc arcs_52_3[1] = {
--    {26, 4},
++static state states_51[6] = {
++    {2, arcs_51_0},
++    {2, arcs_51_1},
++    {1, arcs_51_2},
++    {1, arcs_51_3},
++    {1, arcs_51_4},
++    {1, arcs_51_5},
++};
++static arc arcs_52_0[2] = {
++    {116, 1},
++    {119, 1},
  };
--static arc arcs_52_4[1] = {
--    {0, 4},
++static arc arcs_52_1[1] = {
++    {0, 1},
  };
--static state states_52[5] = {
--    {1, arcs_52_0},
--    {2, arcs_52_1},
--    {1, arcs_52_2},
--    {1, arcs_52_3},
--    {1, arcs_52_4},
++static state states_52[2] = {
++    {2, arcs_52_0},
++    {1, arcs_52_1},
  };
  static arc arcs_53_0[1] = {
--    {118, 1},
++    {120, 1},
  };
  static arc arcs_53_1[2] = {
 -    {35, 2},
 +    {36, 2},
      {27, 3},
  };
  static arc arcs_53_2[1] = {
      {27, 3},
  };
  static arc arcs_53_3[1] = {
--    {116, 4},
++    {26, 4},
  };
  static arc arcs_53_4[1] = {
      {0, 4},
@@@ -1323,15 -1256,15 +1320,27 @@@ static state states_53[5] = 
      {1, arcs_53_4},
  };
  static arc arcs_54_0[1] = {
--    {119, 1},
++    {120, 1},
  };
  static arc arcs_54_1[2] = {
--    {120, 0},
--    {0, 1},
++    {36, 2},
++    {27, 3},
+ };
 -static state states_54[2] = {
++static arc arcs_54_2[1] = {
++    {27, 3},
++};
++static arc arcs_54_3[1] = {
++    {118, 4},
 +};
- static state states_54[2] = {
++static arc arcs_54_4[1] = {
++    {0, 4},
++};
++static state states_54[5] = {
      {1, arcs_54_0},
      {2, arcs_54_1},
++    {1, arcs_54_2},
++    {1, arcs_54_3},
++    {1, arcs_54_4},
  };
  static arc arcs_55_0[1] = {
      {121, 1},
@@@ -1344,84 -1277,84 +1353,84 @@@ static state states_55[2] = 
      {1, arcs_55_0},
      {2, arcs_55_1},
  };
--static arc arcs_56_0[2] = {
++static arc arcs_56_0[1] = {
      {123, 1},
--    {124, 2},
  };
--static arc arcs_56_1[1] = {
--    {121, 2},
++static arc arcs_56_1[2] = {
++    {124, 0},
++    {0, 1},
++};
++static state states_56[2] = {
++    {1, arcs_56_0},
++    {2, arcs_56_1},
++};
++static arc arcs_57_0[2] = {
++    {125, 1},
++    {126, 2},
  };
--static arc arcs_56_2[1] = {
++static arc arcs_57_1[1] = {
++    {123, 2},
++};
++static arc arcs_57_2[1] = {
      {0, 2},
  };
--static state states_56[3] = {
--    {2, arcs_56_0},
--    {1, arcs_56_1},
--    {1, arcs_56_2},
++static state states_57[3] = {
++    {2, arcs_57_0},
++    {1, arcs_57_1},
++    {1, arcs_57_2},
  };
--static arc arcs_57_0[1] = {
-     {110, 1},
 -    {109, 1},
++static arc arcs_58_0[1] = {
++    {111, 1},
  };
--static arc arcs_57_1[2] = {
--    {125, 0},
++static arc arcs_58_1[2] = {
++    {127, 0},
      {0, 1},
  };
--static state states_57[2] = {
--    {1, arcs_57_0},
--    {2, arcs_57_1},
++static state states_58[2] = {
++    {1, arcs_58_0},
++    {2, arcs_58_1},
  };
--static arc arcs_58_0[10] = {
--    {126, 1},
--    {127, 1},
++static arc arcs_59_0[10] = {
      {128, 1},
      {129, 1},
      {130, 1},
      {131, 1},
      {132, 1},
-     {104, 1},
 -    {103, 1},
--    {123, 2},
--    {133, 3},
++    {133, 1},
++    {134, 1},
++    {105, 1},
++    {125, 2},
++    {135, 3},
  };
--static arc arcs_58_1[1] = {
++static arc arcs_59_1[1] = {
      {0, 1},
  };
--static arc arcs_58_2[1] = {
-     {104, 1},
 -    {103, 1},
++static arc arcs_59_2[1] = {
++    {105, 1},
  };
--static arc arcs_58_3[2] = {
--    {123, 1},
++static arc arcs_59_3[2] = {
++    {125, 1},
      {0, 3},
  };
--static state states_58[4] = {
--    {10, arcs_58_0},
--    {1, arcs_58_1},
--    {1, arcs_58_2},
--    {2, arcs_58_3},
--};
--static arc arcs_59_0[1] = {
-     {34, 1},
 -    {33, 1},
--};
--static arc arcs_59_1[1] = {
-     {110, 2},
 -    {109, 2},
--};
--static arc arcs_59_2[1] = {
--    {0, 2},
--};
--static state states_59[3] = {
--    {1, arcs_59_0},
++static state states_59[4] = {
++    {10, arcs_59_0},
      {1, arcs_59_1},
      {1, arcs_59_2},
++    {2, arcs_59_3},
  };
  static arc arcs_60_0[1] = {
--    {134, 1},
++    {34, 1},
  };
--static arc arcs_60_1[2] = {
--    {135, 0},
--    {0, 1},
++static arc arcs_60_1[1] = {
++    {111, 2},
 +};
- static state states_60[2] = {
++static arc arcs_60_2[1] = {
++    {0, 2},
+ };
 -static state states_60[2] = {
++static state states_60[3] = {
      {1, arcs_60_0},
--    {2, arcs_60_1},
++    {1, arcs_60_1},
++    {1, arcs_60_2},
  };
  static arc arcs_61_0[1] = {
      {136, 1},
@@@ -1448,21 -1381,21 +1457,20 @@@ static state states_62[2] = 
  static arc arcs_63_0[1] = {
      {140, 1},
  };
--static arc arcs_63_1[3] = {
++static arc arcs_63_1[2] = {
      {141, 0},
--    {142, 0},
      {0, 1},
  };
  static state states_63[2] = {
      {1, arcs_63_0},
--    {3, arcs_63_1},
++    {2, arcs_63_1},
  };
  static arc arcs_64_0[1] = {
--    {143, 1},
++    {142, 1},
  };
  static arc arcs_64_1[3] = {
++    {143, 0},
      {144, 0},
--    {145, 0},
      {0, 1},
  };
  static state states_64[2] = {
@@@ -1470,645 -1403,544 +1478,658 @@@
      {3, arcs_64_1},
  };
  static arc arcs_65_0[1] = {
--    {146, 1},
++    {145, 1},
  };
--static arc arcs_65_1[6] = {
-     {34, 0},
 -    {33, 0},
--    {11, 0},
++static arc arcs_65_1[3] = {
++    {146, 0},
      {147, 0},
--    {148, 0},
--    {149, 0},
      {0, 1},
  };
  static state states_65[2] = {
      {1, arcs_65_0},
--    {6, arcs_65_1},
++    {3, arcs_65_1},
  };
--static arc arcs_66_0[4] = {
--    {144, 1},
--    {145, 1},
--    {150, 1},
--    {151, 2},
++static arc arcs_66_0[1] = {
++    {148, 1},
+ };
 -static arc arcs_66_1[1] = {
 -    {146, 2},
++static arc arcs_66_1[6] = {
++    {34, 0},
++    {11, 0},
++    {149, 0},
++    {150, 0},
++    {151, 0},
++    {0, 1},
++};
++static state states_66[2] = {
++    {1, arcs_66_0},
++    {6, arcs_66_1},
++};
++static arc arcs_67_0[4] = {
++    {146, 1},
++    {147, 1},
++    {152, 1},
++    {153, 2},
  };
- static arc arcs_66_1[1] = {
-     {146, 2},
 -static arc arcs_66_2[1] = {
++static arc arcs_67_1[1] = {
++    {148, 2},
 +};
- static arc arcs_66_2[1] = {
++static arc arcs_67_2[1] = {
      {0, 2},
  };
--static state states_66[3] = {
--    {4, arcs_66_0},
--    {1, arcs_66_1},
--    {1, arcs_66_2},
++static state states_67[3] = {
++    {4, arcs_67_0},
++    {1, arcs_67_1},
++    {1, arcs_67_2},
  };
--static arc arcs_67_0[1] = {
--    {152, 1},
++static arc arcs_68_0[1] = {
++    {154, 1},
  };
--static arc arcs_67_1[2] = {
 -    {34, 2},
++static arc arcs_68_1[2] = {
 +    {35, 2},
      {0, 1},
  };
--static arc arcs_67_2[1] = {
--    {146, 3},
++static arc arcs_68_2[1] = {
++    {148, 3},
  };
--static arc arcs_67_3[1] = {
++static arc arcs_68_3[1] = {
      {0, 3},
  };
--static state states_67[4] = {
--    {1, arcs_67_0},
--    {2, arcs_67_1},
--    {1, arcs_67_2},
--    {1, arcs_67_3},
++static state states_68[4] = {
++    {1, arcs_68_0},
++    {2, arcs_68_1},
++    {1, arcs_68_2},
++    {1, arcs_68_3},
  };
--static arc arcs_68_0[2] = {
--    {153, 1},
--    {154, 2},
++static arc arcs_69_0[2] = {
++    {155, 1},
++    {156, 2},
  };
--static arc arcs_68_1[1] = {
--    {154, 2},
++static arc arcs_69_1[1] = {
++    {156, 2},
  };
--static arc arcs_68_2[2] = {
--    {155, 2},
++static arc arcs_69_2[2] = {
++    {157, 2},
      {0, 2},
  };
--static state states_68[3] = {
--    {2, arcs_68_0},
--    {1, arcs_68_1},
--    {2, arcs_68_2},
++static state states_69[3] = {
++    {2, arcs_69_0},
++    {1, arcs_69_1},
++    {2, arcs_69_2},
  };
--static arc arcs_69_0[10] = {
++static arc arcs_70_0[10] = {
      {13, 1},
--    {157, 2},
--    {159, 3},
++    {159, 2},
++    {161, 3},
      {23, 4},
--    {162, 4},
--    {163, 5},
-     {84, 4},
 -    {83, 4},
      {164, 4},
--    {165, 4},
++    {165, 5},
++    {84, 4},
      {166, 4},
++    {167, 4},
++    {168, 4},
  };
--static arc arcs_69_1[3] = {
 -    {50, 6},
 -    {156, 6},
++static arc arcs_70_1[3] = {
 +    {51, 6},
-     {156, 6},
++    {158, 6},
      {15, 4},
  };
--static arc arcs_69_2[2] = {
--    {156, 7},
--    {158, 4},
++static arc arcs_70_2[2] = {
++    {158, 7},
++    {160, 4},
  };
--static arc arcs_69_3[2] = {
--    {160, 8},
--    {161, 4},
++static arc arcs_70_3[2] = {
++    {162, 8},
++    {163, 4},
  };
--static arc arcs_69_4[1] = {
++static arc arcs_70_4[1] = {
      {0, 4},
  };
--static arc arcs_69_5[2] = {
--    {163, 5},
++static arc arcs_70_5[2] = {
++    {165, 5},
      {0, 5},
  };
--static arc arcs_69_6[1] = {
++static arc arcs_70_6[1] = {
      {15, 4},
  };
--static arc arcs_69_7[1] = {
--    {158, 4},
++static arc arcs_70_7[1] = {
++    {160, 4},
  };
--static arc arcs_69_8[1] = {
--    {161, 4},
++static arc arcs_70_8[1] = {
++    {163, 4},
  };
--static state states_69[9] = {
--    {10, arcs_69_0},
--    {3, arcs_69_1},
--    {2, arcs_69_2},
--    {2, arcs_69_3},
--    {1, arcs_69_4},
--    {2, arcs_69_5},
--    {1, arcs_69_6},
--    {1, arcs_69_7},
--    {1, arcs_69_8},
--};
--static arc arcs_70_0[2] = {
-     {26, 1},
 -    {98, 1},
 -    {51, 1},
++static state states_70[9] = {
++    {10, arcs_70_0},
++    {3, arcs_70_1},
++    {2, arcs_70_2},
++    {2, arcs_70_3},
++    {1, arcs_70_4},
++    {2, arcs_70_5},
++    {1, arcs_70_6},
++    {1, arcs_70_7},
++    {1, arcs_70_8},
++};
++static arc arcs_71_0[2] = {
++    {99, 1},
 +    {52, 1},
  };
--static arc arcs_70_1[3] = {
--    {167, 2},
 -    {32, 3},
++static arc arcs_71_1[3] = {
++    {169, 2},
 +    {33, 3},
      {0, 1},
  };
--static arc arcs_70_2[1] = {
++static arc arcs_71_2[1] = {
      {0, 2},
  };
--static arc arcs_70_3[3] = {
-     {26, 4},
 -    {98, 4},
 -    {51, 4},
++static arc arcs_71_3[3] = {
++    {99, 4},
 +    {52, 4},
      {0, 3},
  };
--static arc arcs_70_4[2] = {
 -    {32, 3},
++static arc arcs_71_4[2] = {
 +    {33, 3},
      {0, 4},
  };
--static state states_70[5] = {
--    {2, arcs_70_0},
--    {3, arcs_70_1},
--    {1, arcs_70_2},
--    {3, arcs_70_3},
--    {2, arcs_70_4},
++static state states_71[5] = {
++    {2, arcs_71_0},
++    {3, arcs_71_1},
++    {1, arcs_71_2},
++    {3, arcs_71_3},
++    {2, arcs_71_4},
  };
--static arc arcs_71_0[3] = {
++static arc arcs_72_0[3] = {
      {13, 1},
--    {157, 2},
 -    {82, 3},
++    {159, 2},
 +    {83, 3},
  };
--static arc arcs_71_1[2] = {
++static arc arcs_72_1[2] = {
      {14, 4},
      {15, 5},
  };
--static arc arcs_71_2[1] = {
--    {168, 6},
++static arc arcs_72_2[1] = {
++    {170, 6},
  };
--static arc arcs_71_3[1] = {
++static arc arcs_72_3[1] = {
      {23, 5},
  };
--static arc arcs_71_4[1] = {
++static arc arcs_72_4[1] = {
      {15, 5},
  };
--static arc arcs_71_5[1] = {
++static arc arcs_72_5[1] = {
      {0, 5},
  };
--static arc arcs_71_6[1] = {
--    {158, 5},
++static arc arcs_72_6[1] = {
++    {160, 5},
  };
--static state states_71[7] = {
--    {3, arcs_71_0},
--    {2, arcs_71_1},
--    {1, arcs_71_2},
--    {1, arcs_71_3},
--    {1, arcs_71_4},
--    {1, arcs_71_5},
--    {1, arcs_71_6},
++static state states_72[7] = {
++    {3, arcs_72_0},
++    {2, arcs_72_1},
++    {1, arcs_72_2},
++    {1, arcs_72_3},
++    {1, arcs_72_4},
++    {1, arcs_72_5},
++    {1, arcs_72_6},
  };
--static arc arcs_72_0[1] = {
--    {169, 1},
++static arc arcs_73_0[1] = {
++    {171, 1},
  };
--static arc arcs_72_1[2] = {
 -    {32, 2},
++static arc arcs_73_1[2] = {
 +    {33, 2},
      {0, 1},
  };
--static arc arcs_72_2[2] = {
--    {169, 1},
++static arc arcs_73_2[2] = {
++    {171, 1},
      {0, 2},
  };
--static state states_72[3] = {
--    {1, arcs_72_0},
--    {2, arcs_72_1},
--    {2, arcs_72_2},
++static state states_73[3] = {
++    {1, arcs_73_0},
++    {2, arcs_73_1},
++    {2, arcs_73_2},
  };
--static arc arcs_73_0[2] = {
++static arc arcs_74_0[2] = {
      {26, 1},
      {27, 2},
  };
--static arc arcs_73_1[2] = {
++static arc arcs_74_1[2] = {
      {27, 2},
      {0, 1},
  };
--static arc arcs_73_2[3] = {
++static arc arcs_74_2[3] = {
      {26, 3},
--    {170, 4},
++    {172, 4},
      {0, 2},
  };
--static arc arcs_73_3[2] = {
--    {170, 4},
++static arc arcs_74_3[2] = {
++    {172, 4},
      {0, 3},
  };
--static arc arcs_73_4[1] = {
++static arc arcs_74_4[1] = {
      {0, 4},
  };
--static state states_73[5] = {
--    {2, arcs_73_0},
--    {2, arcs_73_1},
--    {3, arcs_73_2},
--    {2, arcs_73_3},
--    {1, arcs_73_4},
++static state states_74[5] = {
++    {2, arcs_74_0},
++    {2, arcs_74_1},
++    {3, arcs_74_2},
++    {2, arcs_74_3},
++    {1, arcs_74_4},
  };
--static arc arcs_74_0[1] = {
++static arc arcs_75_0[1] = {
      {27, 1},
  };
--static arc arcs_74_1[2] = {
++static arc arcs_75_1[2] = {
      {26, 2},
      {0, 1},
  };
--static arc arcs_74_2[1] = {
++static arc arcs_75_2[1] = {
      {0, 2},
  };
--static state states_74[3] = {
--    {1, arcs_74_0},
--    {2, arcs_74_1},
--    {1, arcs_74_2},
++static state states_75[3] = {
++    {1, arcs_75_0},
++    {2, arcs_75_1},
++    {1, arcs_75_2},
  };
--static arc arcs_75_0[2] = {
-     {110, 1},
 -    {109, 1},
 -    {51, 1},
++static arc arcs_76_0[2] = {
++    {111, 1},
 +    {52, 1},
  };
--static arc arcs_75_1[2] = {
 -    {32, 2},
++static arc arcs_76_1[2] = {
 +    {33, 2},
      {0, 1},
  };
--static arc arcs_75_2[3] = {
-     {110, 1},
 -    {109, 1},
 -    {51, 1},
++static arc arcs_76_2[3] = {
++    {111, 1},
 +    {52, 1},
      {0, 2},
  };
--static state states_75[3] = {
--    {2, arcs_75_0},
--    {2, arcs_75_1},
--    {3, arcs_75_2},
++static state states_76[3] = {
++    {2, arcs_76_0},
++    {2, arcs_76_1},
++    {3, arcs_76_2},
  };
--static arc arcs_76_0[1] = {
++static arc arcs_77_0[1] = {
      {26, 1},
  };
--static arc arcs_76_1[2] = {
 -    {32, 2},
++static arc arcs_77_1[2] = {
 +    {33, 2},
      {0, 1},
  };
--static arc arcs_76_2[2] = {
++static arc arcs_77_2[2] = {
      {26, 1},
      {0, 2},
  };
--static state states_76[3] = {
--    {1, arcs_76_0},
--    {2, arcs_76_1},
--    {2, arcs_76_2},
++static state states_77[3] = {
++    {1, arcs_77_0},
++    {2, arcs_77_1},
++    {2, arcs_77_2},
  };
--static arc arcs_77_0[3] = {
++static arc arcs_78_0[3] = {
      {26, 1},
 -    {34, 2},
 -    {51, 3},
 +    {35, 2},
 +    {52, 3},
  };
--static arc arcs_77_1[4] = {
++static arc arcs_78_1[4] = {
      {27, 4},
--    {167, 5},
 -    {32, 6},
++    {169, 5},
 +    {33, 6},
      {0, 1},
  };
--static arc arcs_77_2[1] = {
-     {110, 7},
 -    {109, 7},
++static arc arcs_78_2[1] = {
++    {111, 7},
  };
--static arc arcs_77_3[3] = {
--    {167, 5},
 -    {32, 6},
++static arc arcs_78_3[3] = {
++    {169, 5},
 +    {33, 6},
      {0, 3},
  };
--static arc arcs_77_4[1] = {
++static arc arcs_78_4[1] = {
      {26, 7},
  };
--static arc arcs_77_5[1] = {
++static arc arcs_78_5[1] = {
      {0, 5},
  };
--static arc arcs_77_6[3] = {
++static arc arcs_78_6[3] = {
      {26, 8},
 -    {51, 8},
 +    {52, 8},
      {0, 6},
  };
--static arc arcs_77_7[3] = {
--    {167, 5},
 -    {32, 9},
++static arc arcs_78_7[3] = {
++    {169, 5},
 +    {33, 9},
      {0, 7},
  };
--static arc arcs_77_8[2] = {
 -    {32, 6},
++static arc arcs_78_8[2] = {
 +    {33, 6},
      {0, 8},
  };
--static arc arcs_77_9[3] = {
++static arc arcs_78_9[3] = {
      {26, 10},
 -    {34, 11},
 +    {35, 11},
      {0, 9},
  };
--static arc arcs_77_10[1] = {
++static arc arcs_78_10[1] = {
      {27, 12},
  };
--static arc arcs_77_11[1] = {
-     {110, 13},
 -    {109, 13},
++static arc arcs_78_11[1] = {
++    {111, 13},
  };
--static arc arcs_77_12[1] = {
++static arc arcs_78_12[1] = {
      {26, 13},
  };
--static arc arcs_77_13[2] = {
 -    {32, 9},
++static arc arcs_78_13[2] = {
 +    {33, 9},
      {0, 13},
  };
--static state states_77[14] = {
--    {3, arcs_77_0},
--    {4, arcs_77_1},
--    {1, arcs_77_2},
--    {3, arcs_77_3},
--    {1, arcs_77_4},
--    {1, arcs_77_5},
--    {3, arcs_77_6},
--    {3, arcs_77_7},
--    {2, arcs_77_8},
--    {3, arcs_77_9},
--    {1, arcs_77_10},
--    {1, arcs_77_11},
--    {1, arcs_77_12},
--    {2, arcs_77_13},
--};
--static arc arcs_78_0[1] = {
--    {171, 1},
++static state states_78[14] = {
++    {3, arcs_78_0},
++    {4, arcs_78_1},
++    {1, arcs_78_2},
++    {3, arcs_78_3},
++    {1, arcs_78_4},
++    {1, arcs_78_5},
++    {3, arcs_78_6},
++    {3, arcs_78_7},
++    {2, arcs_78_8},
++    {3, arcs_78_9},
++    {1, arcs_78_10},
++    {1, arcs_78_11},
++    {1, arcs_78_12},
++    {2, arcs_78_13},
 +};
- static arc arcs_78_1[1] = {
++static arc arcs_79_0[1] = {
++    {173, 1},
+ };
 -static arc arcs_78_1[1] = {
++static arc arcs_79_1[1] = {
      {23, 2},
  };
--static arc arcs_78_2[2] = {
++static arc arcs_79_2[2] = {
      {13, 3},
      {27, 4},
  };
--static arc arcs_78_3[2] = {
++static arc arcs_79_3[2] = {
      {14, 5},
      {15, 6},
  };
--static arc arcs_78_4[1] = {
-     {99, 7},
 -    {28, 7},
++static arc arcs_79_4[1] = {
++    {100, 7},
  };
--static arc arcs_78_5[1] = {
++static arc arcs_79_5[1] = {
      {15, 6},
  };
--static arc arcs_78_6[1] = {
++static arc arcs_79_6[1] = {
      {27, 4},
  };
--static arc arcs_78_7[1] = {
++static arc arcs_79_7[1] = {
      {0, 7},
  };
--static state states_78[8] = {
--    {1, arcs_78_0},
--    {1, arcs_78_1},
--    {2, arcs_78_2},
--    {2, arcs_78_3},
--    {1, arcs_78_4},
--    {1, arcs_78_5},
--    {1, arcs_78_6},
--    {1, arcs_78_7},
++static state states_79[8] = {
++    {1, arcs_79_0},
++    {1, arcs_79_1},
++    {2, arcs_79_2},
++    {2, arcs_79_3},
++    {1, arcs_79_4},
++    {1, arcs_79_5},
++    {1, arcs_79_6},
++    {1, arcs_79_7},
  };
--static arc arcs_79_0[1] = {
--    {172, 1},
++static arc arcs_80_0[1] = {
++    {174, 1},
  };
--static arc arcs_79_1[2] = {
 -    {32, 2},
++static arc arcs_80_1[2] = {
 +    {33, 2},
      {0, 1},
  };
--static arc arcs_79_2[2] = {
--    {172, 1},
++static arc arcs_80_2[2] = {
++    {174, 1},
      {0, 2},
  };
--static state states_79[3] = {
--    {1, arcs_79_0},
--    {2, arcs_79_1},
--    {2, arcs_79_2},
++static state states_80[3] = {
++    {1, arcs_80_0},
++    {2, arcs_80_1},
++    {2, arcs_80_2},
  };
--static arc arcs_80_0[3] = {
++static arc arcs_81_0[3] = {
      {26, 1},
 +    {35, 2},
      {34, 2},
 -    {33, 2},
  };
- static arc arcs_80_1[3] = {
 -static arc arcs_80_1[4] = {
--    {167, 3},
 -    {113, 2},
 -    {31, 2},
++static arc arcs_81_1[4] = {
++    {169, 3},
++    {115, 2},
 +    {32, 2},
      {0, 1},
  };
--static arc arcs_80_2[1] = {
++static arc arcs_81_2[1] = {
      {26, 3},
  };
--static arc arcs_80_3[1] = {
++static arc arcs_81_3[1] = {
      {0, 3},
  };
--static state states_80[4] = {
--    {3, arcs_80_0},
-     {3, arcs_80_1},
 -    {4, arcs_80_1},
--    {1, arcs_80_2},
--    {1, arcs_80_3},
++static state states_81[4] = {
++    {3, arcs_81_0},
++    {4, arcs_81_1},
++    {1, arcs_81_2},
++    {1, arcs_81_3},
  };
--static arc arcs_81_0[2] = {
--    {167, 1},
--    {174, 1},
++static arc arcs_82_0[2] = {
++    {169, 1},
++    {176, 1},
  };
--static arc arcs_81_1[1] = {
++static arc arcs_82_1[1] = {
      {0, 1},
  };
--static state states_81[2] = {
--    {2, arcs_81_0},
--    {1, arcs_81_1},
++static state states_82[2] = {
++    {2, arcs_82_0},
++    {1, arcs_82_1},
  };
--static arc arcs_82_0[1] = {
-     {103, 1},
 -    {102, 1},
++static arc arcs_83_0[1] = {
++    {104, 1},
  };
--static arc arcs_82_1[1] = {
 -    {66, 2},
++static arc arcs_83_1[1] = {
 +    {67, 2},
  };
--static arc arcs_82_2[1] = {
-     {104, 3},
 -    {103, 3},
++static arc arcs_83_2[1] = {
++    {105, 3},
  };
--static arc arcs_82_3[1] = {
--    {114, 4},
++static arc arcs_83_3[1] = {
++    {116, 4},
  };
--static arc arcs_82_4[2] = {
--    {173, 5},
++static arc arcs_83_4[2] = {
++    {175, 5},
      {0, 4},
  };
--static arc arcs_82_5[1] = {
++static arc arcs_83_5[1] = {
      {0, 5},
  };
--static state states_82[6] = {
--    {1, arcs_82_0},
--    {1, arcs_82_1},
--    {1, arcs_82_2},
--    {1, arcs_82_3},
--    {2, arcs_82_4},
--    {1, arcs_82_5},
 -};
 -static arc arcs_83_0[2] = {
 -    {21, 1},
 -    {175, 2},
 -};
 -static arc arcs_83_1[1] = {
 -    {175, 2},
 -};
 -static arc arcs_83_2[1] = {
 -    {0, 2},
 -};
 -static state states_83[3] = {
 -    {2, arcs_83_0},
++static state states_83[6] = {
++    {1, arcs_83_0},
+     {1, arcs_83_1},
+     {1, arcs_83_2},
++    {1, arcs_83_3},
++    {2, arcs_83_4},
++    {1, arcs_83_5},
  };
- static arc arcs_83_0[2] = {
 -static arc arcs_84_0[1] = {
 -    {97, 1},
++static arc arcs_84_0[2] = {
 +    {21, 1},
-     {175, 2},
++    {177, 2},
  };
- static arc arcs_83_1[1] = {
-     {175, 2},
+ static arc arcs_84_1[1] = {
 -    {116, 2},
++    {177, 2},
  };
- static arc arcs_83_2[1] = {
 -static arc arcs_84_2[2] = {
 -    {173, 3},
++static arc arcs_84_2[1] = {
      {0, 2},
  };
- static state states_83[3] = {
-     {2, arcs_83_0},
-     {1, arcs_83_1},
-     {1, arcs_83_2},
 -static arc arcs_84_3[1] = {
 -    {0, 3},
 -};
 -static state states_84[4] = {
 -    {1, arcs_84_0},
++static state states_84[3] = {
++    {2, arcs_84_0},
+     {1, arcs_84_1},
 -    {2, arcs_84_2},
 -    {1, arcs_84_3},
++    {1, arcs_84_2},
  };
- static arc arcs_84_0[1] = {
+ static arc arcs_85_0[1] = {
 -    {23, 1},
 +    {98, 1},
  };
- static arc arcs_84_1[1] = {
-     {116, 2},
+ static arc arcs_85_1[1] = {
 -    {0, 1},
++    {118, 2},
 +};
- static arc arcs_84_2[2] = {
-     {173, 3},
++static arc arcs_85_2[2] = {
++    {175, 3},
 +    {0, 2},
  };
- static arc arcs_84_3[1] = {
 -static state states_85[2] = {
++static arc arcs_85_3[1] = {
 +    {0, 3},
 +};
- static state states_84[4] = {
-     {1, arcs_84_0},
-     {1, arcs_84_1},
-     {2, arcs_84_2},
-     {1, arcs_84_3},
++static state states_85[4] = {
+     {1, arcs_85_0},
+     {1, arcs_85_1},
++    {2, arcs_85_2},
++    {1, arcs_85_3},
  };
- static arc arcs_85_0[1] = {
+ static arc arcs_86_0[1] = {
 -    {177, 1},
 +    {23, 1},
  };
- static arc arcs_85_1[1] = {
 -static arc arcs_86_1[2] = {
 -    {178, 2},
++static arc arcs_86_1[1] = {
      {0, 1},
  };
- static state states_85[2] = {
-     {1, arcs_85_0},
-     {1, arcs_85_1},
 -static arc arcs_86_2[1] = {
 -    {0, 2},
 -};
 -static state states_86[3] = {
++static state states_86[2] = {
+     {1, arcs_86_0},
 -    {2, arcs_86_1},
 -    {1, arcs_86_2},
++    {1, arcs_86_1},
  };
- static arc arcs_86_0[1] = {
-     {177, 1},
 -static arc arcs_87_0[2] = {
 -    {77, 1},
 -    {47, 2},
++static arc arcs_87_0[1] = {
++    {179, 1},
  };
- static arc arcs_86_1[2] = {
-     {178, 2},
 -static arc arcs_87_1[1] = {
 -    {26, 2},
++static arc arcs_87_1[2] = {
++    {180, 2},
 +    {0, 1},
  };
- static arc arcs_86_2[1] = {
+ static arc arcs_87_2[1] = {
      {0, 2},
  };
- static state states_86[3] = {
-     {1, arcs_86_0},
-     {2, arcs_86_1},
-     {1, arcs_86_2},
+ static state states_87[3] = {
 -    {2, arcs_87_0},
 -    {1, arcs_87_1},
++    {1, arcs_87_0},
++    {2, arcs_87_1},
+     {1, arcs_87_2},
  };
- static arc arcs_87_0[2] = {
 -static dfa dfas[88] = {
++static arc arcs_88_0[2] = {
 +    {78, 1},
 +    {48, 2},
 +};
- static arc arcs_87_1[1] = {
++static arc arcs_88_1[1] = {
 +    {26, 2},
 +};
- static arc arcs_87_2[1] = {
++static arc arcs_88_2[1] = {
 +    {0, 2},
 +};
- static state states_87[3] = {
-     {2, arcs_87_0},
-     {1, arcs_87_1},
-     {1, arcs_87_2},
++static state states_88[3] = {
++    {2, arcs_88_0},
++    {1, arcs_88_1},
++    {1, arcs_88_2},
 +};
- static arc arcs_88_0[1] = {
-     {180, 1},
++static arc arcs_89_0[1] = {
++    {182, 1},
 +};
- static arc arcs_88_1[2] = {
++static arc arcs_89_1[2] = {
 +    {2, 1},
 +    {7, 2},
 +};
- static arc arcs_88_2[1] = {
++static arc arcs_89_2[1] = {
 +    {0, 2},
 +};
- static state states_88[3] = {
-     {1, arcs_88_0},
-     {2, arcs_88_1},
-     {1, arcs_88_2},
++static state states_89[3] = {
++    {1, arcs_89_0},
++    {2, arcs_89_1},
++    {1, arcs_89_2},
 +};
- static arc arcs_89_0[1] = {
++static arc arcs_90_0[1] = {
 +    {13, 1},
 +};
- static arc arcs_89_1[2] = {
-     {181, 2},
++static arc arcs_90_1[2] = {
++    {183, 2},
 +    {15, 3},
 +};
- static arc arcs_89_2[1] = {
++static arc arcs_90_2[1] = {
 +    {15, 3},
 +};
- static arc arcs_89_3[1] = {
++static arc arcs_90_3[1] = {
 +    {25, 4},
 +};
- static arc arcs_89_4[1] = {
++static arc arcs_90_4[1] = {
 +    {26, 5},
 +};
- static arc arcs_89_5[1] = {
++static arc arcs_90_5[1] = {
 +    {0, 5},
 +};
- static state states_89[6] = {
-     {1, arcs_89_0},
-     {2, arcs_89_1},
-     {1, arcs_89_2},
-     {1, arcs_89_3},
-     {1, arcs_89_4},
-     {1, arcs_89_5},
++static state states_90[6] = {
++    {1, arcs_90_0},
++    {2, arcs_90_1},
++    {1, arcs_90_2},
++    {1, arcs_90_3},
++    {1, arcs_90_4},
++    {1, arcs_90_5},
 +};
- static arc arcs_90_0[3] = {
++static arc arcs_91_0[3] = {
 +    {26, 1},
 +    {34, 2},
 +    {35, 3},
 +};
- static arc arcs_90_1[2] = {
++static arc arcs_91_1[2] = {
 +    {33, 4},
 +    {0, 1},
 +};
- static arc arcs_90_2[3] = {
++static arc arcs_91_2[3] = {
 +    {26, 5},
 +    {33, 6},
 +    {0, 2},
 +};
- static arc arcs_90_3[1] = {
++static arc arcs_91_3[1] = {
 +    {26, 7},
 +};
- static arc arcs_90_4[4] = {
++static arc arcs_91_4[4] = {
 +    {26, 1},
 +    {34, 8},
 +    {35, 3},
 +    {0, 4},
 +};
- static arc arcs_90_5[2] = {
++static arc arcs_91_5[2] = {
 +    {33, 6},
 +    {0, 5},
 +};
- static arc arcs_90_6[2] = {
++static arc arcs_91_6[2] = {
 +    {26, 5},
 +    {35, 3},
 +};
- static arc arcs_90_7[1] = {
++static arc arcs_91_7[1] = {
 +    {0, 7},
 +};
- static arc arcs_90_8[3] = {
++static arc arcs_91_8[3] = {
 +    {26, 9},
 +    {33, 10},
 +    {0, 8},
 +};
- static arc arcs_90_9[2] = {
++static arc arcs_91_9[2] = {
 +    {33, 10},
 +    {0, 9},
 +};
- static arc arcs_90_10[2] = {
++static arc arcs_91_10[2] = {
 +    {26, 9},
 +    {35, 3},
 +};
- static state states_90[11] = {
-     {3, arcs_90_0},
-     {2, arcs_90_1},
-     {3, arcs_90_2},
-     {1, arcs_90_3},
-     {4, arcs_90_4},
-     {2, arcs_90_5},
-     {2, arcs_90_6},
-     {1, arcs_90_7},
-     {3, arcs_90_8},
-     {2, arcs_90_9},
-     {2, arcs_90_10},
- };
- static dfa dfas[91] = {
++static state states_91[11] = {
++    {3, arcs_91_0},
++    {2, arcs_91_1},
++    {3, arcs_91_2},
++    {1, arcs_91_3},
++    {4, arcs_91_4},
++    {2, arcs_91_5},
++    {2, arcs_91_6},
++    {1, arcs_91_7},
++    {3, arcs_91_8},
++    {2, arcs_91_9},
++    {2, arcs_91_10},
++};
++static dfa dfas[92] = {
      {256, "single_input", 0, 3, states_0,
-      "\004\050\340\000\004\000\000\000\024\174\022\016\304\022\100\010\000\000\103\242\174\010\002"},
 -     "\004\050\340\000\002\000\000\000\012\076\011\007\142\011\100\010\000\000\103\242\174\010\002"},
++     "\004\050\340\000\004\000\000\000\024\174\022\016\204\045\000\041\000\000\014\211\362\041\010"},
      {257, "file_input", 0, 2, states_1,
-      "\204\050\340\000\004\000\000\000\024\174\022\016\304\022\100\010\000\000\103\242\174\010\002"},
 -     "\204\050\340\000\002\000\000\000\012\076\011\007\142\011\100\010\000\000\103\242\174\010\002"},
++     "\204\050\340\000\004\000\000\000\024\174\022\016\204\045\000\041\000\000\014\211\362\041\010"},
      {258, "eval_input", 0, 3, states_2,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\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\000\000"},
      {260, "decorators", 0, 2, states_4,
@@@ -2130,41 -1962,41 +2151,41 @@@
      {268, "vfpdef", 0, 2, states_12,
       "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
      {269, "stmt", 0, 2, states_13,
-      "\000\050\340\000\004\000\000\000\024\174\022\016\304\022\100\010\000\000\103\242\174\010\002"},
 -     "\000\050\340\000\002\000\000\000\012\076\011\007\142\011\100\010\000\000\103\242\174\010\002"},
++     "\000\050\340\000\004\000\000\000\024\174\022\016\204\045\000\041\000\000\014\211\362\041\010"},
      {270, "simple_stmt", 0, 4, states_14,
-      "\000\040\200\000\004\000\000\000\024\174\022\016\000\000\100\010\000\000\103\242\174\000\002"},
 -     "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\100\010\000\000\103\242\174\000\002"},
++     "\000\040\200\000\004\000\000\000\024\174\022\016\000\000\000\041\000\000\014\211\362\001\010"},
      {271, "small_stmt", 0, 2, states_15,
-      "\000\040\200\000\004\000\000\000\024\174\022\016\000\000\100\010\000\000\103\242\174\000\002"},
 -     "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\100\010\000\000\103\242\174\000\002"},
++     "\000\040\200\000\004\000\000\000\024\174\022\016\000\000\000\041\000\000\014\211\362\001\010"},
      {272, "expr_stmt", 0, 6, states_16,
-      "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
 -     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
++     "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
      {273, "annassign", 0, 5, states_17,
       "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
      {274, "testlist_star_expr", 0, 3, states_18,
-      "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
 -     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
++     "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
      {275, "augassign", 0, 2, states_19,
 -     "\000\000\000\000\000\000\360\377\001\000\000\000\000\000\000\000\000\000\000\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"},
      {276, "del_stmt", 0, 3, states_20,
 -     "\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\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
      {277, "pass_stmt", 0, 2, states_21,
 -     "\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\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
      {278, "flow_stmt", 0, 2, states_22,
-      "\000\000\000\000\000\000\000\000\000\074\000\000\000\000\000\000\000\000\000\000\000\000\002"},
 -     "\000\000\000\000\000\000\000\000\000\036\000\000\000\000\000\000\000\000\000\000\000\000\002"},
++     "\000\000\000\000\000\000\000\000\000\074\000\000\000\000\000\000\000\000\000\000\000\000\010"},
      {279, "break_stmt", 0, 2, states_23,
 -     "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000"},
 -    {280, "continue_stmt", 0, 2, states_24,
       "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000"},
 -    {281, "return_stmt", 0, 3, states_25,
 +    {280, "continue_stmt", 0, 2, states_24,
       "\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000"},
 +    {281, "return_stmt", 0, 3, states_25,
 +     "\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000"},
      {282, "yield_stmt", 0, 2, states_26,
--     "\000\000\000\000\000\000\000\000\000\000\000\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\000\000\010"},
      {283, "raise_stmt", 0, 5, states_27,
 -     "\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\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000"},
      {284, "import_stmt", 0, 2, states_28,
 -     "\000\000\000\000\000\000\000\000\000\040\001\000\000\000\000\000\000\000\000\000\000\000\000"},
 +     "\000\000\000\000\000\000\000\000\000\100\002\000\000\000\000\000\000\000\000\000\000\000\000"},
      {285, "import_name", 0, 3, states_29,
 -     "\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\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000"},
      {286, "import_from", 0, 8, states_30,
 -     "\000\000\000\000\000\000\000\000\000\040\000\000\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\000\000"},
      {287, "import_as_name", 0, 4, states_31,
       "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
      {288, "dotted_as_name", 0, 4, states_32,
@@@ -2176,117 -2008,111 +2197,119 @@@
      {291, "dotted_name", 0, 2, states_35,
       "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
      {292, "global_stmt", 0, 3, states_36,
 -     "\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000"},
 -    {293, "nonlocal_stmt", 0, 3, states_37,
       "\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000"},
 -    {294, "assert_stmt", 0, 5, states_38,
 +    {293, "nonlocal_stmt", 0, 3, states_37,
       "\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000"},
 +    {294, "assert_stmt", 0, 5, states_38,
 +     "\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000"},
      {295, "compound_stmt", 0, 2, states_39,
-      "\000\010\140\000\000\000\000\000\000\000\000\000\304\022\000\000\000\000\000\000\000\010\000"},
 -     "\000\010\140\000\000\000\000\000\000\000\000\000\142\011\000\000\000\000\000\000\000\010\000"},
++     "\000\010\140\000\000\000\000\000\000\000\000\000\204\045\000\000\000\000\000\000\000\040\000"},
      {296, "async_stmt", 0, 3, states_40,
       "\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
      {297, "if_stmt", 0, 8, states_41,
 -     "\000\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\000\000\004\000\000\000\000\000\000\000\000\000\000"},
      {298, "while_stmt", 0, 8, states_42,
 -     "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
 -    {299, "for_stmt", 0, 10, states_43,
--     "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000"},
-     {299, "for_stmt", 0, 11, states_43,
 -    {300, "try_stmt", 0, 13, states_44,
 +     "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000"},
++    {299, "for_stmt", 0, 11, states_43,
+      "\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
 -    {301, "with_stmt", 0, 5, states_45,
 -     "\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"},
 +    {300, "try_stmt", 0, 13, states_44,
-      "\000\000\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\000\000\004\000\000\000\000\000\000\000\000\000"},
 +    {301, "with_stmt", 0, 6, states_45,
-      "\000\000\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\000\000\040\000\000\000\000\000\000\000\000\000"},
      {302, "with_item", 0, 4, states_46,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
      {303, "except_clause", 0, 5, states_47,
-      "\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\100\000\000\000\000\000\000\000\000\000"},
 -    {304, "suite", 0, 5, states_48,
 -     "\004\040\200\000\002\000\000\000\012\076\011\007\000\000\100\010\000\000\103\242\174\000\002"},
 -    {305, "namedexpr_test", 0, 4, states_49,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
 -    {306, "test", 0, 6, states_50,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
 -    {307, "test_nocond", 0, 2, states_51,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
 -    {308, "lambdef", 0, 5, states_52,
 -     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
 -    {309, "lambdef_nocond", 0, 5, states_53,
 -     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
 -    {310, "or_test", 0, 2, states_54,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\010\000\000\103\242\174\000\000"},
 -    {311, "and_test", 0, 2, states_55,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\010\000\000\103\242\174\000\000"},
 -    {312, "not_test", 0, 3, states_56,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\010\000\000\103\242\174\000\000"},
 -    {313, "comparison", 0, 2, states_57,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
 -    {314, "comp_op", 0, 4, states_58,
 -     "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\310\077\000\000\000\000\000\000"},
 -    {315, "star_expr", 0, 3, states_59,
 -     "\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
 -    {316, "expr", 0, 2, states_60,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
 -    {317, "xor_expr", 0, 2, states_61,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
 -    {318, "and_expr", 0, 2, states_62,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
 -    {319, "shift_expr", 0, 2, states_63,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
 -    {320, "arith_expr", 0, 2, states_64,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
 -    {321, "term", 0, 2, states_65,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
 -    {322, "factor", 0, 3, states_66,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
 -    {323, "power", 0, 4, states_67,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\242\174\000\000"},
 -    {324, "atom_expr", 0, 3, states_68,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\242\174\000\000"},
 -    {325, "atom", 0, 9, states_69,
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\240\174\000\000"},
 -    {326, "testlist_comp", 0, 5, states_70,
 -     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
 -    {327, "trailer", 0, 7, states_71,
 -     "\000\040\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\040\000\000\000"},
 -    {328, "subscriptlist", 0, 3, states_72,
 -     "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
 -    {329, "subscript", 0, 5, states_73,
 -     "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
 -    {330, "sliceop", 0, 3, states_74,
++     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000"},
 +    {304, "func_body_suite", 0, 7, states_48,
-      "\004\040\200\000\004\000\000\000\024\174\022\016\000\000\100\010\000\000\103\242\174\000\002"},
++     "\004\040\200\000\004\000\000\000\024\174\022\016\000\000\000\041\000\000\014\211\362\001\010"},
 +    {305, "suite", 0, 5, states_49,
-      "\004\040\200\000\004\000\000\000\024\174\022\016\000\000\100\010\000\000\103\242\174\000\002"},
-     {306, "test", 0, 6, states_50,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
-     {307, "test_nocond", 0, 2, states_51,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
-     {308, "lambdef", 0, 5, states_52,
-      "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
-     {309, "lambdef_nocond", 0, 5, states_53,
-      "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
-     {310, "or_test", 0, 2, states_54,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\010\000\000\103\242\174\000\000"},
-     {311, "and_test", 0, 2, states_55,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\010\000\000\103\242\174\000\000"},
-     {312, "not_test", 0, 3, states_56,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\010\000\000\103\242\174\000\000"},
-     {313, "comparison", 0, 2, states_57,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\103\242\174\000\000"},
-     {314, "comp_op", 0, 4, states_58,
-      "\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\310\077\000\000\000\000\000\000"},
-     {315, "star_expr", 0, 3, states_59,
++     "\004\040\200\000\004\000\000\000\024\174\022\016\000\000\000\041\000\000\014\211\362\001\010"},
++    {306, "namedexpr_test", 0, 4, states_50,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {307, "test", 0, 6, states_51,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {308, "test_nocond", 0, 2, states_52,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {309, "lambdef", 0, 5, states_53,
++     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"},
++    {310, "lambdef_nocond", 0, 5, states_54,
++     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"},
++    {311, "or_test", 0, 2, states_55,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\040\000\000\014\211\362\001\000"},
++    {312, "and_test", 0, 2, states_56,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\040\000\000\014\211\362\001\000"},
++    {313, "not_test", 0, 3, states_57,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\040\000\000\014\211\362\001\000"},
++    {314, "comparison", 0, 2, states_58,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
++    {315, "comp_op", 0, 4, states_59,
++     "\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\040\377\000\000\000\000\000\000"},
++    {316, "star_expr", 0, 3, states_60,
 +     "\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-     {316, "expr", 0, 2, states_60,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\103\242\174\000\000"},
-     {317, "xor_expr", 0, 2, states_61,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\103\242\174\000\000"},
-     {318, "and_expr", 0, 2, states_62,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\103\242\174\000\000"},
-     {319, "shift_expr", 0, 2, states_63,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\103\242\174\000\000"},
-     {320, "arith_expr", 0, 2, states_64,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\103\242\174\000\000"},
-     {321, "term", 0, 2, states_65,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\103\242\174\000\000"},
-     {322, "factor", 0, 3, states_66,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\103\242\174\000\000"},
-     {323, "power", 0, 4, states_67,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\242\174\000\000"},
-     {324, "atom_expr", 0, 3, states_68,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\242\174\000\000"},
-     {325, "atom", 0, 9, states_69,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\240\174\000\000"},
-     {326, "testlist_comp", 0, 5, states_70,
-      "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
-     {327, "trailer", 0, 7, states_71,
-      "\000\040\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\040\000\000\000"},
-     {328, "subscriptlist", 0, 3, states_72,
-      "\000\040\200\010\000\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
-     {329, "subscript", 0, 5, states_73,
-      "\000\040\200\010\000\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
-     {330, "sliceop", 0, 3, states_74,
++    {317, "expr", 0, 2, states_61,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
++    {318, "xor_expr", 0, 2, states_62,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
++    {319, "and_expr", 0, 2, states_63,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
++    {320, "shift_expr", 0, 2, states_64,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
++    {321, "arith_expr", 0, 2, states_65,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
++    {322, "term", 0, 2, states_66,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
++    {323, "factor", 0, 3, states_67,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
++    {324, "power", 0, 4, states_68,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\210\362\001\000"},
++    {325, "atom_expr", 0, 3, states_69,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\210\362\001\000"},
++    {326, "atom", 0, 9, states_70,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\200\362\001\000"},
++    {327, "testlist_comp", 0, 5, states_71,
++     "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {328, "trailer", 0, 7, states_72,
++     "\000\040\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\200\000\000\000"},
++    {329, "subscriptlist", 0, 3, states_73,
++     "\000\040\200\010\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {330, "subscript", 0, 5, states_74,
++     "\000\040\200\010\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {331, "sliceop", 0, 3, states_75,
       "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
--    {331, "exprlist", 0, 3, states_75,
-      "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\000\000\000\103\242\174\000\000"},
 -     "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
--    {332, "testlist", 0, 3, states_76,
-      "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
 -     "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
--    {333, "dictorsetmaker", 0, 14, states_77,
-      "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
 -     "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
--    {334, "classdef", 0, 8, states_78,
--     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000"},
--    {335, "arglist", 0, 3, states_79,
-      "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
 -     "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
--    {336, "argument", 0, 4, states_80,
-      "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
 -     "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
--    {337, "comp_iter", 0, 2, states_81,
-      "\000\000\040\000\000\000\000\000\000\000\000\000\204\000\000\000\000\000\000\000\000\000\000"},
 -     "\000\000\040\000\000\000\000\000\000\000\000\000\102\000\000\000\000\000\000\000\000\000\000"},
--    {338, "sync_comp_for", 0, 6, states_82,
-      "\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\100\000\000\000\000\000\000\000\000\000\000"},
--    {339, "comp_for", 0, 3, states_83,
-      "\000\000\040\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000"},
 -     "\000\000\040\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000"},
--    {340, "comp_if", 0, 4, states_84,
 -     "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"},
 -    {341, "encoding_decl", 0, 2, states_85,
++    {332, "exprlist", 0, 3, states_76,
++     "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
++    {333, "testlist", 0, 3, states_77,
++     "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {334, "dictorsetmaker", 0, 14, states_78,
++     "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {335, "classdef", 0, 8, states_79,
++     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000"},
++    {336, "arglist", 0, 3, states_80,
++     "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {337, "argument", 0, 4, states_81,
++     "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {338, "comp_iter", 0, 2, states_82,
++     "\000\000\040\000\000\000\000\000\000\000\000\000\004\001\000\000\000\000\000\000\000\000\000"},
++    {339, "sync_comp_for", 0, 6, states_83,
++     "\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
++    {340, "comp_for", 0, 3, states_84,
++     "\000\000\040\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
++    {341, "comp_if", 0, 4, states_85,
 +     "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000"},
-     {341, "encoding_decl", 0, 2, states_85,
++    {342, "encoding_decl", 0, 2, states_86,
       "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
--    {342, "yield_expr", 0, 3, states_86,
--     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"},
--    {343, "yield_arg", 0, 3, states_87,
-      "\000\040\200\000\004\000\000\000\000\100\020\000\000\000\100\010\000\000\103\242\174\000\000"},
-     {344, "func_type_input", 0, 3, states_88,
 -     "\000\040\200\000\002\000\000\000\000\040\010\000\000\000\100\010\000\000\103\242\174\000\000"},
++    {343, "yield_expr", 0, 3, states_87,
++     "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010"},
++    {344, "yield_arg", 0, 3, states_88,
++     "\000\040\200\000\004\000\000\000\000\100\020\000\000\000\000\041\000\000\014\211\362\001\000"},
++    {345, "func_type_input", 0, 3, states_89,
 +     "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-     {345, "func_type", 0, 6, states_89,
++    {346, "func_type", 0, 6, states_90,
 +     "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
-     {346, "typelist", 0, 11, states_90,
-      "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\100\010\000\000\103\242\174\000\000"},
++    {347, "typelist", 0, 11, states_91,
++     "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
  };
- static label labels[182] = {
 -static label labels[179] = {
++static label labels[184] = {
      {0, "EMPTY"},
      {256, 0},
      {4, 0},
@@@ -2296,16 -2122,16 +2319,16 @@@
      {269, 0},
      {0, 0},
      {258, 0},
--    {332, 0},
++    {333, 0},
      {259, 0},
      {49, 0},
      {291, 0},
      {7, 0},
--    {335, 0},
++    {336, 0},
      {8, 0},
      {260, 0},
      {261, 0},
--    {334, 0},
++    {335, 0},
      {263, 0},
      {262, 0},
      {1, "async"},
@@@ -2313,9 -2139,8 +2336,9 @@@
      {1, 0},
      {264, 0},
      {51, 0},
--    {306, 0},
++    {307, 0},
      {11, 0},
-     {55, 0},
++    {56, 0},
      {304, 0},
      {265, 0},
      {266, 0},
@@@ -2338,8 -2163,8 +2361,8 @@@
      {274, 0},
      {273, 0},
      {275, 0},
--    {342, 0},
--    {315, 0},
++    {343, 0},
++    {316, 0},
      {36, 0},
      {37, 0},
      {38, 0},
@@@ -2354,7 -2179,7 +2377,7 @@@
      {46, 0},
      {48, 0},
      {1, "del"},
--    {331, 0},
++    {332, 0},
      {1, "pass"},
      {279, 0},
      {280, 0},
@@@ -2386,6 -2211,6 +2409,7 @@@
      {301, 0},
      {296, 0},
      {1, "if"},
++    {306, 0},
      {305, 0},
      {1, "elif"},
      {1, "else"},
@@@ -2397,22 -2222,23 +2421,23 @@@
      {1, "finally"},
      {1, "with"},
      {302, 0},
--    {316, 0},
++    {317, 0},
      {1, "except"},
      {5, 0},
      {6, 0},
-     {310, 0},
-     {308, 0},
-     {307, 0},
+     {53, 0},
 -    {310, 0},
 -    {308, 0},
 -    {307, 0},
++    {311, 0},
      {309, 0},
++    {308, 0},
++    {310, 0},
      {1, "lambda"},
--    {311, 0},
--    {1, "or"},
      {312, 0},
++    {1, "or"},
++    {313, 0},
      {1, "and"},
      {1, "not"},
--    {313, 0},
      {314, 0},
++    {315, 0},
      {20, 0},
      {21, 0},
      {27, 0},
@@@ -2421,58 -2247,55 +2446,58 @@@
      {28, 0},
      {28, 0},
      {1, "is"},
--    {317, 0},
--    {18, 0},
      {318, 0},
--    {32, 0},
++    {18, 0},
      {319, 0},
--    {19, 0},
++    {32, 0},
      {320, 0},
++    {19, 0},
++    {321, 0},
      {33, 0},
      {34, 0},
--    {321, 0},
++    {322, 0},
      {14, 0},
      {15, 0},
--    {322, 0},
++    {323, 0},
      {17, 0},
      {24, 0},
      {47, 0},
      {31, 0},
--    {323, 0},
      {324, 0},
--    {1, "await"},
      {325, 0},
--    {327, 0},
++    {1, "await"},
      {326, 0},
++    {328, 0},
++    {327, 0},
      {9, 0},
      {10, 0},
      {25, 0},
--    {333, 0},
++    {334, 0},
      {26, 0},
      {2, 0},
      {3, 0},
      {1, "None"},
      {1, "True"},
      {1, "False"},
--    {339, 0},
--    {328, 0},
++    {340, 0},
      {329, 0},
      {330, 0},
++    {331, 0},
      {1, "class"},
--    {336, 0},
      {337, 0},
--    {340, 0},
      {338, 0},
      {341, 0},
++    {339, 0},
++    {342, 0},
      {1, "yield"},
--    {343, 0},
 +    {344, 0},
 +    {345, 0},
 +    {346, 0},
++    {347, 0},
  };
  grammar _PyParser_Grammar = {
-     91,
 -    88,
++    92,
      dfas,
-     {182, labels},
 -    {179, labels},
++    {184, labels},
      256
  };