@@ -1977,7 +1977,7 @@ compiler_try_except(struct compiler *c, stmt_ty s)
19771977 compiler_use_next_block(c, except);
19781978 for (i = 0; i < n; i++) {
19791979 excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET(
1980- s->v.TryExcept.handlers, i);
1980+ s->v.TryExcept.handlers, i);
19811981 if (!handler->v.ExceptHandler.type && i < n-1)
19821982 return compiler_error(c, "default 'except:' must be last");
19831983 c->u->u_lineno_set = 0;
@@ -1993,70 +1993,70 @@ compiler_try_except(struct compiler *c, stmt_ty s)
19931993 }
19941994 ADDOP(c, POP_TOP);
19951995 if (handler->v.ExceptHandler.name) {
1996- basicblock *cleanup_end, *cleanup_body;
1996+ basicblock *cleanup_end, *cleanup_body;
19971997
1998- cleanup_end = compiler_new_block(c);
1999- cleanup_body = compiler_new_block(c);
2000- if(!(cleanup_end || cleanup_body))
2001- return 0;
1998+ cleanup_end = compiler_new_block(c);
1999+ cleanup_body = compiler_new_block(c);
2000+ if(!(cleanup_end || cleanup_body))
2001+ return 0;
20022002
2003- compiler_nameop(c, handler->v.ExceptHandler.name, Store);
2004- ADDOP(c, POP_TOP);
2003+ compiler_nameop(c, handler->v.ExceptHandler.name, Store);
2004+ ADDOP(c, POP_TOP);
20052005
2006- /*
2007- try:
2008- # body
2009- except type as name:
2010- try:
2011- # body
2012- finally:
2013- name = None
2014- del name
2015- */
2006+ /*
2007+ try:
2008+ # body
2009+ except type as name:
2010+ try:
2011+ # body
2012+ finally:
2013+ name = None
2014+ del name
2015+ */
20162016
2017- /* second try: */
2018- ADDOP_JREL(c, SETUP_FINALLY, cleanup_end);
2019- compiler_use_next_block(c, cleanup_body);
2020- if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
2021- return 0;
2017+ /* second try: */
2018+ ADDOP_JREL(c, SETUP_FINALLY, cleanup_end);
2019+ compiler_use_next_block(c, cleanup_body);
2020+ if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
2021+ return 0;
20222022
2023- /* second # body */
2024- VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
2025- ADDOP(c, POP_BLOCK);
2026- ADDOP(c, POP_EXCEPT);
2027- compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
2023+ /* second # body */
2024+ VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
2025+ ADDOP(c, POP_BLOCK);
2026+ ADDOP(c, POP_EXCEPT);
2027+ compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
20282028
2029- /* finally: */
2030- ADDOP_O(c, LOAD_CONST, Py_None, consts);
2031- compiler_use_next_block(c, cleanup_end);
2032- if (!compiler_push_fblock(c, FINALLY_END, cleanup_end))
2033- return 0;
2029+ /* finally: */
2030+ ADDOP_O(c, LOAD_CONST, Py_None, consts);
2031+ compiler_use_next_block(c, cleanup_end);
2032+ if (!compiler_push_fblock(c, FINALLY_END, cleanup_end))
2033+ return 0;
20342034
2035- /* name = None */
2036- ADDOP_O(c, LOAD_CONST, Py_None, consts);
2037- compiler_nameop(c, handler->v.ExceptHandler.name, Store);
2035+ /* name = None */
2036+ ADDOP_O(c, LOAD_CONST, Py_None, consts);
2037+ compiler_nameop(c, handler->v.ExceptHandler.name, Store);
20382038
2039- /* del name */
2040- compiler_nameop(c, handler->v.ExceptHandler.name, Del);
2039+ /* del name */
2040+ compiler_nameop(c, handler->v.ExceptHandler.name, Del);
20412041
2042- ADDOP(c, END_FINALLY);
2043- compiler_pop_fblock(c, FINALLY_END, cleanup_end);
2042+ ADDOP(c, END_FINALLY);
2043+ compiler_pop_fblock(c, FINALLY_END, cleanup_end);
20442044 }
20452045 else {
2046- basicblock *cleanup_body;
2046+ basicblock *cleanup_body;
20472047
2048- cleanup_body = compiler_new_block(c);
2049- if(!cleanup_body)
2050- return 0;
2048+ cleanup_body = compiler_new_block(c);
2049+ if(!cleanup_body)
2050+ return 0;
20512051
20522052 ADDOP(c, POP_TOP);
2053- ADDOP(c, POP_TOP);
2054- compiler_use_next_block(c, cleanup_body);
2055- if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
2056- return 0;
2053+ ADDOP(c, POP_TOP);
2054+ compiler_use_next_block(c, cleanup_body);
2055+ if (!compiler_push_fblock(c, FINALLY_TRY, cleanup_body))
2056+ return 0;
20572057 VISIT_SEQ(c, stmt, handler->v.ExceptHandler.body);
2058- ADDOP(c, POP_EXCEPT);
2059- compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
2058+ ADDOP(c, POP_EXCEPT);
2059+ compiler_pop_fblock(c, FINALLY_TRY, cleanup_body);
20602060 }
20612061 ADDOP_JREL(c, JUMP_FORWARD, end);
20622062 compiler_use_next_block(c, except);
0 commit comments