[Python-checkins] bpo-40334: Correct return value of func_type_comment (GH-19833)

[Pablo Galindo]

https://github.com/python/cpython/commit/d955241469c18c946924dba79c18a9ef200391ad
commit: d955241469c18c946924dba79c18a9ef200391ad
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020-05-01T08:32:09-07:00
summary:

bpo-40334: Correct return value of func_type_comment (GH-19833)

files:
M Grammar/python.gram
M Parser/pegen/parse.c

diff --git a/Grammar/python.gram b/Grammar/python.gram
index 3813d8845be24..0acd851e09ff6 100644
--- a/Grammar/python.gram
+++ b/Grammar/python.gram
@@ -210,7 +210,7 @@ function_def_raw[stmt_ty]:
                             (params) ? params : CHECK(_PyPegen_empty_arguments(p)),
                             b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA)
         ) }
-func_type_comment[PyObject*]:
+func_type_comment[Token*]:
     | NEWLINE t=TYPE_COMMENT &(NEWLINE INDENT) { t }  # Must be followed by indented block
     | invalid_double_type_comments
     | TYPE_COMMENT
diff --git a/Parser/pegen/parse.c b/Parser/pegen/parse.c
index 33c92c232c54a..f4dacbffba493 100644
--- a/Parser/pegen/parse.c
+++ b/Parser/pegen/parse.c
@@ -408,7 +408,7 @@ static stmt_ty return_stmt_rule(Parser *p);
 static stmt_ty raise_stmt_rule(Parser *p);
 static stmt_ty function_def_rule(Parser *p);
 static stmt_ty function_def_raw_rule(Parser *p);
-static PyObject* func_type_comment_rule(Parser *p);
+static Token* func_type_comment_rule(Parser *p);
 static arguments_ty params_rule(Parser *p);
 static arguments_ty parameters_rule(Parser *p);
 static asdl_seq* slash_no_default_rule(Parser *p);
@@ -3679,13 +3679,13 @@ function_def_raw_rule(Parser *p)
 //     | NEWLINE TYPE_COMMENT &(NEWLINE INDENT)
 //     | invalid_double_type_comments
 //     | TYPE_COMMENT
-static PyObject*
+static Token*
 func_type_comment_rule(Parser *p)
 {
     if (p->error_indicator) {
         return NULL;
     }
-    PyObject* res = NULL;
+    Token* res = NULL;
     int mark = p->mark;
     { // NEWLINE TYPE_COMMENT &(NEWLINE INDENT)
         Token * newline_var;