Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-43244: Rename pycore_ast.h to pycore_ast_state.h (GH-24907)

This commit is contained in:
Victor Stinner 2021-03-17 23:11:03 +01:00 committed by GitHub
parent e272528bbd
commit b4536e1c6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Include/internal/pycore_ast.h → Include/internal/pycore_ast_state.h
View File

@ -1,7 +1,7 @@
// File automatically generated by Parser/asdl_c.py. // File automatically generated by Parser/asdl_c.py.
#ifndef Py_INTERNAL_AST_H #ifndef Py_INTERNAL_AST_STATE_H
#define Py_INTERNAL_AST_H #define Py_INTERNAL_AST_STATE_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -240,5 +240,5 @@ struct ast_state {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* !Py_INTERNAL_AST_H */ #endif /* !Py_INTERNAL_AST_STATE_H */

2
Include/internal/pycore_interp.h
View File

@ -9,7 +9,7 @@ extern "C" {
#endif #endif
#include "pycore_atomic.h" // _Py_atomic_address #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_gil.h" // struct _gil_runtime_state
#include "pycore_gc.h" // struct _gc_runtime_state #include "pycore_gc.h" // struct _gc_runtime_state
#include "pycore_warnings.h" // struct _warnings_runtime_state #include "pycore_warnings.h" // struct _warnings_runtime_state

5
Makefile.pre.in
View File

@ -854,11 +854,11 @@ regen-ast:
$(PYTHON_FOR_REGEN) $(srcdir)/Parser/asdl_c.py \ $(PYTHON_FOR_REGEN) $(srcdir)/Parser/asdl_c.py \
$(srcdir)/Parser/Python.asdl \ $(srcdir)/Parser/Python.asdl \
-H $(srcdir)/Include/Python-ast.h.new \ -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 -C $(srcdir)/Python/Python-ast.c.new
$(UPDATE_FILE) $(srcdir)/Include/Python-ast.h $(srcdir)/Include/Python-ast.h.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 $(UPDATE_FILE) $(srcdir)/Python/Python-ast.c $(srcdir)/Python/Python-ast.c.new
.PHONY: regen-opcode .PHONY: regen-opcode
@ -1135,6 +1135,7 @@ PYTHON_HEADERS= \
\ \
$(srcdir)/Include/internal/pycore_abstract.h \ $(srcdir)/Include/internal/pycore_abstract.h \
$(srcdir)/Include/internal/pycore_accu.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.h \
$(srcdir)/Include/internal/pycore_atomic_funcs.h \ $(srcdir)/Include/internal/pycore_atomic_funcs.h \
$(srcdir)/Include/internal/pycore_bitutils.h \ $(srcdir)/Include/internal/pycore_bitutils.h \

1
PCbuild/pythoncore.vcxproj
View File

@ -175,6 +175,7 @@
<ClInclude Include="..\Include\import.h" /> <ClInclude Include="..\Include\import.h" />
<ClInclude Include="..\Include\internal\pycore_abstract.h" /> <ClInclude Include="..\Include\internal\pycore_abstract.h" />
<ClInclude Include="..\Include\internal\pycore_accu.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.h" />
<ClInclude Include="..\Include\internal\pycore_atomic_funcs.h" /> <ClInclude Include="..\Include\internal\pycore_atomic_funcs.h" />
<ClInclude Include="..\Include\internal\pycore_bitutils.h" /> <ClInclude Include="..\Include\internal\pycore_bitutils.h" />

3
PCbuild/pythoncore.vcxproj.filters
View File

@ -486,6 +486,9 @@
<ClInclude Include="..\Include\internal\pycore_accu.h"> <ClInclude Include="..\Include\internal\pycore_accu.h">
<Filter>Include\internal</Filter> <Filter>Include\internal</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Include\internal\pycore_ast_state.h">
<Filter>Include\internal</Filter>
</ClInclude>
<ClInclude Include="..\Include\internal\pycore_atomic.h"> <ClInclude Include="..\Include\internal\pycore_atomic.h">
<Filter>Include\internal</Filter> <Filter>Include\internal</Filter>
</ClInclude> </ClInclude>

10
PCbuild/regen.vcxproj
View File

@ -137,7 +137,7 @@
</None> </None>
<None Include="..\Include\opcode.h"> <None Include="..\Include\opcode.h">
</None> </None>
<None Include="..\Include\internal\pycore_ast.h"> <None Include="..\Include\internal\pycore_ast_state.h">
</None> </None>
<None Include="..\Include\Python-ast.h"> <None Include="..\Include\Python-ast.h">
</None> </None>
@ -163,15 +163,15 @@
<Warning Text="Pegen updated. You will need to rebuild pythoncore to see the changes." Condition="'@(_UpdatedParse)' != ''" /> <Warning Text="Pegen updated. You will need to rebuild pythoncore to see the changes." Condition="'@(_UpdatedParse)' != ''" />
</Target> </Target>
<Target Name="_RegenAST_H" AfterTargets="_RegenGrammar"> <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 --> <!-- 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.h&quot;" /> <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"> <Copy SourceFiles="$(IntDir)Python-ast.h" DestinationFiles="$(PySourcePath)Include\Python-ast.h">
<Output TaskParameter="CopiedFiles" ItemName="_UpdatedH" /> <Output TaskParameter="CopiedFiles" ItemName="_UpdatedH" />
</Copy> </Copy>
<Copy SourceFiles="$(IntDir)Python-ast.c" DestinationFiles="$(PySourcePath)Python\Python-ast.c"> <Copy SourceFiles="$(IntDir)Python-ast.c" DestinationFiles="$(PySourcePath)Python\Python-ast.c">
<Output TaskParameter="CopiedFiles" ItemName="_UpdatedC" /> <Output TaskParameter="CopiedFiles" ItemName="_UpdatedC" />
</Copy> </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" /> <Output TaskParameter="CopiedFiles" ItemName="_UpdatedInternalH" />
</Copy> </Copy>
<Warning Text="ASDL is updated. You will need to rebuild pythoncore to see the changes." Condition="'@(_UpdatedH)' != '' != '' and '@(_UpdatedC)' != '' and @(_UpdatedInternalH)'" /> <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)opcode.h" />
<Clean Include="$(IntDir)Python-ast.c" /> <Clean Include="$(IntDir)Python-ast.c" />
<Clean Include="$(IntDir)Python-ast.h" /> <Clean Include="$(IntDir)Python-ast.h" />
<Clean Include="$(IntDir)pycore_ast.h" /> <Clean Include="$(IntDir)pycore_ast_state.h" />
</ItemGroup> </ItemGroup>
</Target> </Target>
</Project> </Project>

