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

Some more changes related to the new except syntax and semantics,

Browse source 
by Collin Winter.
This commit is contained in:
Guido van Rossum 2007-01-10 18:51:35 +00:00
parent b940e113bf
commit 16be03e4a2
10 changed files with 46 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Python/Python-ast.c
View file

@ -1836,7 +1836,7 @@ 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, identifier name, asdl_seq * body, int lineno, int
col_offset, PyArena *arena)
{
excepthandler_ty p;
@ -2928,7 +2928,7 @@ ast2obj_excepthandler(void* _o)
if (PyObject_SetAttrString(result, "type", value) == -1)
goto failed;
Py_DECREF(value);
value = ast2obj_expr(o->name);
value = ast2obj_identifier(o->name);
if (!value) goto failed;
if (PyObject_SetAttrString(result, "name", value) == -1)
goto failed;

4
Python/ast.c
View file

@ -2899,11 +2899,9 @@ ast_for_except_clause(struct compiling *c, const node *exc, node *body)
else if (NCH(exc) == 4) {
asdl_seq *suite_seq;
expr_ty expression;
expr_ty e = ast_for_expr(c, CHILD(exc, 3));
identifier e = NEW_IDENTIFIER(CHILD(exc, 3));
if (!e)
return NULL;
if (!set_context(e, Store, CHILD(exc, 3)))
return NULL;
expression = ast_for_expr(c, CHILD(exc, 1));
if (!expression)
return NULL;

15
Python/compile.c
View file

@ -1956,16 +1956,13 @@ compiler_try_except(struct compiler *c, stmt_ty s)
ADDOP(c, POP_TOP);
if (handler->name) {
basicblock *cleanup_end, *cleanup_body;
expr_context_ty orig_ctx;
assert(handler->name->kind == Name_kind);
cleanup_end = compiler_new_block(c);
cleanup_body = compiler_new_block(c);
if(!(cleanup_end || cleanup_body))
return 0;
VISIT(c, expr, handler->name);
compiler_nameop(c, handler->name, Store);
ADDOP(c, POP_TOP);
/*
@ -1998,14 +1995,10 @@ compiler_try_except(struct compiler *c, stmt_ty s)
/* name = None */
ADDOP_O(c, LOAD_CONST, Py_None, consts);
orig_ctx = handler->name->v.Name.ctx;
handler->name->v.Name.ctx = Store;
VISIT(c, expr, handler->name);
compiler_nameop(c, handler->name, Store);
/* del name */
handler->name->v.Name.ctx = Del;
VISIT(c, expr, handler->name);
handler->name->v.Name.ctx = orig_ctx;
/* del name */
compiler_nameop(c, handler->name, Del);
ADDOP(c, END_FINALLY);
compiler_pop_fblock(c, FINALLY_END, cleanup_end);

2
Python/graminit.c
View file

@ -1053,7 +1053,7 @@ static arc arcs_46_2[2] = {
{0, 2},
};
static arc arcs_46_3[1] = {
{22, 4},
{19, 4},
};
static arc arcs_46_4[1] = {
{0, 4},

3
Python/symtable.c
View file

@ -1335,7 +1335,8 @@ 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);
if (!symtable_add_def(st, eh->name, DEF_LOCAL))
return 0;
VISIT_SEQ(st, stmt, eh->body);
return 1;
}