mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Georg Brandl 2008-03-30 06:40:17 +00:00
parent c15317efcd
commit a48f3ab895
6 changed files with 136 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Include/Python-ast.h
View file

@ -324,10 +324,17 @@ struct _comprehension {
asdl_seq *ifs; asdl_seq *ifs;
}; };
enum _excepthandler_kind {ExceptHandler_kind=1};
struct _excepthandler { struct _excepthandler {
expr_ty type; enum _excepthandler_kind kind;
expr_ty name; union {
asdl_seq *body; struct {
expr_ty type;
expr_ty name;
asdl_seq *body;
} ExceptHandler;
} v;
int lineno; int lineno;
int col_offset; 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) #define comprehension(a0, a1, a2, a3) _Py_comprehension(a0, a1, a2, a3)
comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq * comprehension_ty _Py_comprehension(expr_ty target, expr_ty iter, asdl_seq *
ifs, PyArena *arena); ifs, PyArena *arena);
#define excepthandler(a0, a1, a2, a3, a4, a5) _Py_excepthandler(a0, a1, a2, a3, a4, a5) #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, excepthandler_ty _Py_ExceptHandler(expr_ty type, expr_ty name, asdl_seq * body,
int lineno, int col_offset, PyArena *arena); int lineno, int col_offset, PyArena *arena);
#define arguments(a0, a1, a2, a3, a4) _Py_arguments(a0, a1, a2, a3, a4) #define arguments(a0, a1, a2, a3, a4) _Py_arguments(a0, a1, a2, a3, a4)
arguments_ty _Py_arguments(asdl_seq * args, identifier vararg, identifier arguments_ty _Py_arguments(asdl_seq * args, identifier vararg, identifier

7
Parser/Python.asdl
View file

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

186
Python/Python-ast.c
View file

@ -336,13 +336,16 @@ static char *comprehension_fields[]={
"ifs", "ifs",
}; };
static PyTypeObject *excepthandler_type; static PyTypeObject *excepthandler_type;
static char *excepthandler_attributes[] = {
"lineno",
"col_offset",
};
static PyObject* ast2obj_excepthandler(void*); static PyObject* ast2obj_excepthandler(void*);
static char *excepthandler_fields[]={ static PyTypeObject *ExceptHandler_type;
static char *ExceptHandler_fields[]={
"type", "type",
"name", "name",
"body", "body",
"lineno",
"col_offset",
}; };
static PyTypeObject *arguments_type; static PyTypeObject *arguments_type;
static PyObject* ast2obj_arguments(void*); static PyObject* ast2obj_arguments(void*);
@ -776,9 +779,13 @@ static int init_types(void)
comprehension_type = make_type("comprehension", AST_type, comprehension_type = make_type("comprehension", AST_type,
comprehension_fields, 3); comprehension_fields, 3);
if (!comprehension_type) return 0; if (!comprehension_type) return 0;
excepthandler_type = make_type("excepthandler", AST_type, excepthandler_type = make_type("excepthandler", AST_type, NULL, 0);
excepthandler_fields, 5);
if (!excepthandler_type) return 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); arguments_type = make_type("arguments", AST_type, arguments_fields, 4);
if (!arguments_type) return 0; if (!arguments_type) return 0;
keyword_type = make_type("keyword", AST_type, keyword_fields, 2); 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_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) col_offset, PyArena *arena)
{ {
excepthandler_ty p; excepthandler_ty p;
p = (excepthandler_ty)PyArena_Malloc(arena, sizeof(*p)); p = (excepthandler_ty)PyArena_Malloc(arena, sizeof(*p));
if (!p) if (!p)
return NULL; return NULL;
p->type = type; p->kind = ExceptHandler_kind;
p->name = name; p->v.ExceptHandler.type = type;
p->body = body; p->v.ExceptHandler.name = name;
p->v.ExceptHandler.body = body;
p->lineno = lineno; p->lineno = lineno;
p->col_offset = col_offset; p->col_offset = col_offset;
return p; return p;
@ -2901,31 +2909,35 @@ ast2obj_excepthandler(void* _o)
return Py_None; return Py_None;
} }
result = PyType_GenericNew(excepthandler_type, NULL, NULL); switch (o->kind) {
if (!result) return NULL; case ExceptHandler_kind:
value = ast2obj_expr(o->type); result = PyType_GenericNew(ExceptHandler_type, NULL, NULL);
if (!value) goto failed; if (!result) goto failed;
if (PyObject_SetAttrString(result, "type", value) == -1) value = ast2obj_expr(o->v.ExceptHandler.type);
goto failed; if (!value) goto failed;
Py_DECREF(value); if (PyObject_SetAttrString(result, "type", value) == -1)
value = ast2obj_expr(o->name); goto failed;
if (!value) goto failed; Py_DECREF(value);
if (PyObject_SetAttrString(result, "name", value) == -1) value = ast2obj_expr(o->v.ExceptHandler.name);
goto failed; if (!value) goto failed;
Py_DECREF(value); if (PyObject_SetAttrString(result, "name", value) == -1)
value = ast2obj_list(o->body, ast2obj_stmt); goto failed;
if (!value) goto failed; Py_DECREF(value);
if (PyObject_SetAttrString(result, "body", value) == -1) value = ast2obj_list(o->v.ExceptHandler.body, ast2obj_stmt);
goto failed; if (!value) goto failed;
Py_DECREF(value); if (PyObject_SetAttrString(result, "body", value) == -1)
goto failed;
Py_DECREF(value);
break;
}
value = ast2obj_int(o->lineno); value = ast2obj_int(o->lineno);
if (!value) goto failed; if (!value) goto failed;
if (PyObject_SetAttrString(result, "lineno", value) == -1) if (PyObject_SetAttrString(result, "lineno", value) < 0)
goto failed; goto failed;
Py_DECREF(value); Py_DECREF(value);
value = ast2obj_int(o->col_offset); value = ast2obj_int(o->col_offset);
if (!value) goto failed; if (!value) goto failed;
if (PyObject_SetAttrString(result, "col_offset", value) == -1) if (PyObject_SetAttrString(result, "col_offset", value) < 0)
goto failed; goto failed;
Py_DECREF(value); Py_DECREF(value);
return result; return result;
@ -5534,58 +5546,13 @@ int
obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena) obj2ast_excepthandler(PyObject* obj, excepthandler_ty* out, PyArena* arena)
{ {
PyObject* tmp = NULL; PyObject* tmp = NULL;
expr_ty type;
expr_ty name;
asdl_seq* body;
int lineno; int lineno;
int col_offset; int col_offset;
if (PyObject_HasAttrString(obj, "type")) { if (obj == Py_None) {
int res; *out = NULL;
tmp = PyObject_GetAttrString(obj, "type"); return 0;
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 (PyObject_HasAttrString(obj, "lineno")) { if (PyObject_HasAttrString(obj, "lineno")) {
int res; 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"); PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from excepthandler");
return 1; return 1;
} }
*out = excepthandler(type, name, body, lineno, col_offset, arena); if (PyObject_IsInstance(obj, (PyObject*)ExceptHandler_type)) {
return 0; 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: failed:
Py_XDECREF(tmp); Py_XDECREF(tmp);
return 1; return 1;
@ -5930,6 +5956,8 @@ init_ast(void)
(PyObject*)comprehension_type) < 0) return; (PyObject*)comprehension_type) < 0) return;
if (PyDict_SetItemString(d, "excepthandler", if (PyDict_SetItemString(d, "excepthandler",
(PyObject*)excepthandler_type) < 0) return; (PyObject*)excepthandler_type) < 0) return;
if (PyDict_SetItemString(d, "ExceptHandler",
(PyObject*)ExceptHandler_type) < 0) return;
if (PyDict_SetItemString(d, "arguments", (PyObject*)arguments_type) < if (PyDict_SetItemString(d, "arguments", (PyObject*)arguments_type) <
0) return; 0) return;
if (PyDict_SetItemString(d, "keyword", (PyObject*)keyword_type) < 0) if (PyDict_SetItemString(d, "keyword", (PyObject*)keyword_type) < 0)

