jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-03 00:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix whileelse bug

Browse Source
This commit is contained in:
rocky
2018-01-11 21:52:33 -05:00
parent b2c082bba2
commit c6e20e4444
9 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_2.6/03_whileelse_bug.pyc Normal file
View File

Binary file not shown.

BIN
test/bytecode_2.7/03_whileelse_bug.pyc Normal file
View File

Binary file not shown.

BIN
test/bytecode_3.3/03_whileelse_bug.pyc Normal file
View File

Binary file not shown.

BIN
test/bytecode_3.4/03_whileelse_bug.pyc Normal file
View File

Binary file not shown.

9
test/simple_source/looping/03_whileelse_bug.py Normal file
View File

@@ -0,0 +1,9 @@
# From idlelib/PyParse.py
# Bug is "if" inside a nested while/else.
def _study1(i, n):
while i:
while i:
i = 0
else:
if i:
i = 1

4
uncompyle6/parsers/parse26.py
View File

@@ -142,8 +142,8 @@ class Python26Parser(Python2Parser):
whilestmt ::= SETUP_LOOP testexpr returns POP_BLOCK COME_FROM whilestmt ::= SETUP_LOOP testexpr returns POP_BLOCK COME_FROM
whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt jb_pop POP_BLOCK whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt jb_pop POP_BLOCK
else_suite COME_FROM else_suitel COME_FROM
while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK else_suite COME_FROM while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK else_suitel COME_FROM
return ::= ret_expr RETURN_END_IF POP_TOP return ::= ret_expr RETURN_END_IF POP_TOP
return ::= ret_expr RETURN_VALUE POP_TOP return ::= ret_expr RETURN_VALUE POP_TOP

4
uncompyle6/parsers/parse27.py
View File

@@ -120,9 +120,9 @@ class Python27Parser(Python2Parser):
while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_BLOCK COME_FROM while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_BLOCK COME_FROM
whilestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK _come_froms whilestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK _come_froms
while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK POP_BLOCK while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK POP_BLOCK
else_suite COME_FROM else_suitel COME_FROM
whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK
else_suite COME_FROM else_suitel COME_FROM
ifstmt ::= testexpr return_if_stmts COME_FROM ifstmt ::= testexpr return_if_stmts COME_FROM
ifelsestmt ::= testexpr c_stmts_opt JUMP_FORWARD else_suite COME_FROM ifelsestmt ::= testexpr c_stmts_opt JUMP_FORWARD else_suite COME_FROM

4
uncompyle6/parsers/parse3.py
View File

@@ -347,10 +347,10 @@ class Python3Parser(PythonParser):
COME_FROM_LOOP COME_FROM_LOOP
while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK
else_suite else_suitel
whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK
else_suite COME_FROM_LOOP else_suitel COME_FROM_LOOP
whileTruestmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_BLOCK whileTruestmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_BLOCK
COME_FROM_LOOP COME_FROM_LOOP

4
uncompyle6/parsers/parse34.py
View File

@@ -19,9 +19,9 @@ class Python34Parser(Python33Parser):
# FIXME the below masks a bug in not detecting COME_FROM_LOOP # FIXME the below masks a bug in not detecting COME_FROM_LOOP
# grammar rules with COME_FROM -> COME_FROM_LOOP alreadly exist # grammar rules with COME_FROM -> COME_FROM_LOOP already exist
whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK
else_suite COME_FROM else_suitel COME_FROM
# Python 3.4+ optimizes the trailing two JUMPS away # Python 3.4+ optimizes the trailing two JUMPS away