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

Merge branch 'master' into python-2.4

Browse Source
This commit is contained in:
rocky
2018-06-22 14:33:22 -04:00
parent eb30181e51 6fd8d2556b
commit f9392ed908
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.0/03_if_try_raise.pyc Normal file
View File

Binary file not shown.

BIN
test/bytecode_3.0/05_abc_test.pyc Normal file
View File

Binary file not shown.

8
uncompyle6/parsers/parse30.py
View File

@@ -28,7 +28,8 @@ class Python30Parser(Python31Parser):
# Specifically POP_TOP is more prevelant since there is no POP_JUMP_IF_...
# instructions
_ifstmts_jump ::= c_stmts_opt JUMP_FORWARD _come_froms POP_TOP COME_FROM
_ifstmts_jump ::= c_stmts JUMP_FORWARD _come_froms POP_TOP COME_FROM
_ifstmts_jump ::= c_stmts POP_TOP
# Used to keep index order the same in semantic actions
jb_pop_top ::= JUMP_BACK POP_TOP
@@ -65,6 +66,9 @@ class Python30Parser(Python31Parser):
jump_forward_else ::= JUMP_FORWARD POP_TOP
jump_absolute_else ::= JUMP_ABSOLUTE POP_TOP
except_suite ::= c_stmts POP_EXCEPT jump_except POP_TOP
except_suite_finalize ::= SETUP_FINALLY c_stmts_opt except_var_finalize END_FINALLY
_jump POP_TOP
# In many ways 3.0 is like 2.6. The below rules in fact are the same or similar.
@@ -96,7 +100,7 @@ class Python30Parser(Python31Parser):
return_if_lambda ::= RETURN_END_IF_LAMBDA
compare_chained1 ::= expr DUP_TOP ROT_THREE COMPARE_OP JUMP_IF_FALSE_OR_POP compare_chained2 COME_FROM
except_handler ::= jmp_abs COME_FROM_EXCEPT except_stmts END_FINALLY
except_suite ::= c_stmts POP_EXCEPT jump_except
""")
return

16
uncompyle6/semantics/customize3.py
View File

@@ -156,6 +156,22 @@ def customize_for_version3(self, version):
self.prune()
self.n_classdef3 = n_classdef3
if version == 3.0:
# In Python 3.0 there is code to move from _[dd] into
# the iteration variable. These rules we can ignore
# since we pick up the iteration variable some other way and
# we definitely don't include in the source _[dd].
def n_comp_iter(node):
if node[0] == 'expr':
n = node[0][0]
if (n == 'LOAD_FAST' and
n.pattr[0:2] == '_['):
self.prune()
pass
pass
# Not this special case, procede as normal...
self.default(node)
self.n_comp_iter = n_comp_iter
if version >= 3.3:
def n_yield_from(node):