diff --git a/ast35/Grammar/Grammar b/ast35/Grammar/Grammar index 7aef9bec..4b481d78 100644 --- a/ast35/Grammar/Grammar +++ b/ast35/Grammar/Grammar @@ -44,8 +44,9 @@ stmt: simple_stmt | compound_stmt simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE small_stmt: (expr_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt | nonlocal_stmt | assert_stmt) -expr_stmt: testlist_star_expr (augassign (yield_expr|testlist) | +expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) | ('=' (yield_expr|testlist_star_expr))* [TYPE_COMMENT]) +annassign: ':' test ['=' test] testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [','] augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' | '**=' | '//=') diff --git a/ast35/Include/Python-ast.h b/ast35/Include/Python-ast.h index 83b92ba0..6b070e69 100644 --- a/ast35/Include/Python-ast.h +++ b/ast35/Include/Python-ast.h @@ -119,6 +119,7 @@ struct _stmt { asdl_seq *targets; expr_ty value; string type_comment; + expr_ty annotation; } Assign; struct { @@ -468,9 +469,10 @@ stmt_ty _Ta35_Return(expr_ty value, int lineno, int col_offset, PyArena *arena); #define Delete(a0, a1, a2, a3) _Ta35_Delete(a0, a1, a2, a3) stmt_ty _Ta35_Delete(asdl_seq * targets, int lineno, int col_offset, PyArena *arena); -#define Assign(a0, a1, a2, a3, a4, a5) _Ta35_Assign(a0, a1, a2, a3, a4, a5) +#define Assign(a0, a1, a2, a3, a4, a5, a6) _Ta35_Assign(a0, a1, a2, a3, a4, a5, a6) stmt_ty _Ta35_Assign(asdl_seq * targets, expr_ty value, string type_comment, - int lineno, int col_offset, PyArena *arena); + expr_ty annotation, int lineno, int col_offset, PyArena + *arena); #define AugAssign(a0, a1, a2, a3, a4, a5) _Ta35_AugAssign(a0, a1, a2, a3, a4, a5) stmt_ty _Ta35_AugAssign(expr_ty target, operator_ty op, expr_ty value, int lineno, int col_offset, PyArena *arena); diff --git a/ast35/Include/compile.h b/ast35/Include/compile.h index 88a93870..f4cd238b 100644 --- a/ast35/Include/compile.h +++ b/ast35/Include/compile.h @@ -6,6 +6,6 @@ #define Py_single_input 256 #define Py_file_input 257 #define Py_eval_input 258 -#define Py_func_type_input 341 +#define Py_func_type_input 342 #endif /* !Ta35_COMPILE_H */ diff --git a/ast35/Include/graminit.h b/ast35/Include/graminit.h index 69d03726..93003981 100644 --- a/ast35/Include/graminit.h +++ b/ast35/Include/graminit.h @@ -17,74 +17,75 @@ #define simple_stmt 270 #define small_stmt 271 #define expr_stmt 272 -#define testlist_star_expr 273 -#define augassign 274 -#define del_stmt 275 -#define pass_stmt 276 -#define flow_stmt 277 -#define break_stmt 278 -#define continue_stmt 279 -#define return_stmt 280 -#define yield_stmt 281 -#define raise_stmt 282 -#define import_stmt 283 -#define import_name 284 -#define import_from 285 -#define import_as_name 286 -#define dotted_as_name 287 -#define import_as_names 288 -#define dotted_as_names 289 -#define dotted_name 290 -#define global_stmt 291 -#define nonlocal_stmt 292 -#define assert_stmt 293 -#define compound_stmt 294 -#define async_stmt 295 -#define if_stmt 296 -#define while_stmt 297 -#define for_stmt 298 -#define try_stmt 299 -#define with_stmt 300 -#define with_item 301 -#define except_clause 302 -#define suite 303 -#define test 304 -#define test_nocond 305 -#define lambdef 306 -#define lambdef_nocond 307 -#define or_test 308 -#define and_test 309 -#define not_test 310 -#define comparison 311 -#define comp_op 312 -#define star_expr 313 -#define expr 314 -#define xor_expr 315 -#define and_expr 316 -#define shift_expr 317 -#define arith_expr 318 -#define term 319 -#define factor 320 -#define power 321 -#define atom_expr 322 -#define atom 323 -#define testlist_comp 324 -#define trailer 325 -#define subscriptlist 326 -#define subscript 327 -#define sliceop 328 -#define exprlist 329 -#define testlist 330 -#define dictorsetmaker 331 -#define classdef 332 -#define arglist 333 -#define argument 334 -#define comp_iter 335 -#define comp_for 336 -#define comp_if 337 -#define encoding_decl 338 -#define yield_expr 339 -#define yield_arg 340 -#define func_type_input 341 -#define func_type 342 -#define typelist 343 +#define annassign 273 +#define testlist_star_expr 274 +#define augassign 275 +#define del_stmt 276 +#define pass_stmt 277 +#define flow_stmt 278 +#define break_stmt 279 +#define continue_stmt 280 +#define return_stmt 281 +#define yield_stmt 282 +#define raise_stmt 283 +#define import_stmt 284 +#define import_name 285 +#define import_from 286 +#define import_as_name 287 +#define dotted_as_name 288 +#define import_as_names 289 +#define dotted_as_names 290 +#define dotted_name 291 +#define global_stmt 292 +#define nonlocal_stmt 293 +#define assert_stmt 294 +#define compound_stmt 295 +#define async_stmt 296 +#define if_stmt 297 +#define while_stmt 298 +#define for_stmt 299 +#define try_stmt 300 +#define with_stmt 301 +#define with_item 302 +#define except_clause 303 +#define suite 304 +#define test 305 +#define test_nocond 306 +#define lambdef 307 +#define lambdef_nocond 308 +#define or_test 309 +#define and_test 310 +#define not_test 311 +#define comparison 312 +#define comp_op 313 +#define star_expr 314 +#define expr 315 +#define xor_expr 316 +#define and_expr 317 +#define shift_expr 318 +#define arith_expr 319 +#define term 320 +#define factor 321 +#define power 322 +#define atom_expr 323 +#define atom 324 +#define testlist_comp 325 +#define trailer 326 +#define subscriptlist 327 +#define subscript 328 +#define sliceop 329 +#define exprlist 330 +#define testlist 331 +#define dictorsetmaker 332 +#define classdef 333 +#define arglist 334 +#define argument 335 +#define comp_iter 336 +#define comp_for 337 +#define comp_if 338 +#define encoding_decl 339 +#define yield_expr 340 +#define yield_arg 341 +#define func_type_input 342 +#define func_type 343 +#define typelist 344 diff --git a/ast35/Parser/Python.asdl b/ast35/Parser/Python.asdl index e4937256..c59a551f 100644 --- a/ast35/Parser/Python.asdl +++ b/ast35/Parser/Python.asdl @@ -23,7 +23,7 @@ module Python | Return(expr? value) | Delete(expr* targets) - | Assign(expr* targets, expr value, string? type_comment) + | Assign(expr* targets, expr? value, string? type_comment, expr? annotation) | AugAssign(expr target, operator op, expr value) -- use 'orelse' because else is a keyword in target languages diff --git a/ast35/Python/Python-ast.c b/ast35/Python/Python-ast.c index eb866be9..45cf4bb6 100644 --- a/ast35/Python/Python-ast.c +++ b/ast35/Python/Python-ast.c @@ -85,10 +85,12 @@ static char *Delete_fields[]={ "targets", }; static PyTypeObject *Assign_type; +_Py_IDENTIFIER(annotation); static char *Assign_fields[]={ "targets", "value", "type_comment", + "annotation", }; static PyTypeObject *AugAssign_type; _Py_IDENTIFIER(target); @@ -464,7 +466,6 @@ static char *arg_attributes[] = { "col_offset", }; _Py_IDENTIFIER(arg); -_Py_IDENTIFIER(annotation); static char *arg_fields[]={ "arg", "annotation", @@ -862,7 +863,7 @@ static int init_types(void) if (!Return_type) return 0; Delete_type = make_type("Delete", stmt_type, Delete_fields, 1); if (!Delete_type) return 0; - Assign_type = make_type("Assign", stmt_type, Assign_fields, 3); + Assign_type = make_type("Assign", stmt_type, Assign_fields, 4); if (!Assign_type) return 0; AugAssign_type = make_type("AugAssign", stmt_type, AugAssign_fields, 3); if (!AugAssign_type) return 0; @@ -1369,15 +1370,10 @@ Delete(asdl_seq * targets, int lineno, int col_offset, PyArena *arena) } stmt_ty -Assign(asdl_seq * targets, expr_ty value, string type_comment, int lineno, int - col_offset, PyArena *arena) +Assign(asdl_seq * targets, expr_ty value, string type_comment, expr_ty + annotation, int lineno, int col_offset, PyArena *arena) { stmt_ty p; - if (!value) { - PyErr_SetString(PyExc_ValueError, - "field value is required for Assign"); - return NULL; - } p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p)); if (!p) return NULL; @@ -1385,6 +1381,7 @@ Assign(asdl_seq * targets, expr_ty value, string type_comment, int lineno, int p->v.Assign.targets = targets; p->v.Assign.value = value; p->v.Assign.type_comment = type_comment; + p->v.Assign.annotation = annotation; p->lineno = lineno; p->col_offset = col_offset; return p; @@ -2729,6 +2726,11 @@ ast2obj_stmt(void* _o) if (_PyObject_SetAttrId(result, &PyId_type_comment, value) == -1) goto failed; Py_DECREF(value); + value = ast2obj_expr(o->v.Assign.annotation); + if (!value) goto failed; + if (_PyObject_SetAttrId(result, &PyId_annotation, value) == -1) + goto failed; + Py_DECREF(value); break; case AugAssign_kind: result = PyType_GenericNew(AugAssign_type, NULL, NULL); @@ -4554,6 +4556,7 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena) asdl_seq* targets; expr_ty value; string type_comment; + expr_ty annotation; if (_PyObject_HasAttrId(obj, &PyId_targets)) { int res; @@ -4579,7 +4582,7 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena) PyErr_SetString(PyExc_TypeError, "required field \"targets\" missing from Assign"); return 1; } - if (_PyObject_HasAttrId(obj, &PyId_value)) { + if (exists_not_none(obj, &PyId_value)) { int res; tmp = _PyObject_GetAttrId(obj, &PyId_value); if (tmp == NULL) goto failed; @@ -4587,8 +4590,7 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena) if (res != 0) goto failed; Py_CLEAR(tmp); } else { - PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Assign"); - return 1; + value = NULL; } if (exists_not_none(obj, &PyId_type_comment)) { int res; @@ -4600,7 +4602,18 @@ obj2ast_stmt(PyObject* obj, stmt_ty* out, PyArena* arena) } else { type_comment = NULL; } - *out = Assign(targets, value, type_comment, lineno, col_offset, arena); + if (exists_not_none(obj, &PyId_annotation)) { + int res; + tmp = _PyObject_GetAttrId(obj, &PyId_annotation); + if (tmp == NULL) goto failed; + res = obj2ast_expr(tmp, &annotation, arena); + if (res != 0) goto failed; + Py_CLEAR(tmp); + } else { + annotation = NULL; + } + *out = Assign(targets, value, type_comment, annotation, lineno, + col_offset, arena); if (*out == NULL) goto failed; return 0; } diff --git a/ast35/Python/ast.c b/ast35/Python/ast.c index 34186f07..1340717e 100644 --- a/ast35/Python/ast.c +++ b/ast35/Python/ast.c @@ -334,8 +334,21 @@ validate_stmt(stmt_ty stmt) case Delete_kind: return validate_assignlist(stmt->v.Delete.targets, Del); case Assign_kind: + if (!stmt->v.Assign.value && !stmt->v.Assign.annotation) { + PyErr_SetString(PyExc_TypeError, + "Assignment should at least have type or value"); + return 0; + } + if (stmt->v.Assign.type_comment && stmt->v.Assign.annotation) { + PyErr_SetString(PyExc_TypeError, + "Assignment can't have both annotation and type comment"); + return 0; + } return validate_assignlist(stmt->v.Assign.targets, Store) && - validate_expr(stmt->v.Assign.value, Load); + (!stmt->v.Assign.value || + validate_expr(stmt->v.Assign.value, Load)) && + (!stmt->v.Assign.annotation || + validate_expr(stmt->v.Assign.annotation, Load)); case AugAssign_kind: return validate_expr(stmt->v.AugAssign.target, Store) && validate_expr(stmt->v.AugAssign.value, Load); @@ -2999,6 +3012,66 @@ ast_for_expr_stmt(struct compiling *c, const node *n) return AugAssign(expr1, newoperator, expr2, LINENO(n), n->n_col_offset, c->c_arena); } + else if (TYPE(CHILD(n, 1)) == annassign) { + expr_ty expr1, annotation, expr3; + node *ch = CHILD(n, 0); + node *ann = CHILD(n, 1); + asdl_seq *targets = _Py_asdl_seq_new(1, c->c_arena); + if (!targets) + return NULL; + + expr1 = ast_for_testlist(c, ch); + if (!expr1) { + return NULL; + } + switch (expr1->kind) { + case Name_kind: + if (forbidden_name(c, expr1->v.Name.id, n, 0)) { + return NULL; + } + expr1->v.Name.ctx = Store; + break; + case Attribute_kind: + if (forbidden_name(c, expr1->v.Attribute.attr, n, 1)) { + return NULL; + } + expr1->v.Attribute.ctx = Store; + break; + case Subscript_kind: + expr1->v.Subscript.ctx = Store; + break; + case List_kind: + ast_error(c, ch, + "only single target (not list) can be annotated"); + return NULL; + case Tuple_kind: + ast_error(c, ch, + "only single target (not tuple) can be annotated"); + return NULL; + default: + ast_error(c, ch, + "illegal target for annotation"); + return NULL; + } + ch = CHILD(ann, 1); + annotation = ast_for_expr(c, ch); + if (!annotation) { + return NULL; + } + if (NCH(ann) == 2) { + expr3 = NULL; + } + else { + ch = CHILD(ann, 3); + expr3 = ast_for_expr(c, ch); + if (!expr3) { + return NULL; + } + } + asdl_seq_SET(targets, 0, expr1); + return Assign(targets, expr3, NULL, annotation, + LINENO(n), n->n_col_offset, c->c_arena); + } else { int i, nch_minus_type, has_type_comment; asdl_seq *targets; @@ -3043,7 +3116,8 @@ ast_for_expr_stmt(struct compiling *c, const node *n) type_comment = NEW_TYPE_COMMENT(CHILD(n, nch_minus_type)); else type_comment = NULL; - return Assign(targets, expression, type_comment, LINENO(n), n->n_col_offset, c->c_arena); + return Assign(targets, expression, type_comment, NULL, + LINENO(n), n->n_col_offset, c->c_arena); } } diff --git a/ast35/Python/graminit.c b/ast35/Python/graminit.c index 29972006..75b05de4 100644 --- a/ast35/Python/graminit.c +++ b/ast35/Python/graminit.c @@ -485,56 +485,79 @@ static state states_15[2] = { static arc arcs_16_0[1] = { {48, 1}, }; -static arc arcs_16_1[4] = { +static arc arcs_16_1[5] = { {49, 2}, - {32, 3}, - {28, 4}, + {50, 3}, + {32, 4}, + {28, 2}, {0, 1}, }; -static arc arcs_16_2[2] = { - {50, 4}, - {9, 4}, +static arc arcs_16_2[1] = { + {0, 2}, }; static arc arcs_16_3[2] = { - {50, 5}, - {48, 5}, + {51, 2}, + {9, 2}, }; -static arc arcs_16_4[1] = { - {0, 4}, +static arc arcs_16_4[2] = { + {51, 5}, + {48, 5}, }; static arc arcs_16_5[3] = { - {32, 3}, - {28, 4}, + {32, 4}, + {28, 2}, {0, 5}, }; static state states_16[6] = { {1, arcs_16_0}, - {4, arcs_16_1}, - {2, arcs_16_2}, + {5, arcs_16_1}, + {1, arcs_16_2}, {2, arcs_16_3}, - {1, arcs_16_4}, + {2, arcs_16_4}, {3, arcs_16_5}, }; -static arc arcs_17_0[2] = { +static arc arcs_17_0[1] = { + {27, 1}, +}; +static arc arcs_17_1[1] = { + {26, 2}, +}; +static arc arcs_17_2[2] = { + {32, 3}, + {0, 2}, +}; +static arc arcs_17_3[1] = { + {26, 4}, +}; +static arc arcs_17_4[1] = { + {0, 4}, +}; +static state states_17[5] = { + {1, arcs_17_0}, + {1, arcs_17_1}, + {2, arcs_17_2}, + {1, arcs_17_3}, + {1, arcs_17_4}, +}; +static arc arcs_18_0[2] = { {26, 1}, - {51, 1}, + {52, 1}, }; -static arc arcs_17_1[2] = { +static arc arcs_18_1[2] = { {33, 2}, {0, 1}, }; -static arc arcs_17_2[3] = { +static arc arcs_18_2[3] = { {26, 1}, - {51, 1}, + {52, 1}, {0, 2}, }; -static state states_17[3] = { - {2, arcs_17_0}, - {2, arcs_17_1}, - {3, arcs_17_2}, +static state states_18[3] = { + {2, arcs_18_0}, + {2, arcs_18_1}, + {3, arcs_18_2}, }; -static arc arcs_18_0[13] = { - {52, 1}, +static arc arcs_19_0[13] = { {53, 1}, {54, 1}, {55, 1}, @@ -547,60 +570,51 @@ static arc arcs_18_0[13] = { {62, 1}, {63, 1}, {64, 1}, -}; -static arc arcs_18_1[1] = { - {0, 1}, -}; -static state states_18[2] = { - {13, arcs_18_0}, - {1, arcs_18_1}, -}; -static arc arcs_19_0[1] = { {65, 1}, }; static arc arcs_19_1[1] = { - {66, 2}, -}; -static arc arcs_19_2[1] = { - {0, 2}, + {0, 1}, }; -static state states_19[3] = { - {1, arcs_19_0}, +static state states_19[2] = { + {13, arcs_19_0}, {1, arcs_19_1}, - {1, arcs_19_2}, }; static arc arcs_20_0[1] = { - {67, 1}, + {66, 1}, }; static arc arcs_20_1[1] = { - {0, 1}, + {67, 2}, }; -static state states_20[2] = { +static arc arcs_20_2[1] = { + {0, 2}, +}; +static state states_20[3] = { {1, arcs_20_0}, {1, arcs_20_1}, + {1, arcs_20_2}, }; -static arc arcs_21_0[5] = { +static arc arcs_21_0[1] = { {68, 1}, - {69, 1}, - {70, 1}, - {71, 1}, - {72, 1}, }; static arc arcs_21_1[1] = { {0, 1}, }; static state states_21[2] = { - {5, arcs_21_0}, + {1, arcs_21_0}, {1, arcs_21_1}, }; -static arc arcs_22_0[1] = { +static arc arcs_22_0[5] = { + {69, 1}, + {70, 1}, + {71, 1}, + {72, 1}, {73, 1}, }; static arc arcs_22_1[1] = { {0, 1}, }; static state states_22[2] = { - {1, arcs_22_0}, + {5, arcs_22_0}, {1, arcs_22_1}, }; static arc arcs_23_0[1] = { @@ -616,142 +630,133 @@ static state states_23[2] = { static arc arcs_24_0[1] = { {75, 1}, }; -static arc arcs_24_1[2] = { - {9, 2}, +static arc arcs_24_1[1] = { {0, 1}, }; -static arc arcs_24_2[1] = { - {0, 2}, -}; -static state states_24[3] = { +static state states_24[2] = { {1, arcs_24_0}, - {2, arcs_24_1}, - {1, arcs_24_2}, + {1, arcs_24_1}, }; static arc arcs_25_0[1] = { - {50, 1}, + {76, 1}, }; -static arc arcs_25_1[1] = { +static arc arcs_25_1[2] = { + {9, 2}, {0, 1}, }; -static state states_25[2] = { +static arc arcs_25_2[1] = { + {0, 2}, +}; +static state states_25[3] = { {1, arcs_25_0}, - {1, arcs_25_1}, + {2, arcs_25_1}, + {1, arcs_25_2}, }; static arc arcs_26_0[1] = { - {76, 1}, + {51, 1}, +}; +static arc arcs_26_1[1] = { + {0, 1}, +}; +static state states_26[2] = { + {1, arcs_26_0}, + {1, arcs_26_1}, }; -static arc arcs_26_1[2] = { +static arc arcs_27_0[1] = { + {77, 1}, +}; +static arc arcs_27_1[2] = { {26, 2}, {0, 1}, }; -static arc arcs_26_2[2] = { - {77, 3}, +static arc arcs_27_2[2] = { + {78, 3}, {0, 2}, }; -static arc arcs_26_3[1] = { +static arc arcs_27_3[1] = { {26, 4}, }; -static arc arcs_26_4[1] = { +static arc arcs_27_4[1] = { {0, 4}, }; -static state states_26[5] = { - {1, arcs_26_0}, - {2, arcs_26_1}, - {2, arcs_26_2}, - {1, arcs_26_3}, - {1, arcs_26_4}, +static state states_27[5] = { + {1, arcs_27_0}, + {2, arcs_27_1}, + {2, arcs_27_2}, + {1, arcs_27_3}, + {1, arcs_27_4}, }; -static arc arcs_27_0[2] = { - {78, 1}, +static arc arcs_28_0[2] = { {79, 1}, + {80, 1}, }; -static arc arcs_27_1[1] = { +static arc arcs_28_1[1] = { {0, 1}, }; -static state states_27[2] = { - {2, arcs_27_0}, - {1, arcs_27_1}, +static state states_28[2] = { + {2, arcs_28_0}, + {1, arcs_28_1}, }; -static arc arcs_28_0[1] = { - {80, 1}, +static arc arcs_29_0[1] = { + {81, 1}, }; -static arc arcs_28_1[1] = { - {81, 2}, +static arc arcs_29_1[1] = { + {82, 2}, }; -static arc arcs_28_2[1] = { +static arc arcs_29_2[1] = { {0, 2}, }; -static state states_28[3] = { - {1, arcs_28_0}, - {1, arcs_28_1}, - {1, arcs_28_2}, +static state states_29[3] = { + {1, arcs_29_0}, + {1, arcs_29_1}, + {1, arcs_29_2}, }; -static arc arcs_29_0[1] = { - {77, 1}, +static arc arcs_30_0[1] = { + {78, 1}, }; -static arc arcs_29_1[3] = { - {82, 2}, +static arc arcs_30_1[3] = { {83, 2}, + {84, 2}, {12, 3}, }; -static arc arcs_29_2[4] = { - {82, 2}, +static arc arcs_30_2[4] = { {83, 2}, + {84, 2}, {12, 3}, - {80, 4}, + {81, 4}, }; -static arc arcs_29_3[1] = { - {80, 4}, +static arc arcs_30_3[1] = { + {81, 4}, }; -static arc arcs_29_4[3] = { +static arc arcs_30_4[3] = { {34, 5}, {13, 6}, - {84, 5}, + {85, 5}, }; -static arc arcs_29_5[1] = { +static arc arcs_30_5[1] = { {0, 5}, }; -static arc arcs_29_6[1] = { - {84, 7}, +static arc arcs_30_6[1] = { + {85, 7}, }; -static arc arcs_29_7[1] = { +static arc arcs_30_7[1] = { {15, 5}, }; -static state states_29[8] = { - {1, arcs_29_0}, - {3, arcs_29_1}, - {4, arcs_29_2}, - {1, arcs_29_3}, - {3, arcs_29_4}, - {1, arcs_29_5}, - {1, arcs_29_6}, - {1, arcs_29_7}, -}; -static arc arcs_30_0[1] = { - {23, 1}, -}; -static arc arcs_30_1[2] = { - {86, 2}, - {0, 1}, -}; -static arc arcs_30_2[1] = { - {23, 3}, -}; -static arc arcs_30_3[1] = { - {0, 3}, -}; -static state states_30[4] = { +static state states_30[8] = { {1, arcs_30_0}, - {2, arcs_30_1}, - {1, arcs_30_2}, + {3, arcs_30_1}, + {4, arcs_30_2}, {1, arcs_30_3}, + {3, arcs_30_4}, + {1, arcs_30_5}, + {1, arcs_30_6}, + {1, arcs_30_7}, }; static arc arcs_31_0[1] = { - {12, 1}, + {23, 1}, }; static arc arcs_31_1[2] = { - {86, 2}, + {87, 2}, {0, 1}, }; static arc arcs_31_2[1] = { @@ -767,37 +772,45 @@ static state states_31[4] = { {1, arcs_31_3}, }; static arc arcs_32_0[1] = { - {85, 1}, + {12, 1}, }; static arc arcs_32_1[2] = { - {33, 2}, + {87, 2}, {0, 1}, }; -static arc arcs_32_2[2] = { - {85, 1}, - {0, 2}, +static arc arcs_32_2[1] = { + {23, 3}, +}; +static arc arcs_32_3[1] = { + {0, 3}, }; -static state states_32[3] = { +static state states_32[4] = { {1, arcs_32_0}, {2, arcs_32_1}, - {2, arcs_32_2}, + {1, arcs_32_2}, + {1, arcs_32_3}, }; static arc arcs_33_0[1] = { - {87, 1}, + {86, 1}, }; static arc arcs_33_1[2] = { - {33, 0}, + {33, 2}, {0, 1}, }; -static state states_33[2] = { +static arc arcs_33_2[2] = { + {86, 1}, + {0, 2}, +}; +static state states_33[3] = { {1, arcs_33_0}, {2, arcs_33_1}, + {2, arcs_33_2}, }; static arc arcs_34_0[1] = { - {23, 1}, + {88, 1}, }; static arc arcs_34_1[2] = { - {82, 0}, + {33, 0}, {0, 1}, }; static state states_34[2] = { @@ -805,19 +818,15 @@ static state states_34[2] = { {2, arcs_34_1}, }; static arc arcs_35_0[1] = { - {88, 1}, -}; -static arc arcs_35_1[1] = { - {23, 2}, + {23, 1}, }; -static arc arcs_35_2[2] = { - {33, 1}, - {0, 2}, +static arc arcs_35_1[2] = { + {83, 0}, + {0, 1}, }; -static state states_35[3] = { +static state states_35[2] = { {1, arcs_35_0}, - {1, arcs_35_1}, - {2, arcs_35_2}, + {2, arcs_35_1}, }; static arc arcs_36_0[1] = { {89, 1}, @@ -838,97 +847,76 @@ static arc arcs_37_0[1] = { {90, 1}, }; static arc arcs_37_1[1] = { - {26, 2}, + {23, 2}, }; static arc arcs_37_2[2] = { + {33, 1}, + {0, 2}, +}; +static state states_37[3] = { + {1, arcs_37_0}, + {1, arcs_37_1}, + {2, arcs_37_2}, +}; +static arc arcs_38_0[1] = { + {91, 1}, +}; +static arc arcs_38_1[1] = { + {26, 2}, +}; +static arc arcs_38_2[2] = { {33, 3}, {0, 2}, }; -static arc arcs_37_3[1] = { +static arc arcs_38_3[1] = { {26, 4}, }; -static arc arcs_37_4[1] = { +static arc arcs_38_4[1] = { {0, 4}, }; -static state states_37[5] = { - {1, arcs_37_0}, - {1, arcs_37_1}, - {2, arcs_37_2}, - {1, arcs_37_3}, - {1, arcs_37_4}, +static state states_38[5] = { + {1, arcs_38_0}, + {1, arcs_38_1}, + {2, arcs_38_2}, + {1, arcs_38_3}, + {1, arcs_38_4}, }; -static arc arcs_38_0[9] = { - {91, 1}, +static arc arcs_39_0[9] = { {92, 1}, {93, 1}, {94, 1}, {95, 1}, + {96, 1}, {19, 1}, {18, 1}, {17, 1}, - {96, 1}, + {97, 1}, }; -static arc arcs_38_1[1] = { +static arc arcs_39_1[1] = { {0, 1}, }; -static state states_38[2] = { - {9, arcs_38_0}, - {1, arcs_38_1}, +static state states_39[2] = { + {9, arcs_39_0}, + {1, arcs_39_1}, }; -static arc arcs_39_0[1] = { +static arc arcs_40_0[1] = { {21, 1}, }; -static arc arcs_39_1[3] = { +static arc arcs_40_1[3] = { {19, 2}, - {95, 2}, - {93, 2}, -}; -static arc arcs_39_2[1] = { - {0, 2}, -}; -static state states_39[3] = { - {1, arcs_39_0}, - {3, arcs_39_1}, - {1, arcs_39_2}, -}; -static arc arcs_40_0[1] = { - {97, 1}, -}; -static arc arcs_40_1[1] = { - {26, 2}, + {96, 2}, + {94, 2}, }; static arc arcs_40_2[1] = { - {27, 3}, -}; -static arc arcs_40_3[1] = { - {29, 4}, -}; -static arc arcs_40_4[3] = { - {98, 1}, - {99, 5}, - {0, 4}, -}; -static arc arcs_40_5[1] = { - {27, 6}, -}; -static arc arcs_40_6[1] = { - {29, 7}, -}; -static arc arcs_40_7[1] = { - {0, 7}, + {0, 2}, }; -static state states_40[8] = { +static state states_40[3] = { {1, arcs_40_0}, - {1, arcs_40_1}, + {3, arcs_40_1}, {1, arcs_40_2}, - {1, arcs_40_3}, - {3, arcs_40_4}, - {1, arcs_40_5}, - {1, arcs_40_6}, - {1, arcs_40_7}, }; static arc arcs_41_0[1] = { - {100, 1}, + {98, 1}, }; static arc arcs_41_1[1] = { {26, 2}, @@ -939,8 +927,9 @@ static arc arcs_41_2[1] = { static arc arcs_41_3[1] = { {29, 4}, }; -static arc arcs_41_4[2] = { - {99, 5}, +static arc arcs_41_4[3] = { + {99, 1}, + {100, 5}, {0, 4}, }; static arc arcs_41_5[1] = { @@ -957,7 +946,7 @@ static state states_41[8] = { {1, arcs_41_1}, {1, arcs_41_2}, {1, arcs_41_3}, - {2, arcs_41_4}, + {3, arcs_41_4}, {1, arcs_41_5}, {1, arcs_41_6}, {1, arcs_41_7}, @@ -966,277 +955,289 @@ static arc arcs_42_0[1] = { {101, 1}, }; static arc arcs_42_1[1] = { - {66, 2}, + {26, 2}, }; static arc arcs_42_2[1] = { - {102, 3}, + {27, 3}, }; static arc arcs_42_3[1] = { - {9, 4}, + {29, 4}, }; -static arc arcs_42_4[1] = { - {27, 5}, +static arc arcs_42_4[2] = { + {100, 5}, + {0, 4}, }; -static arc arcs_42_5[2] = { - {28, 6}, - {29, 7}, +static arc arcs_42_5[1] = { + {27, 6}, }; static arc arcs_42_6[1] = { {29, 7}, }; -static arc arcs_42_7[2] = { - {99, 8}, +static arc arcs_42_7[1] = { {0, 7}, }; -static arc arcs_42_8[1] = { - {27, 9}, -}; -static arc arcs_42_9[1] = { - {29, 10}, -}; -static arc arcs_42_10[1] = { - {0, 10}, -}; -static state states_42[11] = { +static state states_42[8] = { {1, arcs_42_0}, {1, arcs_42_1}, {1, arcs_42_2}, {1, arcs_42_3}, - {1, arcs_42_4}, - {2, arcs_42_5}, + {2, arcs_42_4}, + {1, arcs_42_5}, {1, arcs_42_6}, - {2, arcs_42_7}, - {1, arcs_42_8}, - {1, arcs_42_9}, - {1, arcs_42_10}, + {1, arcs_42_7}, }; static arc arcs_43_0[1] = { - {103, 1}, + {102, 1}, }; static arc arcs_43_1[1] = { - {27, 2}, + {67, 2}, }; static arc arcs_43_2[1] = { - {29, 3}, + {103, 3}, }; -static arc arcs_43_3[2] = { - {104, 4}, - {105, 5}, +static arc arcs_43_3[1] = { + {9, 4}, }; static arc arcs_43_4[1] = { - {27, 6}, + {27, 5}, }; -static arc arcs_43_5[1] = { - {27, 7}, +static arc arcs_43_5[2] = { + {28, 6}, + {29, 7}, }; static arc arcs_43_6[1] = { - {29, 8}, + {29, 7}, }; -static arc arcs_43_7[1] = { - {29, 9}, +static arc arcs_43_7[2] = { + {100, 8}, + {0, 7}, }; -static arc arcs_43_8[4] = { - {104, 4}, - {99, 10}, - {105, 5}, - {0, 8}, +static arc arcs_43_8[1] = { + {27, 9}, }; static arc arcs_43_9[1] = { - {0, 9}, + {29, 10}, }; static arc arcs_43_10[1] = { - {27, 11}, -}; -static arc arcs_43_11[1] = { - {29, 12}, -}; -static arc arcs_43_12[2] = { - {105, 5}, - {0, 12}, + {0, 10}, }; -static state states_43[13] = { +static state states_43[11] = { {1, arcs_43_0}, {1, arcs_43_1}, {1, arcs_43_2}, - {2, arcs_43_3}, + {1, arcs_43_3}, {1, arcs_43_4}, - {1, arcs_43_5}, + {2, arcs_43_5}, {1, arcs_43_6}, - {1, arcs_43_7}, - {4, arcs_43_8}, + {2, arcs_43_7}, + {1, arcs_43_8}, {1, arcs_43_9}, {1, arcs_43_10}, - {1, arcs_43_11}, - {2, arcs_43_12}, }; static arc arcs_44_0[1] = { - {106, 1}, + {104, 1}, }; static arc arcs_44_1[1] = { - {107, 2}, + {27, 2}, }; -static arc arcs_44_2[2] = { - {33, 1}, - {27, 3}, +static arc arcs_44_2[1] = { + {29, 3}, }; static arc arcs_44_3[2] = { - {28, 4}, - {29, 5}, + {105, 4}, + {106, 5}, }; static arc arcs_44_4[1] = { - {29, 5}, + {27, 6}, }; static arc arcs_44_5[1] = { - {0, 5}, + {27, 7}, +}; +static arc arcs_44_6[1] = { + {29, 8}, +}; +static arc arcs_44_7[1] = { + {29, 9}, +}; +static arc arcs_44_8[4] = { + {105, 4}, + {100, 10}, + {106, 5}, + {0, 8}, +}; +static arc arcs_44_9[1] = { + {0, 9}, }; -static state states_44[6] = { +static arc arcs_44_10[1] = { + {27, 11}, +}; +static arc arcs_44_11[1] = { + {29, 12}, +}; +static arc arcs_44_12[2] = { + {106, 5}, + {0, 12}, +}; +static state states_44[13] = { {1, arcs_44_0}, {1, arcs_44_1}, - {2, arcs_44_2}, + {1, arcs_44_2}, {2, arcs_44_3}, {1, arcs_44_4}, {1, arcs_44_5}, + {1, arcs_44_6}, + {1, arcs_44_7}, + {4, arcs_44_8}, + {1, arcs_44_9}, + {1, arcs_44_10}, + {1, arcs_44_11}, + {2, arcs_44_12}, }; static arc arcs_45_0[1] = { - {26, 1}, + {107, 1}, }; -static arc arcs_45_1[2] = { - {86, 2}, - {0, 1}, +static arc arcs_45_1[1] = { + {108, 2}, }; -static arc arcs_45_2[1] = { - {108, 3}, +static arc arcs_45_2[2] = { + {33, 1}, + {27, 3}, }; -static arc arcs_45_3[1] = { - {0, 3}, +static arc arcs_45_3[2] = { + {28, 4}, + {29, 5}, }; -static state states_45[4] = { +static arc arcs_45_4[1] = { + {29, 5}, +}; +static arc arcs_45_5[1] = { + {0, 5}, +}; +static state states_45[6] = { {1, arcs_45_0}, - {2, arcs_45_1}, - {1, arcs_45_2}, - {1, arcs_45_3}, + {1, arcs_45_1}, + {2, arcs_45_2}, + {2, arcs_45_3}, + {1, arcs_45_4}, + {1, arcs_45_5}, }; static arc arcs_46_0[1] = { - {109, 1}, + {26, 1}, }; static arc arcs_46_1[2] = { - {26, 2}, + {87, 2}, {0, 1}, }; -static arc arcs_46_2[2] = { - {86, 3}, - {0, 2}, +static arc arcs_46_2[1] = { + {109, 3}, }; static arc arcs_46_3[1] = { - {23, 4}, -}; -static arc arcs_46_4[1] = { - {0, 4}, + {0, 3}, }; -static state states_46[5] = { +static state states_46[4] = { {1, arcs_46_0}, {2, arcs_46_1}, - {2, arcs_46_2}, + {1, arcs_46_2}, {1, arcs_46_3}, - {1, arcs_46_4}, }; -static arc arcs_47_0[2] = { - {3, 1}, - {2, 2}, +static arc arcs_47_0[1] = { + {110, 1}, }; -static arc arcs_47_1[1] = { +static arc arcs_47_1[2] = { + {26, 2}, {0, 1}, }; static arc arcs_47_2[2] = { - {28, 3}, - {110, 4}, + {87, 3}, + {0, 2}, }; static arc arcs_47_3[1] = { - {2, 5}, + {23, 4}, }; static arc arcs_47_4[1] = { - {6, 6}, -}; -static arc arcs_47_5[1] = { - {110, 4}, -}; -static arc arcs_47_6[2] = { - {6, 6}, - {111, 1}, + {0, 4}, }; -static state states_47[7] = { - {2, arcs_47_0}, - {1, arcs_47_1}, +static state states_47[5] = { + {1, arcs_47_0}, + {2, arcs_47_1}, {2, arcs_47_2}, {1, arcs_47_3}, {1, arcs_47_4}, - {1, arcs_47_5}, - {2, arcs_47_6}, }; static arc arcs_48_0[2] = { - {112, 1}, - {113, 2}, + {3, 1}, + {2, 2}, }; -static arc arcs_48_1[2] = { - {97, 3}, +static arc arcs_48_1[1] = { {0, 1}, }; -static arc arcs_48_2[1] = { - {0, 2}, +static arc arcs_48_2[2] = { + {28, 3}, + {111, 4}, }; static arc arcs_48_3[1] = { - {112, 4}, + {2, 5}, }; static arc arcs_48_4[1] = { - {99, 5}, + {6, 6}, }; static arc arcs_48_5[1] = { - {26, 2}, + {111, 4}, +}; +static arc arcs_48_6[2] = { + {6, 6}, + {112, 1}, }; -static state states_48[6] = { +static state states_48[7] = { {2, arcs_48_0}, - {2, arcs_48_1}, - {1, arcs_48_2}, + {1, arcs_48_1}, + {2, arcs_48_2}, {1, arcs_48_3}, {1, arcs_48_4}, {1, arcs_48_5}, + {2, arcs_48_6}, }; static arc arcs_49_0[2] = { - {112, 1}, - {115, 1}, + {113, 1}, + {114, 2}, }; -static arc arcs_49_1[1] = { +static arc arcs_49_1[2] = { + {98, 3}, {0, 1}, }; -static state states_49[2] = { - {2, arcs_49_0}, - {1, arcs_49_1}, +static arc arcs_49_2[1] = { + {0, 2}, }; -static arc arcs_50_0[1] = { - {116, 1}, +static arc arcs_49_3[1] = { + {113, 4}, }; -static arc arcs_50_1[2] = { - {36, 2}, - {27, 3}, +static arc arcs_49_4[1] = { + {100, 5}, }; -static arc arcs_50_2[1] = { - {27, 3}, +static arc arcs_49_5[1] = { + {26, 2}, }; -static arc arcs_50_3[1] = { - {26, 4}, +static state states_49[6] = { + {2, arcs_49_0}, + {2, arcs_49_1}, + {1, arcs_49_2}, + {1, arcs_49_3}, + {1, arcs_49_4}, + {1, arcs_49_5}, +}; +static arc arcs_50_0[2] = { + {113, 1}, + {116, 1}, }; -static arc arcs_50_4[1] = { - {0, 4}, +static arc arcs_50_1[1] = { + {0, 1}, }; -static state states_50[5] = { - {1, arcs_50_0}, - {2, arcs_50_1}, - {1, arcs_50_2}, - {1, arcs_50_3}, - {1, arcs_50_4}, +static state states_50[2] = { + {2, arcs_50_0}, + {1, arcs_50_1}, }; static arc arcs_51_0[1] = { - {116, 1}, + {117, 1}, }; static arc arcs_51_1[2] = { {36, 2}, @@ -1246,7 +1247,7 @@ static arc arcs_51_2[1] = { {27, 3}, }; static arc arcs_51_3[1] = { - {114, 4}, + {26, 4}, }; static arc arcs_51_4[1] = { {0, 4}, @@ -1262,108 +1263,120 @@ static arc arcs_52_0[1] = { {117, 1}, }; static arc arcs_52_1[2] = { - {118, 0}, - {0, 1}, + {36, 2}, + {27, 3}, }; -static state states_52[2] = { +static arc arcs_52_2[1] = { + {27, 3}, +}; +static arc arcs_52_3[1] = { + {115, 4}, +}; +static arc arcs_52_4[1] = { + {0, 4}, +}; +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] = { - {119, 1}, + {118, 1}, }; static arc arcs_53_1[2] = { - {120, 0}, + {119, 0}, {0, 1}, }; static state states_53[2] = { {1, arcs_53_0}, {2, arcs_53_1}, }; -static arc arcs_54_0[2] = { - {121, 1}, - {122, 2}, +static arc arcs_54_0[1] = { + {120, 1}, +}; +static arc arcs_54_1[2] = { + {121, 0}, + {0, 1}, +}; +static state states_54[2] = { + {1, arcs_54_0}, + {2, arcs_54_1}, +}; +static arc arcs_55_0[2] = { + {122, 1}, + {123, 2}, }; -static arc arcs_54_1[1] = { - {119, 2}, +static arc arcs_55_1[1] = { + {120, 2}, }; -static arc arcs_54_2[1] = { +static arc arcs_55_2[1] = { {0, 2}, }; -static state states_54[3] = { - {2, arcs_54_0}, - {1, arcs_54_1}, - {1, arcs_54_2}, +static state states_55[3] = { + {2, arcs_55_0}, + {1, arcs_55_1}, + {1, arcs_55_2}, }; -static arc arcs_55_0[1] = { - {108, 1}, +static arc arcs_56_0[1] = { + {109, 1}, }; -static arc arcs_55_1[2] = { - {123, 0}, +static arc arcs_56_1[2] = { + {124, 0}, {0, 1}, }; -static state states_55[2] = { - {1, arcs_55_0}, - {2, arcs_55_1}, +static state states_56[2] = { + {1, arcs_56_0}, + {2, arcs_56_1}, }; -static arc arcs_56_0[10] = { - {124, 1}, +static arc arcs_57_0[10] = { {125, 1}, {126, 1}, {127, 1}, {128, 1}, {129, 1}, {130, 1}, - {102, 1}, - {121, 2}, - {131, 3}, + {131, 1}, + {103, 1}, + {122, 2}, + {132, 3}, }; -static arc arcs_56_1[1] = { +static arc arcs_57_1[1] = { {0, 1}, }; -static arc arcs_56_2[1] = { - {102, 1}, +static arc arcs_57_2[1] = { + {103, 1}, }; -static arc arcs_56_3[2] = { - {121, 1}, +static arc arcs_57_3[2] = { + {122, 1}, {0, 3}, }; -static state states_56[4] = { - {10, arcs_56_0}, - {1, arcs_56_1}, - {1, arcs_56_2}, - {2, arcs_56_3}, -}; -static arc arcs_57_0[1] = { - {34, 1}, -}; -static arc arcs_57_1[1] = { - {108, 2}, -}; -static arc arcs_57_2[1] = { - {0, 2}, -}; -static state states_57[3] = { - {1, arcs_57_0}, +static state states_57[4] = { + {10, arcs_57_0}, {1, arcs_57_1}, {1, arcs_57_2}, + {2, arcs_57_3}, }; static arc arcs_58_0[1] = { - {132, 1}, + {34, 1}, +}; +static arc arcs_58_1[1] = { + {109, 2}, }; -static arc arcs_58_1[2] = { - {133, 0}, - {0, 1}, +static arc arcs_58_2[1] = { + {0, 2}, }; -static state states_58[2] = { +static state states_58[3] = { {1, arcs_58_0}, - {2, arcs_58_1}, + {1, arcs_58_1}, + {1, arcs_58_2}, }; static arc arcs_59_0[1] = { - {134, 1}, + {133, 1}, }; static arc arcs_59_1[2] = { - {135, 0}, + {134, 0}, {0, 1}, }; static state states_59[2] = { @@ -1371,10 +1384,10 @@ static state states_59[2] = { {2, arcs_59_1}, }; static arc arcs_60_0[1] = { - {136, 1}, + {135, 1}, }; static arc arcs_60_1[2] = { - {137, 0}, + {136, 0}, {0, 1}, }; static state states_60[2] = { @@ -1382,23 +1395,22 @@ static state states_60[2] = { {2, arcs_60_1}, }; static arc arcs_61_0[1] = { - {138, 1}, + {137, 1}, }; -static arc arcs_61_1[3] = { - {139, 0}, - {140, 0}, +static arc arcs_61_1[2] = { + {138, 0}, {0, 1}, }; static state states_61[2] = { {1, arcs_61_0}, - {3, arcs_61_1}, + {2, arcs_61_1}, }; static arc arcs_62_0[1] = { - {141, 1}, + {139, 1}, }; static arc arcs_62_1[3] = { - {142, 0}, - {143, 0}, + {140, 0}, + {141, 0}, {0, 1}, }; static state states_62[2] = { @@ -1406,630 +1418,642 @@ static state states_62[2] = { {3, arcs_62_1}, }; static arc arcs_63_0[1] = { - {144, 1}, + {142, 1}, +}; +static arc arcs_63_1[3] = { + {143, 0}, + {144, 0}, + {0, 1}, +}; +static state states_63[2] = { + {1, arcs_63_0}, + {3, arcs_63_1}, +}; +static arc arcs_64_0[1] = { + {145, 1}, }; -static arc arcs_63_1[6] = { +static arc arcs_64_1[6] = { {34, 0}, {11, 0}, - {145, 0}, {146, 0}, {147, 0}, + {148, 0}, {0, 1}, }; -static state states_63[2] = { - {1, arcs_63_0}, - {6, arcs_63_1}, +static state states_64[2] = { + {1, arcs_64_0}, + {6, arcs_64_1}, }; -static arc arcs_64_0[4] = { - {142, 1}, +static arc arcs_65_0[4] = { {143, 1}, - {148, 1}, - {149, 2}, + {144, 1}, + {149, 1}, + {150, 2}, }; -static arc arcs_64_1[1] = { - {144, 2}, +static arc arcs_65_1[1] = { + {145, 2}, }; -static arc arcs_64_2[1] = { +static arc arcs_65_2[1] = { {0, 2}, }; -static state states_64[3] = { - {4, arcs_64_0}, - {1, arcs_64_1}, - {1, arcs_64_2}, +static state states_65[3] = { + {4, arcs_65_0}, + {1, arcs_65_1}, + {1, arcs_65_2}, }; -static arc arcs_65_0[1] = { - {150, 1}, +static arc arcs_66_0[1] = { + {151, 1}, }; -static arc arcs_65_1[2] = { +static arc arcs_66_1[2] = { {35, 2}, {0, 1}, }; -static arc arcs_65_2[1] = { - {144, 3}, +static arc arcs_66_2[1] = { + {145, 3}, }; -static arc arcs_65_3[1] = { +static arc arcs_66_3[1] = { {0, 3}, }; -static state states_65[4] = { - {1, arcs_65_0}, - {2, arcs_65_1}, - {1, arcs_65_2}, - {1, arcs_65_3}, -}; -static arc arcs_66_0[2] = { - {151, 1}, - {152, 2}, +static state states_66[4] = { + {1, arcs_66_0}, + {2, arcs_66_1}, + {1, arcs_66_2}, + {1, arcs_66_3}, }; -static arc arcs_66_1[1] = { - {152, 2}, +static arc arcs_67_0[2] = { + {152, 1}, + {153, 2}, }; -static arc arcs_66_2[2] = { +static arc arcs_67_1[1] = { {153, 2}, +}; +static arc arcs_67_2[2] = { + {154, 2}, {0, 2}, }; -static state states_66[3] = { - {2, arcs_66_0}, - {1, arcs_66_1}, - {2, arcs_66_2}, +static state states_67[3] = { + {2, arcs_67_0}, + {1, arcs_67_1}, + {2, arcs_67_2}, }; -static arc arcs_67_0[10] = { +static arc arcs_68_0[10] = { {13, 1}, - {155, 2}, - {157, 3}, + {156, 2}, + {158, 3}, {23, 4}, - {160, 4}, - {161, 5}, - {83, 4}, - {162, 4}, + {161, 4}, + {162, 5}, + {84, 4}, {163, 4}, {164, 4}, + {165, 4}, }; -static arc arcs_67_1[3] = { - {50, 6}, - {154, 6}, +static arc arcs_68_1[3] = { + {51, 6}, + {155, 6}, {15, 4}, }; -static arc arcs_67_2[2] = { - {154, 7}, - {156, 4}, +static arc arcs_68_2[2] = { + {155, 7}, + {157, 4}, }; -static arc arcs_67_3[2] = { - {158, 8}, - {159, 4}, +static arc arcs_68_3[2] = { + {159, 8}, + {160, 4}, }; -static arc arcs_67_4[1] = { +static arc arcs_68_4[1] = { {0, 4}, }; -static arc arcs_67_5[2] = { - {161, 5}, +static arc arcs_68_5[2] = { + {162, 5}, {0, 5}, }; -static arc arcs_67_6[1] = { +static arc arcs_68_6[1] = { {15, 4}, }; -static arc arcs_67_7[1] = { - {156, 4}, +static arc arcs_68_7[1] = { + {157, 4}, }; -static arc arcs_67_8[1] = { - {159, 4}, +static arc arcs_68_8[1] = { + {160, 4}, }; -static state states_67[9] = { - {10, arcs_67_0}, - {3, arcs_67_1}, - {2, arcs_67_2}, - {2, arcs_67_3}, - {1, arcs_67_4}, - {2, arcs_67_5}, - {1, arcs_67_6}, - {1, arcs_67_7}, - {1, arcs_67_8}, -}; -static arc arcs_68_0[2] = { +static state states_68[9] = { + {10, arcs_68_0}, + {3, arcs_68_1}, + {2, arcs_68_2}, + {2, arcs_68_3}, + {1, arcs_68_4}, + {2, arcs_68_5}, + {1, arcs_68_6}, + {1, arcs_68_7}, + {1, arcs_68_8}, +}; +static arc arcs_69_0[2] = { {26, 1}, - {51, 1}, + {52, 1}, }; -static arc arcs_68_1[3] = { - {165, 2}, +static arc arcs_69_1[3] = { + {166, 2}, {33, 3}, {0, 1}, }; -static arc arcs_68_2[1] = { +static arc arcs_69_2[1] = { {0, 2}, }; -static arc arcs_68_3[3] = { +static arc arcs_69_3[3] = { {26, 4}, - {51, 4}, + {52, 4}, {0, 3}, }; -static arc arcs_68_4[2] = { +static arc arcs_69_4[2] = { {33, 3}, {0, 4}, }; -static state states_68[5] = { - {2, arcs_68_0}, - {3, arcs_68_1}, - {1, arcs_68_2}, - {3, arcs_68_3}, - {2, arcs_68_4}, +static state states_69[5] = { + {2, arcs_69_0}, + {3, arcs_69_1}, + {1, arcs_69_2}, + {3, arcs_69_3}, + {2, arcs_69_4}, }; -static arc arcs_69_0[3] = { +static arc arcs_70_0[3] = { {13, 1}, - {155, 2}, - {82, 3}, + {156, 2}, + {83, 3}, }; -static arc arcs_69_1[2] = { +static arc arcs_70_1[2] = { {14, 4}, {15, 5}, }; -static arc arcs_69_2[1] = { - {166, 6}, +static arc arcs_70_2[1] = { + {167, 6}, }; -static arc arcs_69_3[1] = { +static arc arcs_70_3[1] = { {23, 5}, }; -static arc arcs_69_4[1] = { +static arc arcs_70_4[1] = { {15, 5}, }; -static arc arcs_69_5[1] = { +static arc arcs_70_5[1] = { {0, 5}, }; -static arc arcs_69_6[1] = { - {156, 5}, +static arc arcs_70_6[1] = { + {157, 5}, }; -static state states_69[7] = { - {3, arcs_69_0}, - {2, arcs_69_1}, - {1, arcs_69_2}, - {1, arcs_69_3}, - {1, arcs_69_4}, - {1, arcs_69_5}, - {1, arcs_69_6}, +static state states_70[7] = { + {3, arcs_70_0}, + {2, arcs_70_1}, + {1, arcs_70_2}, + {1, arcs_70_3}, + {1, arcs_70_4}, + {1, arcs_70_5}, + {1, arcs_70_6}, }; -static arc arcs_70_0[1] = { - {167, 1}, +static arc arcs_71_0[1] = { + {168, 1}, }; -static arc arcs_70_1[2] = { +static arc arcs_71_1[2] = { {33, 2}, {0, 1}, }; -static arc arcs_70_2[2] = { - {167, 1}, +static arc arcs_71_2[2] = { + {168, 1}, {0, 2}, }; -static state states_70[3] = { - {1, arcs_70_0}, - {2, arcs_70_1}, - {2, arcs_70_2}, +static state states_71[3] = { + {1, arcs_71_0}, + {2, arcs_71_1}, + {2, arcs_71_2}, }; -static arc arcs_71_0[2] = { +static arc arcs_72_0[2] = { {26, 1}, {27, 2}, }; -static arc arcs_71_1[2] = { +static arc arcs_72_1[2] = { {27, 2}, {0, 1}, }; -static arc arcs_71_2[3] = { +static arc arcs_72_2[3] = { {26, 3}, - {168, 4}, + {169, 4}, {0, 2}, }; -static arc arcs_71_3[2] = { - {168, 4}, +static arc arcs_72_3[2] = { + {169, 4}, {0, 3}, }; -static arc arcs_71_4[1] = { +static arc arcs_72_4[1] = { {0, 4}, }; -static state states_71[5] = { - {2, arcs_71_0}, - {2, arcs_71_1}, - {3, arcs_71_2}, - {2, arcs_71_3}, - {1, arcs_71_4}, +static state states_72[5] = { + {2, arcs_72_0}, + {2, arcs_72_1}, + {3, arcs_72_2}, + {2, arcs_72_3}, + {1, arcs_72_4}, }; -static arc arcs_72_0[1] = { +static arc arcs_73_0[1] = { {27, 1}, }; -static arc arcs_72_1[2] = { +static arc arcs_73_1[2] = { {26, 2}, {0, 1}, }; -static arc arcs_72_2[1] = { +static arc arcs_73_2[1] = { {0, 2}, }; -static state states_72[3] = { - {1, arcs_72_0}, - {2, arcs_72_1}, - {1, arcs_72_2}, +static state states_73[3] = { + {1, arcs_73_0}, + {2, arcs_73_1}, + {1, arcs_73_2}, }; -static arc arcs_73_0[2] = { - {108, 1}, - {51, 1}, +static arc arcs_74_0[2] = { + {109, 1}, + {52, 1}, }; -static arc arcs_73_1[2] = { +static arc arcs_74_1[2] = { {33, 2}, {0, 1}, }; -static arc arcs_73_2[3] = { - {108, 1}, - {51, 1}, +static arc arcs_74_2[3] = { + {109, 1}, + {52, 1}, {0, 2}, }; -static state states_73[3] = { - {2, arcs_73_0}, - {2, arcs_73_1}, - {3, arcs_73_2}, +static state states_74[3] = { + {2, arcs_74_0}, + {2, arcs_74_1}, + {3, arcs_74_2}, }; -static arc arcs_74_0[1] = { +static arc arcs_75_0[1] = { {26, 1}, }; -static arc arcs_74_1[2] = { +static arc arcs_75_1[2] = { {33, 2}, {0, 1}, }; -static arc arcs_74_2[2] = { +static arc arcs_75_2[2] = { {26, 1}, {0, 2}, }; -static state states_74[3] = { - {1, arcs_74_0}, - {2, arcs_74_1}, - {2, arcs_74_2}, +static state states_75[3] = { + {1, arcs_75_0}, + {2, arcs_75_1}, + {2, arcs_75_2}, }; -static arc arcs_75_0[3] = { +static arc arcs_76_0[3] = { {26, 1}, {35, 2}, - {51, 3}, + {52, 3}, }; -static arc arcs_75_1[4] = { +static arc arcs_76_1[4] = { {27, 4}, - {165, 5}, + {166, 5}, {33, 6}, {0, 1}, }; -static arc arcs_75_2[1] = { - {108, 7}, +static arc arcs_76_2[1] = { + {109, 7}, }; -static arc arcs_75_3[3] = { - {165, 5}, +static arc arcs_76_3[3] = { + {166, 5}, {33, 6}, {0, 3}, }; -static arc arcs_75_4[1] = { +static arc arcs_76_4[1] = { {26, 7}, }; -static arc arcs_75_5[1] = { +static arc arcs_76_5[1] = { {0, 5}, }; -static arc arcs_75_6[3] = { +static arc arcs_76_6[3] = { {26, 8}, - {51, 8}, + {52, 8}, {0, 6}, }; -static arc arcs_75_7[3] = { - {165, 5}, +static arc arcs_76_7[3] = { + {166, 5}, {33, 9}, {0, 7}, }; -static arc arcs_75_8[2] = { +static arc arcs_76_8[2] = { {33, 6}, {0, 8}, }; -static arc arcs_75_9[3] = { +static arc arcs_76_9[3] = { {26, 10}, {35, 11}, {0, 9}, }; -static arc arcs_75_10[1] = { +static arc arcs_76_10[1] = { {27, 12}, }; -static arc arcs_75_11[1] = { - {108, 13}, +static arc arcs_76_11[1] = { + {109, 13}, }; -static arc arcs_75_12[1] = { +static arc arcs_76_12[1] = { {26, 13}, }; -static arc arcs_75_13[2] = { +static arc arcs_76_13[2] = { {33, 9}, {0, 13}, }; -static state states_75[14] = { - {3, arcs_75_0}, - {4, arcs_75_1}, - {1, arcs_75_2}, - {3, arcs_75_3}, - {1, arcs_75_4}, - {1, arcs_75_5}, - {3, arcs_75_6}, - {3, arcs_75_7}, - {2, arcs_75_8}, - {3, arcs_75_9}, - {1, arcs_75_10}, - {1, arcs_75_11}, - {1, arcs_75_12}, - {2, arcs_75_13}, -}; -static arc arcs_76_0[1] = { - {169, 1}, -}; -static arc arcs_76_1[1] = { +static state states_76[14] = { + {3, arcs_76_0}, + {4, arcs_76_1}, + {1, arcs_76_2}, + {3, arcs_76_3}, + {1, arcs_76_4}, + {1, arcs_76_5}, + {3, arcs_76_6}, + {3, arcs_76_7}, + {2, arcs_76_8}, + {3, arcs_76_9}, + {1, arcs_76_10}, + {1, arcs_76_11}, + {1, arcs_76_12}, + {2, arcs_76_13}, +}; +static arc arcs_77_0[1] = { + {170, 1}, +}; +static arc arcs_77_1[1] = { {23, 2}, }; -static arc arcs_76_2[2] = { +static arc arcs_77_2[2] = { {13, 3}, {27, 4}, }; -static arc arcs_76_3[2] = { +static arc arcs_77_3[2] = { {14, 5}, {15, 6}, }; -static arc arcs_76_4[1] = { +static arc arcs_77_4[1] = { {29, 7}, }; -static arc arcs_76_5[1] = { +static arc arcs_77_5[1] = { {15, 6}, }; -static arc arcs_76_6[1] = { +static arc arcs_77_6[1] = { {27, 4}, }; -static arc arcs_76_7[1] = { +static arc arcs_77_7[1] = { {0, 7}, }; -static state states_76[8] = { - {1, arcs_76_0}, - {1, arcs_76_1}, - {2, arcs_76_2}, - {2, arcs_76_3}, - {1, arcs_76_4}, - {1, arcs_76_5}, - {1, arcs_76_6}, - {1, arcs_76_7}, +static state states_77[8] = { + {1, arcs_77_0}, + {1, arcs_77_1}, + {2, arcs_77_2}, + {2, arcs_77_3}, + {1, arcs_77_4}, + {1, arcs_77_5}, + {1, arcs_77_6}, + {1, arcs_77_7}, }; -static arc arcs_77_0[1] = { - {170, 1}, +static arc arcs_78_0[1] = { + {171, 1}, }; -static arc arcs_77_1[2] = { +static arc arcs_78_1[2] = { {33, 2}, {0, 1}, }; -static arc arcs_77_2[2] = { - {170, 1}, +static arc arcs_78_2[2] = { + {171, 1}, {0, 2}, }; -static state states_77[3] = { - {1, arcs_77_0}, - {2, arcs_77_1}, - {2, arcs_77_2}, +static state states_78[3] = { + {1, arcs_78_0}, + {2, arcs_78_1}, + {2, arcs_78_2}, }; -static arc arcs_78_0[3] = { +static arc arcs_79_0[3] = { {26, 1}, {35, 2}, {34, 2}, }; -static arc arcs_78_1[3] = { - {165, 3}, +static arc arcs_79_1[3] = { + {166, 3}, {32, 2}, {0, 1}, }; -static arc arcs_78_2[1] = { +static arc arcs_79_2[1] = { {26, 3}, }; -static arc arcs_78_3[1] = { +static arc arcs_79_3[1] = { {0, 3}, }; -static state states_78[4] = { - {3, arcs_78_0}, - {3, arcs_78_1}, - {1, arcs_78_2}, - {1, arcs_78_3}, -}; -static arc arcs_79_0[2] = { - {165, 1}, - {172, 1}, +static state states_79[4] = { + {3, arcs_79_0}, + {3, arcs_79_1}, + {1, arcs_79_2}, + {1, arcs_79_3}, }; -static arc arcs_79_1[1] = { - {0, 1}, -}; -static state states_79[2] = { - {2, arcs_79_0}, - {1, arcs_79_1}, -}; -static arc arcs_80_0[1] = { - {101, 1}, +static arc arcs_80_0[2] = { + {166, 1}, + {173, 1}, }; static arc arcs_80_1[1] = { - {66, 2}, -}; -static arc arcs_80_2[1] = { - {102, 3}, -}; -static arc arcs_80_3[1] = { - {112, 4}, -}; -static arc arcs_80_4[2] = { - {171, 5}, - {0, 4}, -}; -static arc arcs_80_5[1] = { - {0, 5}, + {0, 1}, }; -static state states_80[6] = { - {1, arcs_80_0}, +static state states_80[2] = { + {2, arcs_80_0}, {1, arcs_80_1}, - {1, arcs_80_2}, - {1, arcs_80_3}, - {2, arcs_80_4}, - {1, arcs_80_5}, }; static arc arcs_81_0[1] = { - {97, 1}, + {102, 1}, }; static arc arcs_81_1[1] = { - {114, 2}, + {67, 2}, }; -static arc arcs_81_2[2] = { - {171, 3}, - {0, 2}, +static arc arcs_81_2[1] = { + {103, 3}, }; static arc arcs_81_3[1] = { - {0, 3}, + {113, 4}, }; -static state states_81[4] = { +static arc arcs_81_4[2] = { + {172, 5}, + {0, 4}, +}; +static arc arcs_81_5[1] = { + {0, 5}, +}; +static state states_81[6] = { {1, arcs_81_0}, {1, arcs_81_1}, - {2, arcs_81_2}, + {1, arcs_81_2}, {1, arcs_81_3}, + {2, arcs_81_4}, + {1, arcs_81_5}, }; static arc arcs_82_0[1] = { - {23, 1}, + {98, 1}, }; static arc arcs_82_1[1] = { - {0, 1}, + {115, 2}, +}; +static arc arcs_82_2[2] = { + {172, 3}, + {0, 2}, +}; +static arc arcs_82_3[1] = { + {0, 3}, }; -static state states_82[2] = { +static state states_82[4] = { {1, arcs_82_0}, {1, arcs_82_1}, + {2, arcs_82_2}, + {1, arcs_82_3}, }; static arc arcs_83_0[1] = { - {174, 1}, + {23, 1}, }; -static arc arcs_83_1[2] = { - {175, 2}, +static arc arcs_83_1[1] = { {0, 1}, }; -static arc arcs_83_2[1] = { - {0, 2}, -}; -static state states_83[3] = { +static state states_83[2] = { {1, arcs_83_0}, - {2, arcs_83_1}, - {1, arcs_83_2}, + {1, arcs_83_1}, }; -static arc arcs_84_0[2] = { - {77, 1}, - {9, 2}, +static arc arcs_84_0[1] = { + {175, 1}, }; -static arc arcs_84_1[1] = { - {26, 2}, +static arc arcs_84_1[2] = { + {176, 2}, + {0, 1}, }; static arc arcs_84_2[1] = { {0, 2}, }; static state states_84[3] = { - {2, arcs_84_0}, - {1, arcs_84_1}, + {1, arcs_84_0}, + {2, arcs_84_1}, {1, arcs_84_2}, }; -static arc arcs_85_0[1] = { - {177, 1}, +static arc arcs_85_0[2] = { + {78, 1}, + {9, 2}, }; -static arc arcs_85_1[2] = { - {2, 1}, - {7, 2}, +static arc arcs_85_1[1] = { + {26, 2}, }; static arc arcs_85_2[1] = { {0, 2}, }; static state states_85[3] = { - {1, arcs_85_0}, - {2, arcs_85_1}, + {2, arcs_85_0}, + {1, arcs_85_1}, {1, arcs_85_2}, }; static arc arcs_86_0[1] = { - {13, 1}, + {178, 1}, }; static arc arcs_86_1[2] = { - {178, 2}, - {15, 3}, + {2, 1}, + {7, 2}, }; 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[1] = { + {13, 1}, +}; +static arc arcs_87_1[2] = { + {179, 2}, {15, 3}, }; -static arc arcs_86_3[1] = { +static arc arcs_87_2[1] = { + {15, 3}, +}; +static arc arcs_87_3[1] = { {25, 4}, }; -static arc arcs_86_4[1] = { +static arc arcs_87_4[1] = { {26, 5}, }; -static arc arcs_86_5[1] = { +static arc arcs_87_5[1] = { {0, 5}, }; -static state states_86[6] = { - {1, arcs_86_0}, - {2, arcs_86_1}, - {1, arcs_86_2}, - {1, arcs_86_3}, - {1, arcs_86_4}, - {1, arcs_86_5}, +static state states_87[6] = { + {1, arcs_87_0}, + {2, arcs_87_1}, + {1, arcs_87_2}, + {1, arcs_87_3}, + {1, arcs_87_4}, + {1, arcs_87_5}, }; -static arc arcs_87_0[3] = { +static arc arcs_88_0[3] = { {26, 1}, {34, 2}, {35, 3}, }; -static arc arcs_87_1[2] = { +static arc arcs_88_1[2] = { {33, 4}, {0, 1}, }; -static arc arcs_87_2[3] = { +static arc arcs_88_2[3] = { {26, 5}, {33, 6}, {0, 2}, }; -static arc arcs_87_3[1] = { +static arc arcs_88_3[1] = { {26, 7}, }; -static arc arcs_87_4[4] = { +static arc arcs_88_4[4] = { {26, 1}, {34, 8}, {35, 3}, {0, 4}, }; -static arc arcs_87_5[2] = { +static arc arcs_88_5[2] = { {33, 6}, {0, 5}, }; -static arc arcs_87_6[2] = { +static arc arcs_88_6[2] = { {26, 5}, {35, 3}, }; -static arc arcs_87_7[1] = { +static arc arcs_88_7[1] = { {0, 7}, }; -static arc arcs_87_8[3] = { +static arc arcs_88_8[3] = { {26, 9}, {33, 10}, {0, 8}, }; -static arc arcs_87_9[2] = { +static arc arcs_88_9[2] = { {33, 10}, {0, 9}, }; -static arc arcs_87_10[2] = { +static arc arcs_88_10[2] = { {26, 9}, {35, 3}, }; -static state states_87[11] = { - {3, arcs_87_0}, - {2, arcs_87_1}, - {3, arcs_87_2}, - {1, arcs_87_3}, - {4, arcs_87_4}, - {2, arcs_87_5}, - {2, arcs_87_6}, - {1, arcs_87_7}, - {3, arcs_87_8}, - {2, arcs_87_9}, - {2, arcs_87_10}, -}; -static dfa dfas[88] = { +static state states_88[11] = { + {3, arcs_88_0}, + {2, arcs_88_1}, + {3, arcs_88_2}, + {1, arcs_88_3}, + {4, arcs_88_4}, + {2, arcs_88_5}, + {2, arcs_88_6}, + {1, arcs_88_7}, + {3, arcs_88_8}, + {2, arcs_88_9}, + {2, arcs_88_10}, +}; +static dfa dfas[89] = { {256, "single_input", 0, 3, states_0, - "\004\050\340\000\004\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\102\000"}, + "\004\050\340\000\004\000\000\000\024\174\022\016\144\011\040\004\000\200\041\121\076\204\000"}, {257, "file_input", 0, 2, states_1, - "\204\050\340\000\004\000\000\000\012\076\011\007\262\004\020\002\000\300\220\050\037\102\000"}, + "\204\050\340\000\004\000\000\000\024\174\022\016\144\011\040\004\000\200\041\121\076\204\000"}, {258, "eval_input", 0, 3, states_2, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\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, @@ -2051,176 +2075,178 @@ static dfa dfas[88] = { {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\012\076\011\007\262\004\020\002\000\300\220\050\037\102\000"}, + "\000\050\340\000\004\000\000\000\024\174\022\016\144\011\040\004\000\200\041\121\076\204\000"}, {270, "simple_stmt", 0, 4, states_14, - "\000\040\200\000\004\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\100\000"}, + "\000\040\200\000\004\000\000\000\024\174\022\016\000\000\040\004\000\200\041\121\076\200\000"}, {271, "small_stmt", 0, 2, states_15, - "\000\040\200\000\004\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\100\000"}, + "\000\040\200\000\004\000\000\000\024\174\022\016\000\000\040\004\000\200\041\121\076\200\000"}, {272, "expr_stmt", 0, 6, states_16, - "\000\040\200\000\004\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {273, "testlist_star_expr", 0, 3, states_17, - "\000\040\200\000\004\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {274, "augassign", 0, 2, states_18, - "\000\000\000\000\000\000\360\377\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {275, "del_stmt", 0, 3, states_19, - "\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {276, "pass_stmt", 0, 2, states_20, - "\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {277, "flow_stmt", 0, 2, states_21, - "\000\000\000\000\000\000\000\000\000\036\000\000\000\000\000\000\000\000\000\000\000\100\000"}, - {278, "break_stmt", 0, 2, states_22, - "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {279, "continue_stmt", 0, 2, states_23, + "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\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\040\004\000\200\041\121\076\000\000"}, + {275, "augassign", 0, 2, states_19, + "\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\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\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\200\000"}, + {279, "break_stmt", 0, 2, states_23, "\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {280, "return_stmt", 0, 3, states_24, + {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, "yield_stmt", 0, 2, states_25, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000"}, - {282, "raise_stmt", 0, 5, states_26, + {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"}, - {283, "import_stmt", 0, 2, states_27, - "\000\000\000\000\000\000\000\000\000\040\001\000\000\000\000\000\000\000\000\000\000\000\000"}, - {284, "import_name", 0, 3, states_28, - "\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"}, - {285, "import_from", 0, 8, states_29, + {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\200\000"}, + {283, "raise_stmt", 0, 5, states_27, "\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {286, "import_as_name", 0, 4, states_30, + {284, "import_stmt", 0, 2, states_28, + "\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\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\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"}, - {287, "dotted_as_name", 0, 4, states_31, + {288, "dotted_as_name", 0, 4, states_32, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {288, "import_as_names", 0, 3, states_32, + {289, "import_as_names", 0, 3, states_33, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {289, "dotted_as_names", 0, 2, states_33, + {290, "dotted_as_names", 0, 2, states_34, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {290, "dotted_name", 0, 2, states_34, + {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"}, - {291, "global_stmt", 0, 3, states_35, - "\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000"}, - {292, "nonlocal_stmt", 0, 3, states_36, + {292, "global_stmt", 0, 3, states_36, "\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000"}, - {293, "assert_stmt", 0, 5, states_37, + {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, "compound_stmt", 0, 2, states_38, - "\000\010\140\000\000\000\000\000\000\000\000\000\262\004\000\000\000\000\000\000\000\002\000"}, - {295, "async_stmt", 0, 3, states_39, + {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\144\011\000\000\000\000\000\000\000\004\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"}, - {296, "if_stmt", 0, 8, states_40, - "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"}, - {297, "while_stmt", 0, 8, states_41, - "\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000"}, - {298, "for_stmt", 0, 11, states_42, + {297, "if_stmt", 0, 8, states_41, + "\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, "try_stmt", 0, 13, states_43, - "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000"}, - {300, "with_stmt", 0, 6, states_44, - "\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_item", 0, 4, states_45, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {302, "except_clause", 0, 5, states_46, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"}, - {303, "suite", 0, 7, states_47, - "\004\040\200\000\004\000\000\000\012\076\011\007\000\000\020\002\000\300\220\050\037\100\000"}, - {304, "test", 0, 6, states_48, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {305, "test_nocond", 0, 2, states_49, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {306, "lambdef", 0, 5, states_50, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000"}, - {307, "lambdef_nocond", 0, 5, states_51, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000"}, - {308, "or_test", 0, 2, states_52, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000\000"}, - {309, "and_test", 0, 2, states_53, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000\000"}, - {310, "not_test", 0, 3, states_54, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\002\000\300\220\050\037\000\000"}, - {311, "comparison", 0, 2, states_55, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"}, - {312, "comp_op", 0, 4, states_56, - "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\362\017\000\000\000\000\000\000"}, - {313, "star_expr", 0, 3, states_57, + {299, "for_stmt", 0, 11, 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"}, + {300, "try_stmt", 0, 13, states_44, + "\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, 6, 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"}, + {302, "with_item", 0, 4, states_46, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {303, "except_clause", 0, 5, states_47, + "\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, 7, states_48, + "\004\040\200\000\004\000\000\000\024\174\022\016\000\000\040\004\000\200\041\121\076\200\000"}, + {305, "test", 0, 6, states_49, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {306, "test_nocond", 0, 2, states_50, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {307, "lambdef", 0, 5, states_51, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000"}, + {308, "lambdef_nocond", 0, 5, states_52, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000"}, + {309, "or_test", 0, 2, states_53, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\004\000\200\041\121\076\000\000"}, + {310, "and_test", 0, 2, states_54, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\004\000\200\041\121\076\000\000"}, + {311, "not_test", 0, 3, states_55, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\004\000\200\041\121\076\000\000"}, + {312, "comparison", 0, 2, states_56, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\200\041\121\076\000\000"}, + {313, "comp_op", 0, 4, states_57, + "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\344\037\000\000\000\000\000\000"}, + {314, "star_expr", 0, 3, states_58, "\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {314, "expr", 0, 2, states_58, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"}, - {315, "xor_expr", 0, 2, states_59, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"}, - {316, "and_expr", 0, 2, states_60, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"}, - {317, "shift_expr", 0, 2, states_61, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"}, - {318, "arith_expr", 0, 2, states_62, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"}, - {319, "term", 0, 2, states_63, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"}, - {320, "factor", 0, 3, states_64, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"}, - {321, "power", 0, 4, states_65, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\200\050\037\000\000"}, - {322, "atom_expr", 0, 3, states_66, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\200\050\037\000\000"}, - {323, "atom", 0, 9, states_67, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\050\037\000\000"}, - {324, "testlist_comp", 0, 5, states_68, - "\000\040\200\000\004\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {325, "trailer", 0, 7, states_69, - "\000\040\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\010\000\000\000"}, - {326, "subscriptlist", 0, 3, states_70, - "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {327, "subscript", 0, 5, states_71, - "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {328, "sliceop", 0, 3, states_72, + {315, "expr", 0, 2, states_59, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\200\041\121\076\000\000"}, + {316, "xor_expr", 0, 2, states_60, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\200\041\121\076\000\000"}, + {317, "and_expr", 0, 2, states_61, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\200\041\121\076\000\000"}, + {318, "shift_expr", 0, 2, states_62, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\200\041\121\076\000\000"}, + {319, "arith_expr", 0, 2, states_63, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\200\041\121\076\000\000"}, + {320, "term", 0, 2, states_64, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\200\041\121\076\000\000"}, + {321, "factor", 0, 3, states_65, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\200\041\121\076\000\000"}, + {322, "power", 0, 4, states_66, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\121\076\000\000"}, + {323, "atom_expr", 0, 3, states_67, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\121\076\000\000"}, + {324, "atom", 0, 9, states_68, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\120\076\000\000"}, + {325, "testlist_comp", 0, 5, states_69, + "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {326, "trailer", 0, 7, states_70, + "\000\040\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\020\000\000\000"}, + {327, "subscriptlist", 0, 3, states_71, + "\000\040\200\010\000\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {328, "subscript", 0, 5, states_72, + "\000\040\200\010\000\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {329, "sliceop", 0, 3, states_73, "\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {329, "exprlist", 0, 3, states_73, - "\000\040\200\000\004\000\000\000\000\000\010\000\000\000\000\000\000\300\220\050\037\000\000"}, - {330, "testlist", 0, 3, states_74, - "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {331, "dictorsetmaker", 0, 14, states_75, - "\000\040\200\000\014\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {332, "classdef", 0, 8, states_76, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000"}, - {333, "arglist", 0, 3, states_77, - "\000\040\200\000\014\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {334, "argument", 0, 4, states_78, - "\000\040\200\000\014\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {335, "comp_iter", 0, 2, states_79, - "\000\000\000\000\000\000\000\000\000\000\000\000\042\000\000\000\000\000\000\000\000\000\000"}, - {336, "comp_for", 0, 6, states_80, - "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"}, - {337, "comp_if", 0, 4, states_81, - "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"}, - {338, "encoding_decl", 0, 2, states_82, + {330, "exprlist", 0, 3, states_74, + "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\000\000\200\041\121\076\000\000"}, + {331, "testlist", 0, 3, states_75, + "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {332, "dictorsetmaker", 0, 14, states_76, + "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {333, "classdef", 0, 8, states_77, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\004\000"}, + {334, "arglist", 0, 3, states_78, + "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {335, "argument", 0, 4, states_79, + "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {336, "comp_iter", 0, 2, states_80, + "\000\000\000\000\000\000\000\000\000\000\000\000\104\000\000\000\000\000\000\000\000\000\000"}, + {337, "comp_for", 0, 6, states_81, + "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000"}, + {338, "comp_if", 0, 4, states_82, + "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000"}, + {339, "encoding_decl", 0, 2, states_83, "\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {339, "yield_expr", 0, 3, states_83, - "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000"}, - {340, "yield_arg", 0, 3, states_84, - "\000\040\200\000\000\000\000\000\000\040\010\000\000\000\020\002\000\300\220\050\037\000\000"}, - {341, "func_type_input", 0, 3, states_85, + {340, "yield_expr", 0, 3, states_84, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\200\000"}, + {341, "yield_arg", 0, 3, states_85, + "\000\040\200\000\000\000\000\000\000\100\020\000\000\000\040\004\000\200\041\121\076\000\000"}, + {342, "func_type_input", 0, 3, states_86, "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {342, "func_type", 0, 6, states_86, + {343, "func_type", 0, 6, states_87, "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"}, - {343, "typelist", 0, 11, states_87, - "\000\040\200\000\014\000\000\000\000\000\010\000\000\000\020\002\000\300\220\050\037\000\000"}, + {344, "typelist", 0, 11, states_88, + "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\040\004\000\200\041\121\076\000\000"}, }; -static label labels[179] = { +static label labels[180] = { {0, "EMPTY"}, {256, 0}, {4, 0}, {270, 0}, - {294, 0}, + {295, 0}, {257, 0}, {269, 0}, {0, 0}, {258, 0}, - {330, 0}, + {331, 0}, {259, 0}, {49, 0}, - {290, 0}, + {291, 0}, {7, 0}, - {333, 0}, + {334, 0}, {8, 0}, {260, 0}, {261, 0}, - {332, 0}, + {333, 0}, {263, 0}, {262, 0}, {55, 0}, @@ -2228,10 +2254,10 @@ static label labels[179] = { {1, 0}, {264, 0}, {51, 0}, - {304, 0}, + {305, 0}, {11, 0}, {57, 0}, - {303, 0}, + {304, 0}, {265, 0}, {266, 0}, {22, 0}, @@ -2243,17 +2269,18 @@ static label labels[179] = { {271, 0}, {13, 0}, {272, 0}, - {275, 0}, {276, 0}, {277, 0}, - {283, 0}, - {291, 0}, + {278, 0}, + {284, 0}, {292, 0}, {293, 0}, - {273, 0}, + {294, 0}, {274, 0}, - {339, 0}, - {313, 0}, + {273, 0}, + {275, 0}, + {340, 0}, + {314, 0}, {36, 0}, {37, 0}, {38, 0}, @@ -2268,37 +2295,37 @@ static label labels[179] = { {46, 0}, {48, 0}, {1, "del"}, - {329, 0}, + {330, 0}, {1, "pass"}, - {278, 0}, {279, 0}, {280, 0}, - {282, 0}, {281, 0}, + {283, 0}, + {282, 0}, {1, "break"}, {1, "continue"}, {1, "return"}, {1, "raise"}, {1, "from"}, - {284, 0}, {285, 0}, + {286, 0}, {1, "import"}, - {289, 0}, + {290, 0}, {23, 0}, {52, 0}, - {288, 0}, - {286, 0}, - {1, "as"}, + {289, 0}, {287, 0}, + {1, "as"}, + {288, 0}, {1, "global"}, {1, "nonlocal"}, {1, "assert"}, - {296, 0}, {297, 0}, {298, 0}, {299, 0}, {300, 0}, - {295, 0}, + {301, 0}, + {296, 0}, {1, "if"}, {1, "elif"}, {1, "else"}, @@ -2306,26 +2333,26 @@ static label labels[179] = { {1, "for"}, {1, "in"}, {1, "try"}, - {302, 0}, + {303, 0}, {1, "finally"}, {1, "with"}, - {301, 0}, - {314, 0}, + {302, 0}, + {315, 0}, {1, "except"}, {5, 0}, {6, 0}, - {308, 0}, - {306, 0}, - {305, 0}, + {309, 0}, {307, 0}, + {306, 0}, + {308, 0}, {1, "lambda"}, - {309, 0}, - {1, "or"}, {310, 0}, + {1, "or"}, + {311, 0}, {1, "and"}, {1, "not"}, - {311, 0}, {312, 0}, + {313, 0}, {20, 0}, {21, 0}, {27, 0}, @@ -2334,57 +2361,57 @@ static label labels[179] = { {28, 0}, {28, 0}, {1, "is"}, - {315, 0}, - {18, 0}, {316, 0}, - {32, 0}, + {18, 0}, {317, 0}, - {19, 0}, + {32, 0}, {318, 0}, + {19, 0}, + {319, 0}, {33, 0}, {34, 0}, - {319, 0}, + {320, 0}, {14, 0}, {15, 0}, - {320, 0}, + {321, 0}, {17, 0}, {24, 0}, {47, 0}, {31, 0}, - {321, 0}, {322, 0}, - {54, 0}, {323, 0}, - {325, 0}, + {54, 0}, {324, 0}, + {326, 0}, + {325, 0}, {9, 0}, {10, 0}, {25, 0}, - {331, 0}, + {332, 0}, {26, 0}, {2, 0}, {3, 0}, {1, "None"}, {1, "True"}, {1, "False"}, - {336, 0}, - {326, 0}, + {337, 0}, {327, 0}, {328, 0}, + {329, 0}, {1, "class"}, - {334, 0}, {335, 0}, - {337, 0}, + {336, 0}, {338, 0}, + {339, 0}, {1, "yield"}, - {340, 0}, {341, 0}, {342, 0}, {343, 0}, + {344, 0}, }; grammar _Ta35Parser_Grammar = { - 88, + 89, dfas, - {179, labels}, + {180, labels}, 256 }; diff --git a/setup.py b/setup.py index 4cd5b5fe..576954ba 100644 --- a/setup.py +++ b/setup.py @@ -82,7 +82,7 @@ """.strip() setup (name = 'typed-ast', - version = '0.5.6', + version = '0.6.0', description = 'fork of Python 2 and 3 ast modules with type comment support', long_description = long_description, author = 'David Fisher', diff --git a/typed_ast/__init__.py b/typed_ast/__init__.py index e69de29b..8b137891 100644 --- a/typed_ast/__init__.py +++ b/typed_ast/__init__.py @@ -0,0 +1 @@ +