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

BUILD_MAP_UNPACK'ing of dictionaries in 3.5

Browse Source
This commit is contained in:
rocky
2017-05-02 05:28:39 -04:00
parent 26cd91046e
commit 91b86ac156
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.5/01_map_unpack.pyc
View File

Binary file not shown.

2
test/simple_source/bug35/01_map_unpack.py
View File

@@ -5,3 +5,5 @@
# {'c': 1, {'d': 2}, **{'e': 3}} # {'c': 1, {'d': 2}, **{'e': 3}}
[*[]] [*[]]
{**{0:0 for a in b}} {**{0:0 for a in b}}
## {**{}, **{}}
## {**{}, **{}, **{}}

2
uncompyle6/parser.py
View File

@@ -35,6 +35,8 @@ class PythonParser(GenericASTBuilder):
'exprlist', 'kvlist', 'kwargs', 'come_froms', '_come_from', 'exprlist', 'kvlist', 'kwargs', 'come_froms', '_come_from',
# Python < 3 # Python < 3
'print_items', 'print_items',
# Python 3.5+
# 'unmap_dict',
# PyPy: # PyPy:
'kvlist_n']) 'kvlist_n'])

10
uncompyle6/parsers/parse3.py
View File

@@ -663,14 +663,16 @@ class Python3Parser(PythonParser):
rule = 'kvlist_n ::=' rule = 'kvlist_n ::='
self.add_unique_rule(rule, 'kvlist_n', 1, customize) self.add_unique_rule(rule, 'kvlist_n', 1, customize)
rule = "mapexpr ::= BUILD_MAP_n kvlist_n" rule = "mapexpr ::= BUILD_MAP_n kvlist_n"
elif self.version >= 3.5: elif self.version == 3.5:
if opname != 'BUILD_MAP_WITH_CALL': if opname != 'BUILD_MAP_WITH_CALL':
rule = kvlist_n + ' ::= ' + 'expr ' * (token.attr*2) if opname == 'BUILD_MAP_UNPACK':
lhs = 'unmap_dict'
else:
lhs = kvlist_n
rule = lhs + ' ::= ' + 'expr ' * (token.attr*2)
self.add_unique_rule(rule, opname, token.attr, customize) self.add_unique_rule(rule, opname, token.attr, customize)
lhs = 'unmapexpr' if opname == 'BUILD_MAP_UNPACK' else' mapexpr' lhs = 'unmapexpr' if opname == 'BUILD_MAP_UNPACK' else' mapexpr'
rule = "%s ::= %s %s" % (lhs, kvlist_n, opname) rule = "%s ::= %s %s" % (lhs, kvlist_n, opname)
# print("XXX", rule)
else: else:
rule = kvlist_n + ' ::= ' + 'expr expr STORE_MAP ' * token.attr rule = kvlist_n + ' ::= ' + 'expr expr STORE_MAP ' * token.attr
self.add_unique_rule(rule, opname, token.attr, customize) self.add_unique_rule(rule, opname, token.attr, customize)

8
uncompyle6/parsers/parse35.py
View File

@@ -33,7 +33,12 @@ class Python35Parser(Python34Parser):
stmt ::= await_stmt stmt ::= await_stmt
await_stmt ::= await_expr POP_TOP await_stmt ::= await_expr POP_TOP
expr ::= unmap_dict
expr ::= unmapexpr
unmap_dict ::= mapexpr BUILD_MAP_UNPACK unmap_dict ::= mapexpr BUILD_MAP_UNPACK
unmap_dict ::= mapexpr unmap_dict
build_list ::= expr BUILD_MAP_UNPACK build_list ::= expr BUILD_MAP_UNPACK
# Python 3.5+ has WITH_CLEANUP_START/FINISH # Python 3.5+ has WITH_CLEANUP_START/FINISH
@@ -132,9 +137,6 @@ class Python35Parser(Python34Parser):
# differently than 3.3, 3.4 # differently than 3.3, 3.4
yield_from ::= expr GET_YIELD_FROM_ITER LOAD_CONST YIELD_FROM yield_from ::= expr GET_YIELD_FROM_ITER LOAD_CONST YIELD_FROM
expr ::= unmap_dict
expr ::= unmapexpr
""" """
def add_custom_rules(self, tokens, customize): def add_custom_rules(self, tokens, customize):