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

ifelsetmt - jump back is only allowed inside loops

Browse Source
This commit is contained in:
rocky
2022-10-16 17:50:58 -04:00
parent 8e6a0b01fa
commit 1819fc8944
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
uncompyle6/parsers/reducecheck/ifelsestmt.py
View File

@@ -195,7 +195,11 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
else: else:
last_token = tokens[last] last_token = tokens[last]
if last_token == "COME_FROM" and first_offset > last_token.attr: if last_token == "COME_FROM" and first_offset > last_token.attr:
if self.version < (3, 0) and self.insts[self.offset2inst_index[last_token.attr]].opname != "SETUP_LOOP": if (
self.version < (3, 0)
and self.insts[self.offset2inst_index[last_token.attr]].opname
!= "SETUP_LOOP"
):
return True return True
testexpr = tree[0] testexpr = tree[0]
@@ -217,7 +221,6 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
else: else:
jmp_target = int(jmp[0].pattr) jmp_target = int(jmp[0].pattr)
# Below we check that jmp_target is jumping to a feasible # Below we check that jmp_target is jumping to a feasible
# location. It should be to the transition after the "then" # location. It should be to the transition after the "then"
# block and to the beginning of the "else" block. # block and to the beginning of the "else" block.
@@ -259,6 +262,32 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
return True return True
if first_offset > jmp_target: if first_offset > jmp_target:
# A backward or loop jump from the end of an "else"
# clause before the beginning of the "if" test is okay
# only if we are trying to match or reduce an "if"
# statement of the kind that can occur only inside a
# loop construct.
if lhs in ("ifelsestmtl", "ifelsestmtc"):
jump_false = jmp
if (
tree[2].kind == "JUMP_FORWARD"
and jump_false == "jmp_false"
and len(else_suite) == 1
):
suite_stmts = else_suite[0]
continue_stmt = suite_stmts[0]
if (
suite_stmts == "suite_stmts"
and len(suite_stmts) == 1
and continue_stmt == "continue"
and jump_false[0].attr == continue_stmt[0].attr
):
# for ...:
# if ...:
# ...
# else:
# continue
return False
return True return True
return (jmp_target > last_offset) and tokens[last] != "JUMP_FORWARD" return (jmp_target > last_offset) and tokens[last] != "JUMP_FORWARD"