+1

Author: skirpichev

Parser/pegen.c

@@ -1054,7 +1054,9 @@ _PyPegen_run_parser_from_file_pointer(FILE *fp, int start_rule, PyObject *filena
                              PyCompilerFlags *flags, int *errcode,
                              PyObject **interactive_src, PyArena *arena)
 {
-    struct tok_state *tok = _PyTokenizer_FromFile(fp, enc, ps1, ps2);
+    int parser_flags = compute_parser_flags(flags);
+    struct tok_state *tok = _PyTokenizer_FromFile(fp, enc, ps1, ps2,
+                                                  parser_flags & PyPARSE_BARRY_AS_BDFL);
     if (tok == NULL) {
         if (PyErr_Occurred()) {
             _PyTokenizer_raise_init_error(filename_ob);
@@ -1080,7 +1082,6 @@ _PyPegen_run_parser_from_file_pointer(FILE *fp, int start_rule, PyObject *filena
         goto error;
     }
 
-    int parser_flags = compute_parser_flags(flags);
     Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, PY_MINOR_VERSION,
                                     errcode, NULL, arena);
     if (p == NULL) {

Parser/tokenizer/file_tokenizer.c

@@ -371,7 +371,8 @@ tok_underflow_file(struct tok_state *tok)
 /* Set up tokenizer for file */
 struct tok_state *
 _PyTokenizer_FromFile(FILE *fp, const char* enc,
-                      const char *ps1, const char *ps2)
+                      const char *ps1, const char *ps2,
+                      int BARRY_AS_BDFL)
 {
     struct tok_state *tok = _PyTokenizer_tok_new();
     if (tok == NULL)
@@ -401,6 +402,7 @@ _PyTokenizer_FromFile(FILE *fp, const char* enc,
         }
         tok->decoding_state = STATE_NORMAL;
     }
+    tok->BARRY_AS_BDFL = BARRY_AS_BDFL;
     return tok;
 }
 
@@ -457,7 +459,7 @@ _PyTokenizer_FindEncodingFilename(int fd, PyObject *filename)
     if (fp == NULL) {
         return NULL;
     }
-    tok = _PyTokenizer_FromFile(fp, NULL, NULL, NULL);
+    tok = _PyTokenizer_FromFile(fp, NULL, NULL, NULL, 0);
     if (tok == NULL) {
         fclose(fp);
         return NULL;

Parser/tokenizer/tokenizer.h

@@ -7,7 +7,7 @@ struct tok_state *_PyTokenizer_FromString(const char *, int, int, int);
 struct tok_state *_PyTokenizer_FromUTF8(const char *, int, int, int);
 struct tok_state *_PyTokenizer_FromReadline(PyObject*, const char*, int, int);
 struct tok_state *_PyTokenizer_FromFile(FILE *, const char*,
-                                              const char *, const char *);
+                                              const char *, const char *, int);
 
 #define tok_dump _Py_tok_dump