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

Increase test coverage. Remove some epsilon reductionsa

Browse Source
This commit is contained in:
rocky
2017-12-14 16:02:48 -05:00
parent 52f2b9341a
commit 6a1e8295b1
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.1/00_import.pyc
View File

Binary file not shown.

BIN
test/bytecode_3.2/00_import.pyc
View File

Binary file not shown.

BIN
test/bytecode_3.6/00_import.pyc
View File

Binary file not shown.

15
uncompyle6/parser.py
View File

@@ -46,14 +46,18 @@ class PythonParser(GenericASTBuilder):
] ]
self.collect = frozenset(nt_list) self.collect = frozenset(nt_list)
# For these items we need to keep the 1st epslion reduction since
# the nonterminal name is used in a semantic action.
self.keep_epsilon = frozenset(('kvlist_n', 'kvlist'))
# ??? Do we need a debug option to skip eliding singleton reductions? # ??? Do we need a debug option to skip eliding singleton reductions?
# Time will tell if it if useful in debugging # Time will tell if it if useful in debugging
# FIXME: optional_nt is a misnomer. It's really about there being a # FIXME: optional_nt is a misnomer. It's really about there being a
# singleton reduction that we can simplify. It also happens to be optional # singleton reduction that we can simplify. It also happens to be optional
# in its other derivation # in its other derivation
self.optional_nt |= frozenset(['come_froms', 'suite_stmts', 'l_stmts_opt', self.optional_nt |= frozenset(('come_froms', 'suite_stmts', 'l_stmts_opt',
'c_stmts_opt']) 'c_stmts_opt'))
# Reduce singleton reductions in these nonterminals: # Reduce singleton reductions in these nonterminals:
# FIXME: would love to do expr, sstmts, stmts and # FIXME: would love to do expr, sstmts, stmts and
@@ -196,7 +200,12 @@ class PythonParser(GenericASTBuilder):
else: else:
rv = args[0] rv = args[0]
pass pass
rv.append(args[1]) # In a list-like entity where the first item goes to epsilon,
# drop that and save the 2nd item as the first one
if len(rv) == 0 and nt not in self.keep_epsilon:
rv = args[1]
else:
rv.append(args[1])
elif n == 1 and args[0] in self.singleton: elif n == 1 and args[0] in self.singleton:
rv = GenericASTBuilder.nonterminal(self, nt, args[0]) rv = GenericASTBuilder.nonterminal(self, nt, args[0])
del args[0] # save memory del args[0] # save memory

2
uncompyle6/parsers/parse36.py
View File

@@ -141,7 +141,7 @@ class Python36Parser(Python35Parser):
self.addRule("""expr ::= call_ex_kw self.addRule("""expr ::= call_ex_kw
expr ::= call_ex_kw2 expr ::= call_ex_kw2
call_ex_kw ::= expr expr build_map_unpack_with_call call_ex_kw ::= expr expr build_map_unpack_with_call
CALL_FUNCTION_EX_KW CALL_FUNCTION_EX_KW
call_ex_kw2 ::= expr call_ex_kw2 ::= expr
build_tuple_unpack_with_call build_tuple_unpack_with_call
build_map_unpack_with_call build_map_unpack_with_call