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

Small cleanup - remove POP_JUMP_TF

Browse Source
This commit is contained in:
rocky
2017-03-07 22:07:29 -05:00
parent 4f2ae2f603
commit 5856802902
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
uncompyle6/scanners/scanner3.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2015, 2016 by Rocky Bernstein # Copyright (c) 2015-2017 by Rocky Bernstein
# Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org> # Copyright (c) 2005 by Dan Pascu <dan@windowmaker.org>
# Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com> # Copyright (c) 2000-2002 by hartmut Goebel <h.goebel@crazy-compilers.com>
""" """
@@ -40,9 +40,6 @@ if PYTHON3:
globals().update(op3.opmap) globals().update(op3.opmap)
# POP_JUMP_IF is used by verify
POP_JUMP_TF = (POP_JUMP_IF_TRUE, POP_JUMP_IF_FALSE)
class Scanner3(Scanner): class Scanner3(Scanner):
def __init__(self, version, show_asm=None, is_pypy=False): def __init__(self, version, show_asm=None, is_pypy=False):
@@ -61,6 +58,8 @@ class Scanner3(Scanner):
setup_ops.append(self.opc.SETUP_WITH) setup_ops.append(self.opc.SETUP_WITH)
self.setup_ops = frozenset(setup_ops) self.setup_ops = frozenset(setup_ops)
self.pop_jump_tf = frozenset([self.opc.PJIF, self.opc.PJIT])
self.setup_ops_no_loop = frozenset(setup_ops) - frozenset([self.opc.SETUP_LOOP]) self.setup_ops_no_loop = frozenset(setup_ops) - frozenset([self.opc.SETUP_LOOP])
# Opcodes that can start a statement. # Opcodes that can start a statement.
@@ -661,7 +660,7 @@ class Scanner3(Scanner):
jump_back += 2 jump_back += 2
if_offset = None if_offset = None
if code[self.prev_op[next_line_byte]] not in POP_JUMP_TF: if code[self.prev_op[next_line_byte]] not in self.pop_jump_tf:
if_offset = self.prev[next_line_byte] if_offset = self.prev[next_line_byte]
if if_offset: if if_offset:
loop_type = 'while' loop_type = 'while'
@@ -706,7 +705,7 @@ class Scanner3(Scanner):
self.structs.append({'type': loop_type + '-else', self.structs.append({'type': loop_type + '-else',
'start': jump_back+3, 'start': jump_back+3,
'end': end}) 'end': end})
elif op in POP_JUMP_TF: elif op in self.pop_jump_tf:
start = offset + self.op_size(op) start = offset + self.op_size(op)
target = self.get_target(offset) target = self.get_target(offset)
rtarget = self.restrict_to_parent(target, parent) rtarget = self.restrict_to_parent(target, parent)
@@ -753,12 +752,12 @@ class Scanner3(Scanner):
target == self.get_target(prev_op[pre_rtarget]) and target == self.get_target(prev_op[pre_rtarget]) and
(prev_op[pre_rtarget] not in self.stmts or (prev_op[pre_rtarget] not in self.stmts or
self.get_target(prev_op[pre_rtarget]) > prev_op[pre_rtarget]) and self.get_target(prev_op[pre_rtarget]) > prev_op[pre_rtarget]) and
1 == len(self.remove_mid_line_ifs(self.rem_or(start, prev_op[pre_rtarget], POP_JUMP_TF, target)))): 1 == len(self.remove_mid_line_ifs(self.rem_or(start, prev_op[pre_rtarget], self.pop_jump_tf, target)))):
pass pass
elif (code[prev_op[pre_rtarget]] == self.opc.RETURN_VALUE elif (code[prev_op[pre_rtarget]] == self.opc.RETURN_VALUE
and self.remove_mid_line_ifs([offset]) and and self.remove_mid_line_ifs([offset]) and
1 == (len(set(self.remove_mid_line_ifs(self.rem_or(start, prev_op[pre_rtarget], 1 == (len(set(self.remove_mid_line_ifs(self.rem_or(start, prev_op[pre_rtarget],
POP_JUMP_TF, target))) | self.pop_jump_tf, target))) |
set(self.remove_mid_line_ifs(self.rem_or(start, prev_op[pre_rtarget], set(self.remove_mid_line_ifs(self.rem_or(start, prev_op[pre_rtarget],
(self.opc.POP_JUMP_IF_FALSE, (self.opc.POP_JUMP_IF_FALSE,
self.opc.POP_JUMP_IF_TRUE, self.opc.POP_JUMP_IF_TRUE,
@@ -841,6 +840,9 @@ class Scanner3(Scanner):
self.structs.append({'type': 'if-then', self.structs.append({'type': 'if-then',
'start': start, 'start': start,
'end': pre_rtarget}) 'end': pre_rtarget})
# FIXME: add this
# self.fixed_jumps[offset] = rtarget
self.not_continue.add(pre_rtarget) self.not_continue.add(pre_rtarget)
if rtarget < end and ( if rtarget < end and (