diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py index 36ff9a56..31e319d2 100644 --- a/uncompyle6/parser.py +++ b/uncompyle6/parser.py @@ -335,15 +335,15 @@ class PythonParser(GenericASTBuilder): def p_function_def(self, args): ''' - stmt ::= function_def - function_def ::= mkfunc store - stmt ::= funcdefdeco - funcdefdeco ::= mkfuncdeco store - mkfuncdeco ::= expr mkfuncdeco CALL_FUNCTION_1 - mkfuncdeco ::= expr mkfuncdeco0 CALL_FUNCTION_1 - mkfuncdeco0 ::= mkfunc - load_closure ::= load_closure LOAD_CLOSURE - load_closure ::= LOAD_CLOSURE + stmt ::= function_def + function_def ::= mkfunc store + stmt ::= function_def_deco + function_def_deco ::= mkfuncdeco store + mkfuncdeco ::= expr mkfuncdeco CALL_FUNCTION_1 + mkfuncdeco ::= expr mkfuncdeco0 CALL_FUNCTION_1 + mkfuncdeco0 ::= mkfunc + load_closure ::= load_closure LOAD_CLOSURE + load_closure ::= LOAD_CLOSURE ''' def p_generator_exp(self, args): diff --git a/uncompyle6/semantics/consts.py b/uncompyle6/semantics/consts.py index 95d6bdb5..32a245df 100644 --- a/uncompyle6/semantics/consts.py +++ b/uncompyle6/semantics/consts.py @@ -204,7 +204,7 @@ TABLE_DIRECT = { 'compare_chained2': ( '%[1]{pattr.replace("-", " ")} %p', (0, 19)), # 'classdef': (), # handled by n_classdef() 'function_def': ( '\n\n%|def %c\n', -2), # -2 to handle closures - 'funcdefdeco': ( '\n\n%c', 0), + 'function_def_deco': ( '\n\n%c', 0), 'mkfuncdeco': ( '%|@%c\n%c', 0, 1), 'mkfuncdeco0': ( '%|def %c\n', 0), 'classdefdeco': ( '\n\n%c', 0),