Add typed and optional arguments to the grammar.

ecffe6f6 · Robert Bradshaw · bd2f4649 · ecffe6f6
Commit ecffe6f6 authored Aug 22, 2014 by Robert Bradshaw
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Cython/Parser/Grammar Cython/Parser/Grammar +3 -2

No files found.
--- a/Cython/Parser/Grammar
+++ b/Cython/Parser/Grammar
@@ -26,8 +26,9 @@ funcdef: 'def' NAME parameters ':' suite
 parameters: '(' [varargslist] ')'
 varargslist: ((fpdef ['=' test] ',')*
              ('*' NAME [',' '**' NAME] | '**' NAME) |
-              fpdef ['=' test] (',' fpdef ['=' test])* [','])
-fpdef: NAME | '(' fplist ')'
+              fpdef ['=' (test | '*')] (',' fpdef ['=' (test | '*')])* [',']
+              ['.' '.' '.'])
+fpdef: maybe_typed_name | '(' fplist ')'
 fplist: fpdef (',' fpdef)* [',']

 stmt: simple_stmt | compound_stmt | cdef_stmt | ctypedef_stmt