From: Lisandro Dalcin Date: Fri, 5 Feb 2010 19:00:31 +0000 (-0300) Subject: fix outdated Parsing.pxd after merging gsoc-danilo X-Git-Tag: 0.13.beta0~349^2~13 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e15e7a45d7dfa15335871bab35d2fbe2695b474;p=cython.git fix outdated Parsing.pxd after merging gsoc-danilo --- diff --git a/Cython/Compiler/Parsing.pxd b/Cython/Compiler/Parsing.pxd index c5f19761..e80d70a1 100644 --- a/Cython/Compiler/Parsing.pxd +++ b/Cython/Compiler/Parsing.pxd @@ -102,11 +102,11 @@ cpdef p_statement_list(PyrexScanner s, ctx, bint first_statement = *) cpdef p_suite(PyrexScanner s, ctx = *, bint with_doc = *, bint with_pseudo_doc = *) cpdef p_positional_and_keyword_args(PyrexScanner s, end_sy_set, type_positions= *, type_keywords= * ) -cpdef p_c_base_type(PyrexScanner s, bint self_flag = *, bint nonempty = *) +cpdef p_c_base_type(PyrexScanner s, bint self_flag = *, bint nonempty = *, templates = *) cpdef p_calling_convention(PyrexScanner s) cpdef p_c_complex_base_type(PyrexScanner s) -cpdef p_c_simple_base_type(PyrexScanner s, self_flag, nonempty) -cpdef p_buffer_access(PyrexScanner s, base_type_node) +cpdef p_c_simple_base_type(PyrexScanner s, bint self_flag, bint nonempty, templates = *) +cpdef p_buffer_or_template(PyrexScanner s, base_type_node) cpdef bint looking_at_name(PyrexScanner s) except -2 cpdef bint looking_at_expr(PyrexScanner s) except -2 cpdef bint looking_at_base_type(PyrexScanner s) except -2 @@ -150,4 +150,4 @@ cpdef p_doc_string(PyrexScanner s) cpdef p_code(PyrexScanner s, level= *) cpdef p_compiler_directive_comments(PyrexScanner s) cpdef p_module(PyrexScanner s, pxd, full_module_name) -cpdef p_cpp_class_definition(PyrexScanner s, ctx) +cpdef p_cpp_class_definition(PyrexScanner s, pos, ctx)