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

Add COME_FROM_LOOP

Browse Source 
Note: we have regressed in --verify and some tests,
but I believe that's because we are producing more equivalant
(if uglier) programs. That's a separate problem though.
This commit is contained in:
rocky
2016-09-22 08:24:02 -04:00
parent 88f2ad1f5a
commit 760532b218
6 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
uncompyle6/scanners/scanner3.py
View File

@@ -103,10 +103,12 @@ class Scanner3(Scanner):
varargs_ops.add(self.opc.CALL_METHOD)
self.varargs_ops = frozenset(varargs_ops)
self.setup_ops = frozenset([
self.opc.SETUP_LOOP,
self.opc.SETUP_EXCEPT, self.opc.SETUP_FINALLY,
self.opc.SETUP_WITH])
setup_ops = [self.opc.SETUP_LOOP, self.opc.SETUP_EXCEPT,
self.opc.SETUP_FINALLY]
if self.version > 3.1:
setup_ops.append(self.opc.SETUP_WITH)
self.setup_ops = frozenset(setup_ops)
# Not really a set, but still clasification-like
self.statement_opcode_sequences = [
@@ -116,6 +118,9 @@ class Scanner3(Scanner):
(self.opc.POP_JUMP_IF_TRUE, self.opc.JUMP_ABSOLUTE)]
def opName(self, offset):
return self.opc.opname[self.code[offset]]
def ingest(self, co, classname=None, code_objects={}, show_asm=None):
"""
Pick out tokens from an uncompyle6 code object, and transform them,
@@ -193,13 +198,16 @@ class Scanner3(Scanner):
jump_idx = 0
for jump_offset in jump_targets[inst.offset]:
come_from_name = 'COME_FROM'
if (inst.offset in offset_action
and offset_action[inst.offset].type == 'end'
# Adjust the grammar and remove the below
and offset_action[inst.offset].name in ['EXCEPT']
):
come_from_name = '%s_%s' % (
(come_from_name, offset_action[inst.offset].name))
if (inst.offset in offset_action):
action = offset_action[inst.offset]
if (action.type == 'end'
# Adjust the grammar and remove the below
and (self.opName(jump_offset)[len('SETUP_'):]
== action.name)
and action.name in ['EXCEPT', 'LOOP']):
come_from_name = '%s_%s' % (
(come_from_name, action.name))
pass
pass
tokens.append(Token(come_from_name,
None, repr(jump_offset),