merge 3.2
This commit is contained in:
commit
4a0f20f5a3
100
Python/compile.c
100
Python/compile.c
|
@ -1968,7 +1968,7 @@ compiler_try_except(struct compiler *c, stmt_ty s)
|
|||
compiler_use_next_block(c, except);
|
||||
for (i = 0; i < n; i++) {
|
||||
excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET(
|
||||
s->v.TryExcept.handlers, i);
|
||||
s->v.TryExcept.handlers, i);
|
||||
if (!handler->v.ExceptHandler.type && i < n-1)
|
||||
return compiler_error(c, "default 'except:' must be last");
|
||||
c->u->u_lineno_set = 0;
|
||||
|
@ -1985,70 +1985,70 @@ compiler_try_except(struct compiler *c, stmt_ty s)
|
|||
}
|
||||
ADDOP(c, POP_TOP);
|
||||
if (handler->v.ExceptHandler.name) {
|
||||
basicblock *cleanup_end, *cleanup_body;
|
||||
basicblock *cleanup_end, *cleanup_body;
|
||||
|
||||
cleanup_end = compiler_new_block(c);
|
||||
cleanup_body = compiler_new_block(c);
|
||||
if(!(cleanup_end || cleanup_body))
|
||||
return 0;
|
||||
cleanup_end = compiler_new_block(c);
|
||||
cleanup_body = compiler_new_block(c);
|
||||
if(!(cleanup_end || cleanup_body))
|
||||
return 0;
|
||||
|
||||
compiler_nameop(c, handler->v.ExceptHandler.name, Store);
|
||||
ADDOP(c, POP_TOP);
|
||||
compiler_nameop(c, handler->v.ExceptHandler.name, Store);
|
||||
ADDOP(c, POP_TOP);
|
||||
|
||||
/*
|
||||
try:
|
||||
# body
|
||||
except type as name:
|
||||
try:
|
||||
# body
|
||||
finally:
|
||||
name = None
|
||||
del name
|
||||
*/
|
||||
/*
|
||||
try:
|
||||
# body
|
||||
except type as name:
|
||||
try:
|
||||
# body
|
||||
finally:
|
||||
name = None
|
||||
del name
|
||||
*/
|
||||
|
||||
/* second try: */
|
||||
ADDOP_JREL(c, SETUP_FINALLY, cleanup_end);
|
||||
compiler_use_next_block(c, cleanup_body);
|
||||
if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
|
||||
return 0;
|
||||
/* second try: */
|
||||
ADDOP_JREL(c, SETUP_FINALLY, cleanup_end);
|
||||
compiler_use_next_block(c, cleanup_body);
|
||||
if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
|
||||
return 0;
|
||||
|
||||
/* second # body */
|
||||
VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
|
||||
ADDOP(c, POP_BLOCK);
|
||||
ADDOP(c, POP_EXCEPT);
|
||||
compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
|
||||
/* second # body */
|
||||
VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
|
||||
ADDOP(c, POP_BLOCK);
|
||||
ADDOP(c, POP_EXCEPT);
|
||||
compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
|
||||
|
||||
/* finally: */
|
||||
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
||||
compiler_use_next_block(c, cleanup_end);
|
||||
if (!compiler_push_fblock(c, FINALLY_END, cleanup_end))
|
||||
return 0;
|
||||
/* finally: */
|
||||
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
||||
compiler_use_next_block(c, cleanup_end);
|
||||
if (!compiler_push_fblock(c, FINALLY_END, cleanup_end))
|
||||
return 0;
|
||||
|
||||
/* name = None */
|
||||
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
||||
compiler_nameop(c, handler->v.ExceptHandler.name, Store);
|
||||
/* name = None */
|
||||
ADDOP_O(c, LOAD_CONST, Py_None, consts);
|
||||
compiler_nameop(c, handler->v.ExceptHandler.name, Store);
|
||||
|
||||
/* del name */
|
||||
compiler_nameop(c, handler->v.ExceptHandler.name, Del);
|
||||
/* del name */
|
||||
compiler_nameop(c, handler->v.ExceptHandler.name, Del);
|
||||
|
||||
ADDOP(c, END_FINALLY);
|
||||
compiler_pop_fblock(c, FINALLY_END, cleanup_end);
|
||||
ADDOP(c, END_FINALLY);
|
||||
compiler_pop_fblock(c, FINALLY_END, cleanup_end);
|
||||
}
|
||||
else {
|
||||
basicblock *cleanup_body;
|
||||
basicblock *cleanup_body;
|
||||
|
||||
cleanup_body = compiler_new_block(c);
|
||||
if(!cleanup_body)
|
||||
return 0;
|
||||
cleanup_body = compiler_new_block(c);
|
||||
if(!cleanup_body)
|
||||
return 0;
|
||||
|
||||
ADDOP(c, POP_TOP);
|
||||
ADDOP(c, POP_TOP);
|
||||
compiler_use_next_block(c, cleanup_body);
|
||||
if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
|
||||
return 0;
|
||||
ADDOP(c, POP_TOP);
|
||||
compiler_use_next_block(c, cleanup_body);
|
||||
if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
|
||||
return 0;
|
||||
VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
|
||||
ADDOP(c, POP_EXCEPT);
|
||||
compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
|
||||
ADDOP(c, POP_EXCEPT);
|
||||
compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
|
||||
}
|
||||
ADDOP_JREL(c, JUMP_FORWARD, end);
|
||||
compiler_use_next_block(c, except);
|
||||
|
|
Loading…
Reference in New Issue