You've already forked python-uncompyle6
mirror of
https://github.com/rocky/python-uncompyle6.git
synced 2025-08-02 16:44:46 +08:00
f2a3721d7d
Add debug flag to find_jump_targets to show the structure we found. When there are control-flow bugs, it's often reflected here. scanner3.py: make code make more similar to 2.x code
70 lines
2.5 KiB
Python
70 lines
2.5 KiB
Python
#!/usr/bin/env python
|
|
from uncompyle6 import PYTHON_VERSION, IS_PYPY
|
|
from uncompyle6.scanner import get_scanner
|
|
from array import array
|
|
def bug(state, slotstate):
|
|
if state:
|
|
if slotstate is not None:
|
|
for key, value in slotstate.items():
|
|
setattr(state, key, 2)
|
|
|
|
# From 2.7 disassemble
|
|
# Problem is not getting while, because
|
|
# COME_FROM not added
|
|
def bug_loop(disassemble, tb=None):
|
|
if tb:
|
|
try:
|
|
tb = 5
|
|
except AttributeError:
|
|
raise RuntimeError
|
|
while tb: tb = tb.tb_next
|
|
disassemble(tb)
|
|
|
|
def test_if_in_for():
|
|
code = bug.__code__
|
|
scan = get_scanner(PYTHON_VERSION)
|
|
print(PYTHON_VERSION)
|
|
if 2.7 <= PYTHON_VERSION <= 3.0 and not IS_PYPY:
|
|
n = scan.setup_code(code)
|
|
scan.build_lines_data(code, n)
|
|
scan.build_prev_op(n)
|
|
fjt = scan.find_jump_targets(False)
|
|
assert {15: [3], 69: [66], 63: [18]} == fjt
|
|
assert scan.structs == \
|
|
[{'start': 0, 'end': 72, 'type': 'root'},
|
|
{'start': 15, 'end': 66, 'type': 'if-then'},
|
|
{'start': 31, 'end': 59, 'type': 'for-loop'},
|
|
{'start': 62, 'end': 63, 'type': 'for-else'}]
|
|
|
|
code = bug_loop.__code__
|
|
n = scan.setup_code(code)
|
|
scan.build_lines_data(code, n)
|
|
scan.build_prev_op(n)
|
|
fjt = scan.find_jump_targets(False)
|
|
assert{64: [42], 67: [42], 42: [16, 41], 19: [6]} == fjt
|
|
assert scan.structs == [
|
|
{'start': 0, 'end': 80, 'type': 'root'},
|
|
{'start': 3, 'end': 64, 'type': 'if-then'},
|
|
{'start': 6, 'end': 15, 'type': 'try'},
|
|
{'start': 19, 'end': 38, 'type': 'except'},
|
|
{'start': 45, 'end': 67, 'type': 'while-loop'},
|
|
{'start': 70, 'end': 64, 'type': 'while-else'},
|
|
# previous bug was not mistaking while-loop for if-then
|
|
{'start': 48, 'end': 67, 'type': 'while-loop'}]
|
|
|
|
elif 3.2 < PYTHON_VERSION <= 3.4:
|
|
scan.code = array('B', code.co_code)
|
|
scan.build_lines_data(code)
|
|
scan.build_prev_op()
|
|
fjt = scan.find_jump_targets(False)
|
|
assert {69: [66], 63: [18]} == fjt
|
|
assert scan.structs == \
|
|
[{'end': 72, 'type': 'root', 'start': 0},
|
|
{'end': 66, 'type': 'if-then', 'start': 6},
|
|
{'end': 63, 'type': 'if-then', 'start': 18},
|
|
{'end': 59, 'type': 'for-loop', 'start': 31},
|
|
{'end': 63, 'type': 'for-else', 'start': 62}]
|
|
else:
|
|
assert True, "FIXME: should note fixed"
|
|
return
|