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

Python 3 while/else bug

Browse Source
This commit is contained in:
rocky
2016-11-27 07:02:17 -05:00
parent 1e324e0e8d
commit 97576e473d
4 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.

8
test/simple_source/bug33/03_while_else.py Normal file
View File

@@ -0,0 +1,8 @@
# Bug from 3.4 threading. Bug is handling while/else
def acquire(self):
with self._cond:
while self:
rc = False
else:
rc = True
return rc

17
uncompyle6/parsers/parse3.py
View File

@@ -336,6 +336,10 @@ class Python3Parser(PythonParser):
while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK
else_suite
whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK
else_suite COME_FROM_LOOP
whileelselaststmt ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK
else_suitec COME_FROM_LOOP
whileTruestmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_BLOCK
@@ -687,14 +691,13 @@ class Python3Parser(PythonParser):
if lhs in ('augassign1', 'augassign2') and ast[0][0] == 'and':
return True
elif lhs == 'while1stmt':
# Skip COME_FROM tokens
skip = 0
if tokens[last] != 'COME_FROM_LOOP':
skip = 1
while last+skip < len(tokens) and isinstance(tokens[last+skip].offset, str):
if tokens[last] in ('COME_FROM_LOOP', 'JUMP_BACK'):
# jump_back should be right afer SETUP_LOOP. Test?
last += 1
if last + skip < len(tokens):
offset = tokens[last+skip].offset
while last < len(tokens) and isinstance(tokens[last].offset, str):
last += 1
if last < len(tokens):
offset = tokens[last].offset
assert tokens[first] == 'SETUP_LOOP'
if offset != tokens[first].attr:
return True

5
uncompyle6/scanners/scanner3.py
View File

@@ -324,9 +324,10 @@ class Scanner3(Scanner):
# FIXME: this is a hack to catch stuff like:
# if x: continue
# the "continue" is not on a new line.
# There are other situations were we don't catch
# There are other situations where we don't catch
# CONTINUE as well.
if tokens[-1].type == 'JUMP_BACK':
if tokens[-1].type == 'JUMP_BACK' and tokens[-1].attr <= argval:
# intern is used because we are changing the *previous* token
tokens[-1].type = intern('CONTINUE')
elif op == self.opc.RETURN_VALUE: