From dbf0e770e1dd18b955631217eeb5b072b075d2b6 Mon Sep 17 00:00:00 2001 From: Stefan Behnel Date: Mon, 8 Nov 2010 14:17:11 +0100 Subject: [PATCH] better function names in parser, declare new functions as C functions in Parsing.pxd --- Cython/Compiler/Parsing.pxd | 2 ++ Cython/Compiler/Parsing.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Cython/Compiler/Parsing.pxd b/Cython/Compiler/Parsing.pxd index b6418c9a..5416601f 100644 --- a/Cython/Compiler/Parsing.pxd +++ b/Cython/Compiler/Parsing.pxd @@ -35,6 +35,8 @@ cpdef p_yield_statement(PyrexScanner s) cpdef p_power(PyrexScanner s) cpdef p_new_expr(PyrexScanner s) cpdef p_trailer(PyrexScanner s, node1) +cpdef p_call_parse_args(PyrexScanner s, bint allow_genexp = *) +cpdef p_call_build_packed_args(pos, positional_args, keyword_args, star_arg) cpdef p_call(PyrexScanner s, function) cpdef p_index(PyrexScanner s, base) cpdef p_subscript_list(PyrexScanner s) diff --git a/Cython/Compiler/Parsing.py b/Cython/Compiler/Parsing.py index 37582939..4d7ad1d8 100644 --- a/Cython/Compiler/Parsing.py +++ b/Cython/Compiler/Parsing.py @@ -381,7 +381,7 @@ def p_trailer(s, node1): # arglist: argument (',' argument)* [','] # argument: [test '='] test # Really [keyword '='] test -def p_call_parse(s): +def p_call_parse_args(s, allow_genexp = True): # s.sy == '(' pos = s.position() s.next() @@ -430,7 +430,7 @@ def p_call_parse(s): s.expect(')') return positional_args, keyword_args, star_arg, starstar_arg -def p_call_prepare_full(pos, positional_args, keyword_args, star_arg): +def p_call_build_packed_args(pos, positional_args, keyword_args, star_arg): arg_tuple = None keyword_dict = None if positional_args or not star_arg: @@ -456,15 +456,15 @@ def p_call(s, function): pos = s.position() positional_args, keyword_args, star_arg, starstar_arg = \ - p_call_parse(s) + p_call_parse_args(s) if not (keyword_args or star_arg or starstar_arg): return ExprNodes.SimpleCallNode(pos, function = function, args = positional_args) else: - arg_tuple, keyword_dict = p_call_prepare_full(pos, - positional_args, keyword_args, star_arg) + arg_tuple, keyword_dict = p_call_build_packed_args( + pos, positional_args, keyword_args, star_arg) return ExprNodes.GeneralCallNode(pos, function = function, positional_args = arg_tuple, @@ -2626,9 +2626,9 @@ def p_class_statement(s, decorators): starstar_arg = None if s.sy == '(': positional_args, keyword_args, star_arg, starstar_arg = \ - p_call_parse(s) - arg_tuple, keyword_dict = p_call_prepare_full(pos, - positional_args, keyword_args, star_arg) + p_call_parse_args(s, allow_genexp = False) + arg_tuple, keyword_dict = p_call_build_packed_args( + pos, positional_args, keyword_args, star_arg) if arg_tuple is None: # XXX: empty arg_tuple arg_tuple = ExprNodes.TupleNode(pos, args = []) -- 2.26.2