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

Align disassembly output with xdis

Browse Source 
align number of offset fields with xdis.
Show None type when we mean None, not ''
This commit is contained in:
rocky
2016-07-17 13:05:10 -04:00
parent ea733c31d7
commit 4a3a62d01b
4 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pytest/testdata/if-2.7.right vendored
View File

@@ -1,12 +1,12 @@
# Python 2.7 # Python 2.7
# Embedded file name: simple_source/branching/05_if.py # Embedded file name: simple_source/branching/05_if.py
6 0 LOAD_NAME 0 'True' 6 0 LOAD_NAME 0 'True'
3 POP_JUMP_IF_FALSE 15 '15' 3 POP_JUMP_IF_FALSE 15 '15'
7 6 LOAD_NAME 1 'False' 7 6 LOAD_NAME 1 'False'
9 STORE_NAME 2 'b' 9 STORE_NAME 2 'b'
12 JUMP_FORWARD 0 '15' 12 JUMP_FORWARD 0 '15'
15_0 COME_FROM '12' 15_0 COME_FROM '12'
15 LOAD_CONST 0 '' 15 LOAD_CONST 0 None
18 RETURN_VALUE 18 RETURN_VALUE

20
pytest/testdata/ifelse-2.7.right vendored
View File

@@ -1,15 +1,15 @@
# Python 2.7 # Python 2.7
# Embedded file name: simple_source/branching/05_ifelse.py # Embedded file name: simple_source/branching/05_ifelse.py
3 0 LOAD_NAME 0 'True' 3 0 LOAD_NAME 0 'True'
3 POP_JUMP_IF_FALSE 15 '15' 3 POP_JUMP_IF_FALSE 15 '15'
4 6 LOAD_CONST 0 1 4 6 LOAD_CONST 0 1
9 STORE_NAME 1 'b' 9 STORE_NAME 1 'b'
12 JUMP_FORWARD 6 '21' 12 JUMP_FORWARD 6 '21'
6 15 LOAD_CONST 1 2 6 15 LOAD_CONST 1 2
18 STORE_NAME 2 'd' 18 STORE_NAME 2 'd'
21_0 COME_FROM '12' 21_0 COME_FROM '12'
21 LOAD_CONST 2 '' 21 LOAD_CONST 2 None
24 RETURN_VALUE 24 RETURN_VALUE

2
uncompyle6/scanners/scanner2.py
View File

@@ -217,7 +217,7 @@ class Scanner2(scan.Scanner):
if show_asm in ('both', 'after'): if show_asm in ('both', 'after'):
for t in tokens: for t in tokens:
print(t) print(t.format())
print() print()
return tokens, customize return tokens, customize

11
uncompyle6/scanners/tok.py
View File

@@ -44,17 +44,16 @@ class Token:
def __str__(self): def __str__(self):
pattr = self.pattr if self.pattr is not None else '' pattr = self.pattr if self.pattr is not None else ''
prefix = '\n%4d ' % self.linestart if self.linestart else (' ' * 6) prefix = '\n%3d ' % self.linestart if self.linestart else (' ' * 6)
return (prefix + return (prefix +
('%6s %-17s %r' % (self.offset, self.type, pattr))) ('%9s %-18s %r' % (self.offset, self.type, pattr)))
def format(self): def format(self):
prefix = '\n%4d ' % self.linestart if self.linestart else (' ' * 6) prefix = '\n%3d ' % self.linestart if self.linestart else (' ' * 6)
offset_opname = '%6s %-17s' % (self.offset, self.type) offset_opname = '%9s %-18s' % (self.offset, self.type)
argstr = "%6d " % self.attr if isinstance(self.attr, int) else (' '*7) argstr = "%6d " % self.attr if isinstance(self.attr, int) else (' '*7)
pattr = self.pattr if self.pattr is not None else ''
if self.has_arg: if self.has_arg:
return "%s%s%s %r" % (prefix, offset_opname, argstr, pattr) return "%s%s%s %r" % (prefix, offset_opname, argstr, self.pattr)
else: else:
return "%s%s" % (prefix, offset_opname) return "%s%s" % (prefix, offset_opname)