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

Tidy ifelsemstmt check

Browse Source
This commit is contained in:
rocky
2022-08-29 05:29:57 -04:00
parent 200250df56
commit 4260deea11
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.7_run/10_extendedargifelse.pyc
View File

Binary file not shown.

8
test/simple_source/bug37/10_extendedargifelse.py
View File

@@ -1,3 +1,10 @@
# This is RUNNABLE!
"""This program is self-checking!"""
# Bug was handling if which has EXTENDED_ARG
# See https://github.com/rocky/python-uncompyle6/pull/406
aa = 0
ab = 0
ac = 0
@@ -262,3 +269,4 @@ if var:
aa = 1
else:
aa = 2
assert aa == 1

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

@@ -136,6 +136,8 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
# print(tokens[t])
# print("=" * 30)
first_offset = tokens[first].off2int()
if rule not in IFELSE_STMT_RULES:
# print("XXX", rule)
return False
@@ -151,7 +153,7 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
):
return True
# Make sure all of the "come froms" offset at the
# Make sure all the offsets from the "come froms" at the
# end of the "if" come from somewhere inside the "if".
# Since the come_froms are ordered so that lowest
# offset COME_FROM is last, it is sufficient to test
@@ -163,8 +165,8 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
end_come_froms = end_come_froms[0]
if not isinstance(end_come_froms, Token):
if len(end_come_froms):
return tokens[first].off2int() > end_come_froms[-1].attr
elif tokens[first].off2int() > end_come_froms.attr:
return first_offset > end_come_froms[-1].attr
elif first_offset > end_come_froms.attr:
return True
# FIXME: There is weirdness in the grammar we need to work around.
@@ -173,7 +175,7 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
last_token = tree[-1]
else:
last_token = tokens[last]
if last_token == "COME_FROM" and tokens[first].off2int() > 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":
return True
@@ -237,7 +239,7 @@ def ifelsestmt(self, lhs, n, rule, tree, tokens, first, last):
if jump_else_end[-1].off2int() != jmp_target:
return True
if tokens[first].off2int() > jmp_target:
if first_offset > jmp_target:
return True
return (jmp_target > last_offset) and tokens[last] != "JUMP_FORWARD"