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

Grammar "COME_FROM"_from cleanups ...

Browse Source 
tryelse constructs in 2.x fixed up
_come_from -> _come_froms (COME_FROM*)
consolidate come_froms rule into sincle parser.py
This commit is contained in:
rocky
2017-12-03 05:10:59 -05:00
parent b1cdbe1656
commit 32f3d947bb
8 changed files with 37 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
uncompyle6/scanners/scanner2.py
View File

@@ -1037,14 +1037,17 @@ class Scanner2(Scanner):
elif not (code[label] == self.opc.POP_TOP and
code[self.prev[label]] == self.opc.RETURN_VALUE):
# In Python < 2.7, don't add a COME_FROM, for:
# RETURN_VALUE POP_TOP .. END_FINALLY
# ~RETURN_VALUE POP_TOP .. END_FINALLY
# or:
# RETURN_VALUE POP_TOP .. POP_TOP END_FINALLY
skip_come_from = False
if self.version <= 2.6:
skip_come_from = (code[offset+3] == self.opc.END_FINALLY or
(code[offset+3] == self.opc.POP_TOP
and code[offset+4] == self.opc.END_FINALLY))
# ~RETURN_VALUE POP_TOP .. POP_TOP END_FINALLY
skip_come_from = (code[offset+3] == self.opc.END_FINALLY or
(code[offset+3] == self.opc.POP_TOP
and code[offset+4] == self.opc.END_FINALLY))
# The below is for special try/else handling
if skip_come_from and op == self.opc.JUMP_FORWARD:
skip_come_from = False
if not skip_come_from:
# FIXME: rocky: I think we need something like this...
if offset not in set(self.ignore_if):