6
Python/ast.c
View file

@ -2830,7 +2830,7 @@ ast_for_except_clause(struct compiling *c, const node *exc, node *body)
if (!suite_seq) if (!suite_seq)
return NULL; 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); exc->n_col_offset, c->c_arena);
} }
else if (NCH(exc) == 2) { else if (NCH(exc) == 2) {
@ -2844,7 +2844,7 @@ ast_for_except_clause(struct compiling *c, const node *exc, node *body)
if (!suite_seq) if (!suite_seq)
return NULL; 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); exc->n_col_offset, c->c_arena);
} }
else if (NCH(exc) == 4) { else if (NCH(exc) == 4) {
@ -2862,7 +2862,7 @@ ast_for_except_clause(struct compiling *c, const node *exc, node *body)
if (!suite_seq) if (!suite_seq)
return NULL; 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); exc->n_col_offset, c->c_arena);
} }

14
Python/compile.c
View file

@ -1855,32 +1855,32 @@ compiler_try_except(struct compiler *c, stmt_ty s)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET( excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET(
s->v.TryExcept.handlers, i); 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"); return compiler_error(c, "default 'except:' must be last");
c->u->u_lineno_set = false; c->u->u_lineno_set = false;
c->u->u_lineno = handler->lineno; c->u->u_lineno = handler->lineno;
except = compiler_new_block(c); except = compiler_new_block(c);
if (except == NULL) if (except == NULL)
return 0; return 0;
if (handler->type) { if (handler->v.ExceptHandler.type) {
ADDOP(c, DUP_TOP); 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_I(c, COMPARE_OP, PyCmp_EXC_MATCH);
ADDOP_JREL(c, JUMP_IF_FALSE, except); ADDOP_JREL(c, JUMP_IF_FALSE, except);
ADDOP(c, POP_TOP); ADDOP(c, POP_TOP);
} }
ADDOP(c, POP_TOP); ADDOP(c, POP_TOP);
if (handler->name) { if (handler->v.ExceptHandler.name) {
VISIT(c, expr, handler->name); VISIT(c, expr, handler->v.ExceptHandler.name);
} }
else { else {
ADDOP(c, POP_TOP); ADDOP(c, POP_TOP);
} }
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); ADDOP_JREL(c, JUMP_FORWARD, end);
compiler_use_next_block(c, except); compiler_use_next_block(c, except);
if (handler->type) if (handler->v.ExceptHandler.type)
ADDOP(c, POP_TOP); ADDOP(c, POP_TOP);
} }
ADDOP(c, END_FINALLY); ADDOP(c, END_FINALLY);

10
Python/symtable.c
View file

@ -1308,11 +1308,11 @@ symtable_visit_arguments(struct symtable *st, arguments_ty a)
static int static int
symtable_visit_excepthandler(struct symtable *st, excepthandler_ty eh) symtable_visit_excepthandler(struct symtable *st, excepthandler_ty eh)
{ {
if (eh->type) if (eh->v.ExceptHandler.type)
VISIT(st, expr, eh->type); VISIT(st, expr, eh->v.ExceptHandler.type);
if (eh->name) if (eh->v.ExceptHandler.name)
VISIT(st, expr, eh->name); VISIT(st, expr, eh->v.ExceptHandler.name);
VISIT_SEQ(st, stmt, eh->body); VISIT_SEQ(st, stmt, eh->v.ExceptHandler.body);
return 1; return 1;
} }