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

Improvement from wibiti

Browse Source
This commit is contained in:
root
2013-04-25 17:14:29 +02:00
parent 0261ea1e66
commit f14ff1b76f
4 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
uncompyle2/scanner25.py
View File

@@ -31,6 +31,10 @@ class Scanner25(scan.Scanner):
customize = {} customize = {}
Token = self.Token # shortcut Token = self.Token # shortcut
self.code = array('B', co.co_code) self.code = array('B', co.co_code)
for i in self.op_range(0, len(self.code)):
if self.code[i] in (RETURN_VALUE, END_FINALLY):
n = i + 1
self.code = array('B', co.co_code[:n])
# linestarts contains bloc code adresse (addr,block) # linestarts contains bloc code adresse (addr,block)
self.linestarts = list(dis.findlinestarts(co)) self.linestarts = list(dis.findlinestarts(co))
self.prev = [0] self.prev = [0]
@@ -573,12 +577,13 @@ class Scanner25(scan.Scanner):
Return the next jump that was generated by an except SomeException: Return the next jump that was generated by an except SomeException:
construct in a try...except...else clause or None if not found. construct in a try...except...else clause or None if not found.
''' '''
except_match = self.first_instr(start, self.lines[start].next, (PJIF)) if self.code[start] == DUP_TOP:
if except_match: except_match = self.first_instr(start, len(self.code), (PJIF))
jmp = self.prev[self.get_target(except_match)] if except_match:
self.ignore_if.add(except_match) jmp = self.prev[self.get_target(except_match)]
self.not_continue.add(jmp) self.ignore_if.add(except_match)
return jmp self.not_continue.add(jmp)
return jmp
count_END_FINALLY = 0 count_END_FINALLY = 0
count_SETUP_ = 0 count_SETUP_ = 0
@@ -622,7 +627,6 @@ class Scanner25(scan.Scanner):
origStructCount = len(self.structs) origStructCount = len(self.structs)
if op == SETUP_LOOP: if op == SETUP_LOOP:
#import pdb; pdb.set_trace()
start = pos+3 start = pos+3
target = self.get_target(pos, op) target = self.get_target(pos, op)
end = self.restrict_to_parent(target, parent) end = self.restrict_to_parent(target, parent)

19
uncompyle2/scanner26.py
View File

@@ -32,6 +32,10 @@ class Scanner26(scan.Scanner):
customize = {} customize = {}
Token = self.Token # shortcut Token = self.Token # shortcut
self.code = array('B', co.co_code) self.code = array('B', co.co_code)
for i in self.op_range(0, len(self.code)):
if self.code[i] in (RETURN_VALUE, END_FINALLY):
n = i + 1
self.code = array('B', co.co_code[:n])
# linestarts contains bloc code adresse (addr,block) # linestarts contains bloc code adresse (addr,block)
self.linestarts = list(dis.findlinestarts(co)) self.linestarts = list(dis.findlinestarts(co))
self.prev = [0] self.prev = [0]
@@ -569,12 +573,14 @@ class Scanner26(scan.Scanner):
Return the next jump that was generated by an except SomeException: Return the next jump that was generated by an except SomeException:
construct in a try...except...else clause or None if not found. construct in a try...except...else clause or None if not found.
''' '''
except_match = self.first_instr(start, self.lines[start].next, (PJIF))
if except_match: if self.code[start] == DUP_TOP:
jmp = self.prev[self.get_target(except_match)] except_match = self.first_instr(start, len(self.code), (PJIF))
self.ignore_if.add(except_match) if except_match:
self.not_continue.add(jmp) jmp = self.prev[self.get_target(except_match)]
return jmp self.ignore_if.add(except_match)
self.not_continue.add(jmp)
return jmp
count_END_FINALLY = 0 count_END_FINALLY = 0
count_SETUP_ = 0 count_SETUP_ = 0
@@ -620,7 +626,6 @@ class Scanner26(scan.Scanner):
origStructCount = len(self.structs) origStructCount = len(self.structs)
if op == SETUP_LOOP: if op == SETUP_LOOP:
#import pdb; pdb.set_trace()
start = pos+3 start = pos+3
target = self.get_target(pos, op) target = self.get_target(pos, op)
end = self.restrict_to_parent(target, parent) end = self.restrict_to_parent(target, parent)

