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

Isolate some 3.x dictcomp grammar rules

Browse Source
This commit is contained in:
rocky
2018-03-22 13:34:39 -04:00
parent fcb4409e50
commit df55ce3212
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
uncompyle6/parsers/parse3.py
View File

@@ -392,9 +392,6 @@ class Python3Parser(PythonParser):
''' '''
load_genexpr ::= LOAD_GENEXPR load_genexpr ::= LOAD_GENEXPR
load_genexpr ::= BUILD_TUPLE_1 LOAD_GENEXPR LOAD_CONST load_genexpr ::= BUILD_TUPLE_1 LOAD_GENEXPR LOAD_CONST
# Is there something general going on here?
dict_comp ::= load_closure LOAD_DICTCOMP LOAD_CONST MAKE_CLOSURE_0 expr GET_ITER CALL_FUNCTION_1
''' '''
def p_expr3(self, args): def p_expr3(self, args):
@@ -574,6 +571,10 @@ class Python3Parser(PythonParser):
seen_LOAD_BUILD_CLASS = False seen_LOAD_BUILD_CLASS = False
seen_GET_AWAITABLE_YIELD_FROM = False seen_GET_AWAITABLE_YIELD_FROM = False
# This is used in parse36.py as well as here
self.seen_LOAD_DICTCOMP = False
# Loop over instructions adding custom grammar rules based on # Loop over instructions adding custom grammar rules based on
# a specific instruction seen. # a specific instruction seen.
@@ -783,6 +784,7 @@ class Python3Parser(PythonParser):
self.addRule("expr ::= LOAD_CLASSNAME", nop_func) self.addRule("expr ::= LOAD_CLASSNAME", nop_func)
custom_ops_seen.add(opname) custom_ops_seen.add(opname)
elif opname == 'LOAD_DICTCOMP': elif opname == 'LOAD_DICTCOMP':
self.seen_LOAD_DICTCOMP = True
if has_get_iter_call_function1: if has_get_iter_call_function1:
rule_pat = ("dict_comp ::= LOAD_DICTCOMP %sMAKE_FUNCTION_0 expr " rule_pat = ("dict_comp ::= LOAD_DICTCOMP %sMAKE_FUNCTION_0 expr "
"GET_ITER CALL_FUNCTION_1") "GET_ITER CALL_FUNCTION_1")
@@ -815,6 +817,17 @@ class Python3Parser(PythonParser):
# DRY with MAKE_FUNCTION # DRY with MAKE_FUNCTION
# Note: this probably doesn't handle kwargs proprerly # Note: this probably doesn't handle kwargs proprerly
if opname == 'MAKE_CLOSURE_0' and self.seen_LOAD_DICTCOMP:
# Is there something general going on here?
# Note that 3.6+ doesn't do this, but we'll remove
# this rule in parse36.py
rule = """
dict_comp ::= load_closure LOAD_DICTCOMP LOAD_CONST
MAKE_CLOSURE_0 expr
GET_ITER CALL_FUNCTION_1
"""
self.addRule(rule, nop_func)
args_pos, args_kw, annotate_args = token.attr args_pos, args_kw, annotate_args = token.attr
# FIXME: Fold test into add_make_function_rule # FIXME: Fold test into add_make_function_rule

11
uncompyle6/parsers/parse36.py
View File

@@ -36,9 +36,6 @@ class Python36Parser(Python35Parser):
# 3.6 redoes how return_closure works. FIXME: Isolate to LOAD_CLOSURE # 3.6 redoes how return_closure works. FIXME: Isolate to LOAD_CLOSURE
return_closure ::= LOAD_CLOSURE DUP_TOP STORE_NAME RETURN_VALUE RETURN_LAST return_closure ::= LOAD_CLOSURE DUP_TOP STORE_NAME RETURN_VALUE RETURN_LAST
# Is there something general going on here? FIXME: Isolate to LOAD_DICTCOMP
dict_comp ::= load_closure LOAD_DICTCOMP LOAD_CONST MAKE_FUNCTION_8 expr GET_ITER CALL_FUNCTION_1
stmt ::= conditional_lambda stmt ::= conditional_lambda
conditional_lambda ::= expr jmp_false expr return_if_lambda conditional_lambda ::= expr jmp_false expr return_if_lambda
return_stmt_lambda LAMBDA_MARKER return_stmt_lambda LAMBDA_MARKER
@@ -106,6 +103,14 @@ class Python36Parser(Python35Parser):
fstring_single ::= expr FORMAT_VALUE fstring_single ::= expr FORMAT_VALUE
""" """
self.add_unique_doc_rules(rules_str, customize) self.add_unique_doc_rules(rules_str, customize)
elif opname == 'MAKE_FUNCTION_8' and self.seen_LOAD_DICTCOMP:
# Is there something general going on here?
rule = """
dict_comp ::= load_closure LOAD_DICTCOMP LOAD_CONST
MAKE_FUNCTION_8 expr
GET_ITER CALL_FUNCTION_1
"""
self.addRule(rule, nop_func)
elif opname == 'BEFORE_ASYNC_WITH': elif opname == 'BEFORE_ASYNC_WITH':
rules_str = """ rules_str = """
stmt ::= async_with_stmt stmt ::= async_with_stmt