Move Include/asdl.h to Include/cpython/asdl.h

nw0 · nw0 · commit bf5a48c5f16f · 2021-03-06T13:22:59.000+08:00
diff --git a/Include/Python-ast.h b/Include/Python-ast.h
diff --git a/Include/Python.h b/Include/Python.h
@@ -160,5 +160,6 @@
 #include "fileutils.h"
 #include "cpython/pyfpe.h"
 #include "tracemalloc.h"
+#include "cpython/asdl.h"
 
 #endif /* !Py_PYTHON_H */
diff --git a/Include/cpython/asdl.h b/Include/cpython/asdl.h
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1015,7 +1015,6 @@ regen-typeslots:
 PYTHON_HEADERS= \
 		$(srcdir)/Include/Python.h \
 		$(srcdir)/Include/abstract.h \
-		$(srcdir)/Include/asdl.h \
 		$(srcdir)/Include/ast.h \
 		$(srcdir)/Include/bltinmodule.h \
 		$(srcdir)/Include/boolobject.h \
@@ -1097,6 +1096,7 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/Python-ast.h \
 		\
 		$(srcdir)/Include/cpython/abstract.h \
+		$(srcdir)/Include/cpython/asdl.h \
 		$(srcdir)/Include/cpython/bytearrayobject.h \
 		$(srcdir)/Include/cpython/bytesobject.h \
 		$(srcdir)/Include/cpython/ceval.h \
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
@@ -113,7 +113,6 @@
     <ClInclude Include="..\Include\Python-ast.h" />
     <ClInclude Include="..\Include\Python.h" />
     <ClInclude Include="..\Include\abstract.h" />
-    <ClInclude Include="..\Include\asdl.h" />
     <ClInclude Include="..\Include\ast.h" />
     <ClInclude Include="..\Include\boolobject.h" />
     <ClInclude Include="..\Include\bytearrayobject.h" />
@@ -127,6 +126,7 @@
     <ClInclude Include="..\Include\complexobject.h" />
     <ClInclude Include="..\Include\context.h" />
     <ClInclude Include="..\Include\cpython\abstract.h" />
+    <ClInclude Include="..\Include\cpython\asdl.h" />
     <ClInclude Include="..\Include\cpython\bytearrayobject.h" />
     <ClInclude Include="..\Include\cpython\bytesobject.h" />
     <ClInclude Include="..\Include\cpython\ceval.h" />
diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
@@ -42,9 +42,6 @@
     <ClInclude Include="..\Include\abstract.h">
       <Filter>Include</Filter>
     </ClInclude>
-    <ClInclude Include="..\Include\asdl.h">
-      <Filter>Include</Filter>
-    </ClInclude>
     <ClInclude Include="..\Include\ast.h">
       <Filter>Include</Filter>
     </ClInclude>
@@ -381,6 +378,9 @@
     <ClInclude Include="..\Include\cpython\abstract.h">
       <Filter>Include\cpython</Filter>
     </ClInclude>
+    <ClInclude Include="..\Include\cpython\asdl.h">
+      <Filter>Include</Filter>
+    </ClInclude>
     <ClInclude Include="..\Include\cpython\bytearrayobject.h">
       <Filter>Include\cpython</Filter>
     </ClInclude>
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
@@ -1498,7 +1498,7 @@ def write_header(mod, f):
     f.write('#endif\n')
     f.write('\n')
     f.write('#ifndef Py_LIMITED_API\n')
-    f.write('#include "asdl.h"\n')
+    f.write('#include "Python.h"\n')
     f.write('\n')
     f.write('#undef Yield   /* undefine macro conflicting with <winbase.h> */\n')
     f.write('\n')
diff --git a/Python/asdl.c b/Python/asdl.c
@@ -1,5 +1,4 @@
 #include "Python.h"
-#include "asdl.h"
 
 GENERATE_ASDL_SEQ_CONSTRUCTOR(generic, void*);
 GENERATE_ASDL_SEQ_CONSTRUCTOR(identifier, PyObject*);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#include "Python.h"`
`2`		`-#include "asdl.h"`
`3`	`2`
`4`	`3`	`GENERATE_ASDL_SEQ_CONSTRUCTOR(generic, void*);`
`5`	`4`	`GENERATE_ASDL_SEQ_CONSTRUCTOR(identifier, PyObject*);`