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

Fix bugs in scanner.last_instr()...

Browse Source 
And ave instruction stream self.insts like we do in Python 3 so we
can start simplifying code.
This commit is contained in:
rocky
2017-12-15 20:34:34 -05:00
parent 9cb99e3290
commit 15057bed1d
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
uncompyle6/scanners/scanner2.py
View File

@@ -26,7 +26,7 @@ from collections import namedtuple
from array import array
from xdis.code import iscode
from xdis.bytecode import op_has_argument, op_size, instruction_size
from xdis.bytecode import Bytecode, op_has_argument, op_size, instruction_size
from xdis.util import code2num
from uncompyle6.scanner import Scanner
@@ -88,10 +88,9 @@ class Scanner2(Scanner):
if not show_asm:
show_asm = self.show_asm
bytecode = Bytecode(co, self.opc)
# show_asm = 'after'
if show_asm in ('both', 'before'):
from xdis.bytecode import Bytecode
bytecode = Bytecode(co, self.opc)
for instr in bytecode.get_instructions(co):
print(instr.disassemble())
@@ -110,6 +109,7 @@ class Scanner2(Scanner):
self.build_lines_data(co, codelen)
self.build_prev_op(codelen)
self.insts = list(bytecode)
free, names, varnames = self.unmangle_code_names(co, classname)
self.names = names