From b4536e1c6abe4c6219177a89e16575d05ea22f64 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Wed, 17 Mar 2021 23:11:03 +0100
Subject: [PATCH] bpo-43244: Rename pycore_ast.h to pycore_ast_state.h
 (GH-24907)

---
 Include/internal/{pycore_ast.h => pycore_ast_state.h} |  6 +++---
 Include/internal/pycore_interp.h                      |  2 +-
 Makefile.pre.in                                       |  5 +++--
 PCbuild/pythoncore.vcxproj                            |  1 +
 PCbuild/pythoncore.vcxproj.filters                    |  3 +++
 PCbuild/regen.vcxproj                                 | 10 +++++-----
 Parser/asdl_c.py                                      |  8 ++++----
 Python/Python-ast.c                                   |  2 +-
 8 files changed, 21 insertions(+), 16 deletions(-)
 rename Include/internal/{pycore_ast.h => pycore_ast_state.h} (98%)

diff --git a/Include/internal/pycore_ast.h b/Include/internal/pycore_ast_state.h
similarity index 98%
rename from Include/internal/pycore_ast.h
rename to Include/internal/pycore_ast_state.h
index 2d0c5fb97a7..c5ae2242177 100644
--- a/Include/internal/pycore_ast.h
+++ b/Include/internal/pycore_ast_state.h
@@ -1,7 +1,7 @@
 // File automatically generated by Parser/asdl_c.py.
 
-#ifndef Py_INTERNAL_AST_H
-#define Py_INTERNAL_AST_H
+#ifndef Py_INTERNAL_AST_STATE_H
+#define Py_INTERNAL_AST_STATE_H
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -240,5 +240,5 @@ struct ast_state {
 #ifdef __cplusplus
 }
 #endif
-#endif /* !Py_INTERNAL_AST_H */
+#endif /* !Py_INTERNAL_AST_STATE_H */
 
diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
index ea770daedd8..1e4b3ff71ee 100644
--- a/Include/internal/pycore_interp.h
+++ b/Include/internal/pycore_interp.h
@@ -9,7 +9,7 @@ extern "C" {
 #endif
 
 #include "pycore_atomic.h"        // _Py_atomic_address
-#include "pycore_ast.h"           // struct ast_state
+#include "pycore_ast_state.h"     // struct ast_state
 #include "pycore_gil.h"           // struct _gil_runtime_state
 #include "pycore_gc.h"            // struct _gc_runtime_state
 #include "pycore_warnings.h"      // struct _warnings_runtime_state
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 50bd75c63a4..ee93ab6ca15 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -854,11 +854,11 @@ regen-ast:
 	$(PYTHON_FOR_REGEN) $(srcdir)/Parser/asdl_c.py \
 		$(srcdir)/Parser/Python.asdl \
 		-H $(srcdir)/Include/Python-ast.h.new \
-		-I $(srcdir)/Include/internal/pycore_ast.h.new \
+		-I $(srcdir)/Include/internal/pycore_ast_state.h.new \
 		-C $(srcdir)/Python/Python-ast.c.new
 
 	$(UPDATE_FILE) $(srcdir)/Include/Python-ast.h $(srcdir)/Include/Python-ast.h.new
-	$(UPDATE_FILE) $(srcdir)/Include/internal/pycore_ast.h $(srcdir)/Include/internal/pycore_ast.h.new
+	$(UPDATE_FILE) $(srcdir)/Include/internal/pycore_ast_state.h $(srcdir)/Include/internal/pycore_ast_state.h.new
 	$(UPDATE_FILE) $(srcdir)/Python/Python-ast.c $(srcdir)/Python/Python-ast.c.new
 
 .PHONY: regen-opcode
@@ -1135,6 +1135,7 @@ PYTHON_HEADERS= \
 		\
 		$(srcdir)/Include/internal/pycore_abstract.h \
 		$(srcdir)/Include/internal/pycore_accu.h \
+		$(srcdir)/Include/internal/pycore_ast_state.h \
 		$(srcdir)/Include/internal/pycore_atomic.h \
 		$(srcdir)/Include/internal/pycore_atomic_funcs.h \
 		$(srcdir)/Include/internal/pycore_bitutils.h \
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
index 92355a886d9..655c831ed5f 100644
--- a/PCbuild/pythoncore.vcxproj
+++ b/PCbuild/pythoncore.vcxproj
@@ -175,6 +175,7 @@
     <ClInclude Include="..\Include\import.h" />
     <ClInclude Include="..\Include\internal\pycore_abstract.h" />
     <ClInclude Include="..\Include\internal\pycore_accu.h" />
+    <ClInclude Include="..\Include\internal\pycore_ast_state.h" />
     <ClInclude Include="..\Include\internal\pycore_atomic.h" />
     <ClInclude Include="..\Include\internal\pycore_atomic_funcs.h" />
     <ClInclude Include="..\Include\internal\pycore_bitutils.h" />
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
index d0b69dbc5b6..fba4af536fe 100644
--- a/PCbuild/pythoncore.vcxproj.filters
+++ b/PCbuild/pythoncore.vcxproj.filters
@@ -486,6 +486,9 @@
     <ClInclude Include="..\Include\internal\pycore_accu.h">
       <Filter>Include\internal</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\internal\pycore_ast_state.h">
+      <Filter>Include\internal</Filter>
+    </ClInclude>
     <ClInclude Include="..\Include\internal\pycore_atomic.h">
       <Filter>Include\internal</Filter>
     </ClInclude>
diff --git a/PCbuild/regen.vcxproj b/PCbuild/regen.vcxproj
index 936f5fd2464..166468a93bf 100644
--- a/PCbuild/regen.vcxproj
+++ b/PCbuild/regen.vcxproj
@@ -137,7 +137,7 @@
     </None>
     <None Include="..\Include\opcode.h">
     </None>
-    <None Include="..\Include\internal\pycore_ast.h">
+    <None Include="..\Include\internal\pycore_ast_state.h">
     </None>
     <None Include="..\Include\Python-ast.h">
     </None>
@@ -163,15 +163,15 @@
     <Warning Text="Pegen updated. You will need to rebuild pythoncore to see the changes." Condition="'@(_UpdatedParse)' != ''" />
   </Target>
   <Target Name="_RegenAST_H" AfterTargets="_RegenGrammar">
-    <!-- Regenerate Include/Python-ast.h, Python/Python-ast.c and Include/internal/pycore_ast.h using Parser/asdl_c.py -h -->
-    <Exec Command="&quot;$(PythonExe)&quot; &quot;$(PySourcePath)Parser\asdl_c.py&quot; &quot;$(PySourcePath)Parser\Python.asdl&quot; -H &quot;$(IntDir)Python-ast.h&quot; -C &quot;$(IntDir)Python-ast.c&quot; -I &quot;$(IntDir)pycore_ast.h&quot;" />
+    <!-- Regenerate Include/Python-ast.h, Python/Python-ast.c and Include/internal/pycore_ast_state.h using Parser/asdl_c.py -h -->
+    <Exec Command="&quot;$(PythonExe)&quot; &quot;$(PySourcePath)Parser\asdl_c.py&quot; &quot;$(PySourcePath)Parser\Python.asdl&quot; -H &quot;$(IntDir)Python-ast.h&quot; -C &quot;$(IntDir)Python-ast.c&quot; -I &quot;$(IntDir)pycore_ast_state.h&quot;" />
     <Copy SourceFiles="$(IntDir)Python-ast.h" DestinationFiles="$(PySourcePath)Include\Python-ast.h">
       <Output TaskParameter="CopiedFiles" ItemName="_UpdatedH" />
     </Copy>
     <Copy SourceFiles="$(IntDir)Python-ast.c" DestinationFiles="$(PySourcePath)Python\Python-ast.c">
       <Output TaskParameter="CopiedFiles" ItemName="_UpdatedC" />
     </Copy>
-    <Copy SourceFiles="$(IntDir)pycore_ast.h" DestinationFiles="$(PySourcePath)Include\internal\pycore_ast.h">
+    <Copy SourceFiles="$(IntDir)pycore_ast_state.h" DestinationFiles="$(PySourcePath)Include\internal\pycore_ast_state.h">
       <Output TaskParameter="CopiedFiles" ItemName="_UpdatedInternalH" />
     </Copy>
     <Warning Text="ASDL is updated. You will need to rebuild pythoncore to see the changes." Condition="'@(_UpdatedH)' != '' != '' and '@(_UpdatedC)' != '' and @(_UpdatedInternalH)'" />
@@ -209,7 +209,7 @@
       <Clean Include="$(IntDir)opcode.h" />
       <Clean Include="$(IntDir)Python-ast.c" />
       <Clean Include="$(IntDir)Python-ast.h" />
-      <Clean Include="$(IntDir)pycore_ast.h" />
+      <Clean Include="$(IntDir)pycore_ast_state.h" />
     </ItemGroup>
   </Target>
 </Project>
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 8c167bc79c7..e96f1f35045 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1429,7 +1429,7 @@ def generate_module_def(mod, f, internal_h):
 
     print(textwrap.dedent(f"""
         #ifdef Py_BUILD_CORE
-        #  include "pycore_ast.h"           // struct ast_state
+        #  include "pycore_ast_state.h"     // struct ast_state
         #  include "pycore_interp.h"        // _PyInterpreterState.ast
         #  include "pycore_pystate.h"       // _PyInterpreterState_GET()
         #else
@@ -1522,8 +1522,8 @@ def write_header(mod, f):
 
 def write_internal_h_header(mod, f):
     print(textwrap.dedent("""
-        #ifndef Py_INTERNAL_AST_H
-        #define Py_INTERNAL_AST_H
+        #ifndef Py_INTERNAL_AST_STATE_H
+        #define Py_INTERNAL_AST_STATE_H
         #ifdef __cplusplus
         extern "C" {
         #endif
@@ -1540,7 +1540,7 @@ def write_internal_h_footer(mod, f):
         #ifdef __cplusplus
         }
         #endif
-        #endif /* !Py_INTERNAL_AST_H */
+        #endif /* !Py_INTERNAL_AST_STATE_H */
     """), file=f)
 
 
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 439da8f2512..59acce79684 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -6,7 +6,7 @@
 #include "Python.h"
 
 #ifdef Py_BUILD_CORE
-#  include "pycore_ast.h"           // struct ast_state
+#  include "pycore_ast_state.h"     // struct ast_state
 #  include "pycore_interp.h"        // _PyInterpreterState.ast
 #  include "pycore_pystate.h"       // _PyInterpreterState_GET()
 #else