Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum.

diff --git a/Include/Python-ast.h b/Include/Python-ast.h
index f1052675c027fd53d771034adcd26fdf946a3f62..3210fc7ba91d7adba8fc5cd8f71035dd4bd929e8 100644 (file)
--- a/Include/Python-ast.h
+++ b/Include/Python-ast.h
@@ -324,10 +324,17 @@ struct _comprehension {
         asdl_seq *ifs;
 };
 
+enum _excepthandler_kind {ExceptHandler_kind=1};
 struct _excepthandler {
-        expr_ty type;
-        expr_ty name;
-        asdl_seq *body;
+        enum _excepthandler_kind kind;
+        union {
+                struct {
+                        expr_ty type;
+                        expr_ty name;
+                        asdl_seq *body;
+                } ExceptHandler;
+                
+        } v;
         int lineno;
         int col_offset;
 };
@@ -489,8 +496,8 @@ slice_ty _Py_Index(expr_ty value, PyArena *arena);
 #define comprehension(a0, a1, a2, a3) _Py_comprehension(a0, a1, a2, a3)
 comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq *
                                    ifs, PyArena *arena);
-#define excepthandler(a0, a1, a2, a3, a4, a5) _Py_excepthandler(a0, a1, a2, a3, a4, a5)
-excepthandler_ty _Py_excepthandler(expr_ty type, expr_ty name, asdl_seq * body,
+#define ExceptHandler(a0, a1, a2, a3, a4, a5) _Py_ExceptHandler(a0, a1, a2, a3, a4, a5)
+excepthandler_ty _Py_ExceptHandler(expr_ty type, expr_ty name, asdl_seq * body,
                                    int lineno, int col_offset, PyArena *arena);
 #define arguments(a0, a1, a2, a3, a4) _Py_arguments(a0, a1, a2, a3, a4)
 arguments_ty _Py_arguments(asdl_seq * args, identifier vararg, identifier

diff --git a/Parser/Python.asdl b/Parser/Python.asdl
index 250e9ac7e2e16d656f193df402b81c7c56faae57..a4394c9adfc7068dabd62a76c9f295517bc700a4 100644 (file)
--- a/Parser/Python.asdl
+++ b/Parser/Python.asdl
@@ -98,11 +98,8 @@ module Python version "$Revision$"
        comprehension = (expr target, expr iter, expr* ifs)
 
        -- not sure what to call the first argument for raise and except
-       -- TODO(jhylton): Figure out if there is a better way to handle
-       --                lineno and col_offset fields, particularly when
-        --                ast is exposed to Python.
-       excepthandler = (expr? type, expr? name, stmt* body, int lineno,
-                        int col_offset)
+       excepthandler = ExceptHandler(expr? type, expr? name, stmt* body)
+                       attributes (int lineno, int col_offset)
 
        arguments = (expr* args, identifier? vararg, 
                     identifier? kwarg, expr* defaults)

diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 0703d515e8da8e05457ab658671e5102176f582a..96049a43825d7e8ac5e8c37b856baf76f11c890a 100644 (file)
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -336,13 +336,16 @@ static char *comprehension_fields[]={
         "ifs",
 };
 static PyTypeObject *excepthandler_type;
+static char *excepthandler_attributes[] = {
+        "lineno",
+        "col_offset",
+};
 static PyObject* ast2obj_excepthandler(void*);
-static char *excepthandler_fields[]={
+static PyTypeObject *ExceptHandler_type;
+static char *ExceptHandler_fields[]={
         "type",
         "name",
         "body",
-        "lineno",
-        "col_offset",
 };
 static PyTypeObject *arguments_type;
 static PyObject* ast2obj_arguments(void*);
@@ -776,9 +779,13 @@ static int init_types(void)
         comprehension_type = make_type("comprehension", AST_type,
                                        comprehension_fields, 3);
         if (!comprehension_type) return 0;
-        excepthandler_type = make_type("excepthandler", AST_type,
-                                       excepthandler_fields, 5);
+        excepthandler_type = make_type("excepthandler", AST_type, NULL, 0);
         if (!excepthandler_type) return 0;
+        if (!add_attributes(excepthandler_type, excepthandler_attributes, 2))
+            return 0;
+        ExceptHandler_type = make_type("ExceptHandler", excepthandler_type,
+                                       ExceptHandler_fields, 3);
+        if (!ExceptHandler_type) return 0;
         arguments_type = make_type("arguments", AST_type, arguments_fields, 4);
         if (!arguments_type) return 0;
         keyword_type = make_type("keyword", AST_type, keyword_fields, 2);
@@ -1825,16 +1832,17 @@ comprehension(expr_ty target, expr_ty iter, asdl_seq * ifs, PyArena *arena)
 }
 
 excepthandler_ty
-excepthandler(expr_ty type, expr_ty name, asdl_seq * body, int lineno, int
+ExceptHandler(expr_ty type, expr_ty name, asdl_seq * body, int lineno, int
               col_offset, PyArena *arena)
 {
         excepthandler_ty p;
         p = (excepthandler_ty)PyArena_Malloc(arena, sizeof(*p));
         if (!p)
                 return NULL;
-        p->type = type;
-        p->name = name;
-        p->body = body;
+        p->kind = ExceptHandler_kind;
+        p->v.ExceptHandler.type = type;
+        p->v.ExceptHandler.name = name;
+        p->v.ExceptHandler.body = body;
         p->lineno = lineno;
         p->col_offset = col_offset;
         return p;
@@ -2901,31 +2909,35 @@ ast2obj_excepthandler(void* _o)
                 return Py_None;
         }
 
-        result = PyType_GenericNew(excepthandler_type, NULL, NULL);
-        if (!result) return NULL;
-        value = ast2obj_expr(o->type);
-        if (!value) goto failed;
-        if (PyObject_SetAttrString(result, "type", value) == -1)
-                goto failed;
-        Py_DECREF(value);
-        value = ast2obj_expr(o->name);
-        if (!value) goto failed;
-        if (PyObject_SetAttrString(result, "name", value) == -1)
-                goto failed;
-        Py_DECREF(value);
-        value = ast2obj_list(o->body, ast2obj_stmt);
-        if (!value) goto failed;
-        if (PyObject_SetAttrString(result, "body", value) == -1)
-                goto failed;
-        Py_DECREF(value);
+        switch (o->kind) {
+        case ExceptHandler_kind:
+                result = PyType_GenericNew(ExceptHandler_type, NULL, NULL);
+                if (!result) goto failed;
+                value = ast2obj_expr(o->v.ExceptHandler.type);
+                if (!value) goto failed;
+                if (PyObject_SetAttrString(result, "type", value) == -1)
+                        goto failed;
+                Py_DECREF(value);
+                value = ast2obj_expr(o->v.ExceptHandler.name);
+                if (!value) goto failed;
+                if (PyObject_SetAttrString(result, "name", value) == -1)
+                        goto failed;
+                Py_DECREF(value);
+                value = ast2obj_list(o->v.ExceptHandler.body, ast2obj_stmt);
+                if (!value) goto failed;
+                if (PyObject_SetAttrString(result, "body", value) == -1)
+                        goto failed;
+                Py_DECREF(value);
+                break;
+        }
         value = ast2obj_int(o->lineno);
         if (!value) goto failed;
-        if (PyObject_SetAttrString(result, "lineno", value) == -1)
+        if (PyObject_SetAttrString(result, "lineno", value) < 0)
                 goto failed;
         Py_DECREF(value);
         value = ast2obj_int(o->col_offset);
         if (!value) goto failed;
-        if (PyObject_SetAttrString(result, "col_offset", value) == -1)
+        if (PyObject_SetAttrString(result, "col_offset", value) < 0)
                 goto failed;
         Py_DECREF(value);
         return result;
@@ -5534,58 +5546,13 @@ int
 obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
 {
         PyObject* tmp = NULL;
-        expr_ty type;
-        expr_ty name;
-        asdl_seq* body;
+
         int lineno;
         int col_offset;
 
-        if (PyObject_HasAttrString(obj, "type")) {
-                int res;
-                tmp = PyObject_GetAttrString(obj, "type");
-                if (tmp == NULL) goto failed;
-                res = obj2ast_expr(tmp, &type, arena);
-                if (res != 0) goto failed;
-                Py_XDECREF(tmp);
-                tmp = NULL;
-        } else {
-                type = NULL;
-        }
-        if (PyObject_HasAttrString(obj, "name")) {
-                int res;
-                tmp = PyObject_GetAttrString(obj, "name");
-                if (tmp == NULL) goto failed;
-                res = obj2ast_expr(tmp, &name, arena);
-                if (res != 0) goto failed;
-                Py_XDECREF(tmp);
-                tmp = NULL;
-        } else {
-                name = NULL;
-        }
-        if (PyObject_HasAttrString(obj, "body")) {
-                int res;
-                Py_ssize_t len;
-                Py_ssize_t i;
-                tmp = PyObject_GetAttrString(obj, "body");
-                if (tmp == NULL) goto failed;
-                if (!PyList_Check(tmp)) {
-                        PyErr_Format(PyExc_TypeError, "excepthandler field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
-                        goto failed;
-                }
-                len = PyList_GET_SIZE(tmp);
-                body = asdl_seq_new(len, arena);
-                if (body == NULL) goto failed;
-                for (i = 0; i < len; i++) {
-                        stmt_ty value;
-                        res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
-                        if (res != 0) goto failed;
-                        asdl_seq_SET(body, i, value);
-                }
-                Py_XDECREF(tmp);
-                tmp = NULL;
-        } else {
-                PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from excepthandler");
-                return 1;
+        if (obj == Py_None) {
+                *out = NULL;
+                return 0;
         }
         if (PyObject_HasAttrString(obj, "lineno")) {
                 int res;
@@ -5611,8 +5578,67 @@ obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
                 PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from excepthandler");
                 return 1;
         }
-        *out = excepthandler(type, name, body, lineno, col_offset, arena);
-        return 0;
+        if (PyObject_IsInstance(obj, (PyObject*)ExceptHandler_type)) {
+                expr_ty type;
+                expr_ty name;
+                asdl_seq* body;
+
+                if (PyObject_HasAttrString(obj, "type")) {
+                        int res;
+                        tmp = PyObject_GetAttrString(obj, "type");
+                        if (tmp == NULL) goto failed;
+                        res = obj2ast_expr(tmp, &type, arena);
+                        if (res != 0) goto failed;
+                        Py_XDECREF(tmp);
+                        tmp = NULL;
+                } else {
+                        type = NULL;
+                }
+                if (PyObject_HasAttrString(obj, "name")) {
+                        int res;
+                        tmp = PyObject_GetAttrString(obj, "name");
+                        if (tmp == NULL) goto failed;
+                        res = obj2ast_expr(tmp, &name, arena);
+                        if (res != 0) goto failed;
+                        Py_XDECREF(tmp);
+                        tmp = NULL;
+                } else {
+                        name = NULL;
+                }
+                if (PyObject_HasAttrString(obj, "body")) {
+                        int res;
+                        Py_ssize_t len;
+                        Py_ssize_t i;
+                        tmp = PyObject_GetAttrString(obj, "body");
+                        if (tmp == NULL) goto failed;
+                        if (!PyList_Check(tmp)) {
+                                PyErr_Format(PyExc_TypeError, "ExceptHandler field \"body\" must be a list, not a %.200s", tmp->ob_type->tp_name);
+                                goto failed;
+                        }
+                        len = PyList_GET_SIZE(tmp);
+                        body = asdl_seq_new(len, arena);
+                        if (body == NULL) goto failed;
+                        for (i = 0; i < len; i++) {
+                                stmt_ty value;
+                                res = obj2ast_stmt(PyList_GET_ITEM(tmp, i), &value, arena);
+                                if (res != 0) goto failed;
+                                asdl_seq_SET(body, i, value);
+                        }
+                        Py_XDECREF(tmp);
+                        tmp = NULL;
+                } else {
+                        PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from ExceptHandler");
+                        return 1;
+                }
+                *out = ExceptHandler(type, name, body, lineno, col_offset,
+                                     arena);
+                if (*out == NULL) goto failed;
+                return 0;
+        }
+
+        tmp = PyObject_Repr(obj);
+        if (tmp == NULL) goto failed;
+        PyErr_Format(PyExc_TypeError, "expected some sort of excepthandler, but got %.400s", PyString_AS_STRING(tmp));
 failed:
         Py_XDECREF(tmp);
         return 1;
@@ -5930,6 +5956,8 @@ init_ast(void)
             (PyObject*)comprehension_type) < 0) return;
         if (PyDict_SetItemString(d, "excepthandler",
             (PyObject*)excepthandler_type) < 0) return;
+        if (PyDict_SetItemString(d, "ExceptHandler",
+            (PyObject*)ExceptHandler_type) < 0) return;
         if (PyDict_SetItemString(d, "arguments", (PyObject*)arguments_type) <
             0) return;
         if (PyDict_SetItemString(d, "keyword", (PyObject*)keyword_type) < 0)

diff --git a/Python/ast.c b/Python/ast.c
index bc918054fda4888a51164fbd0ebc80f903e3f693..cf9a06aa9e8b10cfe508124b6463345210c1c791 100644 (file)
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -2830,7 +2830,7 @@ ast_for_except_clause(struct compiling *c, const node *exc, node *body)
         if (!suite_seq)
             return NULL;
 
-        return excepthandler(NULL, NULL, suite_seq, LINENO(exc),
+        return ExceptHandler(NULL, NULL, suite_seq, LINENO(exc),
                              exc->n_col_offset, c->c_arena);
     }
     else if (NCH(exc) == 2) {
@@ -2844,7 +2844,7 @@ ast_for_except_clause(struct compiling *c, const node *exc, node *body)
         if (!suite_seq)
             return NULL;
 
-        return excepthandler(expression, NULL, suite_seq, LINENO(exc),
+        return ExceptHandler(expression, NULL, suite_seq, LINENO(exc),
                              exc->n_col_offset, c->c_arena);
     }
     else if (NCH(exc) == 4) {
@@ -2862,7 +2862,7 @@ ast_for_except_clause(struct compiling *c, const node *exc, node *body)
         if (!suite_seq)
             return NULL;
 
-        return excepthandler(expression, e, suite_seq, LINENO(exc),
+        return ExceptHandler(expression, e, suite_seq, LINENO(exc),
                              exc->n_col_offset, c->c_arena);
     }
 

diff --git a/Python/compile.c b/Python/compile.c
index ae1f0da89761a4ed334156367237f03e4a7cc46d..c81218d0326cb647897ae35f657ba942c506cc8e 100644 (file)
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1855,32 +1855,32 @@ compiler_try_except(struct compiler *c, stmt_ty s)
        for (i = 0; i < n; i++) {
                excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET(
                                                s->v.TryExcept.handlers, i);
-               if (!handler->type && i < n-1)
+               if (!handler->v.ExceptHandler.type && i < n-1)
                    return compiler_error(c, "default 'except:' must be last");
                c->u->u_lineno_set = false;
                c->u->u_lineno = handler->lineno;
                except = compiler_new_block(c);
                if (except == NULL)
                        return 0;
-               if (handler->type) {
+               if (handler->v.ExceptHandler.type) {
                        ADDOP(c, DUP_TOP);
-                       VISIT(c, expr, handler->type);
+                       VISIT(c, expr, handler->v.ExceptHandler.type);
                        ADDOP_I(c, COMPARE_OP, PyCmp_EXC_MATCH);
                        ADDOP_JREL(c, JUMP_IF_FALSE, except);
                        ADDOP(c, POP_TOP);
                }
                ADDOP(c, POP_TOP);
-               if (handler->name) {
-                       VISIT(c, expr, handler->name);
+               if (handler->v.ExceptHandler.name) {
+                       VISIT(c, expr, handler->v.ExceptHandler.name);
                }
                else {
                        ADDOP(c, POP_TOP);
                }
                ADDOP(c, POP_TOP);
-               VISIT_SEQ(c, stmt, handler->body);
+               VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
                ADDOP_JREL(c, JUMP_FORWARD, end);
                compiler_use_next_block(c, except);
-               if (handler->type)
+               if (handler->v.ExceptHandler.type)
                        ADDOP(c, POP_TOP);
        }
        ADDOP(c, END_FINALLY);

diff --git a/Python/symtable.c b/Python/symtable.c
index 6318324d5c9b5bbbf4a216f41b55610aca0b3d18..cc3c774e6f6c859ea16aaa12b079af6404e5d081 100644 (file)
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1308,11 +1308,11 @@ symtable_visit_arguments(struct symtable *st, arguments_ty a)
 static int 
 symtable_visit_excepthandler(struct symtable *st, excepthandler_ty eh)
 {
-       if (eh->type)
-               VISIT(st, expr, eh->type);
-       if (eh->name)
-               VISIT(st, expr, eh->name);
-       VISIT_SEQ(st, stmt, eh->body);
+       if (eh->v.ExceptHandler.type)
+               VISIT(st, expr, eh->v.ExceptHandler.type);
+       if (eh->v.ExceptHandler.name)
+               VISIT(st, expr, eh->v.ExceptHandler.name);
+       VISIT_SEQ(st, stmt, eh->v.ExceptHandler.body);
        return 1;
 }