From 41db5b8848fb3a46ff238c23dacf3a4635b4acac Mon Sep 17 00:00:00 2001 From: rocky Date: Wed, 6 Dec 2017 22:47:19 -0500 Subject: [PATCH] Fix while1/if parsing in 3.x. Reinstate some tests --- ...hile1_while1.pyc-notyet => 04_while1_while1.pyc} | Bin .../06_list_ifnot_and.pyc} | Bin uncompyle6/parsers/parse3.py | 1 + 3 files changed, 1 insertion(+) rename test/bytecode_3.4/{04_while1_while1.pyc-notyet => 04_while1_while1.pyc} (100%) rename test/{bytecode_2.7/06_list_ifnot_and.pyc-pypy-notyet => bytecode_pypy2.7/06_list_ifnot_and.pyc} (100%) diff --git a/test/bytecode_3.4/04_while1_while1.pyc-notyet b/test/bytecode_3.4/04_while1_while1.pyc similarity index 100% rename from test/bytecode_3.4/04_while1_while1.pyc-notyet rename to test/bytecode_3.4/04_while1_while1.pyc diff --git a/test/bytecode_2.7/06_list_ifnot_and.pyc-pypy-notyet b/test/bytecode_pypy2.7/06_list_ifnot_and.pyc similarity index 100% rename from test/bytecode_2.7/06_list_ifnot_and.pyc-pypy-notyet rename to test/bytecode_pypy2.7/06_list_ifnot_and.pyc diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py index 6ea1b1ea..908e2e81 100644 --- a/uncompyle6/parsers/parse3.py +++ b/uncompyle6/parsers/parse3.py @@ -138,6 +138,7 @@ class Python3Parser(PythonParser): iflaststmtl ::= testexpr c_stmts_opt JUMP_BACK iflaststmtl ::= testexpr c_stmts_opt JUMP_BACK COME_FROM_LOOP + iflaststmtl ::= testexpr c_stmts_opt JUMP_BACK POP_BLOCK # These are used to keep AST indices the same jump_forward_else ::= JUMP_FORWARD ELSE