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

git commit -m'Adjust "or" offset check ...

Browse Source 
for Python < 3.6 hopefully it doesn't break Python 3.6+
This commit is contained in:
rocky
2020-04-18 19:21:59 -04:00
parent 17d07eaf00
commit b77efec36c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uncompyle6/parsers/reducecheck/or_check.py
View File

@@ -38,6 +38,7 @@ def or_check(self, lhs, n, rule, ast, tokens, first, last):
last_token = tokens[last] last_token = tokens[last]
last_token_offset = last_token.off2int() last_token_offset = last_token.off2int()
# FIXME: use instructions for all of this
if jmp_true_target < first_offset: if jmp_true_target < first_offset:
return False return False
elif jmp_true_target < last_token_offset: elif jmp_true_target < last_token_offset:
@@ -49,8 +50,10 @@ def or_check(self, lhs, n, rule, ast, tokens, first, last):
# For a backwards loop, well compare to the instruction *after* # For a backwards loop, well compare to the instruction *after*
# then POP_JUMP... # then POP_JUMP...
last_token = tokens[last + 1] last_token = tokens[last + 1]
# HACK alert 3 is the Python < 3.6ish thing.
# Convert to using instructions
return not ( return not (
(last_token_offset <= jmp_true_target <= last_token_offset + 2) (last_token_offset <= jmp_true_target <= last_token_offset + 3)
or jmp_true_target < tokens[first].off2int() or jmp_true_target < tokens[first].off2int()
) )
elif last_token == "JUMP_FORWARD" and expr_jt.kind != "expr_jitop": elif last_token == "JUMP_FORWARD" and expr_jt.kind != "expr_jitop":