From 308df83ccc9add2e777d0d2390b75c4346c05794 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 25 Jan 2019 11:37:09 -0800 Subject: [PATCH] Move func_body_suite towards the end of Grammar to stabilize symbol numbering --- Grammar/Grammar | 5 +- Include/graminit.h | 82 ++--- Lib/symbol.py | 11 +- Python/graminit.c | 886 ++++++++++++++++++++++----------------------- 4 files changed, 493 insertions(+), 491 deletions(-) diff --git a/Grammar/Grammar b/Grammar/Grammar index 9965b3bb9f52..7f736711ee01 100644 --- a/Grammar/Grammar +++ b/Grammar/Grammar @@ -84,8 +84,6 @@ with_stmt: 'with' with_item (',' with_item)* ':' [TYPE_COMMENT] suite 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] @@ -156,6 +154,9 @@ encoding_decl: NAME yield_expr: 'yield' [yield_arg] yield_arg: 'from' test | testlist_star_expr +# 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 + func_type_input: func_type NEWLINE* ENDMARKER func_type: '(' [typelist] ')' '->' test # typelist is a modified typedargslist (see above) diff --git a/Include/graminit.h b/Include/graminit.h index c85e31b84bb6..d1027b7a743f 100644 --- a/Include/graminit.h +++ b/Include/graminit.h @@ -48,47 +48,47 @@ #define with_stmt 301 #define with_item 302 #define except_clause 303 -#define func_body_suite 304 -#define suite 305 -#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 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 344 #define func_type_input 345 #define func_type 346 #define typelist 347 diff --git a/Lib/symbol.py b/Lib/symbol.py index e089053e318f..36e0eec7ac1f 100644 --- a/Lib/symbol.py +++ b/Lib/symbol.py @@ -60,8 +60,8 @@ try_stmt = 300 with_stmt = 301 with_item = 302 except_clause = 303 -func_body_suite = 304 -suite = 305 +suite = 304 +namedexpr_test = 305 test = 306 test_nocond = 307 lambdef = 308 @@ -100,9 +100,10 @@ comp_if = 340 encoding_decl = 341 yield_expr = 342 yield_arg = 343 -func_type_input = 344 -func_type = 345 -typelist = 346 +func_body_suite = 344 +func_type_input = 345 +func_type = 346 +typelist = 347 #--end constants-- sym_name = {} diff --git a/Python/graminit.c b/Python/graminit.c index c58231000d9d..516eca85b1a5 100644 --- a/Python/graminit.c +++ b/Python/graminit.c @@ -1188,113 +1188,103 @@ static arc arcs_48_0[2] = { static arc arcs_48_1[1] = { {0, 1}, }; -static arc arcs_48_2[2] = { - {28, 3}, - {113, 4}, +static arc arcs_48_2[1] = { + {113, 3}, }; static arc arcs_48_3[1] = { - {2, 5}, -}; -static arc arcs_48_4[1] = { - {6, 6}, -}; -static arc arcs_48_5[1] = { - {113, 4}, + {6, 4}, }; -static arc arcs_48_6[2] = { - {6, 6}, +static arc arcs_48_4[2] = { + {6, 4}, {114, 1}, }; -static state states_48[7] = { +static state states_48[5] = { {2, arcs_48_0}, {1, arcs_48_1}, - {2, arcs_48_2}, + {1, arcs_48_2}, {1, arcs_48_3}, - {1, arcs_48_4}, - {1, arcs_48_5}, - {2, arcs_48_6}, + {2, arcs_48_4}, }; -static arc arcs_49_0[2] = { - {3, 1}, - {2, 2}, +static arc arcs_49_0[1] = { + {26, 1}, }; -static arc arcs_49_1[1] = { +static arc arcs_49_1[2] = { + {115, 2}, {0, 1}, }; static arc arcs_49_2[1] = { - {113, 3}, + {26, 3}, }; static arc arcs_49_3[1] = { - {6, 4}, -}; -static arc arcs_49_4[2] = { - {6, 4}, - {114, 1}, + {0, 3}, }; -static state states_49[5] = { - {2, arcs_49_0}, - {1, arcs_49_1}, +static state states_49[4] = { + {1, arcs_49_0}, + {2, arcs_49_1}, {1, arcs_49_2}, {1, arcs_49_3}, - {2, arcs_49_4}, }; -static arc arcs_50_0[1] = { - {26, 1}, +static arc arcs_50_0[2] = { + {116, 1}, + {117, 2}, }; static arc arcs_50_1[2] = { - {115, 2}, + {98, 3}, {0, 1}, }; static arc arcs_50_2[1] = { - {26, 3}, + {0, 2}, }; static arc arcs_50_3[1] = { - {0, 3}, + {116, 4}, }; -static state states_50[4] = { - {1, arcs_50_0}, +static arc arcs_50_4[1] = { + {102, 5}, +}; +static arc arcs_50_5[1] = { + {26, 2}, +}; +static state states_50[6] = { + {2, 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] = { {116, 1}, - {117, 2}, + {119, 1}, }; -static arc arcs_51_1[2] = { - {98, 3}, +static arc arcs_51_1[1] = { {0, 1}, }; -static arc arcs_51_2[1] = { - {0, 2}, -}; -static arc arcs_51_3[1] = { - {116, 4}, +static state states_51[2] = { + {2, arcs_51_0}, + {1, arcs_51_1}, }; -static arc arcs_51_4[1] = { - {102, 5}, +static arc arcs_52_0[1] = { + {120, 1}, }; -static arc arcs_51_5[1] = { - {26, 2}, +static arc arcs_52_1[2] = { + {36, 2}, + {27, 3}, }; -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_2[1] = { + {27, 3}, }; -static arc arcs_52_0[2] = { - {116, 1}, - {119, 1}, +static arc arcs_52_3[1] = { + {26, 4}, }; -static arc arcs_52_1[1] = { - {0, 1}, +static arc arcs_52_4[1] = { + {0, 4}, }; -static state states_52[2] = { - {2, arcs_52_0}, - {1, arcs_52_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 arc arcs_53_0[1] = { {120, 1}, @@ -1307,7 +1297,7 @@ static arc arcs_53_2[1] = { {27, 3}, }; static arc arcs_53_3[1] = { - {26, 4}, + {118, 4}, }; static arc arcs_53_4[1] = { {0, 4}, @@ -1320,77 +1310,54 @@ static state states_53[5] = { {1, arcs_53_4}, }; static arc arcs_54_0[1] = { - {120, 1}, + {121, 1}, }; static arc arcs_54_1[2] = { - {36, 2}, - {27, 3}, -}; -static arc arcs_54_2[1] = { - {27, 3}, -}; -static arc arcs_54_3[1] = { - {118, 4}, -}; -static arc arcs_54_4[1] = { - {0, 4}, + {122, 0}, + {0, 1}, }; -static state states_54[5] = { +static state states_54[2] = { {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}, + {123, 1}, }; static arc arcs_55_1[2] = { - {122, 0}, + {124, 0}, {0, 1}, }; static state states_55[2] = { {1, arcs_55_0}, {2, arcs_55_1}, }; -static arc arcs_56_0[1] = { - {123, 1}, -}; -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] = { +static arc arcs_56_0[2] = { {125, 1}, {126, 2}, }; -static arc arcs_57_1[1] = { +static arc arcs_56_1[1] = { {123, 2}, }; -static arc arcs_57_2[1] = { +static arc arcs_56_2[1] = { {0, 2}, }; -static state states_57[3] = { - {2, arcs_57_0}, - {1, arcs_57_1}, - {1, arcs_57_2}, +static state states_56[3] = { + {2, arcs_56_0}, + {1, arcs_56_1}, + {1, arcs_56_2}, }; -static arc arcs_58_0[1] = { +static arc arcs_57_0[1] = { {111, 1}, }; -static arc arcs_58_1[2] = { +static arc arcs_57_1[2] = { {127, 0}, {0, 1}, }; -static state states_58[2] = { - {1, arcs_58_0}, - {2, arcs_58_1}, +static state states_57[2] = { + {1, arcs_57_0}, + {2, arcs_57_1}, }; -static arc arcs_59_0[10] = { +static arc arcs_58_0[10] = { {128, 1}, {129, 1}, {130, 1}, @@ -1402,41 +1369,52 @@ static arc arcs_59_0[10] = { {125, 2}, {135, 3}, }; -static arc arcs_59_1[1] = { +static arc arcs_58_1[1] = { {0, 1}, }; -static arc arcs_59_2[1] = { +static arc arcs_58_2[1] = { {105, 1}, }; -static arc arcs_59_3[2] = { +static arc arcs_58_3[2] = { {125, 1}, {0, 3}, }; -static state states_59[4] = { - {10, arcs_59_0}, - {1, arcs_59_1}, - {1, arcs_59_2}, - {2, arcs_59_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_60_0[1] = { +static arc arcs_59_0[1] = { {34, 1}, }; -static arc arcs_60_1[1] = { +static arc arcs_59_1[1] = { {111, 2}, }; -static arc arcs_60_2[1] = { +static arc arcs_59_2[1] = { {0, 2}, }; -static state states_60[3] = { +static state states_59[3] = { + {1, arcs_59_0}, + {1, arcs_59_1}, + {1, arcs_59_2}, +}; +static arc arcs_60_0[1] = { + {136, 1}, +}; +static arc arcs_60_1[2] = { + {137, 0}, + {0, 1}, +}; +static state states_60[2] = { {1, arcs_60_0}, - {1, arcs_60_1}, - {1, arcs_60_2}, + {2, arcs_60_1}, }; static arc arcs_61_0[1] = { - {136, 1}, + {138, 1}, }; static arc arcs_61_1[2] = { - {137, 0}, + {139, 0}, {0, 1}, }; static state states_61[2] = { @@ -1444,10 +1422,10 @@ static state states_61[2] = { {2, arcs_61_1}, }; static arc arcs_62_0[1] = { - {138, 1}, + {140, 1}, }; static arc arcs_62_1[2] = { - {139, 0}, + {141, 0}, {0, 1}, }; static state states_62[2] = { @@ -1455,22 +1433,23 @@ static state states_62[2] = { {2, arcs_62_1}, }; static arc arcs_63_0[1] = { - {140, 1}, + {142, 1}, }; -static arc arcs_63_1[2] = { - {141, 0}, +static arc arcs_63_1[3] = { + {143, 0}, + {144, 0}, {0, 1}, }; static state states_63[2] = { {1, arcs_63_0}, - {2, arcs_63_1}, + {3, arcs_63_1}, }; static arc arcs_64_0[1] = { - {142, 1}, + {145, 1}, }; static arc arcs_64_1[3] = { - {143, 0}, - {144, 0}, + {146, 0}, + {147, 0}, {0, 1}, }; static state states_64[2] = { @@ -1478,21 +1457,9 @@ static state states_64[2] = { {3, arcs_64_1}, }; static arc arcs_65_0[1] = { - {145, 1}, -}; -static arc arcs_65_1[3] = { - {146, 0}, - {147, 0}, - {0, 1}, -}; -static state states_65[2] = { - {1, arcs_65_0}, - {3, arcs_65_1}, -}; -static arc arcs_66_0[1] = { {148, 1}, }; -static arc arcs_66_1[6] = { +static arc arcs_65_1[6] = { {34, 0}, {11, 0}, {149, 0}, @@ -1500,63 +1467,63 @@ static arc arcs_66_1[6] = { {151, 0}, {0, 1}, }; -static state states_66[2] = { - {1, arcs_66_0}, - {6, arcs_66_1}, +static state states_65[2] = { + {1, arcs_65_0}, + {6, arcs_65_1}, }; -static arc arcs_67_0[4] = { +static arc arcs_66_0[4] = { {146, 1}, {147, 1}, {152, 1}, {153, 2}, }; -static arc arcs_67_1[1] = { +static arc arcs_66_1[1] = { {148, 2}, }; -static arc arcs_67_2[1] = { +static arc arcs_66_2[1] = { {0, 2}, }; -static state states_67[3] = { - {4, arcs_67_0}, - {1, arcs_67_1}, - {1, arcs_67_2}, +static state states_66[3] = { + {4, arcs_66_0}, + {1, arcs_66_1}, + {1, arcs_66_2}, }; -static arc arcs_68_0[1] = { +static arc arcs_67_0[1] = { {154, 1}, }; -static arc arcs_68_1[2] = { +static arc arcs_67_1[2] = { {35, 2}, {0, 1}, }; -static arc arcs_68_2[1] = { +static arc arcs_67_2[1] = { {148, 3}, }; -static arc arcs_68_3[1] = { +static arc arcs_67_3[1] = { {0, 3}, }; -static state states_68[4] = { - {1, arcs_68_0}, - {2, arcs_68_1}, - {1, arcs_68_2}, - {1, arcs_68_3}, +static state states_67[4] = { + {1, arcs_67_0}, + {2, arcs_67_1}, + {1, arcs_67_2}, + {1, arcs_67_3}, }; -static arc arcs_69_0[2] = { +static arc arcs_68_0[2] = { {155, 1}, {156, 2}, }; -static arc arcs_69_1[1] = { +static arc arcs_68_1[1] = { {156, 2}, }; -static arc arcs_69_2[2] = { +static arc arcs_68_2[2] = { {157, 2}, {0, 2}, }; -static state states_69[3] = { - {2, arcs_69_0}, - {1, arcs_69_1}, - {2, arcs_69_2}, +static state states_68[3] = { + {2, arcs_68_0}, + {1, arcs_68_1}, + {2, arcs_68_2}, }; -static arc arcs_70_0[10] = { +static arc arcs_69_0[10] = { {13, 1}, {159, 2}, {161, 3}, @@ -1568,458 +1535,491 @@ static arc arcs_70_0[10] = { {167, 4}, {168, 4}, }; -static arc arcs_70_1[3] = { +static arc arcs_69_1[3] = { {51, 6}, {158, 6}, {15, 4}, }; -static arc arcs_70_2[2] = { +static arc arcs_69_2[2] = { {158, 7}, {160, 4}, }; -static arc arcs_70_3[2] = { +static arc arcs_69_3[2] = { {162, 8}, {163, 4}, }; -static arc arcs_70_4[1] = { +static arc arcs_69_4[1] = { {0, 4}, }; -static arc arcs_70_5[2] = { +static arc arcs_69_5[2] = { {165, 5}, {0, 5}, }; -static arc arcs_70_6[1] = { +static arc arcs_69_6[1] = { {15, 4}, }; -static arc arcs_70_7[1] = { +static arc arcs_69_7[1] = { {160, 4}, }; -static arc arcs_70_8[1] = { +static arc arcs_69_8[1] = { {163, 4}, }; -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] = { +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] = { {99, 1}, {52, 1}, }; -static arc arcs_71_1[3] = { +static arc arcs_70_1[3] = { {169, 2}, {33, 3}, {0, 1}, }; -static arc arcs_71_2[1] = { +static arc arcs_70_2[1] = { {0, 2}, }; -static arc arcs_71_3[3] = { +static arc arcs_70_3[3] = { {99, 4}, {52, 4}, {0, 3}, }; -static arc arcs_71_4[2] = { +static arc arcs_70_4[2] = { {33, 3}, {0, 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 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 arc arcs_72_0[3] = { +static arc arcs_71_0[3] = { {13, 1}, {159, 2}, {83, 3}, }; -static arc arcs_72_1[2] = { +static arc arcs_71_1[2] = { {14, 4}, {15, 5}, }; -static arc arcs_72_2[1] = { +static arc arcs_71_2[1] = { {170, 6}, }; -static arc arcs_72_3[1] = { +static arc arcs_71_3[1] = { {23, 5}, }; -static arc arcs_72_4[1] = { +static arc arcs_71_4[1] = { {15, 5}, }; -static arc arcs_72_5[1] = { +static arc arcs_71_5[1] = { {0, 5}, }; -static arc arcs_72_6[1] = { +static arc arcs_71_6[1] = { {160, 5}, }; -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 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 arc arcs_73_0[1] = { +static arc arcs_72_0[1] = { {171, 1}, }; -static arc arcs_73_1[2] = { +static arc arcs_72_1[2] = { {33, 2}, {0, 1}, }; -static arc arcs_73_2[2] = { +static arc arcs_72_2[2] = { {171, 1}, {0, 2}, }; -static state states_73[3] = { - {1, arcs_73_0}, - {2, arcs_73_1}, - {2, arcs_73_2}, +static state states_72[3] = { + {1, arcs_72_0}, + {2, arcs_72_1}, + {2, arcs_72_2}, }; -static arc arcs_74_0[2] = { +static arc arcs_73_0[2] = { {26, 1}, {27, 2}, }; -static arc arcs_74_1[2] = { +static arc arcs_73_1[2] = { {27, 2}, {0, 1}, }; -static arc arcs_74_2[3] = { +static arc arcs_73_2[3] = { {26, 3}, {172, 4}, {0, 2}, }; -static arc arcs_74_3[2] = { +static arc arcs_73_3[2] = { {172, 4}, {0, 3}, }; -static arc arcs_74_4[1] = { +static arc arcs_73_4[1] = { {0, 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 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 arc arcs_75_0[1] = { +static arc arcs_74_0[1] = { {27, 1}, }; -static arc arcs_75_1[2] = { +static arc arcs_74_1[2] = { {26, 2}, {0, 1}, }; -static arc arcs_75_2[1] = { +static arc arcs_74_2[1] = { {0, 2}, }; -static state states_75[3] = { - {1, arcs_75_0}, - {2, arcs_75_1}, - {1, arcs_75_2}, +static state states_74[3] = { + {1, arcs_74_0}, + {2, arcs_74_1}, + {1, arcs_74_2}, }; -static arc arcs_76_0[2] = { +static arc arcs_75_0[2] = { {111, 1}, {52, 1}, }; -static arc arcs_76_1[2] = { +static arc arcs_75_1[2] = { {33, 2}, {0, 1}, }; -static arc arcs_76_2[3] = { +static arc arcs_75_2[3] = { {111, 1}, {52, 1}, {0, 2}, }; -static state states_76[3] = { - {2, arcs_76_0}, - {2, arcs_76_1}, - {3, arcs_76_2}, +static state states_75[3] = { + {2, arcs_75_0}, + {2, arcs_75_1}, + {3, arcs_75_2}, }; -static arc arcs_77_0[1] = { +static arc arcs_76_0[1] = { {26, 1}, }; -static arc arcs_77_1[2] = { +static arc arcs_76_1[2] = { {33, 2}, {0, 1}, }; -static arc arcs_77_2[2] = { +static arc arcs_76_2[2] = { {26, 1}, {0, 2}, }; -static state states_77[3] = { - {1, arcs_77_0}, - {2, arcs_77_1}, - {2, arcs_77_2}, +static state states_76[3] = { + {1, arcs_76_0}, + {2, arcs_76_1}, + {2, arcs_76_2}, }; -static arc arcs_78_0[3] = { +static arc arcs_77_0[3] = { {26, 1}, {35, 2}, {52, 3}, }; -static arc arcs_78_1[4] = { +static arc arcs_77_1[4] = { {27, 4}, {169, 5}, {33, 6}, {0, 1}, }; -static arc arcs_78_2[1] = { +static arc arcs_77_2[1] = { {111, 7}, }; -static arc arcs_78_3[3] = { +static arc arcs_77_3[3] = { {169, 5}, {33, 6}, {0, 3}, }; -static arc arcs_78_4[1] = { +static arc arcs_77_4[1] = { {26, 7}, }; -static arc arcs_78_5[1] = { +static arc arcs_77_5[1] = { {0, 5}, }; -static arc arcs_78_6[3] = { +static arc arcs_77_6[3] = { {26, 8}, {52, 8}, {0, 6}, }; -static arc arcs_78_7[3] = { +static arc arcs_77_7[3] = { {169, 5}, {33, 9}, {0, 7}, }; -static arc arcs_78_8[2] = { +static arc arcs_77_8[2] = { {33, 6}, {0, 8}, }; -static arc arcs_78_9[3] = { +static arc arcs_77_9[3] = { {26, 10}, {35, 11}, {0, 9}, }; -static arc arcs_78_10[1] = { +static arc arcs_77_10[1] = { {27, 12}, }; -static arc arcs_78_11[1] = { +static arc arcs_77_11[1] = { {111, 13}, }; -static arc arcs_78_12[1] = { +static arc arcs_77_12[1] = { {26, 13}, }; -static arc arcs_78_13[2] = { +static arc arcs_77_13[2] = { {33, 9}, {0, 13}, }; -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_79_0[1] = { +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] = { {173, 1}, }; -static arc arcs_79_1[1] = { +static arc arcs_78_1[1] = { {23, 2}, }; -static arc arcs_79_2[2] = { +static arc arcs_78_2[2] = { {13, 3}, {27, 4}, }; -static arc arcs_79_3[2] = { +static arc arcs_78_3[2] = { {14, 5}, {15, 6}, }; -static arc arcs_79_4[1] = { +static arc arcs_78_4[1] = { {100, 7}, }; -static arc arcs_79_5[1] = { +static arc arcs_78_5[1] = { {15, 6}, }; -static arc arcs_79_6[1] = { +static arc arcs_78_6[1] = { {27, 4}, }; -static arc arcs_79_7[1] = { +static arc arcs_78_7[1] = { {0, 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 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 arc arcs_80_0[1] = { +static arc arcs_79_0[1] = { {174, 1}, }; -static arc arcs_80_1[2] = { +static arc arcs_79_1[2] = { {33, 2}, {0, 1}, }; -static arc arcs_80_2[2] = { +static arc arcs_79_2[2] = { {174, 1}, {0, 2}, }; -static state states_80[3] = { - {1, arcs_80_0}, - {2, arcs_80_1}, - {2, arcs_80_2}, +static state states_79[3] = { + {1, arcs_79_0}, + {2, arcs_79_1}, + {2, arcs_79_2}, }; -static arc arcs_81_0[3] = { +static arc arcs_80_0[3] = { {26, 1}, {35, 2}, {34, 2}, }; -static arc arcs_81_1[4] = { +static arc arcs_80_1[4] = { {169, 3}, {115, 2}, {32, 2}, {0, 1}, }; -static arc arcs_81_2[1] = { +static arc arcs_80_2[1] = { {26, 3}, }; -static arc arcs_81_3[1] = { +static arc arcs_80_3[1] = { {0, 3}, }; -static state states_81[4] = { - {3, arcs_81_0}, - {4, arcs_81_1}, - {1, arcs_81_2}, - {1, arcs_81_3}, +static state states_80[4] = { + {3, arcs_80_0}, + {4, arcs_80_1}, + {1, arcs_80_2}, + {1, arcs_80_3}, }; -static arc arcs_82_0[2] = { +static arc arcs_81_0[2] = { {169, 1}, {176, 1}, }; -static arc arcs_82_1[1] = { +static arc arcs_81_1[1] = { {0, 1}, }; -static state states_82[2] = { - {2, arcs_82_0}, - {1, arcs_82_1}, +static state states_81[2] = { + {2, arcs_81_0}, + {1, arcs_81_1}, }; -static arc arcs_83_0[1] = { +static arc arcs_82_0[1] = { {104, 1}, }; -static arc arcs_83_1[1] = { +static arc arcs_82_1[1] = { {67, 2}, }; -static arc arcs_83_2[1] = { +static arc arcs_82_2[1] = { {105, 3}, }; -static arc arcs_83_3[1] = { +static arc arcs_82_3[1] = { {116, 4}, }; -static arc arcs_83_4[2] = { +static arc arcs_82_4[2] = { {175, 5}, {0, 4}, }; -static arc arcs_83_5[1] = { +static arc arcs_82_5[1] = { {0, 5}, }; -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 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_84_0[2] = { +static arc arcs_83_0[2] = { {21, 1}, {177, 2}, }; -static arc arcs_84_1[1] = { +static arc arcs_83_1[1] = { {177, 2}, }; -static arc arcs_84_2[1] = { +static arc arcs_83_2[1] = { {0, 2}, }; -static state states_84[3] = { - {2, arcs_84_0}, - {1, arcs_84_1}, - {1, arcs_84_2}, +static state states_83[3] = { + {2, arcs_83_0}, + {1, arcs_83_1}, + {1, arcs_83_2}, }; -static arc arcs_85_0[1] = { +static arc arcs_84_0[1] = { {98, 1}, }; -static arc arcs_85_1[1] = { +static arc arcs_84_1[1] = { {118, 2}, }; -static arc arcs_85_2[2] = { +static arc arcs_84_2[2] = { {175, 3}, {0, 2}, }; -static arc arcs_85_3[1] = { +static arc arcs_84_3[1] = { {0, 3}, }; -static state states_85[4] = { - {1, arcs_85_0}, - {1, arcs_85_1}, - {2, arcs_85_2}, - {1, arcs_85_3}, +static state states_84[4] = { + {1, arcs_84_0}, + {1, arcs_84_1}, + {2, arcs_84_2}, + {1, arcs_84_3}, }; -static arc arcs_86_0[1] = { +static arc arcs_85_0[1] = { {23, 1}, }; -static arc arcs_86_1[1] = { +static arc arcs_85_1[1] = { {0, 1}, }; -static state states_86[2] = { - {1, arcs_86_0}, - {1, arcs_86_1}, +static state states_85[2] = { + {1, arcs_85_0}, + {1, arcs_85_1}, }; -static arc arcs_87_0[1] = { +static arc arcs_86_0[1] = { {179, 1}, }; -static arc arcs_87_1[2] = { +static arc arcs_86_1[2] = { {180, 2}, {0, 1}, }; +static arc arcs_86_2[1] = { + {0, 2}, +}; +static state states_86[3] = { + {1, arcs_86_0}, + {2, arcs_86_1}, + {1, arcs_86_2}, +}; +static arc arcs_87_0[2] = { + {78, 1}, + {48, 2}, +}; +static arc arcs_87_1[1] = { + {26, 2}, +}; static arc arcs_87_2[1] = { {0, 2}, }; static state states_87[3] = { - {1, arcs_87_0}, - {2, arcs_87_1}, + {2, arcs_87_0}, + {1, arcs_87_1}, {1, arcs_87_2}, }; static arc arcs_88_0[2] = { - {78, 1}, - {48, 2}, + {3, 1}, + {2, 2}, }; static arc arcs_88_1[1] = { - {26, 2}, + {0, 1}, }; -static arc arcs_88_2[1] = { - {0, 2}, +static arc arcs_88_2[2] = { + {28, 3}, + {113, 4}, +}; +static arc arcs_88_3[1] = { + {2, 5}, +}; +static arc arcs_88_4[1] = { + {6, 6}, +}; +static arc arcs_88_5[1] = { + {113, 4}, +}; +static arc arcs_88_6[2] = { + {6, 6}, + {114, 1}, }; -static state states_88[3] = { +static state states_88[7] = { {2, arcs_88_0}, {1, arcs_88_1}, - {1, arcs_88_2}, + {2, arcs_88_2}, + {1, arcs_88_3}, + {1, arcs_88_4}, + {1, arcs_88_5}, + {2, arcs_88_6}, }; static arc arcs_89_0[1] = { {182, 1}, @@ -2220,88 +2220,88 @@ static dfa dfas[92] = { "\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\000\001\000\000\000\000\000\000\000\000"}, - {304, "func_body_suite", 0, 7, states_48, + {304, "suite", 0, 5, states_48, "\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\000\041\000\000\014\211\362\001\010"}, - {306, "namedexpr_test", 0, 4, states_50, + {305, "namedexpr_test", 0, 4, states_49, "\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, + {306, "test", 0, 6, 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"}, - {308, "test_nocond", 0, 2, states_52, + {307, "test_nocond", 0, 2, 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"}, - {309, "lambdef", 0, 5, states_53, + {308, "lambdef", 0, 5, states_52, "\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, + {309, "lambdef_nocond", 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"}, - {311, "or_test", 0, 2, states_55, + {310, "or_test", 0, 2, states_54, "\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, + {311, "and_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"}, - {313, "not_test", 0, 3, states_57, + {312, "not_test", 0, 3, 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"}, - {314, "comparison", 0, 2, states_58, + {313, "comparison", 0, 2, states_57, "\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, + {314, "comp_op", 0, 4, states_58, "\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, + {315, "star_expr", 0, 3, states_59, "\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {317, "expr", 0, 2, states_61, + {316, "expr", 0, 2, states_60, "\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, + {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\014\211\362\001\000"}, - {319, "and_expr", 0, 2, states_63, + {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\014\211\362\001\000"}, - {320, "shift_expr", 0, 2, states_64, + {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\014\211\362\001\000"}, - {321, "arith_expr", 0, 2, states_65, + {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\014\211\362\001\000"}, - {322, "term", 0, 2, states_66, + {321, "term", 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"}, - {323, "factor", 0, 3, states_67, + {322, "factor", 0, 3, 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"}, - {324, "power", 0, 4, states_68, + {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\210\362\001\000"}, - {325, "atom_expr", 0, 3, states_69, + {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\210\362\001\000"}, - {326, "atom", 0, 9, states_70, + {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\200\362\001\000"}, - {327, "testlist_comp", 0, 5, states_71, + {326, "testlist_comp", 0, 5, states_70, "\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, + {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\200\000\000\000"}, - {329, "subscriptlist", 0, 3, states_73, + {328, "subscriptlist", 0, 3, states_72, "\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, + {329, "subscript", 0, 5, 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"}, - {331, "sliceop", 0, 3, states_75, + {330, "sliceop", 0, 3, states_74, "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {332, "exprlist", 0, 3, states_76, + {331, "exprlist", 0, 3, states_75, "\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, + {332, "testlist", 0, 3, states_76, "\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, + {333, "dictorsetmaker", 0, 14, states_77, "\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, + {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\040\000"}, - {336, "arglist", 0, 3, states_80, + {335, "arglist", 0, 3, states_79, "\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, + {336, "argument", 0, 4, 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"}, - {338, "comp_iter", 0, 2, states_82, + {337, "comp_iter", 0, 2, states_81, "\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, + {338, "sync_comp_for", 0, 6, states_82, "\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, + {339, "comp_for", 0, 3, states_83, "\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, + {340, "comp_if", 0, 4, states_84, "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000"}, - {342, "encoding_decl", 0, 2, states_86, + {341, "encoding_decl", 0, 2, states_85, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {343, "yield_expr", 0, 3, states_87, + {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\010"}, - {344, "yield_arg", 0, 3, states_88, + {343, "yield_arg", 0, 3, states_87, "\000\040\200\000\004\000\000\000\000\100\020\000\000\000\000\041\000\000\014\211\362\001\000"}, + {344, "func_body_suite", 0, 7, states_88, + "\004\040\200\000\004\000\000\000\024\174\022\016\000\000\000\041\000\000\014\211\362\001\010"}, {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"}, {346, "func_type", 0, 6, states_90, @@ -2319,16 +2319,16 @@ static label labels[184] = { {269, 0}, {0, 0}, {258, 0}, - {333, 0}, + {332, 0}, {259, 0}, {49, 0}, {291, 0}, {7, 0}, - {336, 0}, + {335, 0}, {8, 0}, {260, 0}, {261, 0}, - {335, 0}, + {334, 0}, {263, 0}, {262, 0}, {1, "async"}, @@ -2336,10 +2336,10 @@ static label labels[184] = { {1, 0}, {264, 0}, {51, 0}, - {307, 0}, + {306, 0}, {11, 0}, {56, 0}, - {304, 0}, + {344, 0}, {265, 0}, {266, 0}, {22, 0}, @@ -2361,8 +2361,8 @@ static label labels[184] = { {274, 0}, {273, 0}, {275, 0}, - {343, 0}, - {316, 0}, + {342, 0}, + {315, 0}, {36, 0}, {37, 0}, {38, 0}, @@ -2377,7 +2377,7 @@ static label labels[184] = { {46, 0}, {48, 0}, {1, "del"}, - {332, 0}, + {331, 0}, {1, "pass"}, {279, 0}, {280, 0}, @@ -2409,8 +2409,8 @@ static label labels[184] = { {301, 0}, {296, 0}, {1, "if"}, - {306, 0}, {305, 0}, + {304, 0}, {1, "elif"}, {1, "else"}, {1, "while"}, @@ -2421,23 +2421,23 @@ static label labels[184] = { {1, "finally"}, {1, "with"}, {302, 0}, - {317, 0}, + {316, 0}, {1, "except"}, {5, 0}, {6, 0}, {53, 0}, - {311, 0}, - {309, 0}, - {308, 0}, {310, 0}, + {308, 0}, + {307, 0}, + {309, 0}, {1, "lambda"}, - {312, 0}, + {311, 0}, {1, "or"}, - {313, 0}, + {312, 0}, {1, "and"}, {1, "not"}, + {313, 0}, {314, 0}, - {315, 0}, {20, 0}, {21, 0}, {27, 0}, @@ -2446,51 +2446,51 @@ static label labels[184] = { {28, 0}, {28, 0}, {1, "is"}, - {318, 0}, + {317, 0}, {18, 0}, - {319, 0}, + {318, 0}, {32, 0}, - {320, 0}, + {319, 0}, {19, 0}, - {321, 0}, + {320, 0}, {33, 0}, {34, 0}, - {322, 0}, + {321, 0}, {14, 0}, {15, 0}, - {323, 0}, + {322, 0}, {17, 0}, {24, 0}, {47, 0}, {31, 0}, + {323, 0}, {324, 0}, - {325, 0}, {1, "await"}, - {326, 0}, - {328, 0}, + {325, 0}, {327, 0}, + {326, 0}, {9, 0}, {10, 0}, {25, 0}, - {334, 0}, + {333, 0}, {26, 0}, {2, 0}, {3, 0}, {1, "None"}, {1, "True"}, {1, "False"}, - {340, 0}, + {339, 0}, + {328, 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"}, - {344, 0}, + {343, 0}, {345, 0}, {346, 0}, {347, 0}, -- 2.47.3