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

Python 3.5 continue detection bug

Browse Source
This commit is contained in:
rocky
2017-01-02 10:06:52 -05:00
parent 84c2932bc5
commit 2b46e71264
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
uncompyle6/parsers/parse35.py
View File

@@ -39,8 +39,11 @@ class Python35Parser(Python34Parser):
return_if_stmt ::= ret_expr RETURN_END_IF POP_BLOCK return_if_stmt ::= ret_expr RETURN_END_IF POP_BLOCK
ifelsestmtc ::= testexpr c_stmts_opt JUMP_FORWARD else_suitec ifelsestmtc ::= testexpr c_stmts_opt JUMP_FORWARD else_suitec
ifelsestmtc ::= testexpr c_stmts_opt jf_else else_suitec
# ifstmt ::= testexpr c_stmts_opt # ifstmt ::= testexpr c_stmts_opt
iflaststmt ::= testexpr c_stmts_opt JUMP_FORWARD
# Python 3.3+ also has yield from. 3.5 does it # Python 3.3+ also has yield from. 3.5 does it
# differently than 3.3, 3.4 # differently than 3.3, 3.4

11
uncompyle6/scanners/scanner3.py
View File

@@ -324,11 +324,12 @@ class Scanner3(Scanner):
if (inst.offset in self.stmts and if (inst.offset in self.stmts and
(next_opname not in ('END_FINALLY', 'POP_BLOCK', (next_opname not in ('END_FINALLY', 'POP_BLOCK',
# Python 3.0 only uses POP_TOP # Python 3.0 only uses POP_TOP
'POP_TOP') 'POP_TOP'))):
and inst.offset not in self.not_continue) or if (self.version == 3.5 or
(tokens[-1].type == 'RETURN_VALUE' and (inst.offset not in self.not_continue) or
self.version < 3.5)): (tokens[-1].type == 'RETURN_VALUE')):
opname = 'CONTINUE' opname = 'CONTINUE'
pass
else: else:
opname = 'JUMP_BACK' opname = 'JUMP_BACK'
# FIXME: this is a hack to catch stuff like: # FIXME: this is a hack to catch stuff like: