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

Bug in 3.x detecting "if" structure and ...

Browse Source 
scanner3.py: bug in 3.x detecting "if" structure
Make scanner2.py look more like scanner3.py
verify.py: add weak-verify which tests Pytyon syntax, but not code
This commit is contained in:
rocky
2016-08-31 04:07:42 -04:00
parent 6f2cdc164d
commit 6189ce3c04
7 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
uncompyle6/scanners/scanner3.py
View File

@@ -415,7 +415,7 @@ class Scanner3(Scanner):
if label is None:
if op in op3.hasjrel and op != self.opc.FOR_ITER:
label = offset + self.op_size(op) + oparg
label = offset + 3 + oparg
elif op in op3.hasjabs:
if op in self.jump_if_pop:
if oparg > offset:
@@ -547,6 +547,12 @@ class Scanner3(Scanner):
parent = struct
if op == self.opc.SETUP_LOOP:
# We categorize loop types: 'for', 'while', 'while 1' with
# possibly suffixes '-loop' and '-else'
# Try to find the jump_back instruction of the loop.
# It could be a return instruction.
start = offset+3
target = self.get_target(offset)
end = self.restrict_to_parent(target, parent)
@@ -679,8 +685,7 @@ class Scanner3(Scanner):
self.fixed_jumps[offset] = fix or match[-1]
return
else:
if is_jump_forward:
self.fixed_jumps[offset] = match[-1]
self.fixed_jumps[offset] = match[-1]
return
# op == POP_JUMP_IF_TRUE
else: