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

Better Python 3 ENDIF detection

Browse Source 
If we have

COMPARE_OP exception-match
POP_JUMP_IF...
....
RETURN_VALUE

Then RETURN_VALUE can't be RETURN_END_IF
This commit is contained in:
rocky
2017-11-08 23:05:01 -05:00
parent 0bb793239b
commit e9b60ddbf0
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
uncompyle6/scanners/scanner30.py
View File

@@ -23,7 +23,7 @@ class Scanner30(Scanner3):
return
pass
def detect_control_flow(self, offset, targets, extended_arg):
def detect_control_flow(self, offset, targets, inst_index):
"""
Detect structures and their boundaries to fix optimized jumps
Python 3.0 is more like Python 2.6 than it is Python 3.x.
@@ -55,7 +55,7 @@ class Scanner30(Scanner3):
# It could be a return instruction.
start += instruction_size(op, self.opc)
target = self.get_target(offset, extended_arg)
target = self.get_target(offset)
end = self.restrict_to_parent(target, parent)
self.setup_loop_targets[offset] = target
self.setup_loops[target] = offset
@@ -136,7 +136,7 @@ class Scanner30(Scanner3):
'end': end})
elif op in self.pop_jump_tf:
start = offset + instruction_size(op, self.opc)
target = self.get_target(offset, extended_arg)
target = self.get_target(offset)
rtarget = self.restrict_to_parent(target, parent)
prev_op = self.prev_op
@@ -329,7 +329,7 @@ class Scanner30(Scanner3):
end = self.restrict_to_parent(target, parent)
self.fixed_jumps[offset] = end
elif op == self.opc.SETUP_FINALLY:
target = self.get_target(offset, extended_arg)
target = self.get_target(offset)
end = self.restrict_to_parent(target, parent)
self.fixed_jumps[offset] = end
elif op in self.jump_if_pop: