Move Include/symtable.h to Include/cpython/symtable.h

python · nw0 · Mar 6, 2021 · Mar 6, 2021 · Mar 6, 2021 · Mar 6, 2021
commit d316147f643382deb54d2dba9ef0e821c350aa6d
diff --git a/Include/Python.h b/Include/Python.h
@@ -162,5 +162,6 @@
 #include "cpython/pyfpe.h"
 #include "tracemalloc.h"
 #include "cpython/asdl.h"
+#include "cpython/symtable.h"

 #endif /* !Py_PYTHON_H */
diff --git a/Include/symtable.h → Include/cpython/symtable.h b/Include/symtable.h → Include/cpython/symtable.h
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -1080,7 +1080,6 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/sliceobject.h \
 		$(srcdir)/Include/structmember.h \
 		$(srcdir)/Include/structseq.h \
-		$(srcdir)/Include/symtable.h \
 		$(srcdir)/Include/sysmodule.h \
 		$(srcdir)/Include/token.h \
 		$(srcdir)/Include/traceback.h \
@@ -1124,6 +1123,7 @@ PYTHON_HEADERS= \
 		$(srcdir)/Include/cpython/pystrhex.h \
 		$(srcdir)/Include/cpython/pythonrun.h \
 		$(srcdir)/Include/cpython/pytime.h \
+		$(srcdir)/Include/cpython/symtable.h \
 		$(srcdir)/Include/cpython/sysmodule.h \
 		$(srcdir)/Include/cpython/traceback.h \
 		$(srcdir)/Include/cpython/tupleobject.h \

diff --git a/Modules/symtablemodule.c b/Modules/symtablemodule.c
@@ -2,7 +2,6 @@

 #include "code.h"
 #include "Python-ast.h"
-#include "symtable.h"

 #include "clinic/symtablemodule.c.h"
 /*[clinic input]

diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
@@ -156,6 +156,7 @@
    <ClInclude Include="..\Include\cpython\pystrhex.h" />
    <ClInclude Include="..\Include\cpython\pythonrun.h" />
    <ClInclude Include="..\Include\cpython\pytime.h" />
+    <ClInclude Include="..\Include\cpython\symtable.h" />
    <ClInclude Include="..\Include\cpython\sysmodule.h" />
    <ClInclude Include="..\Include\cpython\traceback.h" />
    <ClInclude Include="..\Include\cpython\tupleobject.h" />
@@ -251,7 +252,6 @@
    <ClInclude Include="..\Include\sliceobject.h" />
    <ClInclude Include="..\Include\structmember.h" />
    <ClInclude Include="..\Include\structseq.h" />
-    <ClInclude Include="..\Include\symtable.h" />
    <ClInclude Include="..\Include\sysmodule.h" />
    <ClInclude Include="..\Include\token.h" />
    <ClInclude Include="..\Include\traceback.h" />

diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters
@@ -231,9 +231,6 @@
    <ClInclude Include="..\Include\structseq.h">
      <Filter>Include</Filter>
    </ClInclude>
-    <ClInclude Include="..\Include\symtable.h">
-      <Filter>Include</Filter>
-    </ClInclude>
    <ClInclude Include="..\Include\sysmodule.h">
      <Filter>Include</Filter>
    </ClInclude>
@@ -468,6 +465,9 @@
    <ClInclude Include="..\Include\cpython\pythonrun.h">
      <Filter>Include\cpython</Filter>
    </ClInclude>
+    <ClInclude Include="..\Include\cpython\symtable.h">
+      <Filter>Include</Filter>
+    </ClInclude>
    <ClInclude Include="..\Include\cpython\sysmodule.h">
      <Filter>Include\cpython</Filter>
    </ClInclude>

diff --git a/Python/compile.c b/Python/compile.c
@@ -28,7 +28,6 @@
 #include "Python-ast.h"
 #include "ast.h"
 #include "code.h"
-#include "symtable.h"
 #define NEED_OPCODE_JUMP_TABLES
 #include "opcode.h"
 #include "wordcode_helpers.h"

diff --git a/Python/future.c b/Python/future.c
@@ -2,7 +2,6 @@
 #include "Python-ast.h"
 #include "token.h"
 #include "code.h"
-#include "symtable.h"
 #include "ast.h"

 #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined"

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -23,7 +23,6 @@
 #include "token.h"                // INDENT
 #include "errcode.h"              // E_EOF
 #include "code.h"                 // PyCodeObject
-#include "symtable.h"             // PySymtable_BuildObject()
 #include "marshal.h"              // PyMarshal_ReadLongFromFile()

 #ifdef MS_WINDOWS

diff --git a/Python/symtable.c b/Python/symtable.c
@@ -1,6 +1,5 @@
 #include "Python.h"
 #include "pycore_pystate.h"   // _PyThreadState_GET()
-#include "symtable.h"
 #undef Yield   /* undefine macro conflicting with <winbase.h> */
 #include "structmember.h"         // PyMemberDef


diff --git a/Tools/scripts/stable_abi.py b/Tools/scripts/stable_abi.py
@@ -24,7 +24,6 @@
    "parsetok.h",
    "pyatomic.h",
    "pytime.h",
-    "symtable.h",
    "token.h",
    "ucnhash.h",
 }