diff options
| author | Victor Stinner <vstinner@python.org> | 2021-03-23 19:47:40 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 19:47:40 (GMT) |
| commit | 94faa0724f8cbae6867c491c8e465e35f4fdbfbb (patch) | |
| tree | 05590930e5ffbdc1e01be0aaf505d74cf3c49136 /PCbuild | |
| parent | cd27af70d58161c59072e27a10e0e63dcbf0bccb (diff) | |
| download | cpython-94faa0724f8cbae6867c491c8e465e35f4fdbfbb.zip cpython-94faa0724f8cbae6867c491c8e465e35f4fdbfbb.tar.gz cpython-94faa0724f8cbae6867c491c8e465e35f4fdbfbb.tar.bz2 | |
bpo-43244: Remove ast.h, asdl.h, Python-ast.h headers (GH-24933)
These functions were undocumented and excluded from the limited C
API.
Most names defined by these header files were not prefixed by "Py"
and so could create names conflicts. For example, Python-ast.h
defined a "Yield" macro which was conflict with the "Yield" name used
by the Windows <winbase.h> header.
Use the Python ast module instead.
* Move Include/asdl.h to Include/internal/pycore_asdl.h.
* Move Include/Python-ast.h to Include/internal/pycore_ast.h.
* Remove ast.h header file.
* pycore_symtable.h no longer includes Python-ast.h.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 4 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj.filters | 12 | ||||
| -rw-r--r-- | PCbuild/regen.vcxproj | 10 |
3 files changed, 9 insertions, 17 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 53b9d72..7802428 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -110,11 +110,8 @@ </Link> </ItemDefinitionGroup> <ItemGroup> - <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" /> <ClInclude Include="..\Include\bytesobject.h" /> @@ -176,6 +173,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_asdl.h" /> <ClInclude Include="..\Include\internal\pycore_ast.h" /> <ClInclude Include="..\Include\internal\pycore_ast_state.h" /> <ClInclude Include="..\Include\internal\pycore_atomic.h" /> diff --git a/PCbuild/pythoncore.vcxproj.filters b/PCbuild/pythoncore.vcxproj.filters index a4f82a1..c91686d 100644 --- a/PCbuild/pythoncore.vcxproj.filters +++ b/PCbuild/pythoncore.vcxproj.filters @@ -42,12 +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> <ClInclude Include="..\Include\boolobject.h"> <Filter>Include</Filter> </ClInclude> @@ -210,9 +204,6 @@ <ClInclude Include="..\Include\pystrhex.h"> <Filter>Include</Filter> </ClInclude> - <ClInclude Include="..\Include\Python-ast.h"> - <Filter>Include</Filter> - </ClInclude> <ClInclude Include="..\Include\Python.h"> <Filter>Include</Filter> </ClInclude> @@ -489,6 +480,9 @@ <ClInclude Include="..\Include\internal\pycore_accu.h"> <Filter>Include\internal</Filter> </ClInclude> + <ClInclude Include="..\Include\internal\pycore_asdl.h"> + <Filter>Include\internal</Filter> + </ClInclude> <ClInclude Include="..\Include\internal\pycore_ast.h"> <Filter>Include\internal</Filter> </ClInclude> diff --git a/PCbuild/regen.vcxproj b/PCbuild/regen.vcxproj index 166468a..ef355a2 100644 --- a/PCbuild/regen.vcxproj +++ b/PCbuild/regen.vcxproj @@ -139,7 +139,7 @@ </None> <None Include="..\Include\internal\pycore_ast_state.h"> </None> - <None Include="..\Include\Python-ast.h"> + <None Include="..\Include\internal\pycore_ast.h"> </None> <None Include="..\Python\Python-ast.c"> </None> @@ -163,9 +163,9 @@ <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_state.h using Parser/asdl_c.py -h --> - <Exec Command=""$(PythonExe)" "$(PySourcePath)Parser\asdl_c.py" "$(PySourcePath)Parser\Python.asdl" -H "$(IntDir)Python-ast.h" -C "$(IntDir)Python-ast.c" -I "$(IntDir)pycore_ast_state.h"" /> - <Copy SourceFiles="$(IntDir)Python-ast.h" DestinationFiles="$(PySourcePath)Include\Python-ast.h"> + <!-- Regenerate Include/internal/pycore_ast.h, Python/Python-ast.c and Include/internal/pycore_ast_state.h using Parser/asdl_c.py -h --> + <Exec Command=""$(PythonExe)" "$(PySourcePath)Parser\asdl_c.py" "$(PySourcePath)Parser\Python.asdl" -H "$(IntDir)pycore_ast.h" -C "$(IntDir)Python-ast.c" -I "$(IntDir)pycore_ast_state.h"" /> + <Copy SourceFiles="$(IntDir)pycore_ast.h" DestinationFiles="$(PySourcePath)Include\internal\pycore_ast.h"> <Output TaskParameter="CopiedFiles" ItemName="_UpdatedH" /> </Copy> <Copy SourceFiles="$(IntDir)Python-ast.c" DestinationFiles="$(PySourcePath)Python\Python-ast.c"> @@ -208,7 +208,7 @@ <Clean Include="$(IntDir)keyword.py" /> <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> |