Move it to _PyRuntime.parser.

python · Dec 15, 2022 · 2d0876e · 2d0876e
1 parent 432fa46
commit 2d0876e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/Include/internal/pycore_global_objects.h b/Include/internal/pycore_global_objects.h
@@ -8,7 +8,6 @@ extern "C" {
 #  error "this header requires Py_BUILD_CORE define"
 #endif
 
-#include "pycore_ast.h"             // struct _expr
 #include "pycore_gc.h"              // PyGC_Head
 #include "pycore_global_strings.h"  // struct _Py_global_strings
 #include "pycore_hamt.h"            // PyHamtNode_Bitmap
@@ -61,8 +60,6 @@ struct _Py_static_objects {
         _PyGC_Head_UNUSED _hamt_bitmap_node_empty_gc_not_used;
         PyHamtNode_Bitmap hamt_bitmap_node_empty;
         _PyContextTokenMissing context_token_missing;
-
-        struct _expr parser_dummy_name;
     } singletons;
 };
 

diff --git a/Include/internal/pycore_parser.h b/Include/internal/pycore_parser.h
@@ -9,7 +9,7 @@ extern "C" {
 #endif
 
 
-#include "pycore_ast.h"             // Name_kind
+#include "pycore_ast.h"             // struct _expr
 #include "pycore_global_strings.h"  // _Py_DECLARE_STR()
 #include "pycore_pyarena.h"         // PyArena
 
@@ -24,20 +24,21 @@ struct _parser_runtime_state {
 #else
     int _not_used;
 #endif
+    struct _expr dummy_name;
 };
 
-
 _Py_DECLARE_STR(empty, "")
-
-#define _Py_parser_dummy_name_INIT \
+#define _parser_runtime_state_INIT \
     { \
-        .kind = Name_kind, \
-        .v.Name.id = &_Py_STR(empty), \
-        .v.Name.ctx = Load, \
-        .lineno = 1, \
-        .col_offset = 0, \
-        .end_lineno = 1, \
-        .end_col_offset = 0, \
+        .dummy_name = { \
+            .kind = Name_kind, \
+            .v.Name.id = &_Py_STR(empty), \
+            .v.Name.ctx = Load, \
+            .lineno = 1, \
+            .col_offset = 0, \
+            .end_lineno = 1, \
+            .end_col_offset = 0, \
+        }, \
     }
 
 extern struct _mod* _PyParser_ASTFromString(

diff --git a/Include/internal/pycore_runtime_init.h b/Include/internal/pycore_runtime_init.h
@@ -33,6 +33,7 @@ extern "C" {
               until _PyInterpreterState_Enable() is called. */ \
             .next_id = -1, \
         }, \
+        .parser = _parser_runtime_state_INIT, \
         .imports = { \
             .lock = { \
                 .mutex = NULL, \
@@ -91,7 +92,6 @@ extern "C" {
                 .context_token_missing = { \
                     .ob_base = _PyObject_IMMORTAL_INIT(&_PyContextTokenMissing_Type), \
                 }, \
-                .parser_dummy_name = _Py_parser_dummy_name_INIT, \
             }, \
         }, \
         ._main_interpreter = _PyInterpreterState_INIT, \

diff --git a/Parser/action_helpers.c b/Parser/action_helpers.c
@@ -3,12 +3,11 @@
 #include "pegen.h"
 #include "string_parser.h"
 #include "pycore_runtime.h"         // _PyRuntime
-#include "pycore_global_objects.h"  // _Py_SINGLETON()
 
 void *
 _PyPegen_dummy_name(Parser *p, ...)
 {
-    return &_Py_SINGLETON(parser_dummy_name);
+    return &_PyRuntime.parser.dummy_name;
 }
 
 /* Creates a single-element asdl_seq* that contains a */