Merged revisions 62047 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62047 | georg.brandl | 2008-03-29 23:40:17 -0700 (Sat, 29 Mar 2008) | 2 lines
Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum.
........
diff --git a/Python/compile.c b/Python/compile.c
index ab51c7b..9ce8ac3 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -1984,22 +1984,22 @@
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 = 0;
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) {
+ if (handler->v.ExceptHandler.name) {
basicblock *cleanup_end, *cleanup_body;
cleanup_end = compiler_new_block(c);
@@ -2007,7 +2007,7 @@
if(!(cleanup_end || cleanup_body))
return 0;
- compiler_nameop(c, handler->name, Store);
+ compiler_nameop(c, handler->v.ExceptHandler.name, Store);
ADDOP(c, POP_TOP);
/*
@@ -2028,7 +2028,7 @@
return 0;
/* second # body */
- VISIT_SEQ(c, stmt, handler->body);
+ VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
ADDOP(c, POP_BLOCK);
compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
@@ -2040,10 +2040,10 @@
/* name = None */
ADDOP_O(c, LOAD_CONST, Py_None, consts);
- compiler_nameop(c, handler->name, Store);
+ compiler_nameop(c, handler->v.ExceptHandler.name, Store);
/* del name */
- compiler_nameop(c, handler->name, Del);
+ compiler_nameop(c, handler->v.ExceptHandler.name, Del);
ADDOP(c, END_FINALLY);
compiler_pop_fblock(c, FINALLY_END, cleanup_end);
@@ -2051,11 +2051,11 @@
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);