bpo-35766: Merge typed_ast back into CPython (GH-11645)
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index a333ff9..1a56e90 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -10,8 +10,10 @@
static PyObject* ast2obj_mod(void*);
static PyTypeObject *Module_type;
_Py_IDENTIFIER(body);
+_Py_IDENTIFIER(type_ignores);
static char *Module_fields[]={
"body",
+ "type_ignores",
};
static PyTypeObject *Interactive_type;
static char *Interactive_fields[]={
@@ -21,6 +23,13 @@
static char *Expression_fields[]={
"body",
};
+static PyTypeObject *FunctionType_type;
+_Py_IDENTIFIER(argtypes);
+_Py_IDENTIFIER(returns);
+static char *FunctionType_fields[]={
+ "argtypes",
+ "returns",
+};
static PyTypeObject *Suite_type;
static char *Suite_fields[]={
"body",
@@ -41,13 +50,14 @@
_Py_IDENTIFIER(name);
_Py_IDENTIFIER(args);
_Py_IDENTIFIER(decorator_list);
-_Py_IDENTIFIER(returns);
+_Py_IDENTIFIER(type_comment);
static char *FunctionDef_fields[]={
"name",
"args",
"body",
"decorator_list",
"returns",
+ "type_comment",
};
static PyTypeObject *AsyncFunctionDef_type;
static char *AsyncFunctionDef_fields[]={
@@ -56,6 +66,7 @@
"body",
"decorator_list",
"returns",
+ "type_comment",
};
static PyTypeObject *ClassDef_type;
_Py_IDENTIFIER(bases);
@@ -81,6 +92,7 @@
static char *Assign_fields[]={
"targets",
"value",
+ "type_comment",
};
static PyTypeObject *AugAssign_type;
_Py_IDENTIFIER(target);
@@ -107,6 +119,7 @@
"iter",
"body",
"orelse",
+ "type_comment",
};
static PyTypeObject *AsyncFor_type;
static char *AsyncFor_fields[]={
@@ -114,6 +127,7 @@
"iter",
"body",
"orelse",
+ "type_comment",
};
static PyTypeObject *While_type;
_Py_IDENTIFIER(test);
@@ -133,11 +147,13 @@
static char *With_fields[]={
"items",
"body",
+ "type_comment",
};
static PyTypeObject *AsyncWith_type;
static char *AsyncWith_fields[]={
"items",
"body",
+ "type_comment",
};
static PyTypeObject *Raise_type;
_Py_IDENTIFIER(exc);
@@ -478,6 +494,7 @@
static char *arg_fields[]={
"arg",
"annotation",
+ "type_comment",
};
static PyTypeObject *keyword_type;
static PyObject* ast2obj_keyword(void*);
@@ -500,6 +517,12 @@
"context_expr",
"optional_vars",
};
+static PyTypeObject *type_ignore_type;
+static PyObject* ast2obj_type_ignore(void*);
+static PyTypeObject *TypeIgnore_type;
+static char *TypeIgnore_fields[]={
+ "lineno",
+};
_Py_IDENTIFIER(_fields);
@@ -769,6 +792,15 @@
return obj2ast_object(obj, out, arena);
}
+static int obj2ast_string(PyObject* obj, PyObject** out, PyArena* arena)
+{
+ if (!PyUnicode_CheckExact(obj) && !PyBytes_CheckExact(obj)) {
+ PyErr_SetString(PyExc_TypeError, "AST string must be of type str");
+ return 1;
+ }
+ return obj2ast_object(obj, out, arena);
+}
+
static int obj2ast_int(PyObject* obj, int* out, PyArena* arena)
{
int i;
@@ -810,23 +842,26 @@
mod_type = make_type("mod", &AST_type, NULL, 0);
if (!mod_type) return 0;
if (!add_attributes(mod_type, NULL, 0)) return 0;
- Module_type = make_type("Module", mod_type, Module_fields, 1);
+ Module_type = make_type("Module", mod_type, Module_fields, 2);
if (!Module_type) return 0;
Interactive_type = make_type("Interactive", mod_type, Interactive_fields,
1);
if (!Interactive_type) return 0;
Expression_type = make_type("Expression", mod_type, Expression_fields, 1);
if (!Expression_type) return 0;
+ FunctionType_type = make_type("FunctionType", mod_type,
+ FunctionType_fields, 2);
+ if (!FunctionType_type) return 0;
Suite_type = make_type("Suite", mod_type, Suite_fields, 1);
if (!Suite_type) return 0;
stmt_type = make_type("stmt", &AST_type, NULL, 0);
if (!stmt_type) return 0;
if (!add_attributes(stmt_type, stmt_attributes, 4)) return 0;
FunctionDef_type = make_type("FunctionDef", stmt_type, FunctionDef_fields,
- 5);
+ 6);
if (!FunctionDef_type) return 0;
AsyncFunctionDef_type = make_type("AsyncFunctionDef", stmt_type,
- AsyncFunctionDef_fields, 5);
+ AsyncFunctionDef_fields, 6);
if (!AsyncFunctionDef_type) return 0;
ClassDef_type = make_type("ClassDef", stmt_type, ClassDef_fields, 5);
if (!ClassDef_type) return 0;
@@ -834,23 +869,23 @@
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, 2);
+ Assign_type = make_type("Assign", stmt_type, Assign_fields, 3);
if (!Assign_type) return 0;
AugAssign_type = make_type("AugAssign", stmt_type, AugAssign_fields, 3);
if (!AugAssign_type) return 0;
AnnAssign_type = make_type("AnnAssign", stmt_type, AnnAssign_fields, 4);
if (!AnnAssign_type) return 0;
- For_type = make_type("For", stmt_type, For_fields, 4);
+ For_type = make_type("For", stmt_type, For_fields, 5);
if (!For_type) return 0;
- AsyncFor_type = make_type("AsyncFor", stmt_type, AsyncFor_fields, 4);
+ AsyncFor_type = make_type("AsyncFor", stmt_type, AsyncFor_fields, 5);
if (!AsyncFor_type) return 0;
While_type = make_type("While", stmt_type, While_fields, 3);
if (!While_type) return 0;
If_type = make_type("If", stmt_type, If_fields, 3);
if (!If_type) return 0;
- With_type = make_type("With", stmt_type, With_fields, 2);
+ With_type = make_type("With", stmt_type, With_fields, 3);
if (!With_type) return 0;
- AsyncWith_type = make_type("AsyncWith", stmt_type, AsyncWith_fields, 2);
+ AsyncWith_type = make_type("AsyncWith", stmt_type, AsyncWith_fields, 3);
if (!AsyncWith_type) return 0;
Raise_type = make_type("Raise", stmt_type, Raise_fields, 2);
if (!Raise_type) return 0;
@@ -1113,7 +1148,7 @@
arguments_type = make_type("arguments", &AST_type, arguments_fields, 6);
if (!arguments_type) return 0;
if (!add_attributes(arguments_type, NULL, 0)) return 0;
- arg_type = make_type("arg", &AST_type, arg_fields, 2);
+ arg_type = make_type("arg", &AST_type, arg_fields, 3);
if (!arg_type) return 0;
if (!add_attributes(arg_type, arg_attributes, 4)) return 0;
keyword_type = make_type("keyword", &AST_type, keyword_fields, 2);
@@ -1125,6 +1160,12 @@
withitem_type = make_type("withitem", &AST_type, withitem_fields, 2);
if (!withitem_type) return 0;
if (!add_attributes(withitem_type, NULL, 0)) return 0;
+ type_ignore_type = make_type("type_ignore", &AST_type, NULL, 0);
+ if (!type_ignore_type) return 0;
+ if (!add_attributes(type_ignore_type, NULL, 0)) return 0;
+ TypeIgnore_type = make_type("TypeIgnore", type_ignore_type,
+ TypeIgnore_fields, 1);
+ if (!TypeIgnore_type) return 0;
initialized = 1;
return 1;
}
@@ -1148,9 +1189,11 @@
static int obj2ast_keyword(PyObject* obj, keyword_ty* out, PyArena* arena);
static int obj2ast_alias(PyObject* obj, alias_ty* out, PyArena* arena);
static int obj2ast_withitem(PyObject* obj, withitem_ty* out, PyArena* arena);
+static int obj2ast_type_ignore(PyObject* obj, type_ignore_ty* out, PyArena*
+ arena);
mod_ty
-Module(asdl_seq * body, PyArena *arena)
+Module(asdl_seq * body, asdl_seq * type_ignores, PyArena *arena)
{
mod_ty p;
p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
@@ -1158,6 +1201,7 @@
return NULL;
p->kind = Module_kind;
p->v.Module.body = body;
+ p->v.Module.type_ignores = type_ignores;
return p;
}
@@ -1191,6 +1235,24 @@
}
mod_ty
+FunctionType(asdl_seq * argtypes, expr_ty returns, PyArena *arena)
+{
+ mod_ty p;
+ if (!returns) {
+ PyErr_SetString(PyExc_ValueError,
+ "field returns is required for FunctionType");
+ return NULL;
+ }
+ p = (mod_ty)PyArena_Malloc(arena, sizeof(*p));
+ if (!p)
+ return NULL;
+ p->kind = FunctionType_kind;
+ p->v.FunctionType.argtypes = argtypes;
+ p->v.FunctionType.returns = returns;
+ return p;
+}
+
+mod_ty
Suite(asdl_seq * body, PyArena *arena)
{
mod_ty p;
@@ -1204,8 +1266,8 @@
stmt_ty
FunctionDef(identifier name, arguments_ty args, asdl_seq * body, asdl_seq *
- decorator_list, expr_ty returns, int lineno, int col_offset, int
- end_lineno, int end_col_offset, PyArena *arena)
+ decorator_list, expr_ty returns, string type_comment, int lineno,
+ int col_offset, int end_lineno, int end_col_offset, PyArena *arena)
{
stmt_ty p;
if (!name) {
@@ -1227,6 +1289,7 @@
p->v.FunctionDef.body = body;
p->v.FunctionDef.decorator_list = decorator_list;
p->v.FunctionDef.returns = returns;
+ p->v.FunctionDef.type_comment = type_comment;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
@@ -1236,8 +1299,9 @@
stmt_ty
AsyncFunctionDef(identifier name, arguments_ty args, asdl_seq * body, asdl_seq
- * decorator_list, expr_ty returns, int lineno, int col_offset,
- int end_lineno, int end_col_offset, PyArena *arena)
+ * decorator_list, expr_ty returns, string type_comment, int
+ lineno, int col_offset, int end_lineno, int end_col_offset,
+ PyArena *arena)
{
stmt_ty p;
if (!name) {
@@ -1259,6 +1323,7 @@
p->v.AsyncFunctionDef.body = body;
p->v.AsyncFunctionDef.decorator_list = decorator_list;
p->v.AsyncFunctionDef.returns = returns;
+ p->v.AsyncFunctionDef.type_comment = type_comment;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
@@ -1328,8 +1393,8 @@
}
stmt_ty
-Assign(asdl_seq * targets, expr_ty value, int lineno, int col_offset, int
- end_lineno, int end_col_offset, PyArena *arena)
+Assign(asdl_seq * targets, expr_ty value, string type_comment, int lineno, int
+ col_offset, int end_lineno, int end_col_offset, PyArena *arena)
{
stmt_ty p;
if (!value) {
@@ -1343,6 +1408,7 @@
p->kind = Assign_kind;
p->v.Assign.targets = targets;
p->v.Assign.value = value;
+ p->v.Assign.type_comment = type_comment;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
@@ -1416,8 +1482,9 @@
}
stmt_ty
-For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * orelse, int
- lineno, int col_offset, int end_lineno, int end_col_offset, PyArena *arena)
+For(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * orelse, string
+ type_comment, int lineno, int col_offset, int end_lineno, int
+ end_col_offset, PyArena *arena)
{
stmt_ty p;
if (!target) {
@@ -1438,6 +1505,7 @@
p->v.For.iter = iter;
p->v.For.body = body;
p->v.For.orelse = orelse;
+ p->v.For.type_comment = type_comment;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
@@ -1446,9 +1514,9 @@
}
stmt_ty
-AsyncFor(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * orelse, int
- lineno, int col_offset, int end_lineno, int end_col_offset, PyArena
- *arena)
+AsyncFor(expr_ty target, expr_ty iter, asdl_seq * body, asdl_seq * orelse,
+ string type_comment, int lineno, int col_offset, int end_lineno, int
+ end_col_offset, PyArena *arena)
{
stmt_ty p;
if (!target) {
@@ -1469,6 +1537,7 @@
p->v.AsyncFor.iter = iter;
p->v.AsyncFor.body = body;
p->v.AsyncFor.orelse = orelse;
+ p->v.AsyncFor.type_comment = type_comment;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
@@ -1525,8 +1594,8 @@
}
stmt_ty
-With(asdl_seq * items, asdl_seq * body, int lineno, int col_offset, int
- end_lineno, int end_col_offset, PyArena *arena)
+With(asdl_seq * items, asdl_seq * body, string type_comment, int lineno, int
+ col_offset, int end_lineno, int end_col_offset, PyArena *arena)
{
stmt_ty p;
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
@@ -1535,6 +1604,7 @@
p->kind = With_kind;
p->v.With.items = items;
p->v.With.body = body;
+ p->v.With.type_comment = type_comment;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
@@ -1543,8 +1613,8 @@
}
stmt_ty
-AsyncWith(asdl_seq * items, asdl_seq * body, int lineno, int col_offset, int
- end_lineno, int end_col_offset, PyArena *arena)
+AsyncWith(asdl_seq * items, asdl_seq * body, string type_comment, int lineno,
+ int col_offset, int end_lineno, int end_col_offset, PyArena *arena)
{
stmt_ty p;
p = (stmt_ty)PyArena_Malloc(arena, sizeof(*p));
@@ -1553,6 +1623,7 @@
p->kind = AsyncWith_kind;
p->v.AsyncWith.items = items;
p->v.AsyncWith.body = body;
+ p->v.AsyncWith.type_comment = type_comment;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
@@ -2518,8 +2589,8 @@
}
arg_ty
-arg(identifier arg, expr_ty annotation, int lineno, int col_offset, int
- end_lineno, int end_col_offset, PyArena *arena)
+arg(identifier arg, expr_ty annotation, string type_comment, int lineno, int
+ col_offset, int end_lineno, int end_col_offset, PyArena *arena)
{
arg_ty p;
if (!arg) {
@@ -2532,6 +2603,7 @@
return NULL;
p->arg = arg;
p->annotation = annotation;
+ p->type_comment = type_comment;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
@@ -2590,6 +2662,18 @@
return p;
}
+type_ignore_ty
+TypeIgnore(int lineno, PyArena *arena)
+{
+ type_ignore_ty p;
+ p = (type_ignore_ty)PyArena_Malloc(arena, sizeof(*p));
+ if (!p)
+ return NULL;
+ p->kind = TypeIgnore_kind;
+ p->v.TypeIgnore.lineno = lineno;
+ return p;
+}
+
PyObject*
ast2obj_mod(void* _o)
@@ -2609,6 +2693,11 @@
if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
goto failed;
Py_DECREF(value);
+ value = ast2obj_list(o->v.Module.type_ignores, ast2obj_type_ignore);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_type_ignores, value) == -1)
+ goto failed;
+ Py_DECREF(value);
break;
case Interactive_kind:
result = PyType_GenericNew(Interactive_type, NULL, NULL);
@@ -2628,6 +2717,20 @@
goto failed;
Py_DECREF(value);
break;
+ case FunctionType_kind:
+ result = PyType_GenericNew(FunctionType_type, NULL, NULL);
+ if (!result) goto failed;
+ value = ast2obj_list(o->v.FunctionType.argtypes, ast2obj_expr);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_argtypes, value) == -1)
+ goto failed;
+ Py_DECREF(value);
+ value = ast2obj_expr(o->v.FunctionType.returns);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_returns, value) == -1)
+ goto failed;
+ Py_DECREF(value);
+ break;
case Suite_kind:
result = PyType_GenericNew(Suite_type, NULL, NULL);
if (!result) goto failed;
@@ -2683,6 +2786,11 @@
if (_PyObject_SetAttrId(result, &PyId_returns, value) == -1)
goto failed;
Py_DECREF(value);
+ value = ast2obj_string(o->v.FunctionDef.type_comment);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_type_comment, value) == -1)
+ goto failed;
+ Py_DECREF(value);
break;
case AsyncFunctionDef_kind:
result = PyType_GenericNew(AsyncFunctionDef_type, NULL, NULL);
@@ -2713,6 +2821,11 @@
if (_PyObject_SetAttrId(result, &PyId_returns, value) == -1)
goto failed;
Py_DECREF(value);
+ value = ast2obj_string(o->v.AsyncFunctionDef.type_comment);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_type_comment, value) == -1)
+ goto failed;
+ Py_DECREF(value);
break;
case ClassDef_kind:
result = PyType_GenericNew(ClassDef_type, NULL, NULL);
@@ -2774,6 +2887,11 @@
if (_PyObject_SetAttrId(result, &PyId_value, value) == -1)
goto failed;
Py_DECREF(value);
+ value = ast2obj_string(o->v.Assign.type_comment);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_type_comment, value) == -1)
+ goto failed;
+ Py_DECREF(value);
break;
case AugAssign_kind:
result = PyType_GenericNew(AugAssign_type, NULL, NULL);
@@ -2841,6 +2959,11 @@
if (_PyObject_SetAttrId(result, &PyId_orelse, value) == -1)
goto failed;
Py_DECREF(value);
+ value = ast2obj_string(o->v.For.type_comment);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_type_comment, value) == -1)
+ goto failed;
+ Py_DECREF(value);
break;
case AsyncFor_kind:
result = PyType_GenericNew(AsyncFor_type, NULL, NULL);
@@ -2865,6 +2988,11 @@
if (_PyObject_SetAttrId(result, &PyId_orelse, value) == -1)
goto failed;
Py_DECREF(value);
+ value = ast2obj_string(o->v.AsyncFor.type_comment);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_type_comment, value) == -1)
+ goto failed;
+ Py_DECREF(value);
break;
case While_kind:
result = PyType_GenericNew(While_type, NULL, NULL);
@@ -2917,6 +3045,11 @@
if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
goto failed;
Py_DECREF(value);
+ value = ast2obj_string(o->v.With.type_comment);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_type_comment, value) == -1)
+ goto failed;
+ Py_DECREF(value);
break;
case AsyncWith_kind:
result = PyType_GenericNew(AsyncWith_type, NULL, NULL);
@@ -2931,6 +3064,11 @@
if (_PyObject_SetAttrId(result, &PyId_body, value) == -1)
goto failed;
Py_DECREF(value);
+ value = ast2obj_string(o->v.AsyncWith.type_comment);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_type_comment, value) == -1)
+ goto failed;
+ Py_DECREF(value);
break;
case Raise_kind:
result = PyType_GenericNew(Raise_type, NULL, NULL);
@@ -3870,6 +4008,11 @@
if (_PyObject_SetAttrId(result, &PyId_annotation, value) == -1)
goto failed;
Py_DECREF(value);
+ value = ast2obj_string(o->type_comment);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_type_comment, value) == -1)
+ goto failed;
+ Py_DECREF(value);
value = ast2obj_int(o->lineno);
if (!value) goto failed;
if (_PyObject_SetAttrId(result, &PyId_lineno, value) < 0)
@@ -3981,6 +4124,33 @@
return NULL;
}
+PyObject*
+ast2obj_type_ignore(void* _o)
+{
+ type_ignore_ty o = (type_ignore_ty)_o;
+ PyObject *result = NULL, *value = NULL;
+ if (!o) {
+ Py_RETURN_NONE;
+ }
+
+ switch (o->kind) {
+ case TypeIgnore_kind:
+ result = PyType_GenericNew(TypeIgnore_type, NULL, NULL);
+ if (!result) goto failed;
+ value = ast2obj_int(o->v.TypeIgnore.lineno);
+ if (!value) goto failed;
+ if (_PyObject_SetAttrId(result, &PyId_lineno, value) == -1)
+ goto failed;
+ Py_DECREF(value);
+ break;
+ }
+ return result;
+failed:
+ Py_XDECREF(value);
+ Py_XDECREF(result);
+ return NULL;
+}
+
int
obj2ast_mod(PyObject* obj, mod_ty* out, PyArena* arena)
@@ -3999,6 +4169,7 @@
}
if (isinstance) {
asdl_seq* body;
+ asdl_seq* type_ignores;
if (_PyObject_LookupAttrId(obj, &PyId_body, &tmp) < 0) {
return 1;
@@ -4030,7 +4201,37 @@
}
Py_CLEAR(tmp);
}
- *out = Module(body, arena);
+ if (_PyObject_LookupAttrId(obj, &PyId_type_ignores, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL) {
+ PyErr_SetString(PyExc_TypeError, "required field \"type_ignores\" missing from Module");
+ return 1;
+ }
+ else {
+ int res;
+ Py_ssize_t len;
+ Py_ssize_t i;
+ if (!PyList_Check(tmp)) {
+ PyErr_Format(PyExc_TypeError, "Module field \"type_ignores\" must be a list, not a %.200s", tmp->ob_type->tp_name);
+ goto failed;
+ }
+ len = PyList_GET_SIZE(tmp);
+ type_ignores = _Py_asdl_seq_new(len, arena);
+ if (type_ignores == NULL) goto failed;
+ for (i = 0; i < len; i++) {
+ type_ignore_ty val;
+ res = obj2ast_type_ignore(PyList_GET_ITEM(tmp, i), &val, arena);
+ if (res != 0) goto failed;
+ if (len != PyList_GET_SIZE(tmp)) {
+ PyErr_SetString(PyExc_RuntimeError, "Module field \"type_ignores\" changed size during iteration");
+ goto failed;
+ }
+ asdl_seq_SET(type_ignores, i, val);
+ }
+ Py_CLEAR(tmp);
+ }
+ *out = Module(body, type_ignores, arena);
if (*out == NULL) goto failed;
return 0;
}
@@ -4099,6 +4300,61 @@
if (*out == NULL) goto failed;
return 0;
}
+ isinstance = PyObject_IsInstance(obj, (PyObject*)FunctionType_type);
+ if (isinstance == -1) {
+ return 1;
+ }
+ if (isinstance) {
+ asdl_seq* argtypes;
+ expr_ty returns;
+
+ if (_PyObject_LookupAttrId(obj, &PyId_argtypes, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL) {
+ PyErr_SetString(PyExc_TypeError, "required field \"argtypes\" missing from FunctionType");
+ return 1;
+ }
+ else {
+ int res;
+ Py_ssize_t len;
+ Py_ssize_t i;
+ if (!PyList_Check(tmp)) {
+ PyErr_Format(PyExc_TypeError, "FunctionType field \"argtypes\" must be a list, not a %.200s", tmp->ob_type->tp_name);
+ goto failed;
+ }
+ len = PyList_GET_SIZE(tmp);
+ argtypes = _Py_asdl_seq_new(len, arena);
+ if (argtypes == NULL) goto failed;
+ for (i = 0; i < len; i++) {
+ expr_ty val;
+ res = obj2ast_expr(PyList_GET_ITEM(tmp, i), &val, arena);
+ if (res != 0) goto failed;
+ if (len != PyList_GET_SIZE(tmp)) {
+ PyErr_SetString(PyExc_RuntimeError, "FunctionType field \"argtypes\" changed size during iteration");
+ goto failed;
+ }
+ asdl_seq_SET(argtypes, i, val);
+ }
+ Py_CLEAR(tmp);
+ }
+ if (_PyObject_LookupAttrId(obj, &PyId_returns, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL) {
+ PyErr_SetString(PyExc_TypeError, "required field \"returns\" missing from FunctionType");
+ return 1;
+ }
+ else {
+ int res;
+ res = obj2ast_expr(tmp, &returns, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
+ *out = FunctionType(argtypes, returns, arena);
+ if (*out == NULL) goto failed;
+ return 0;
+ }
isinstance = PyObject_IsInstance(obj, (PyObject*)Suite_type);
if (isinstance == -1) {
return 1;
@@ -4224,6 +4480,7 @@
asdl_seq* body;
asdl_seq* decorator_list;
expr_ty returns;
+ string type_comment;
if (_PyObject_LookupAttrId(obj, &PyId_name, &tmp) < 0) {
return 1;
@@ -4324,8 +4581,22 @@
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
- *out = FunctionDef(name, args, body, decorator_list, returns, lineno,
- col_offset, end_lineno, end_col_offset, arena);
+ if (_PyObject_LookupAttrId(obj, &PyId_type_comment, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL || tmp == Py_None) {
+ Py_CLEAR(tmp);
+ type_comment = NULL;
+ }
+ else {
+ int res;
+ res = obj2ast_string(tmp, &type_comment, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
+ *out = FunctionDef(name, args, body, decorator_list, returns,
+ type_comment, lineno, col_offset, end_lineno,
+ end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
@@ -4339,6 +4610,7 @@
asdl_seq* body;
asdl_seq* decorator_list;
expr_ty returns;
+ string type_comment;
if (_PyObject_LookupAttrId(obj, &PyId_name, &tmp) < 0) {
return 1;
@@ -4439,9 +4711,22 @@
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
+ if (_PyObject_LookupAttrId(obj, &PyId_type_comment, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL || tmp == Py_None) {
+ Py_CLEAR(tmp);
+ type_comment = NULL;
+ }
+ else {
+ int res;
+ res = obj2ast_string(tmp, &type_comment, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
*out = AsyncFunctionDef(name, args, body, decorator_list, returns,
- lineno, col_offset, end_lineno, end_col_offset,
- arena);
+ type_comment, lineno, col_offset, end_lineno,
+ end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
@@ -4668,6 +4953,7 @@
if (isinstance) {
asdl_seq* targets;
expr_ty value;
+ string type_comment;
if (_PyObject_LookupAttrId(obj, &PyId_targets, &tmp) < 0) {
return 1;
@@ -4712,8 +4998,21 @@
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
- *out = Assign(targets, value, lineno, col_offset, end_lineno,
- end_col_offset, arena);
+ if (_PyObject_LookupAttrId(obj, &PyId_type_comment, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL || tmp == Py_None) {
+ Py_CLEAR(tmp);
+ type_comment = NULL;
+ }
+ else {
+ int res;
+ res = obj2ast_string(tmp, &type_comment, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
+ *out = Assign(targets, value, type_comment, lineno, col_offset,
+ end_lineno, end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
@@ -4846,6 +5145,7 @@
expr_ty iter;
asdl_seq* body;
asdl_seq* orelse;
+ string type_comment;
if (_PyObject_LookupAttrId(obj, &PyId_target, &tmp) < 0) {
return 1;
@@ -4933,8 +5233,21 @@
}
Py_CLEAR(tmp);
}
- *out = For(target, iter, body, orelse, lineno, col_offset, end_lineno,
- end_col_offset, arena);
+ if (_PyObject_LookupAttrId(obj, &PyId_type_comment, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL || tmp == Py_None) {
+ Py_CLEAR(tmp);
+ type_comment = NULL;
+ }
+ else {
+ int res;
+ res = obj2ast_string(tmp, &type_comment, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
+ *out = For(target, iter, body, orelse, type_comment, lineno,
+ col_offset, end_lineno, end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
@@ -4947,6 +5260,7 @@
expr_ty iter;
asdl_seq* body;
asdl_seq* orelse;
+ string type_comment;
if (_PyObject_LookupAttrId(obj, &PyId_target, &tmp) < 0) {
return 1;
@@ -5034,8 +5348,21 @@
}
Py_CLEAR(tmp);
}
- *out = AsyncFor(target, iter, body, orelse, lineno, col_offset,
- end_lineno, end_col_offset, arena);
+ if (_PyObject_LookupAttrId(obj, &PyId_type_comment, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL || tmp == Py_None) {
+ Py_CLEAR(tmp);
+ type_comment = NULL;
+ }
+ else {
+ int res;
+ res = obj2ast_string(tmp, &type_comment, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
+ *out = AsyncFor(target, iter, body, orelse, type_comment, lineno,
+ col_offset, end_lineno, end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
@@ -5220,6 +5547,7 @@
if (isinstance) {
asdl_seq* items;
asdl_seq* body;
+ string type_comment;
if (_PyObject_LookupAttrId(obj, &PyId_items, &tmp) < 0) {
return 1;
@@ -5281,7 +5609,20 @@
}
Py_CLEAR(tmp);
}
- *out = With(items, body, lineno, col_offset, end_lineno,
+ if (_PyObject_LookupAttrId(obj, &PyId_type_comment, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL || tmp == Py_None) {
+ Py_CLEAR(tmp);
+ type_comment = NULL;
+ }
+ else {
+ int res;
+ res = obj2ast_string(tmp, &type_comment, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
+ *out = With(items, body, type_comment, lineno, col_offset, end_lineno,
end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
@@ -5293,6 +5634,7 @@
if (isinstance) {
asdl_seq* items;
asdl_seq* body;
+ string type_comment;
if (_PyObject_LookupAttrId(obj, &PyId_items, &tmp) < 0) {
return 1;
@@ -5354,8 +5696,21 @@
}
Py_CLEAR(tmp);
}
- *out = AsyncWith(items, body, lineno, col_offset, end_lineno,
- end_col_offset, arena);
+ if (_PyObject_LookupAttrId(obj, &PyId_type_comment, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL || tmp == Py_None) {
+ Py_CLEAR(tmp);
+ type_comment = NULL;
+ }
+ else {
+ int res;
+ res = obj2ast_string(tmp, &type_comment, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
+ *out = AsyncWith(items, body, type_comment, lineno, col_offset,
+ end_lineno, end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
@@ -8073,6 +8428,7 @@
PyObject* tmp = NULL;
identifier arg;
expr_ty annotation;
+ string type_comment;
int lineno;
int col_offset;
int end_lineno;
@@ -8104,6 +8460,19 @@
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
+ if (_PyObject_LookupAttrId(obj, &PyId_type_comment, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL || tmp == Py_None) {
+ Py_CLEAR(tmp);
+ type_comment = NULL;
+ }
+ else {
+ int res;
+ res = obj2ast_string(tmp, &type_comment, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
if (_PyObject_LookupAttrId(obj, &PyId_lineno, &tmp) < 0) {
return 1;
}
@@ -8156,8 +8525,8 @@
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
- *out = arg(arg, annotation, lineno, col_offset, end_lineno, end_col_offset,
- arena);
+ *out = arg(arg, annotation, type_comment, lineno, col_offset, end_lineno,
+ end_col_offset, arena);
return 0;
failed:
Py_XDECREF(tmp);
@@ -8284,6 +8653,48 @@
return 1;
}
+int
+obj2ast_type_ignore(PyObject* obj, type_ignore_ty* out, PyArena* arena)
+{
+ int isinstance;
+
+ PyObject *tmp = NULL;
+
+ if (obj == Py_None) {
+ *out = NULL;
+ return 0;
+ }
+ isinstance = PyObject_IsInstance(obj, (PyObject*)TypeIgnore_type);
+ if (isinstance == -1) {
+ return 1;
+ }
+ if (isinstance) {
+ int lineno;
+
+ if (_PyObject_LookupAttrId(obj, &PyId_lineno, &tmp) < 0) {
+ return 1;
+ }
+ if (tmp == NULL) {
+ PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from TypeIgnore");
+ return 1;
+ }
+ else {
+ int res;
+ res = obj2ast_int(tmp, &lineno, arena);
+ if (res != 0) goto failed;
+ Py_CLEAR(tmp);
+ }
+ *out = TypeIgnore(lineno, arena);
+ if (*out == NULL) goto failed;
+ return 0;
+ }
+
+ PyErr_Format(PyExc_TypeError, "expected some sort of type_ignore, but got %R", obj);
+ failed:
+ Py_XDECREF(tmp);
+ return 1;
+}
+
static struct PyModuleDef _astmodule = {
PyModuleDef_HEAD_INIT, "_ast"
@@ -8299,6 +8710,8 @@
if (PyDict_SetItemString(d, "AST", (PyObject*)&AST_type) < 0) return NULL;
if (PyModule_AddIntMacro(m, PyCF_ONLY_AST) < 0)
return NULL;
+ if (PyModule_AddIntMacro(m, PyCF_TYPE_COMMENTS) < 0)
+ return NULL;
if (PyDict_SetItemString(d, "mod", (PyObject*)mod_type) < 0) return NULL;
if (PyDict_SetItemString(d, "Module", (PyObject*)Module_type) < 0) return
NULL;
@@ -8306,6 +8719,8 @@
0) return NULL;
if (PyDict_SetItemString(d, "Expression", (PyObject*)Expression_type) < 0)
return NULL;
+ if (PyDict_SetItemString(d, "FunctionType", (PyObject*)FunctionType_type) <
+ 0) return NULL;
if (PyDict_SetItemString(d, "Suite", (PyObject*)Suite_type) < 0) return
NULL;
if (PyDict_SetItemString(d, "stmt", (PyObject*)stmt_type) < 0) return NULL;
@@ -8486,6 +8901,10 @@
NULL;
if (PyDict_SetItemString(d, "withitem", (PyObject*)withitem_type) < 0)
return NULL;
+ if (PyDict_SetItemString(d, "type_ignore", (PyObject*)type_ignore_type) <
+ 0) return NULL;
+ if (PyDict_SetItemString(d, "TypeIgnore", (PyObject*)TypeIgnore_type) < 0)
+ return NULL;
return m;
}
@@ -8498,18 +8917,19 @@
}
/* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */
+/* and 3 for "func_type" */
mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
{
mod_ty res;
PyObject *req_type[3];
- char *req_name[] = {"Module", "Expression", "Interactive"};
+ char *req_name[] = {"Module", "Expression", "Interactive", "FunctionType"};
int isinstance;
req_type[0] = (PyObject*)Module_type;
req_type[1] = (PyObject*)Expression_type;
req_type[2] = (PyObject*)Interactive_type;
- assert(0 <= mode && mode <= 2);
+ assert(0 <= mode && mode <= 3);
if (!init_types())
return NULL;
diff --git a/Python/ast.c b/Python/ast.c
index e10e63f..c422e96 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -698,6 +698,13 @@
small_stmt elements is returned.
*/
+static string
+new_type_comment(const char *s)
+{
+ return PyUnicode_DecodeUTF8(s, strlen(s), NULL);
+}
+#define NEW_TYPE_COMMENT(n) new_type_comment(STR(n))
+
static int
num_stmts(const node *n)
{
@@ -725,11 +732,17 @@
case simple_stmt:
return NCH(n) / 2; /* Divide by 2 to remove count of semi-colons */
case suite:
+ case func_body_suite:
+ /* func_body_suite: simple_stmt | NEWLINE [TYPE_COMMENT NEWLINE] INDENT stmt+ DEDENT */
+ /* suite: simple_stmt | NEWLINE INDENT stmt+ DEDENT */
if (NCH(n) == 1)
return num_stmts(CHILD(n, 0));
else {
+ i = 2;
l = 0;
- for (i = 2; i < (NCH(n) - 1); i++)
+ if (TYPE(CHILD(n, 1)) == TYPE_COMMENT)
+ i += 2;
+ for (; i < (NCH(n) - 1); i++)
l += num_stmts(CHILD(n, i));
return l;
}
@@ -753,10 +766,13 @@
{
int i, j, k, num;
asdl_seq *stmts = NULL;
+ asdl_seq *type_ignores = NULL;
stmt_ty s;
node *ch;
struct compiling c;
mod_ty res = NULL;
+ asdl_seq *argtypes = NULL;
+ expr_ty ret, arg;
c.c_arena = arena;
/* borrowed reference */
@@ -795,7 +811,23 @@
}
}
}
- res = Module(stmts, arena);
+
+ /* Type ignores are stored under the ENDMARKER in file_input. */
+ ch = CHILD(n, NCH(n) - 1);
+ REQ(ch, ENDMARKER);
+ num = NCH(ch);
+ type_ignores = _Py_asdl_seq_new(num, arena);
+ if (!type_ignores)
+ goto out;
+
+ for (i = 0; i < num; i++) {
+ type_ignore_ty ti = TypeIgnore(LINENO(CHILD(ch, i)), arena);
+ if (!ti)
+ goto out;
+ asdl_seq_SET(type_ignores, i, ti);
+ }
+
+ res = Module(stmts, type_ignores, arena);
break;
case eval_input: {
expr_ty testlist_ast;
@@ -847,6 +879,46 @@
res = Interactive(stmts, arena);
}
break;
+ case func_type_input:
+ n = CHILD(n, 0);
+ REQ(n, func_type);
+
+ if (TYPE(CHILD(n, 1)) == typelist) {
+ ch = CHILD(n, 1);
+ /* this is overly permissive -- we don't pay any attention to
+ * stars on the args -- just parse them into an ordered list */
+ num = 0;
+ for (i = 0; i < NCH(ch); i++) {
+ if (TYPE(CHILD(ch, i)) == test) {
+ num++;
+ }
+ }
+
+ argtypes = _Py_asdl_seq_new(num, arena);
+ if (!argtypes)
+ goto out;
+
+ j = 0;
+ for (i = 0; i < NCH(ch); i++) {
+ if (TYPE(CHILD(ch, i)) == test) {
+ arg = ast_for_expr(&c, CHILD(ch, i));
+ if (!arg)
+ goto out;
+ asdl_seq_SET(argtypes, j++, arg);
+ }
+ }
+ }
+ else {
+ argtypes = _Py_asdl_seq_new(0, arena);
+ if (!argtypes)
+ goto out;
+ }
+
+ ret = ast_for_expr(&c, CHILD(n, NCH(n) - 1));
+ if (!ret)
+ goto out;
+ res = FunctionType(argtypes, ret, arena);
+ break;
default:
PyErr_Format(PyExc_SystemError,
"invalid node %d for PyAST_FromNode", TYPE(n));
@@ -1269,7 +1341,7 @@
return NULL;
}
- ret = arg(name, annotation, LINENO(n), n->n_col_offset,
+ ret = arg(name, annotation, NULL, LINENO(n), n->n_col_offset,
n->n_end_lineno, n->n_end_col_offset, c->c_arena);
if (!ret)
return NULL;
@@ -1328,13 +1400,22 @@
goto error;
if (forbidden_name(c, argname, ch, 0))
goto error;
- arg = arg(argname, annotation, LINENO(ch), ch->n_col_offset,
+ arg = arg(argname, annotation, NULL, LINENO(ch), ch->n_col_offset,
ch->n_end_lineno, ch->n_end_col_offset,
c->c_arena);
if (!arg)
goto error;
asdl_seq_SET(kwonlyargs, j++, arg);
- i += 2; /* the name and the comma */
+ i += 1; /* the name */
+ if (TYPE(CHILD(n, i)) == COMMA)
+ i += 1; /* the comma, if present */
+ break;
+ case TYPE_COMMENT:
+ /* arg will be equal to the last argument processed */
+ arg->type_comment = NEW_TYPE_COMMENT(ch);
+ if (!arg->type_comment)
+ goto error;
+ i += 1;
break;
case DOUBLESTAR:
return i;
@@ -1464,19 +1545,29 @@
if (!arg)
return NULL;
asdl_seq_SET(posargs, k++, arg);
- i += 2; /* the name and the comma */
+ i += 1; /* the name */
+ if (i < NCH(n) && TYPE(CHILD(n, i)) == COMMA)
+ i += 1; /* the comma, if present */
break;
case STAR:
if (i+1 >= NCH(n) ||
- (i+2 == NCH(n) && TYPE(CHILD(n, i+1)) == COMMA)) {
+ (i+2 == NCH(n) && (TYPE(CHILD(n, i+1)) == COMMA
+ || TYPE(CHILD(n, i+1)) == TYPE_COMMENT))) {
ast_error(c, CHILD(n, i),
- "named arguments must follow bare *");
+ "named arguments must follow bare *");
return NULL;
}
ch = CHILD(n, i+1); /* tfpdef or COMMA */
if (TYPE(ch) == COMMA) {
int res = 0;
i += 2; /* now follows keyword only arguments */
+
+ if (i < NCH(n) && TYPE(CHILD(n, i)) == TYPE_COMMENT) {
+ ast_error(c, CHILD(n, i),
+ "bare * has associated type comment");
+ return NULL;
+ }
+
res = handle_keywordonly_args(c, n, i,
kwonlyargs, kwdefaults);
if (res == -1) return NULL;
@@ -1487,7 +1578,17 @@
if (!vararg)
return NULL;
- i += 3;
+ i += 2; /* the star and the name */
+ if (i < NCH(n) && TYPE(CHILD(n, i)) == COMMA)
+ i += 1; /* the comma, if present */
+
+ if (i < NCH(n) && TYPE(CHILD(n, i)) == TYPE_COMMENT) {
+ vararg->type_comment = NEW_TYPE_COMMENT(CHILD(n, i));
+ if (!vararg->type_comment)
+ return NULL;
+ i += 1;
+ }
+
if (i < NCH(n) && (TYPE(CHILD(n, i)) == tfpdef
|| TYPE(CHILD(n, i)) == vfpdef)) {
int res = 0;
@@ -1504,7 +1605,21 @@
kwarg = ast_for_arg(c, ch);
if (!kwarg)
return NULL;
- i += 3;
+ i += 2; /* the double star and the name */
+ if (TYPE(CHILD(n, i)) == COMMA)
+ i += 1; /* the comma, if present */
+ break;
+ case TYPE_COMMENT:
+ assert(i);
+
+ if (kwarg)
+ arg = kwarg;
+
+ /* arg will be equal to the last argument processed */
+ arg->type_comment = NEW_TYPE_COMMENT(ch);
+ if (!arg->type_comment)
+ return NULL;
+ i += 1;
break;
default:
PyErr_Format(PyExc_SystemError,
@@ -1613,7 +1728,7 @@
ast_for_funcdef_impl(struct compiling *c, const node *n0,
asdl_seq *decorator_seq, bool is_async)
{
- /* funcdef: 'def' NAME parameters ['->' test] ':' suite */
+ /* funcdef: 'def' NAME parameters ['->' test] ':' [TYPE_COMMENT] suite */
const node * const n = is_async ? CHILD(n0, 1) : n0;
identifier name;
arguments_ty args;
@@ -1621,6 +1736,8 @@
expr_ty returns = NULL;
int name_i = 1;
int end_lineno, end_col_offset;
+ node *tc;
+ string type_comment = NULL;
REQ(n, funcdef);
@@ -1638,16 +1755,37 @@
return NULL;
name_i += 2;
}
+ if (TYPE(CHILD(n, name_i + 3)) == TYPE_COMMENT) {
+ type_comment = NEW_TYPE_COMMENT(CHILD(n, name_i + 3));
+ if (!type_comment)
+ return NULL;
+ name_i += 1;
+ }
body = ast_for_suite(c, CHILD(n, name_i + 3));
if (!body)
return NULL;
get_last_end_pos(body, &end_lineno, &end_col_offset);
+ if (NCH(CHILD(n, name_i + 3)) > 1) {
+ /* Check if the suite has a type comment in it. */
+ tc = CHILD(CHILD(n, name_i + 3), 1);
+
+ if (TYPE(tc) == TYPE_COMMENT) {
+ if (type_comment != NULL) {
+ ast_error(c, n, "Cannot have two type comments on def");
+ return NULL;
+ }
+ type_comment = NEW_TYPE_COMMENT(tc);
+ if (!type_comment)
+ return NULL;
+ }
+ }
+
if (is_async)
- return AsyncFunctionDef(name, args, body, decorator_seq, returns,
+ return AsyncFunctionDef(name, args, body, decorator_seq, returns, type_comment,
LINENO(n0), n0->n_col_offset, end_lineno, end_col_offset, c->c_arena);
else
- return FunctionDef(name, args, body, decorator_seq, returns,
+ return FunctionDef(name, args, body, decorator_seq, returns, type_comment,
LINENO(n), n->n_col_offset, end_lineno, end_col_offset, c->c_arena);
}
@@ -2295,7 +2433,7 @@
/* It's a dictionary comprehension. */
if (is_dict) {
ast_error(c, n, "dict unpacking cannot be used in "
- "dict comprehension");
+ "dict comprehension");
return NULL;
}
res = ast_for_dictcomp(c, ch);
@@ -2870,13 +3008,13 @@
if (nkeywords) {
if (ndoublestars) {
ast_error(c, chch,
- "positional argument follows "
- "keyword argument unpacking");
+ "positional argument follows "
+ "keyword argument unpacking");
}
else {
ast_error(c, chch,
- "positional argument follows "
- "keyword argument");
+ "positional argument follows "
+ "keyword argument");
}
return NULL;
}
@@ -2890,8 +3028,8 @@
expr_ty starred;
if (ndoublestars) {
ast_error(c, chch,
- "iterable argument unpacking follows "
- "keyword argument unpacking");
+ "iterable argument unpacking follows "
+ "keyword argument unpacking");
return NULL;
}
e = ast_for_expr(c, CHILD(ch, 1));
@@ -2929,13 +3067,13 @@
if (nkeywords) {
if (ndoublestars) {
ast_error(c, chch,
- "positional argument follows "
- "keyword argument unpacking");
+ "positional argument follows "
+ "keyword argument unpacking");
}
else {
ast_error(c, chch,
- "positional argument follows "
- "keyword argument");
+ "positional argument follows "
+ "keyword argument");
}
return NULL;
}
@@ -2996,7 +3134,7 @@
tmp = ((keyword_ty)asdl_seq_GET(keywords, k))->arg;
if (tmp && !PyUnicode_Compare(tmp, key)) {
ast_error(c, chch,
- "keyword argument repeated");
+ "keyword argument repeated");
return NULL;
}
}
@@ -3045,15 +3183,16 @@
{
REQ(n, expr_stmt);
/* expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) |
- ('=' (yield_expr|testlist_star_expr))*)
- annassign: ':' test ['=' test]
- testlist_star_expr: (test|star_expr) (',' test|star_expr)* [',']
- augassign: '+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^='
- | '<<=' | '>>=' | '**=' | '//='
+ [('=' (yield_expr|testlist_star_expr))+ [TYPE_COMMENT]] )
+ annassign: ':' test ['=' (yield_expr|testlist)]
+ testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [',']
+ augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' |
+ '<<=' | '>>=' | '**=' | '//=')
test: ... here starts the operator precedence dance
*/
+ int num = NCH(n);
- if (NCH(n) == 1) {
+ if (num == 1) {
expr_ty e = ast_for_testlist(c, CHILD(n, 0));
if (!e)
return NULL;
@@ -3178,17 +3317,22 @@
}
}
else {
- int i;
+ int i, nch_minus_type, has_type_comment;
asdl_seq *targets;
node *value;
expr_ty expression;
+ string type_comment;
/* a normal assignment */
REQ(CHILD(n, 1), EQUAL);
- targets = _Py_asdl_seq_new(NCH(n) / 2, c->c_arena);
+
+ has_type_comment = TYPE(CHILD(n, num - 1)) == TYPE_COMMENT;
+ nch_minus_type = num - has_type_comment;
+
+ targets = _Py_asdl_seq_new(nch_minus_type / 2, c->c_arena);
if (!targets)
return NULL;
- for (i = 0; i < NCH(n) - 2; i += 2) {
+ for (i = 0; i < nch_minus_type - 2; i += 2) {
expr_ty e;
node *ch = CHILD(n, i);
if (TYPE(ch) == yield_expr) {
@@ -3205,14 +3349,21 @@
asdl_seq_SET(targets, i / 2, e);
}
- value = CHILD(n, NCH(n) - 1);
+ value = CHILD(n, nch_minus_type - 1);
if (TYPE(value) == testlist_star_expr)
expression = ast_for_testlist(c, value);
else
expression = ast_for_expr(c, value);
if (!expression)
return NULL;
- return Assign(targets, expression, LINENO(n), n->n_col_offset,
+ if (has_type_comment) {
+ type_comment = NEW_TYPE_COMMENT(CHILD(n, nch_minus_type));
+ if (!type_comment)
+ return NULL;
+ }
+ else
+ type_comment = NULL;
+ return Assign(targets, expression, type_comment, LINENO(n), n->n_col_offset,
n->n_end_lineno, n->n_end_col_offset, c->c_arena);
}
}
@@ -3520,8 +3671,9 @@
n = CHILD(n, idx);
n_children = NCH(n);
if (n_children % 2 == 0) {
- ast_error(c, n, "trailing comma not allowed without"
- " surrounding parentheses");
+ ast_error(c, n,
+ "trailing comma not allowed without"
+ " surrounding parentheses");
return NULL;
}
break;
@@ -3639,13 +3791,15 @@
static asdl_seq *
ast_for_suite(struct compiling *c, const node *n)
{
- /* suite: simple_stmt | NEWLINE INDENT stmt+ DEDENT */
+ /* suite: simple_stmt | NEWLINE [TYPE_COMMENT NEWLINE] INDENT stmt+ DEDENT */
asdl_seq *seq;
stmt_ty s;
int i, total, num, end, pos = 0;
node *ch;
- REQ(n, suite);
+ if (TYPE(n) != func_body_suite) {
+ REQ(n, suite);
+ }
total = num_stmts(n);
seq = _Py_asdl_seq_new(total, c->c_arena);
@@ -3669,7 +3823,13 @@
}
}
else {
- for (i = 2; i < (NCH(n) - 1); i++) {
+ i = 2;
+ if (TYPE(CHILD(n, 1)) == TYPE_COMMENT) {
+ i += 2;
+ REQ(CHILD(n, 2), NEWLINE);
+ }
+
+ for (; i < (NCH(n) - 1); i++) {
ch = CHILD(n, i);
REQ(ch, stmt);
num = num_stmts(ch);
@@ -3903,11 +4063,15 @@
expr_ty target, first;
const node *node_target;
int end_lineno, end_col_offset;
- /* for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite] */
+ int has_type_comment;
+ string type_comment;
+ /* for_stmt: 'for' exprlist 'in' testlist ':' [TYPE_COMMENT] suite ['else' ':' suite] */
REQ(n, for_stmt);
- if (NCH(n) == 9) {
- seq = ast_for_suite(c, CHILD(n, 8));
+ has_type_comment = TYPE(CHILD(n, 5)) == TYPE_COMMENT;
+
+ if (NCH(n) == 9 + has_type_comment) {
+ seq = ast_for_suite(c, CHILD(n, 8 + has_type_comment));
if (!seq)
return NULL;
}
@@ -3929,7 +4093,7 @@
expression = ast_for_testlist(c, CHILD(n, 3));
if (!expression)
return NULL;
- suite_seq = ast_for_suite(c, CHILD(n, 5));
+ suite_seq = ast_for_suite(c, CHILD(n, 5 + has_type_comment));
if (!suite_seq)
return NULL;
@@ -3938,12 +4102,21 @@
} else {
get_last_end_pos(suite_seq, &end_lineno, &end_col_offset);
}
+
+ if (has_type_comment) {
+ type_comment = NEW_TYPE_COMMENT(CHILD(n, 5));
+ if (!type_comment)
+ return NULL;
+ }
+ else
+ type_comment = NULL;
+
if (is_async)
- return AsyncFor(target, expression, suite_seq, seq,
+ return AsyncFor(target, expression, suite_seq, seq, type_comment,
LINENO(n0), n0->n_col_offset,
end_lineno, end_col_offset, c->c_arena);
else
- return For(target, expression, suite_seq, seq,
+ return For(target, expression, suite_seq, seq, type_comment,
LINENO(n), n->n_col_offset,
end_lineno, end_col_offset, c->c_arena);
}
@@ -4111,21 +4284,25 @@
return withitem(context_expr, optional_vars, c->c_arena);
}
-/* with_stmt: 'with' with_item (',' with_item)* ':' suite */
+/* with_stmt: 'with' with_item (',' with_item)* ':' [TYPE_COMMENT] suite */
static stmt_ty
ast_for_with_stmt(struct compiling *c, const node *n0, bool is_async)
{
const node * const n = is_async ? CHILD(n0, 1) : n0;
- int i, n_items, end_lineno, end_col_offset;
+ int i, n_items, nch_minus_type, has_type_comment, end_lineno, end_col_offset;
asdl_seq *items, *body;
+ string type_comment;
REQ(n, with_stmt);
- n_items = (NCH(n) - 2) / 2;
+ has_type_comment = TYPE(CHILD(n, NCH(n) - 2)) == TYPE_COMMENT;
+ nch_minus_type = NCH(n) - has_type_comment;
+
+ n_items = (nch_minus_type - 2) / 2;
items = _Py_asdl_seq_new(n_items, c->c_arena);
if (!items)
return NULL;
- for (i = 1; i < NCH(n) - 2; i += 2) {
+ for (i = 1; i < nch_minus_type - 2; i += 2) {
withitem_ty item = ast_for_with_item(c, CHILD(n, i));
if (!item)
return NULL;
@@ -4137,11 +4314,19 @@
return NULL;
get_last_end_pos(body, &end_lineno, &end_col_offset);
+ if (has_type_comment) {
+ type_comment = NEW_TYPE_COMMENT(CHILD(n, NCH(n) - 2));
+ if (!type_comment)
+ return NULL;
+ }
+ else
+ type_comment = NULL;
+
if (is_async)
- return AsyncWith(items, body, LINENO(n0), n0->n_col_offset,
+ return AsyncWith(items, body, type_comment, LINENO(n0), n0->n_col_offset,
end_lineno, end_col_offset, c->c_arena);
else
- return With(items, body, LINENO(n), n->n_col_offset,
+ return With(items, body, type_comment, LINENO(n), n->n_col_offset,
end_lineno, end_col_offset, c->c_arena);
}
@@ -4768,8 +4953,9 @@
if (ch == '\\') {
/* Error: can't include a backslash character, inside
parens or strings or not. */
- ast_error(c, n, "f-string expression part "
- "cannot include a backslash");
+ ast_error(c, n,
+ "f-string expression part "
+ "cannot include a backslash");
return -1;
}
if (quote_char) {
@@ -4893,8 +5079,9 @@
/* Validate the conversion. */
if (!(conversion == 's' || conversion == 'r'
|| conversion == 'a')) {
- ast_error(c, n, "f-string: invalid conversion character: "
- "expected 's', 'r', or 'a'");
+ ast_error(c, n,
+ "f-string: invalid conversion character: "
+ "expected 's', 'r', or 'a'");
return -1;
}
}
@@ -5446,7 +5633,8 @@
const char *ch;
for (ch = s; *ch; ch++) {
if (Py_CHARMASK(*ch) >= 0x80) {
- ast_error(c, n, "bytes can only contain ASCII "
+ ast_error(c, n,
+ "bytes can only contain ASCII "
"literal characters.");
return -1;
}
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 332142f..f9b901f 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -765,13 +765,13 @@
int compile_mode = -1;
int is_ast;
PyCompilerFlags cf;
- int start[] = {Py_file_input, Py_eval_input, Py_single_input};
+ int start[] = {Py_file_input, Py_eval_input, Py_single_input, Py_func_type_input};
PyObject *result;
cf.cf_flags = flags | PyCF_SOURCE_IS_UTF8;
if (flags &
- ~(PyCF_MASK | PyCF_MASK_OBSOLETE | PyCF_DONT_IMPLY_DEDENT | PyCF_ONLY_AST))
+ ~(PyCF_MASK | PyCF_MASK_OBSOLETE | PyCF_DONT_IMPLY_DEDENT | PyCF_ONLY_AST | PyCF_TYPE_COMMENTS))
{
PyErr_SetString(PyExc_ValueError,
"compile(): unrecognised flags");
@@ -795,9 +795,21 @@
compile_mode = 1;
else if (strcmp(mode, "single") == 0)
compile_mode = 2;
+ else if (strcmp(mode, "func_type") == 0) {
+ if (!(flags & PyCF_ONLY_AST)) {
+ PyErr_SetString(PyExc_ValueError,
+ "compile() mode 'func_type' requires flag PyCF_ONLY_AST");
+ goto error;
+ }
+ compile_mode = 3;
+ }
else {
- PyErr_SetString(PyExc_ValueError,
- "compile() mode must be 'exec', 'eval' or 'single'");
+ const char *msg;
+ if (flags & PyCF_ONLY_AST)
+ msg = "compile() mode must be 'exec', 'eval', 'single' or 'func_type'";
+ else
+ msg = "compile() mode must be 'exec', 'eval' or 'single'";
+ PyErr_SetString(PyExc_ValueError, msg);
goto error;
}
diff --git a/Python/graminit.c b/Python/graminit.c
index 225d327..6e0f198 100644
--- a/Python/graminit.c
+++ b/Python/graminit.c
@@ -135,30 +135,35 @@
static arc arcs_7_4[1] = {
{26, 6},
};
-static arc arcs_7_5[1] = {
+static arc arcs_7_5[2] = {
{28, 7},
+ {29, 8},
};
static arc arcs_7_6[1] = {
{27, 5},
};
static arc arcs_7_7[1] = {
- {0, 7},
+ {29, 8},
};
-static state states_7[8] = {
+static arc arcs_7_8[1] = {
+ {0, 8},
+};
+static state states_7[9] = {
{1, arcs_7_0},
{1, arcs_7_1},
{1, arcs_7_2},
{2, arcs_7_3},
{1, arcs_7_4},
- {1, arcs_7_5},
+ {2, arcs_7_5},
{1, arcs_7_6},
{1, arcs_7_7},
+ {1, arcs_7_8},
};
static arc arcs_8_0[1] = {
{13, 1},
};
static arc arcs_8_1[2] = {
- {29, 2},
+ {30, 2},
{15, 3},
};
static arc arcs_8_2[1] = {
@@ -174,107 +179,144 @@
{1, arcs_8_3},
};
static arc arcs_9_0[3] = {
- {30, 1},
- {33, 2},
- {34, 3},
+ {31, 1},
+ {34, 2},
+ {35, 3},
};
-static arc arcs_9_1[3] = {
- {31, 4},
- {32, 5},
+static arc arcs_9_1[4] = {
+ {32, 4},
+ {33, 5},
+ {28, 6},
{0, 1},
};
-static arc arcs_9_2[3] = {
- {30, 6},
- {32, 7},
+static arc arcs_9_2[4] = {
+ {31, 7},
+ {33, 8},
+ {28, 6},
{0, 2},
};
static arc arcs_9_3[1] = {
- {30, 8},
+ {31, 9},
};
static arc arcs_9_4[1] = {
- {26, 9},
+ {26, 10},
};
-static arc arcs_9_5[4] = {
- {30, 10},
- {33, 11},
- {34, 3},
+static arc arcs_9_5[5] = {
+ {28, 11},
+ {31, 12},
+ {34, 13},
+ {35, 3},
{0, 5},
};
-static arc arcs_9_6[2] = {
- {32, 7},
+static arc arcs_9_6[1] = {
{0, 6},
};
static arc arcs_9_7[3] = {
- {30, 12},
- {34, 3},
+ {33, 8},
+ {28, 6},
{0, 7},
};
-static arc arcs_9_8[2] = {
- {32, 13},
+static arc arcs_9_8[4] = {
+ {28, 14},
+ {31, 15},
+ {35, 3},
{0, 8},
};
-static arc arcs_9_9[2] = {
- {32, 5},
+static arc arcs_9_9[3] = {
+ {33, 16},
+ {28, 6},
{0, 9},
};
static arc arcs_9_10[3] = {
- {32, 5},
- {31, 4},
+ {33, 5},
+ {28, 6},
{0, 10},
};
-static arc arcs_9_11[3] = {
- {30, 14},
- {32, 15},
+static arc arcs_9_11[4] = {
+ {31, 12},
+ {34, 13},
+ {35, 3},
{0, 11},
};
-static arc arcs_9_12[3] = {
- {32, 7},
- {31, 16},
+static arc arcs_9_12[4] = {
+ {33, 5},
+ {32, 4},
+ {28, 6},
{0, 12},
};
-static arc arcs_9_13[1] = {
+static arc arcs_9_13[4] = {
+ {31, 17},
+ {33, 18},
+ {28, 6},
{0, 13},
};
-static arc arcs_9_14[2] = {
- {32, 15},
+static arc arcs_9_14[3] = {
+ {31, 15},
+ {35, 3},
{0, 14},
};
-static arc arcs_9_15[3] = {
- {30, 17},
- {34, 3},
+static arc arcs_9_15[4] = {
+ {33, 8},
+ {32, 19},
+ {28, 6},
{0, 15},
};
-static arc arcs_9_16[1] = {
- {26, 6},
+static arc arcs_9_16[2] = {
+ {28, 6},
+ {0, 16},
};
static arc arcs_9_17[3] = {
- {32, 15},
- {31, 18},
+ {33, 18},
+ {28, 6},
{0, 17},
};
-static arc arcs_9_18[1] = {
- {26, 14},
+static arc arcs_9_18[4] = {
+ {28, 20},
+ {31, 21},
+ {35, 3},
+ {0, 18},
};
-static state states_9[19] = {
+static arc arcs_9_19[1] = {
+ {26, 7},
+};
+static arc arcs_9_20[3] = {
+ {31, 21},
+ {35, 3},
+ {0, 20},
+};
+static arc arcs_9_21[4] = {
+ {33, 18},
+ {32, 22},
+ {28, 6},
+ {0, 21},
+};
+static arc arcs_9_22[1] = {
+ {26, 17},
+};
+static state states_9[23] = {
{3, arcs_9_0},
- {3, arcs_9_1},
- {3, arcs_9_2},
+ {4, arcs_9_1},
+ {4, arcs_9_2},
{1, arcs_9_3},
{1, arcs_9_4},
- {4, arcs_9_5},
- {2, arcs_9_6},
+ {5, arcs_9_5},
+ {1, arcs_9_6},
{3, arcs_9_7},
- {2, arcs_9_8},
- {2, arcs_9_9},
+ {4, arcs_9_8},
+ {3, arcs_9_9},
{3, arcs_9_10},
- {3, arcs_9_11},
- {3, arcs_9_12},
- {1, arcs_9_13},
- {2, arcs_9_14},
- {3, arcs_9_15},
- {1, arcs_9_16},
+ {4, arcs_9_11},
+ {4, arcs_9_12},
+ {4, arcs_9_13},
+ {3, arcs_9_14},
+ {4, arcs_9_15},
+ {2, arcs_9_16},
{3, arcs_9_17},
- {1, arcs_9_18},
+ {4, arcs_9_18},
+ {1, arcs_9_19},
+ {3, arcs_9_20},
+ {4, arcs_9_21},
+ {1, arcs_9_22},
};
static arc arcs_10_0[1] = {
{23, 1},
@@ -296,82 +338,82 @@
{1, arcs_10_3},
};
static arc arcs_11_0[3] = {
- {36, 1},
- {33, 2},
- {34, 3},
+ {37, 1},
+ {34, 2},
+ {35, 3},
};
static arc arcs_11_1[3] = {
- {31, 4},
- {32, 5},
+ {32, 4},
+ {33, 5},
{0, 1},
};
static arc arcs_11_2[3] = {
- {36, 6},
- {32, 7},
+ {37, 6},
+ {33, 7},
{0, 2},
};
static arc arcs_11_3[1] = {
- {36, 8},
+ {37, 8},
};
static arc arcs_11_4[1] = {
{26, 9},
};
static arc arcs_11_5[4] = {
- {36, 10},
- {33, 11},
- {34, 3},
+ {37, 10},
+ {34, 11},
+ {35, 3},
{0, 5},
};
static arc arcs_11_6[2] = {
- {32, 7},
+ {33, 7},
{0, 6},
};
static arc arcs_11_7[3] = {
- {36, 12},
- {34, 3},
+ {37, 12},
+ {35, 3},
{0, 7},
};
static arc arcs_11_8[2] = {
- {32, 13},
+ {33, 13},
{0, 8},
};
static arc arcs_11_9[2] = {
- {32, 5},
+ {33, 5},
{0, 9},
};
static arc arcs_11_10[3] = {
- {32, 5},
- {31, 4},
+ {33, 5},
+ {32, 4},
{0, 10},
};
static arc arcs_11_11[3] = {
- {36, 14},
- {32, 15},
+ {37, 14},
+ {33, 15},
{0, 11},
};
static arc arcs_11_12[3] = {
- {32, 7},
- {31, 16},
+ {33, 7},
+ {32, 16},
{0, 12},
};
static arc arcs_11_13[1] = {
{0, 13},
};
static arc arcs_11_14[2] = {
- {32, 15},
+ {33, 15},
{0, 14},
};
static arc arcs_11_15[3] = {
- {36, 17},
- {34, 3},
+ {37, 17},
+ {35, 3},
{0, 15},
};
static arc arcs_11_16[1] = {
{26, 6},
};
static arc arcs_11_17[3] = {
- {32, 15},
- {31, 18},
+ {33, 15},
+ {32, 18},
{0, 17},
};
static arc arcs_11_18[1] = {
@@ -420,14 +462,14 @@
{1, arcs_13_1},
};
static arc arcs_14_0[1] = {
- {37, 1},
+ {38, 1},
};
static arc arcs_14_1[2] = {
- {38, 2},
+ {39, 2},
{2, 3},
};
static arc arcs_14_2[2] = {
- {37, 1},
+ {38, 1},
{2, 3},
};
static arc arcs_14_3[1] = {
@@ -440,7 +482,6 @@
{1, arcs_14_3},
};
static arc arcs_15_0[8] = {
- {39, 1},
{40, 1},
{41, 1},
{42, 1},
@@ -448,6 +489,7 @@
{44, 1},
{45, 1},
{46, 1},
+ {47, 1},
};
static arc arcs_15_1[1] = {
{0, 1},
@@ -457,27 +499,28 @@
{1, arcs_15_1},
};
static arc arcs_16_0[1] = {
- {47, 1},
+ {48, 1},
};
static arc arcs_16_1[4] = {
- {48, 2},
- {49, 3},
- {31, 4},
+ {49, 2},
+ {50, 3},
+ {32, 4},
{0, 1},
};
static arc arcs_16_2[1] = {
{0, 2},
};
static arc arcs_16_3[2] = {
- {50, 2},
+ {51, 2},
{9, 2},
};
static arc arcs_16_4[2] = {
- {50, 5},
- {47, 5},
+ {51, 5},
+ {48, 5},
};
-static arc arcs_16_5[2] = {
- {31, 4},
+static arc arcs_16_5[3] = {
+ {32, 4},
+ {28, 2},
{0, 5},
};
static state states_16[6] = {
@@ -486,7 +529,7 @@
{1, arcs_16_2},
{2, arcs_16_3},
{2, arcs_16_4},
- {2, arcs_16_5},
+ {3, arcs_16_5},
};
static arc arcs_17_0[1] = {
{27, 1},
@@ -495,11 +538,11 @@
{26, 2},
};
static arc arcs_17_2[2] = {
- {31, 3},
+ {32, 3},
{0, 2},
};
static arc arcs_17_3[2] = {
- {50, 4},
+ {51, 4},
{9, 4},
};
static arc arcs_17_4[1] = {
@@ -514,15 +557,15 @@
};
static arc arcs_18_0[2] = {
{26, 1},
- {51, 1},
+ {52, 1},
};
static arc arcs_18_1[2] = {
- {32, 2},
+ {33, 2},
{0, 1},
};
static arc arcs_18_2[3] = {
{26, 1},
- {51, 1},
+ {52, 1},
{0, 2},
};
static state states_18[3] = {
@@ -531,7 +574,6 @@
{3, arcs_18_2},
};
static arc arcs_19_0[13] = {
- {52, 1},
{53, 1},
{54, 1},
{55, 1},
@@ -544,6 +586,7 @@
{62, 1},
{63, 1},
{64, 1},
+ {65, 1},
};
static arc arcs_19_1[1] = {
{0, 1},
@@ -553,10 +596,10 @@
{1, arcs_19_1},
};
static arc arcs_20_0[1] = {
- {65, 1},
+ {66, 1},
};
static arc arcs_20_1[1] = {
- {66, 2},
+ {67, 2},
};
static arc arcs_20_2[1] = {
{0, 2},
@@ -567,7 +610,7 @@
{1, arcs_20_2},
};
static arc arcs_21_0[1] = {
- {67, 1},
+ {68, 1},
};
static arc arcs_21_1[1] = {
{0, 1},
@@ -577,11 +620,11 @@
{1, arcs_21_1},
};
static arc arcs_22_0[5] = {
- {68, 1},
{69, 1},
{70, 1},
{71, 1},
{72, 1},
+ {73, 1},
};
static arc arcs_22_1[1] = {
{0, 1},
@@ -591,7 +634,7 @@
{1, arcs_22_1},
};
static arc arcs_23_0[1] = {
- {73, 1},
+ {74, 1},
};
static arc arcs_23_1[1] = {
{0, 1},
@@ -601,7 +644,7 @@
{1, arcs_23_1},
};
static arc arcs_24_0[1] = {
- {74, 1},
+ {75, 1},
};
static arc arcs_24_1[1] = {
{0, 1},
@@ -611,10 +654,10 @@
{1, arcs_24_1},
};
static arc arcs_25_0[1] = {
- {75, 1},
+ {76, 1},
};
static arc arcs_25_1[2] = {
- {47, 2},
+ {48, 2},
{0, 1},
};
static arc arcs_25_2[1] = {
@@ -626,7 +669,7 @@
{1, arcs_25_2},
};
static arc arcs_26_0[1] = {
- {50, 1},
+ {51, 1},
};
static arc arcs_26_1[1] = {
{0, 1},
@@ -636,14 +679,14 @@
{1, arcs_26_1},
};
static arc arcs_27_0[1] = {
- {76, 1},
+ {77, 1},
};
static arc arcs_27_1[2] = {
{26, 2},
{0, 1},
};
static arc arcs_27_2[2] = {
- {77, 3},
+ {78, 3},
{0, 2},
};
static arc arcs_27_3[1] = {
@@ -660,8 +703,8 @@
{1, arcs_27_4},
};
static arc arcs_28_0[2] = {
- {78, 1},
{79, 1},
+ {80, 1},
};
static arc arcs_28_1[1] = {
{0, 1},
@@ -671,10 +714,10 @@
{1, arcs_28_1},
};
static arc arcs_29_0[1] = {
- {80, 1},
+ {81, 1},
};
static arc arcs_29_1[1] = {
- {81, 2},
+ {82, 2},
};
static arc arcs_29_2[1] = {
{0, 2},
@@ -685,32 +728,32 @@
{1, arcs_29_2},
};
static arc arcs_30_0[1] = {
- {77, 1},
+ {78, 1},
};
static arc arcs_30_1[3] = {
- {82, 2},
{83, 2},
+ {84, 2},
{12, 3},
};
static arc arcs_30_2[4] = {
- {82, 2},
{83, 2},
+ {84, 2},
{12, 3},
- {80, 4},
+ {81, 4},
};
static arc arcs_30_3[1] = {
- {80, 4},
+ {81, 4},
};
static arc arcs_30_4[3] = {
- {33, 5},
+ {34, 5},
{13, 6},
- {84, 5},
+ {85, 5},
};
static arc arcs_30_5[1] = {
{0, 5},
};
static arc arcs_30_6[1] = {
- {84, 7},
+ {85, 7},
};
static arc arcs_30_7[1] = {
{15, 5},
@@ -729,7 +772,7 @@
{23, 1},
};
static arc arcs_31_1[2] = {
- {86, 2},
+ {87, 2},
{0, 1},
};
static arc arcs_31_2[1] = {
@@ -748,7 +791,7 @@
{12, 1},
};
static arc arcs_32_1[2] = {
- {86, 2},
+ {87, 2},
{0, 1},
};
static arc arcs_32_2[1] = {
@@ -764,14 +807,14 @@
{1, arcs_32_3},
};
static arc arcs_33_0[1] = {
- {85, 1},
+ {86, 1},
};
static arc arcs_33_1[2] = {
- {32, 2},
+ {33, 2},
{0, 1},
};
static arc arcs_33_2[2] = {
- {85, 1},
+ {86, 1},
{0, 2},
};
static state states_33[3] = {
@@ -780,10 +823,10 @@
{2, arcs_33_2},
};
static arc arcs_34_0[1] = {
- {87, 1},
+ {88, 1},
};
static arc arcs_34_1[2] = {
- {32, 0},
+ {33, 0},
{0, 1},
};
static state states_34[2] = {
@@ -794,7 +837,7 @@
{23, 1},
};
static arc arcs_35_1[2] = {
- {82, 0},
+ {83, 0},
{0, 1},
};
static state states_35[2] = {
@@ -802,13 +845,13 @@
{2, arcs_35_1},
};
static arc arcs_36_0[1] = {
- {88, 1},
+ {89, 1},
};
static arc arcs_36_1[1] = {
{23, 2},
};
static arc arcs_36_2[2] = {
- {32, 1},
+ {33, 1},
{0, 2},
};
static state states_36[3] = {
@@ -817,13 +860,13 @@
{2, arcs_36_2},
};
static arc arcs_37_0[1] = {
- {89, 1},
+ {90, 1},
};
static arc arcs_37_1[1] = {
{23, 2},
};
static arc arcs_37_2[2] = {
- {32, 1},
+ {33, 1},
{0, 2},
};
static state states_37[3] = {
@@ -832,13 +875,13 @@
{2, arcs_37_2},
};
static arc arcs_38_0[1] = {
- {90, 1},
+ {91, 1},
};
static arc arcs_38_1[1] = {
{26, 2},
};
static arc arcs_38_2[2] = {
- {32, 3},
+ {33, 3},
{0, 2},
};
static arc arcs_38_3[1] = {
@@ -855,15 +898,15 @@
{1, arcs_38_4},
};
static arc arcs_39_0[9] = {
- {91, 1},
{92, 1},
{93, 1},
{94, 1},
{95, 1},
+ {96, 1},
{19, 1},
{18, 1},
{17, 1},
- {96, 1},
+ {97, 1},
};
static arc arcs_39_1[1] = {
{0, 1},
@@ -877,8 +920,8 @@
};
static arc arcs_40_1[3] = {
{19, 2},
- {95, 2},
- {93, 2},
+ {96, 2},
+ {94, 2},
};
static arc arcs_40_2[1] = {
{0, 2},
@@ -889,27 +932,27 @@
{1, arcs_40_2},
};
static arc arcs_41_0[1] = {
- {97, 1},
+ {98, 1},
};
static arc arcs_41_1[1] = {
- {98, 2},
+ {99, 2},
};
static arc arcs_41_2[1] = {
{27, 3},
};
static arc arcs_41_3[1] = {
- {28, 4},
+ {100, 4},
};
static arc arcs_41_4[3] = {
- {99, 1},
- {100, 5},
+ {101, 1},
+ {102, 5},
{0, 4},
};
static arc arcs_41_5[1] = {
{27, 6},
};
static arc arcs_41_6[1] = {
- {28, 7},
+ {100, 7},
};
static arc arcs_41_7[1] = {
{0, 7},
@@ -925,7 +968,7 @@
{1, arcs_41_7},
};
static arc arcs_42_0[1] = {
- {101, 1},
+ {103, 1},
};
static arc arcs_42_1[1] = {
{26, 2},
@@ -934,17 +977,17 @@
{27, 3},
};
static arc arcs_42_3[1] = {
- {28, 4},
+ {100, 4},
};
static arc arcs_42_4[2] = {
- {100, 5},
+ {102, 5},
{0, 4},
};
static arc arcs_42_5[1] = {
{27, 6},
};
static arc arcs_42_6[1] = {
- {28, 7},
+ {100, 7},
};
static arc arcs_42_7[1] = {
{0, 7},
@@ -960,13 +1003,13 @@
{1, arcs_42_7},
};
static arc arcs_43_0[1] = {
- {102, 1},
+ {104, 1},
};
static arc arcs_43_1[1] = {
- {66, 2},
+ {67, 2},
};
static arc arcs_43_2[1] = {
- {103, 3},
+ {105, 3},
};
static arc arcs_43_3[1] = {
{9, 4},
@@ -974,46 +1017,51 @@
static arc arcs_43_4[1] = {
{27, 5},
};
-static arc arcs_43_5[1] = {
+static arc arcs_43_5[2] = {
{28, 6},
-};
-static arc arcs_43_6[2] = {
{100, 7},
- {0, 6},
};
-static arc arcs_43_7[1] = {
- {27, 8},
+static arc arcs_43_6[1] = {
+ {100, 7},
+};
+static arc arcs_43_7[2] = {
+ {102, 8},
+ {0, 7},
};
static arc arcs_43_8[1] = {
- {28, 9},
+ {27, 9},
};
static arc arcs_43_9[1] = {
- {0, 9},
+ {100, 10},
};
-static state states_43[10] = {
+static arc arcs_43_10[1] = {
+ {0, 10},
+};
+static state states_43[11] = {
{1, arcs_43_0},
{1, arcs_43_1},
{1, arcs_43_2},
{1, arcs_43_3},
{1, arcs_43_4},
- {1, arcs_43_5},
- {2, arcs_43_6},
- {1, arcs_43_7},
+ {2, arcs_43_5},
+ {1, arcs_43_6},
+ {2, arcs_43_7},
{1, arcs_43_8},
{1, arcs_43_9},
+ {1, arcs_43_10},
};
static arc arcs_44_0[1] = {
- {104, 1},
+ {106, 1},
};
static arc arcs_44_1[1] = {
{27, 2},
};
static arc arcs_44_2[1] = {
- {28, 3},
+ {100, 3},
};
static arc arcs_44_3[2] = {
- {105, 4},
- {106, 5},
+ {107, 4},
+ {108, 5},
};
static arc arcs_44_4[1] = {
{27, 6},
@@ -1022,15 +1070,15 @@
{27, 7},
};
static arc arcs_44_6[1] = {
- {28, 8},
+ {100, 8},
};
static arc arcs_44_7[1] = {
- {28, 9},
+ {100, 9},
};
static arc arcs_44_8[4] = {
- {105, 4},
- {100, 10},
- {106, 5},
+ {107, 4},
+ {102, 10},
+ {108, 5},
{0, 8},
};
static arc arcs_44_9[1] = {
@@ -1040,10 +1088,10 @@
{27, 11},
};
static arc arcs_44_11[1] = {
- {28, 12},
+ {100, 12},
};
static arc arcs_44_12[2] = {
- {106, 5},
+ {108, 5},
{0, 12},
};
static state states_44[13] = {
@@ -1062,37 +1110,42 @@
{2, arcs_44_12},
};
static arc arcs_45_0[1] = {
- {107, 1},
+ {109, 1},
};
static arc arcs_45_1[1] = {
- {108, 2},
+ {110, 2},
};
static arc arcs_45_2[2] = {
- {32, 1},
+ {33, 1},
{27, 3},
};
-static arc arcs_45_3[1] = {
+static arc arcs_45_3[2] = {
{28, 4},
+ {100, 5},
};
static arc arcs_45_4[1] = {
- {0, 4},
+ {100, 5},
};
-static state states_45[5] = {
+static arc arcs_45_5[1] = {
+ {0, 5},
+};
+static state states_45[6] = {
{1, arcs_45_0},
{1, arcs_45_1},
{2, arcs_45_2},
- {1, arcs_45_3},
+ {2, arcs_45_3},
{1, arcs_45_4},
+ {1, arcs_45_5},
};
static arc arcs_46_0[1] = {
{26, 1},
};
static arc arcs_46_1[2] = {
- {86, 2},
+ {87, 2},
{0, 1},
};
static arc arcs_46_2[1] = {
- {109, 3},
+ {111, 3},
};
static arc arcs_46_3[1] = {
{0, 3},
@@ -1104,14 +1157,14 @@
{1, arcs_46_3},
};
static arc arcs_47_0[1] = {
- {110, 1},
+ {112, 1},
};
static arc arcs_47_1[2] = {
{26, 2},
{0, 1},
};
static arc arcs_47_2[2] = {
- {86, 3},
+ {87, 3},
{0, 2},
};
static arc arcs_47_3[1] = {
@@ -1135,14 +1188,14 @@
{0, 1},
};
static arc arcs_48_2[1] = {
- {111, 3},
+ {113, 3},
};
static arc arcs_48_3[1] = {
{6, 4},
};
static arc arcs_48_4[2] = {
{6, 4},
- {112, 1},
+ {114, 1},
};
static state states_48[5] = {
{2, arcs_48_0},
@@ -1155,7 +1208,7 @@
{26, 1},
};
static arc arcs_49_1[2] = {
- {113, 2},
+ {115, 2},
{0, 1},
};
static arc arcs_49_2[1] = {
@@ -1171,21 +1224,21 @@
{1, arcs_49_3},
};
static arc arcs_50_0[2] = {
- {114, 1},
- {115, 2},
+ {116, 1},
+ {117, 2},
};
static arc arcs_50_1[2] = {
- {97, 3},
+ {98, 3},
{0, 1},
};
static arc arcs_50_2[1] = {
{0, 2},
};
static arc arcs_50_3[1] = {
- {114, 4},
+ {116, 4},
};
static arc arcs_50_4[1] = {
- {100, 5},
+ {102, 5},
};
static arc arcs_50_5[1] = {
{26, 2},
@@ -1199,8 +1252,8 @@
{1, arcs_50_5},
};
static arc arcs_51_0[2] = {
- {114, 1},
- {117, 1},
+ {116, 1},
+ {119, 1},
};
static arc arcs_51_1[1] = {
{0, 1},
@@ -1210,10 +1263,10 @@
{1, arcs_51_1},
};
static arc arcs_52_0[1] = {
- {118, 1},
+ {120, 1},
};
static arc arcs_52_1[2] = {
- {35, 2},
+ {36, 2},
{27, 3},
};
static arc arcs_52_2[1] = {
@@ -1233,17 +1286,17 @@
{1, arcs_52_4},
};
static arc arcs_53_0[1] = {
- {118, 1},
+ {120, 1},
};
static arc arcs_53_1[2] = {
- {35, 2},
+ {36, 2},
{27, 3},
};
static arc arcs_53_2[1] = {
{27, 3},
};
static arc arcs_53_3[1] = {
- {116, 4},
+ {118, 4},
};
static arc arcs_53_4[1] = {
{0, 4},
@@ -1256,10 +1309,10 @@
{1, arcs_53_4},
};
static arc arcs_54_0[1] = {
- {119, 1},
+ {121, 1},
};
static arc arcs_54_1[2] = {
- {120, 0},
+ {122, 0},
{0, 1},
};
static state states_54[2] = {
@@ -1267,10 +1320,10 @@
{2, arcs_54_1},
};
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] = {
@@ -1278,11 +1331,11 @@
{2, arcs_55_1},
};
static arc arcs_56_0[2] = {
- {123, 1},
- {124, 2},
+ {125, 1},
+ {126, 2},
};
static arc arcs_56_1[1] = {
- {121, 2},
+ {123, 2},
};
static arc arcs_56_2[1] = {
{0, 2},
@@ -1293,10 +1346,10 @@
{1, arcs_56_2},
};
static arc arcs_57_0[1] = {
- {109, 1},
+ {111, 1},
};
static arc arcs_57_1[2] = {
- {125, 0},
+ {127, 0},
{0, 1},
};
static state states_57[2] = {
@@ -1304,25 +1357,25 @@
{2, arcs_57_1},
};
static arc arcs_58_0[10] = {
- {126, 1},
- {127, 1},
{128, 1},
{129, 1},
{130, 1},
{131, 1},
{132, 1},
- {103, 1},
- {123, 2},
- {133, 3},
+ {133, 1},
+ {134, 1},
+ {105, 1},
+ {125, 2},
+ {135, 3},
};
static arc arcs_58_1[1] = {
{0, 1},
};
static arc arcs_58_2[1] = {
- {103, 1},
+ {105, 1},
};
static arc arcs_58_3[2] = {
- {123, 1},
+ {125, 1},
{0, 3},
};
static state states_58[4] = {
@@ -1332,10 +1385,10 @@
{2, arcs_58_3},
};
static arc arcs_59_0[1] = {
- {33, 1},
+ {34, 1},
};
static arc arcs_59_1[1] = {
- {109, 2},
+ {111, 2},
};
static arc arcs_59_2[1] = {
{0, 2},
@@ -1346,10 +1399,10 @@
{1, arcs_59_2},
};
static arc arcs_60_0[1] = {
- {134, 1},
+ {136, 1},
};
static arc arcs_60_1[2] = {
- {135, 0},
+ {137, 0},
{0, 1},
};
static state states_60[2] = {
@@ -1357,10 +1410,10 @@
{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] = {
@@ -1368,10 +1421,10 @@
{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] = {
@@ -1379,11 +1432,11 @@
{2, arcs_62_1},
};
static arc arcs_63_0[1] = {
- {140, 1},
+ {142, 1},
};
static arc arcs_63_1[3] = {
- {141, 0},
- {142, 0},
+ {143, 0},
+ {144, 0},
{0, 1},
};
static state states_63[2] = {
@@ -1391,11 +1444,11 @@
{3, arcs_63_1},
};
static arc arcs_64_0[1] = {
- {143, 1},
+ {145, 1},
};
static arc arcs_64_1[3] = {
- {144, 0},
- {145, 0},
+ {146, 0},
+ {147, 0},
{0, 1},
};
static state states_64[2] = {
@@ -1403,14 +1456,14 @@
{3, arcs_64_1},
};
static arc arcs_65_0[1] = {
- {146, 1},
+ {148, 1},
};
static arc arcs_65_1[6] = {
- {33, 0},
+ {34, 0},
{11, 0},
- {147, 0},
- {148, 0},
{149, 0},
+ {150, 0},
+ {151, 0},
{0, 1},
};
static state states_65[2] = {
@@ -1418,13 +1471,13 @@
{6, arcs_65_1},
};
static arc arcs_66_0[4] = {
- {144, 1},
- {145, 1},
- {150, 1},
- {151, 2},
+ {146, 1},
+ {147, 1},
+ {152, 1},
+ {153, 2},
};
static arc arcs_66_1[1] = {
- {146, 2},
+ {148, 2},
};
static arc arcs_66_2[1] = {
{0, 2},
@@ -1435,14 +1488,14 @@
{1, arcs_66_2},
};
static arc arcs_67_0[1] = {
- {152, 1},
+ {154, 1},
};
static arc arcs_67_1[2] = {
- {34, 2},
+ {35, 2},
{0, 1},
};
static arc arcs_67_2[1] = {
- {146, 3},
+ {148, 3},
};
static arc arcs_67_3[1] = {
{0, 3},
@@ -1454,14 +1507,14 @@
{1, arcs_67_3},
};
static arc arcs_68_0[2] = {
- {153, 1},
- {154, 2},
+ {155, 1},
+ {156, 2},
};
static arc arcs_68_1[1] = {
- {154, 2},
+ {156, 2},
};
static arc arcs_68_2[2] = {
- {155, 2},
+ {157, 2},
{0, 2},
};
static state states_68[3] = {
@@ -1471,44 +1524,44 @@
};
static arc arcs_69_0[10] = {
{13, 1},
- {157, 2},
- {159, 3},
+ {159, 2},
+ {161, 3},
{23, 4},
- {162, 4},
- {163, 5},
- {83, 4},
{164, 4},
- {165, 4},
+ {165, 5},
+ {84, 4},
{166, 4},
+ {167, 4},
+ {168, 4},
};
static arc arcs_69_1[3] = {
- {50, 6},
- {156, 6},
+ {51, 6},
+ {158, 6},
{15, 4},
};
static arc arcs_69_2[2] = {
- {156, 7},
- {158, 4},
+ {158, 7},
+ {160, 4},
};
static arc arcs_69_3[2] = {
- {160, 8},
- {161, 4},
+ {162, 8},
+ {163, 4},
};
static arc arcs_69_4[1] = {
{0, 4},
};
static arc arcs_69_5[2] = {
- {163, 5},
+ {165, 5},
{0, 5},
};
static arc arcs_69_6[1] = {
{15, 4},
};
static arc arcs_69_7[1] = {
- {158, 4},
+ {160, 4},
};
static arc arcs_69_8[1] = {
- {161, 4},
+ {163, 4},
};
static state states_69[9] = {
{10, arcs_69_0},
@@ -1522,24 +1575,24 @@
{1, arcs_69_8},
};
static arc arcs_70_0[2] = {
- {98, 1},
- {51, 1},
+ {99, 1},
+ {52, 1},
};
static arc arcs_70_1[3] = {
- {167, 2},
- {32, 3},
+ {169, 2},
+ {33, 3},
{0, 1},
};
static arc arcs_70_2[1] = {
{0, 2},
};
static arc arcs_70_3[3] = {
- {98, 4},
- {51, 4},
+ {99, 4},
+ {52, 4},
{0, 3},
};
static arc arcs_70_4[2] = {
- {32, 3},
+ {33, 3},
{0, 4},
};
static state states_70[5] = {
@@ -1551,15 +1604,15 @@
};
static arc arcs_71_0[3] = {
{13, 1},
- {157, 2},
- {82, 3},
+ {159, 2},
+ {83, 3},
};
static arc arcs_71_1[2] = {
{14, 4},
{15, 5},
};
static arc arcs_71_2[1] = {
- {168, 6},
+ {170, 6},
};
static arc arcs_71_3[1] = {
{23, 5},
@@ -1571,7 +1624,7 @@
{0, 5},
};
static arc arcs_71_6[1] = {
- {158, 5},
+ {160, 5},
};
static state states_71[7] = {
{3, arcs_71_0},
@@ -1583,14 +1636,14 @@
{1, arcs_71_6},
};
static arc arcs_72_0[1] = {
- {169, 1},
+ {171, 1},
};
static arc arcs_72_1[2] = {
- {32, 2},
+ {33, 2},
{0, 1},
};
static arc arcs_72_2[2] = {
- {169, 1},
+ {171, 1},
{0, 2},
};
static state states_72[3] = {
@@ -1608,11 +1661,11 @@
};
static arc arcs_73_2[3] = {
{26, 3},
- {170, 4},
+ {172, 4},
{0, 2},
};
static arc arcs_73_3[2] = {
- {170, 4},
+ {172, 4},
{0, 3},
};
static arc arcs_73_4[1] = {
@@ -1641,16 +1694,16 @@
{1, arcs_74_2},
};
static arc arcs_75_0[2] = {
- {109, 1},
- {51, 1},
+ {111, 1},
+ {52, 1},
};
static arc arcs_75_1[2] = {
- {32, 2},
+ {33, 2},
{0, 1},
};
static arc arcs_75_2[3] = {
- {109, 1},
- {51, 1},
+ {111, 1},
+ {52, 1},
{0, 2},
};
static state states_75[3] = {
@@ -1662,7 +1715,7 @@
{26, 1},
};
static arc arcs_76_1[2] = {
- {32, 2},
+ {33, 2},
{0, 1},
};
static arc arcs_76_2[2] = {
@@ -1676,21 +1729,21 @@
};
static arc arcs_77_0[3] = {
{26, 1},
- {34, 2},
- {51, 3},
+ {35, 2},
+ {52, 3},
};
static arc arcs_77_1[4] = {
{27, 4},
- {167, 5},
- {32, 6},
+ {169, 5},
+ {33, 6},
{0, 1},
};
static arc arcs_77_2[1] = {
- {109, 7},
+ {111, 7},
};
static arc arcs_77_3[3] = {
- {167, 5},
- {32, 6},
+ {169, 5},
+ {33, 6},
{0, 3},
};
static arc arcs_77_4[1] = {
@@ -1701,34 +1754,34 @@
};
static arc arcs_77_6[3] = {
{26, 8},
- {51, 8},
+ {52, 8},
{0, 6},
};
static arc arcs_77_7[3] = {
- {167, 5},
- {32, 9},
+ {169, 5},
+ {33, 9},
{0, 7},
};
static arc arcs_77_8[2] = {
- {32, 6},
+ {33, 6},
{0, 8},
};
static arc arcs_77_9[3] = {
{26, 10},
- {34, 11},
+ {35, 11},
{0, 9},
};
static arc arcs_77_10[1] = {
{27, 12},
};
static arc arcs_77_11[1] = {
- {109, 13},
+ {111, 13},
};
static arc arcs_77_12[1] = {
{26, 13},
};
static arc arcs_77_13[2] = {
- {32, 9},
+ {33, 9},
{0, 13},
};
static state states_77[14] = {
@@ -1748,7 +1801,7 @@
{2, arcs_77_13},
};
static arc arcs_78_0[1] = {
- {171, 1},
+ {173, 1},
};
static arc arcs_78_1[1] = {
{23, 2},
@@ -1762,7 +1815,7 @@
{15, 6},
};
static arc arcs_78_4[1] = {
- {28, 7},
+ {100, 7},
};
static arc arcs_78_5[1] = {
{15, 6},
@@ -1784,14 +1837,14 @@
{1, arcs_78_7},
};
static arc arcs_79_0[1] = {
- {172, 1},
+ {174, 1},
};
static arc arcs_79_1[2] = {
- {32, 2},
+ {33, 2},
{0, 1},
};
static arc arcs_79_2[2] = {
- {172, 1},
+ {174, 1},
{0, 2},
};
static state states_79[3] = {
@@ -1801,13 +1854,13 @@
};
static arc arcs_80_0[3] = {
{26, 1},
+ {35, 2},
{34, 2},
- {33, 2},
};
static arc arcs_80_1[4] = {
- {167, 3},
- {113, 2},
- {31, 2},
+ {169, 3},
+ {115, 2},
+ {32, 2},
{0, 1},
};
static arc arcs_80_2[1] = {
@@ -1823,8 +1876,8 @@
{1, arcs_80_3},
};
static arc arcs_81_0[2] = {
- {167, 1},
- {174, 1},
+ {169, 1},
+ {176, 1},
};
static arc arcs_81_1[1] = {
{0, 1},
@@ -1834,19 +1887,19 @@
{1, arcs_81_1},
};
static arc arcs_82_0[1] = {
- {102, 1},
+ {104, 1},
};
static arc arcs_82_1[1] = {
- {66, 2},
+ {67, 2},
};
static arc arcs_82_2[1] = {
- {103, 3},
+ {105, 3},
};
static arc arcs_82_3[1] = {
- {114, 4},
+ {116, 4},
};
static arc arcs_82_4[2] = {
- {173, 5},
+ {175, 5},
{0, 4},
};
static arc arcs_82_5[1] = {
@@ -1862,10 +1915,10 @@
};
static arc arcs_83_0[2] = {
{21, 1},
- {175, 2},
+ {177, 2},
};
static arc arcs_83_1[1] = {
- {175, 2},
+ {177, 2},
};
static arc arcs_83_2[1] = {
{0, 2},
@@ -1876,13 +1929,13 @@
{1, arcs_83_2},
};
static arc arcs_84_0[1] = {
- {97, 1},
+ {98, 1},
};
static arc arcs_84_1[1] = {
- {116, 2},
+ {118, 2},
};
static arc arcs_84_2[2] = {
- {173, 3},
+ {175, 3},
{0, 2},
};
static arc arcs_84_3[1] = {
@@ -1905,10 +1958,10 @@
{1, arcs_85_1},
};
static arc arcs_86_0[1] = {
- {177, 1},
+ {179, 1},
};
static arc arcs_86_1[2] = {
- {178, 2},
+ {180, 2},
{0, 1},
};
static arc arcs_86_2[1] = {
@@ -1920,8 +1973,8 @@
{1, arcs_86_2},
};
static arc arcs_87_0[2] = {
- {77, 1},
- {47, 2},
+ {78, 1},
+ {48, 2},
};
static arc arcs_87_1[1] = {
{26, 2},
@@ -1934,13 +1987,148 @@
{1, arcs_87_1},
{1, arcs_87_2},
};
-static dfa dfas[88] = {
+static arc arcs_88_0[2] = {
+ {3, 1},
+ {2, 2},
+};
+static arc arcs_88_1[1] = {
+ {0, 1},
+};
+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[7] = {
+ {2, arcs_88_0},
+ {1, arcs_88_1},
+ {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},
+};
+static arc arcs_89_1[2] = {
+ {2, 1},
+ {7, 2},
+};
+static arc arcs_89_2[1] = {
+ {0, 2},
+};
+static state states_89[3] = {
+ {1, arcs_89_0},
+ {2, arcs_89_1},
+ {1, arcs_89_2},
+};
+static arc arcs_90_0[1] = {
+ {13, 1},
+};
+static arc arcs_90_1[2] = {
+ {183, 2},
+ {15, 3},
+};
+static arc arcs_90_2[1] = {
+ {15, 3},
+};
+static arc arcs_90_3[1] = {
+ {25, 4},
+};
+static arc arcs_90_4[1] = {
+ {26, 5},
+};
+static arc arcs_90_5[1] = {
+ {0, 5},
+};
+static state states_90[6] = {
+ {1, arcs_90_0},
+ {2, arcs_90_1},
+ {1, arcs_90_2},
+ {1, arcs_90_3},
+ {1, arcs_90_4},
+ {1, arcs_90_5},
+};
+static arc arcs_91_0[3] = {
+ {26, 1},
+ {34, 2},
+ {35, 3},
+};
+static arc arcs_91_1[2] = {
+ {33, 4},
+ {0, 1},
+};
+static arc arcs_91_2[3] = {
+ {26, 5},
+ {33, 6},
+ {0, 2},
+};
+static arc arcs_91_3[1] = {
+ {26, 7},
+};
+static arc arcs_91_4[4] = {
+ {26, 1},
+ {34, 8},
+ {35, 3},
+ {0, 4},
+};
+static arc arcs_91_5[2] = {
+ {33, 6},
+ {0, 5},
+};
+static arc arcs_91_6[2] = {
+ {26, 5},
+ {35, 3},
+};
+static arc arcs_91_7[1] = {
+ {0, 7},
+};
+static arc arcs_91_8[3] = {
+ {26, 9},
+ {33, 10},
+ {0, 8},
+};
+static arc arcs_91_9[2] = {
+ {33, 10},
+ {0, 9},
+};
+static arc arcs_91_10[2] = {
+ {26, 9},
+ {35, 3},
+};
+static state states_91[11] = {
+ {3, arcs_91_0},
+ {2, arcs_91_1},
+ {3, arcs_91_2},
+ {1, arcs_91_3},
+ {4, arcs_91_4},
+ {2, arcs_91_5},
+ {2, arcs_91_6},
+ {1, arcs_91_7},
+ {3, arcs_91_8},
+ {2, arcs_91_9},
+ {2, arcs_91_10},
+};
+static dfa dfas[92] = {
{256, "single_input", 0, 3, states_0,
- "\004\050\340\000\002\000\000\000\012\076\011\007\142\011\100\010\000\000\103\242\174\010\002"},
+ "\004\050\340\000\004\000\000\000\024\174\022\016\204\045\000\041\000\000\014\211\362\041\010"},
{257, "file_input", 0, 2, states_1,
- "\204\050\340\000\002\000\000\000\012\076\011\007\142\011\100\010\000\000\103\242\174\010\002"},
+ "\204\050\340\000\004\000\000\000\024\174\022\016\204\045\000\041\000\000\014\211\362\041\010"},
{258, "eval_input", 0, 3, states_2,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{259, "decorator", 0, 7, states_3,
"\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{260, "decorators", 0, 2, states_4,
@@ -1949,54 +2137,54 @@
"\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{262, "async_funcdef", 0, 3, states_6,
"\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {263, "funcdef", 0, 8, states_7,
+ {263, "funcdef", 0, 9, states_7,
"\000\000\100\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{264, "parameters", 0, 4, states_8,
"\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {265, "typedargslist", 0, 19, states_9,
- "\000\000\200\000\006\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {265, "typedargslist", 0, 23, states_9,
+ "\000\000\200\000\014\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{266, "tfpdef", 0, 4, states_10,
"\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{267, "varargslist", 0, 19, states_11,
- "\000\000\200\000\006\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\200\000\014\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{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\002\000\000\000\012\076\011\007\142\011\100\010\000\000\103\242\174\010\002"},
+ "\000\050\340\000\004\000\000\000\024\174\022\016\204\045\000\041\000\000\014\211\362\041\010"},
{270, "simple_stmt", 0, 4, states_14,
- "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\100\010\000\000\103\242\174\000\002"},
+ "\000\040\200\000\004\000\000\000\024\174\022\016\000\000\000\041\000\000\014\211\362\001\010"},
{271, "small_stmt", 0, 2, states_15,
- "\000\040\200\000\002\000\000\000\012\076\011\007\000\000\100\010\000\000\103\242\174\000\002"},
+ "\000\040\200\000\004\000\000\000\024\174\022\016\000\000\000\041\000\000\014\211\362\001\010"},
{272, "expr_stmt", 0, 6, states_16,
- "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{273, "annassign", 0, 5, states_17,
"\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{274, "testlist_star_expr", 0, 3, states_18,
- "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{275, "augassign", 0, 2, states_19,
- "\000\000\000\000\000\000\360\377\001\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\340\377\003\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{276, "del_stmt", 0, 3, states_20,
- "\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{277, "pass_stmt", 0, 2, states_21,
- "\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{278, "flow_stmt", 0, 2, states_22,
- "\000\000\000\000\000\000\000\000\000\036\000\000\000\000\000\000\000\000\000\000\000\000\002"},
+ "\000\000\000\000\000\000\000\000\000\074\000\000\000\000\000\000\000\000\000\000\000\000\010"},
{279, "break_stmt", 0, 2, states_23,
- "\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {280, "continue_stmt", 0, 2, states_24,
"\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {281, "return_stmt", 0, 3, states_25,
+ {280, "continue_stmt", 0, 2, states_24,
"\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000\000\000"},
- {282, "yield_stmt", 0, 2, states_26,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"},
- {283, "raise_stmt", 0, 5, states_27,
+ {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"},
- {284, "import_stmt", 0, 2, states_28,
- "\000\000\000\000\000\000\000\000\000\040\001\000\000\000\000\000\000\000\000\000\000\000\000"},
- {285, "import_name", 0, 3, states_29,
- "\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000\000"},
- {286, "import_from", 0, 8, states_30,
+ {282, "yield_stmt", 0, 2, states_26,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010"},
+ {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"},
+ {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"},
{288, "dotted_as_name", 0, 4, states_32,
@@ -2008,111 +2196,119 @@
{291, "dotted_name", 0, 2, states_35,
"\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{292, "global_stmt", 0, 3, states_36,
- "\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000\000\000"},
- {293, "nonlocal_stmt", 0, 3, states_37,
"\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000"},
- {294, "assert_stmt", 0, 5, states_38,
+ {293, "nonlocal_stmt", 0, 3, states_37,
"\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000"},
+ {294, "assert_stmt", 0, 5, states_38,
+ "\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000\000\000"},
{295, "compound_stmt", 0, 2, states_39,
- "\000\010\140\000\000\000\000\000\000\000\000\000\142\011\000\000\000\000\000\000\000\010\000"},
+ "\000\010\140\000\000\000\000\000\000\000\000\000\204\045\000\000\000\000\000\000\000\040\000"},
{296, "async_stmt", 0, 3, states_40,
"\000\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{297, "if_stmt", 0, 8, states_41,
- "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000"},
{298, "while_stmt", 0, 8, states_42,
- "\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000\000"},
- {299, "for_stmt", 0, 10, states_43,
- "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000"},
- {300, "try_stmt", 0, 13, states_44,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\000\000\000\000\000\000\000\000"},
+ {299, "for_stmt", 0, 11, states_43,
"\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
- {301, "with_stmt", 0, 5, states_45,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\000"},
+ {300, "try_stmt", 0, 13, states_44,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000"},
+ {301, "with_stmt", 0, 6, states_45,
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000\000\000\000\000\000\000\000\000"},
{302, "with_item", 0, 4, states_46,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{303, "except_clause", 0, 5, states_47,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000"},
{304, "suite", 0, 5, states_48,
- "\004\040\200\000\002\000\000\000\012\076\011\007\000\000\100\010\000\000\103\242\174\000\002"},
+ "\004\040\200\000\004\000\000\000\024\174\022\016\000\000\000\041\000\000\014\211\362\001\010"},
{305, "namedexpr_test", 0, 4, states_49,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{306, "test", 0, 6, states_50,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\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_nocond", 0, 2, states_51,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{308, "lambdef", 0, 5, states_52,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"},
{309, "lambdef_nocond", 0, 5, states_53,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000"},
{310, "or_test", 0, 2, states_54,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\040\000\000\014\211\362\001\000"},
{311, "and_test", 0, 2, states_55,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\040\000\000\014\211\362\001\000"},
{312, "not_test", 0, 3, states_56,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\040\000\000\014\211\362\001\000"},
{313, "comparison", 0, 2, states_57,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
{314, "comp_op", 0, 4, states_58,
- "\000\000\000\000\000\000\000\000\000\000\000\000\200\000\000\310\077\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\002\000\040\377\000\000\000\000\000\000"},
{315, "star_expr", 0, 3, states_59,
- "\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{316, "expr", 0, 2, states_60,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
{317, "xor_expr", 0, 2, states_61,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
{318, "and_expr", 0, 2, states_62,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
{319, "shift_expr", 0, 2, states_63,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
{320, "arith_expr", 0, 2, states_64,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
{321, "term", 0, 2, states_65,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
{322, "factor", 0, 3, states_66,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
{323, "power", 0, 4, states_67,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\210\362\001\000"},
{324, "atom_expr", 0, 3, states_68,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\242\174\000\000"},
+ "\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", 0, 9, states_69,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\240\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\000\000\000\000\200\362\001\000"},
{326, "testlist_comp", 0, 5, states_70,
- "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{327, "trailer", 0, 7, states_71,
- "\000\040\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\040\000\000\000"},
+ "\000\040\000\000\000\000\000\000\000\000\010\000\000\000\000\000\000\000\000\200\000\000\000"},
{328, "subscriptlist", 0, 3, states_72,
- "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\010\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{329, "subscript", 0, 5, states_73,
- "\000\040\200\010\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\010\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{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"},
{331, "exprlist", 0, 3, states_75,
- "\000\040\200\000\002\000\000\000\000\000\010\000\000\000\000\000\000\000\103\242\174\000\000"},
+ "\000\040\200\000\004\000\000\000\000\000\020\000\000\000\000\000\000\000\014\211\362\001\000"},
{332, "testlist", 0, 3, states_76,
- "\000\040\200\000\000\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\000\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{333, "dictorsetmaker", 0, 14, states_77,
- "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{334, "classdef", 0, 8, states_78,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010\000"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\040\000"},
{335, "arglist", 0, 3, states_79,
- "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{336, "argument", 0, 4, states_80,
- "\000\040\200\000\006\000\000\000\000\000\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
{337, "comp_iter", 0, 2, states_81,
- "\000\000\040\000\000\000\000\000\000\000\000\000\102\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\040\000\000\000\000\000\000\000\000\000\004\001\000\000\000\000\000\000\000\000\000"},
{338, "sync_comp_for", 0, 6, states_82,
- "\000\000\000\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
{339, "comp_for", 0, 3, states_83,
- "\000\000\040\000\000\000\000\000\000\000\000\000\100\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\040\000\000\000\000\000\000\000\000\000\000\001\000\000\000\000\000\000\000\000\000"},
{340, "comp_if", 0, 4, states_84,
- "\000\000\000\000\000\000\000\000\000\000\000\000\002\000\000\000\000\000\000\000\000\000\000"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\004\000\000\000\000\000\000\000\000\000\000"},
{341, "encoding_decl", 0, 2, states_85,
"\000\000\200\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
{342, "yield_expr", 0, 3, states_86,
- "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\002"},
+ "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\010"},
{343, "yield_arg", 0, 3, states_87,
- "\000\040\200\000\002\000\000\000\000\040\010\000\000\000\100\010\000\000\103\242\174\000\000"},
+ "\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,
+ "\000\040\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"},
+ {347, "typelist", 0, 11, states_91,
+ "\000\040\200\000\014\000\000\000\000\000\020\000\000\000\000\041\000\000\014\211\362\001\000"},
};
-static label labels[179] = {
+static label labels[184] = {
{0, "EMPTY"},
{256, 0},
{4, 0},
@@ -2141,7 +2337,8 @@
{51, 0},
{306, 0},
{11, 0},
- {304, 0},
+ {56, 0},
+ {344, 0},
{265, 0},
{266, 0},
{22, 0},
@@ -2212,6 +2409,7 @@
{296, 0},
{1, "if"},
{305, 0},
+ {304, 0},
{1, "elif"},
{1, "else"},
{1, "while"},
@@ -2292,10 +2490,13 @@
{341, 0},
{1, "yield"},
{343, 0},
+ {345, 0},
+ {346, 0},
+ {347, 0},
};
grammar _PyParser_Grammar = {
- 88,
+ 92,
dfas,
- {179, labels},
+ {184, labels},
256
};
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 9b6371d..c7a622c 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -158,6 +158,8 @@
parser_flags |= PyPARSE_IGNORE_COOKIE;
if (flags->cf_flags & CO_FUTURE_BARRY_AS_BDFL)
parser_flags |= PyPARSE_BARRY_AS_BDFL;
+ if (flags->cf_flags & PyCF_TYPE_COMMENTS)
+ parser_flags |= PyPARSE_TYPE_COMMENTS;
return parser_flags;
}