8
Parser/asdl_c.py
View File

@ -1429,7 +1429,7 @@ def generate_module_def(mod, f, internal_h):
print(textwrap.dedent(f""" print(textwrap.dedent(f"""
#ifdef Py_BUILD_CORE #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_interp.h" // _PyInterpreterState.ast
# include "pycore_pystate.h" // _PyInterpreterState_GET() # include "pycore_pystate.h" // _PyInterpreterState_GET()
#else #else
@ -1522,8 +1522,8 @@ def write_header(mod, f):
def write_internal_h_header(mod, f): def write_internal_h_header(mod, f):
print(textwrap.dedent(""" print(textwrap.dedent("""
#ifndef Py_INTERNAL_AST_H #ifndef Py_INTERNAL_AST_STATE_H
#define Py_INTERNAL_AST_H #define Py_INTERNAL_AST_STATE_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -1540,7 +1540,7 @@ def write_internal_h_footer(mod, f):
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* !Py_INTERNAL_AST_H */ #endif /* !Py_INTERNAL_AST_STATE_H */
"""), file=f) """), file=f)

2
Python/Python-ast.c generated
View File

@ -6,7 +6,7 @@
#include "Python.h" #include "Python.h"
#ifdef Py_BUILD_CORE #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_interp.h" // _PyInterpreterState.ast
# include "pycore_pystate.h" // _PyInterpreterState_GET() # include "pycore_pystate.h" // _PyInterpreterState_GET()
#else #else