summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2008-10-19 08:27:43 (GMT)
committerArmin Ronacher <armin.ronacher@active-4.com>2008-10-19 08:27:43 (GMT)
commit35e01fbeaab6a1d7ce63b974677b823a7e3228ff (patch)
tree760a527d869ee9821d66b68f3ba403b088cab041
parent92b70bcc6e469e001616fadc5f7be125a90b6c63 (diff)
downloadcpython-35e01fbeaab6a1d7ce63b974677b823a7e3228ff.zip
cpython-35e01fbeaab6a1d7ce63b974677b823a7e3228ff.tar.gz
cpython-35e01fbeaab6a1d7ce63b974677b823a7e3228ff.tar.bz2
Fixed #4067 by implementing _attributes and _fields for the AST root node.
-rwxr-xr-xParser/asdl_c.py18
-rw-r--r--Python/Python-ast.c18
2 files changed, 36 insertions, 0 deletions
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 4613500..46688a3 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -824,12 +824,30 @@ static int obj2ast_bool(PyObject* obj, bool* out, PyArena* arena)
return 0;
}
+static int add_ast_fields()
+{
+ PyObject *empty_tuple, *d;
+ if (PyType_Ready(&AST_type) < 0)
+ return -1;
+ d = AST_type.tp_dict;
+ empty_tuple = PyTuple_New(0);
+ if (!empty_tuple ||
+ PyDict_SetItemString(d, "_fields", empty_tuple) < 0 ||
+ PyDict_SetItemString(d, "_attributes", empty_tuple) < 0) {
+ Py_XDECREF(empty_tuple);
+ return -1;
+ }
+ Py_DECREF(empty_tuple);
+ return 0;
+}
+
""", 0, reflow=False)
self.emit("static int init_types(void)",0)
self.emit("{", 0)
self.emit("static int initialized;", 1)
self.emit("if (initialized) return 1;", 1)
+ self.emit("if (add_ast_fields() < 0) return 0;", 1)
for dfn in mod.dfns:
self.visit(dfn)
self.emit("initialized = 1;", 1)
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 1c78515..cabc666 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -615,11 +615,29 @@ static int obj2ast_bool(PyObject* obj, bool* out, PyArena* arena)
return 0;
}
+static int add_ast_fields()
+{
+ PyObject *empty_tuple, *d;
+ if (PyType_Ready(&AST_type) < 0)
+ return -1;
+ d = AST_type.tp_dict;
+ empty_tuple = PyTuple_New(0);
+ if (!empty_tuple ||
+ PyDict_SetItemString(d, "_fields", empty_tuple) < 0 ||
+ PyDict_SetItemString(d, "_attributes", empty_tuple) < 0) {
+ Py_XDECREF(empty_tuple);
+ return -1;
+ }
+ Py_DECREF(empty_tuple);
+ return 0;
+}
+
static int init_types(void)
{
static int initialized;
if (initialized) return 1;
+ if (add_ast_fields() < 0) return 0;
mod_type = make_type("mod", &AST_type, NULL, 0);
if (!mod_type) return 0;
if (!add_attributes(mod_type, NULL, 0)) return 0;