From d9d6eadf003605f4cdb55e38df2168dd1bc0dbd5 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 1 May 2020 09:42:32 -0700 Subject: [PATCH] Ensure that tok->type_comments is set on every path (GH-19828) --- Parser/pegen/pegen.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c index a7add8fbb14..6ff09b3b31f 100644 --- a/Parser/pegen/pegen.c +++ b/Parser/pegen/pegen.c @@ -1017,6 +1017,8 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags, return (Parser *) PyErr_NoMemory(); } assert(tok != NULL); + tok->type_comments = (flags & PyPARSE_TYPE_COMMENTS) > 0; + tok->async_hacks = (flags & PyPARSE_ASYNC_HACKS) > 0; p->tok = tok; p->keywords = NULL; p->n_keyword_lists = -1; @@ -1172,9 +1174,6 @@ _PyPegen_run_parser_from_string(const char *str, int start_rule, PyObject *filen int parser_flags = compute_parser_flags(flags); int feature_version = flags ? flags->cf_feature_version : PY_MINOR_VERSION; - tok->type_comments = (parser_flags & PyPARSE_TYPE_COMMENTS) > 0; - tok->async_hacks = (parser_flags & PyPARSE_ASYNC_HACKS) > 0; - Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, feature_version, NULL, arena); if (p == NULL) {