44
uncompyle2/scanner27.py
View File

@@ -28,12 +28,16 @@ class Scanner27(scan.Scanner):
rv = [] rv = []
customize = {} customize = {}
Token = self.Token # shortcut Token = self.Token # shortcut
self.code = code = array('B', co.co_code) self.code = array('B', co.co_code)
n = len(code) for i in self.op_range(0, len(self.code)):
if self.code[i] in (RETURN_VALUE, END_FINALLY):
n = i + 1
self.code = array('B', co.co_code[:n])
self.prev = [0] self.prev = [0]
# mapping adresses of instru & arg # mapping adresses of instru & arg
for i in self.op_range(0, n): for i in self.op_range(0, n):
op = code[i] op = self.code[i]
self.prev.append(i) self.prev.append(i)
if op >= HAVE_ARGUMENT: if op >= HAVE_ARGUMENT:
self.prev.append(i) self.prev.append(i)
@@ -50,7 +54,7 @@ class Scanner27(scan.Scanner):
while j < start_byte: while j < start_byte:
self.lines.append(linetuple(prev_line_no, start_byte)) self.lines.append(linetuple(prev_line_no, start_byte))
j += 1 j += 1
last_op = code[self.prev[start_byte]] last_op = self.code[self.prev[start_byte]]
(prev_start_byte, prev_line_no) = (start_byte, line_no) (prev_start_byte, prev_line_no) = (start_byte, line_no)
while j < n: while j < n:
self.lines.append(linetuple(prev_line_no, n)) self.lines.append(linetuple(prev_line_no, n))
@@ -73,21 +77,21 @@ class Scanner27(scan.Scanner):
self.load_asserts = set() self.load_asserts = set()
for i in self.op_range(0, n): for i in self.op_range(0, n):
if code[i] == PJIT and code[i+3] == LOAD_GLOBAL: if self.code[i] == PJIT and self.code[i+3] == LOAD_GLOBAL:
if names[self.get_argument(i+3)] == 'AssertionError': if names[self.get_argument(i+3)] == 'AssertionError':
self.load_asserts.add(i+3) self.load_asserts.add(i+3)
cf = self.find_jump_targets(code) cf = self.find_jump_targets(self.code)
# contains (code, [addrRefToCode]) # contains (code, [addrRefToCode])
last_stmt = self.next_stmt[0] last_stmt = self.next_stmt[0]
i = self.next_stmt[last_stmt] i = self.next_stmt[last_stmt]
replace = {} replace = {}
while i < n-1: while i < n-1:
if self.lines[last_stmt].next > i: if self.lines[last_stmt].next > i:
if code[last_stmt] == PRINT_ITEM: if self.code[last_stmt] == PRINT_ITEM:
if code[i] == PRINT_ITEM: if self.code[i] == PRINT_ITEM:
replace[i] = 'PRINT_ITEM_CONT' replace[i] = 'PRINT_ITEM_CONT'
elif code[i] == PRINT_NEWLINE: elif self.code[i] == PRINT_NEWLINE:
replace[i] = 'PRINT_NEWLINE_CONT' replace[i] = 'PRINT_NEWLINE_CONT'
last_stmt = i last_stmt = i
i = self.next_stmt[i] i = self.next_stmt[i]
@@ -97,7 +101,7 @@ class Scanner27(scan.Scanner):
last_import = imports[0] last_import = imports[0]
for i in imports[1:]: for i in imports[1:]:
if self.lines[last_import].next > i: if self.lines[last_import].next > i:
if code[last_import] == IMPORT_NAME == code[i]: if self.code[last_import] == IMPORT_NAME == self.code[i]:
replace[i] = 'IMPORT_NAME_CONT' replace[i] = 'IMPORT_NAME_CONT'
last_import = i last_import = i
@@ -110,7 +114,7 @@ class Scanner27(scan.Scanner):
offset="%s_%d" % (offset, k))) offset="%s_%d" % (offset, k)))
k += 1 k += 1
op = code[offset] op = self.code[offset]
op_name = opname[op] op_name = opname[op]
oparg = None; pattr = None oparg = None; pattr = None
if op >= HAVE_ARGUMENT: if op >= HAVE_ARGUMENT:
@@ -163,7 +167,7 @@ class Scanner27(scan.Scanner):
# Now all values loaded via LOAD_CLOSURE are packed into # Now all values loaded via LOAD_CLOSURE are packed into
# a tuple before calling MAKE_CLOSURE. # a tuple before calling MAKE_CLOSURE.
if op == BUILD_TUPLE and \ if op == BUILD_TUPLE and \
code[self.prev[offset]] == LOAD_CLOSURE: self.code[self.prev[offset]] == LOAD_CLOSURE:
continue continue
else: else:
op_name = '%s_%d' % (op_name, oparg) op_name = '%s_%d' % (op_name, oparg)
@@ -172,7 +176,7 @@ class Scanner27(scan.Scanner):
elif op == JA: elif op == JA:
target = self.get_target(offset) target = self.get_target(offset)
if target < offset: if target < offset:
if offset in self.stmts and code[offset+3] not in (END_FINALLY, POP_BLOCK) \ if offset in self.stmts and self.code[offset+3] not in (END_FINALLY, POP_BLOCK) \
and offset not in self.not_continue: and offset not in self.not_continue:
op_name = 'CONTINUE' op_name = 'CONTINUE'
else: else:
@@ -298,12 +302,13 @@ class Scanner27(scan.Scanner):
construct in a try...except...else clause or None if not found. construct in a try...except...else clause or None if not found.
''' '''
except_match = self.first_instr(start, self.lines[start].next, POP_JUMP_IF_FALSE) if self.code[start] == DUP_TOP:
if except_match: except_match = self.first_instr(start, len(self.code), POP_JUMP_IF_FALSE)
jmp = self.prev[self.get_target(except_match)] if except_match:
self.ignore_if.add(except_match) jmp = self.prev[self.get_target(except_match)]
self.not_continue.add(jmp) self.ignore_if.add(except_match)
return jmp self.not_continue.add(jmp)
return jmp
count_END_FINALLY = 0 count_END_FINALLY = 0
count_SETUP_ = 0 count_SETUP_ = 0
@@ -346,7 +351,6 @@ class Scanner27(scan.Scanner):
origStructCount = len(self.structs) origStructCount = len(self.structs)
if op == SETUP_LOOP: if op == SETUP_LOOP:
#import pdb; pdb.set_trace()
start = pos+3 start = pos+3
target = self.get_target(pos, op) target = self.get_target(pos, op)
end = self.restrict_to_parent(target, parent) end = self.restrict_to_parent(target, parent)

3
uncompyle2/walker.py
View File

@@ -917,6 +917,7 @@ class Walker(GenericASTTraversal, object):
#assert isinstance(code, Code) #assert isinstance(code, Code)
ast = self.build_ast(code._tokens, code._customize) ast = self.build_ast(code._tokens, code._customize)
self.customize(code._customize)
ast = ast[0][0][0] ast = ast[0][0][0]
n = ast[iter_index] n = ast[iter_index]
@@ -1420,7 +1421,7 @@ class Walker(GenericASTTraversal, object):
self.print_(repr(ast)) self.print_(repr(ast))
return ast return ast
if len(tokens) > 2 or len(tokens) == 2 and not noneInNames: if len(tokens) >= 2 and not noneInNames:
if tokens[-1] == Token('RETURN_VALUE'): if tokens[-1] == Token('RETURN_VALUE'):
if tokens[-2] == Token('LOAD_CONST'): if tokens[-2] == Token('LOAD_CONST'):
del tokens[-2:] del tokens[-2:]