diff --git a/test/simple_source/looping/12_if_while_bug.py b/test/simple_source/looping/12_if_while_bug.py index e13ed1a5..c3f745c4 100644 --- a/test/simple_source/looping/12_if_while_bug.py +++ b/test/simple_source/looping/12_if_while_bug.py @@ -3,11 +3,11 @@ # end of if can come from both finishing loop # and not taking the if. -# whilestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK \e__come_from +# whilestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK \e__come_froms # _ifstmts_jump ::= c_stmts_opt JUMP_FORWARD \e__come_from # ifstmt ::= testexpr _ifstmts_jump -# _come_from ::= _come_from COME_FROM -# _ifstmts_jump ::= c_stmts_opt JUMP_FORWARD _come_from +# _come_froms ::= _come_froms COME_FROM +# _ifstmts_jump ::= c_stmts_opt JUMP_FORWARD _come_froms def splitext(p, sep, altsep, extsep): if altsep > extsep: diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py index e11764a2..bd86f880 100644 --- a/uncompyle6/parsers/parse27.py +++ b/uncompyle6/parsers/parse27.py @@ -97,7 +97,7 @@ class Python27Parser(Python2Parser): # assert condition, expr assert2 ::= assert_expr jmp_true LOAD_ASSERT expr CALL_FUNCTION_1 RAISE_VARARGS_1 - for_block ::= return_stmts _come_from + for_block ::= return_stmts _come_froms withstmt ::= expr SETUP_WITH POP_TOP suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM_WITH