Add TYPE_COMMENT in the grammar excerpt in comments.

progval · progval · commit ae3eadaa0d1e · 2020-09-09T11:30:05.000+02:00
Completely ignored for now as I don't want to prioritize this, but
needed in order to keep up with other evolutions of the grammar.

cpython commit: dcfcd146f8e6fc5c2fc16a4c192a0c5f5ca8c53c
diff --git a/src/functions.rs b/src/functions.rs
@@ -5,7 +5,7 @@ use nom::IResult;
 use ast::*;
 use expressions::ExpressionParser;
 use helpers::*;
-use statements::{block, ImportParser};
+use statements::{block, func_body_suite, ImportParser};
 
 /*********************************************************************
  * Decorators
@@ -46,7 +46,7 @@ named_args!(pub decorated(indent: usize) <StrSpan, CompoundStatement>,
  *********************************************************************/
 
 // async_funcdef: 'async' funcdef
-// funcdef: 'def' NAME parameters ['->' test] ':' suite
+// funcdef: 'def' NAME parameters ['->' test] ':' [TYPE_COMMENT] func_body_suite
 named_args!(funcdef(indent: usize, decorators: Vec<Decorator>) <StrSpan, CompoundStatement>,
   do_parse!(
     indent!(indent) >>
@@ -57,7 +57,7 @@ named_args!(funcdef(indent: usize, decorators: Vec<Decorator>) <StrSpan, Compoun
     parameters: ws_nonl!(parameters) >>
     return_type: opt!(ws_nonl!(preceded!(tag!("->"), call!(ExpressionParser::<NewlinesAreNotSpaces>::test)))) >>
     ws_nonl!(char!(':')) >>
-    code: call!(block, indent) >> (
+    code: call!(func_body_suite, indent) >> (
       CompoundStatement::Funcdef(Funcdef {
           async: async.is_some(), decorators, name, parameters, return_type: return_type.map(|t| *t), code
       })
@@ -195,11 +195,11 @@ named!(parameters<StrSpan, TypedArgsList>,
   map!(delimited!(char!('('), opt!(ws_comm!(typedargslist)), char!(')')), |o| o.unwrap_or_default())
 );
 
-// typedargslist: (tfpdef ['=' test] (',' tfpdef ['=' test])* [',' [
-//         '*' [tfpdef] (',' tfpdef ['=' test])* [',' ['**' tfpdef [',']]]
-//       | '**' tfpdef [',']]]
-//   | '*' [tfpdef] (',' tfpdef ['=' test])* [',' ['**' tfpdef [',']]]
-//   | '**' tfpdef [','])
+// typedargslist: (tfpdef ['=' test] (',' [TYPE_COMMENT] tfpdef ['=' test])* (TYPE_COMMENT | [',' [TYPE_COMMENT] [
+//        '*' [tfpdef] (',' [TYPE_COMMENT] tfpdef ['=' test])* (TYPE_COMMENT | [',' [TYPE_COMMENT] ['**' tfpdef [','] [TYPE_COMMENT]]])
+//      | '**' tfpdef [','] [TYPE_COMMENT]]])
+//  | '*' [tfpdef] (',' [TYPE_COMMENT] tfpdef ['=' test])* (TYPE_COMMENT | [',' [TYPE_COMMENT] ['**' tfpdef [','] [TYPE_COMMENT]]])
+//  | '**' tfpdef [','] [TYPE_COMMENT])
 //
 // tfpdef: NAME [':' test]
 //
diff --git a/src/statements.rs b/src/statements.rs
@@ -57,7 +57,7 @@ named!(small_stmt<StrSpan, Statement>,
  *********************************************************************/
 
 // expr_stmt: testlist_star_expr (annassign | augassign (yield_expr|testlist) |
-//                     ('=' (yield_expr|testlist_star_expr))*)
+//                      [('=' (yield_expr|testlist_star_expr))+ [TYPE_COMMENT]] )
 // annassign: ':' test ['=' (yield_expr|testlist)]
 named!(expr_stmt<StrSpan, Statement>,
   do_parse!(
@@ -354,6 +354,12 @@ named_args!(cond_and_block(indent: usize) <StrSpan, (Expression, Vec<Statement>)
   ))
 );
 
+// func_body_suite: simple_stmt | NEWLINE [TYPE_COMMENT NEWLINE] INDENT stmt+ DEDENT
+// for now, we ignore type comments, so it's exactly the same as 'suite'
+named_args!(pub func_body_suite(indent: usize) <StrSpan, Vec<Statement>>,
+  call!(block, indent)
+);
+
 // compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated | async_stmt
 named_args!(compound_stmt(indent: usize) <StrSpan, CompoundStatement>,
   alt!(
@@ -419,7 +425,7 @@ named_args!(while_stmt(indent: usize) <StrSpan, CompoundStatement>,
   )
 );
 
-// for_stmt: 'for' exprlist 'in' testlist ':' suite ['else' ':' suite]
+// for_stmt: 'for' exprlist 'in' testlist ':' [TYPE_COMMENT] suite ['else' ':' suite]
 named_args!(for_stmt(indent: usize) <StrSpan, CompoundStatement>,
   do_parse!(
     indent!(indent) >>
@@ -500,7 +506,7 @@ named_args!(try_stmt(indent: usize) <StrSpan, CompoundStatement>,
   )
 );
 
-// with_stmt: 'with' with_item (',' with_item)*  ':' suite
+// with_stmt: 'with' with_item (',' with_item)*  ':' [TYPE_COMMENT] suite
 // with_item: test ['as' expr]
 named_args!(with_stmt(indent: usize) <StrSpan, CompoundStatement>,
   do_parse!(
