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

Merge pull request #406 from tangboxuan/master

Browse Source 
Fix offset of extended argument instruction
This commit is contained in:
R. Bernstein
2022-08-24 05:51:41 -04:00
committed by GitHub
parent 765b0149ea 2f3b5e53d4
commit 200250df56
3 changed files with 267 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,8 +163,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].offset > end_come_froms[-1].attr
elif tokens[first].offset > end_come_froms.attr:
return tokens[first].off2int() > end_come_froms[-1].attr
elif tokens[first].off2int() > end_come_froms.attr:
return True
# FIXME: There is weirdness in the grammar we need to work around.
@@ -173,7 +173,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].offset > last_token.attr:
if last_token == "COME_FROM" and tokens[first].off2int() > last_token.attr:
if self.version < (3, 0) and self.insts[self.offset2inst_index[last_token.attr]].opname != "SETUP_LOOP":
return True