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

Python 2.5- grammar reduction

Browse Source
This commit is contained in:
rocky
2017-11-27 12:39:33 -05:00
parent 4afff131f4
commit bd4f2d086c
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
__pkginfo__.py
View File

@@ -39,7 +39,7 @@ entry_points = {
'pydisassemble=uncompyle6.bin.pydisassemble:main', 'pydisassemble=uncompyle6.bin.pydisassemble:main',
]} ]}
ftp_url = None ftp_url = None
install_requires = ['spark-parser >= 1.8.1, < 1.9.0', install_requires = ['spark-parser >= 1.8.2, < 1.9.0',
'xdis >= 3.6.1, < 3.7.0', 'six'] 'xdis >= 3.6.1, < 3.7.0', 'six']
license = 'MIT' license = 'MIT'
mailing_list = 'python-debugger@googlegroups.com' mailing_list = 'python-debugger@googlegroups.com'

15
uncompyle6/parsers/parse25.py
View File

@@ -50,7 +50,7 @@ class Python25Parser(Python26Parser):
""" """
def add_custom_rules(self, tokens, customize): def add_custom_rules(self, tokens, customize):
# grammar rules inherited from Python 2.6 # Remove grammar rules inherited from Python 2.6 or Python 2
self.remove_rules(""" self.remove_rules("""
setupwith ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 POP_TOP setupwith ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 POP_TOP
withstmt ::= expr setupwith SETUP_FINALLY suite_stmts_opt withstmt ::= expr setupwith SETUP_FINALLY suite_stmts_opt
@@ -58,6 +58,19 @@ class Python25Parser(Python26Parser):
withasstmt ::= expr setupwithas designator suite_stmts_opt withasstmt ::= expr setupwithas designator suite_stmts_opt
POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY POP_BLOCK LOAD_CONST COME_FROM WITH_CLEANUP END_FINALLY
assert2 ::= assert_expr jmp_true LOAD_ASSERT expr CALL_FUNCTION_1 RAISE_VARARGS_1 assert2 ::= assert_expr jmp_true LOAD_ASSERT expr CALL_FUNCTION_1 RAISE_VARARGS_1
stmt ::= classdefdeco
classdefdeco ::= classdefdeco1 designator
classdefdeco1 ::= expr classdefdeco1 CALL_FUNCTION_1
classdefdeco1 ::= expr classdefdeco2 CALL_FUNCTION_1
classdefdeco2 ::= LOAD_CONST expr mkfunc CALL_FUNCTION_0 BUILD_CLASS
mkfuncdeco ::= expr mkfuncdeco CALL_FUNCTION_1
ret_cond ::= expr jmp_false_then expr RETURN_END_IF POP_TOP ret_expr_or_cond
return_if_stmt ::= ret_expr RETURN_END_IF POP_TOP
return_if_stmts ::= return_if_stmt
return_stmt ::= ret_expr RETURN_END_IF POP_TOP
return_stmt ::= ret_expr RETURN_VALUE POP_TOP
stmt ::= conditional_lambda
setupwithas ::= DUP_TOP LOAD_ATTR ROT_TWO LOAD_ATTR CALL_FUNCTION_0 setup_finally
""") """)
super(Python25Parser, self).add_custom_rules(tokens, customize) super(Python25Parser, self).add_custom_rules(tokens, customize)
if self.version == 2.5: if self.version == 2.5:

2
uncompyle6/parsers/parse26.py
View File

@@ -265,7 +265,7 @@ class Python26Parser(Python2Parser):
invalid = super(Python26Parser, invalid = super(Python26Parser,
self).reduce_is_invalid(rule, ast, self).reduce_is_invalid(rule, ast,
tokens, first, last) tokens, first, last)
if invalid: if invalid or tokens is None:
return invalid return invalid
if rule == ('and', ('expr', 'jmp_false', 'expr', '\\e_come_from_opt')): if rule == ('and', ('expr', 'jmp_false', 'expr', '\\e_come_from_opt')):