Skip to content

Commit 360fa6a

Browse files
nw0nw0
committed
Move Include/token.h to Include/cpython/token.h
1 parent d316147 commit 360fa6a

File tree

12 files changed

+18
-19
lines changed

12 files changed

+18
-19
lines changed

‎Include/token.h‎ renamed to ‎Include/cpython/token.h‎

File renamed without changes.

‎Makefile.pre.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -882,11 +882,11 @@ regen-token:
882882
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_token.py rst \
883883
$(srcdir)/Grammar/Tokens \
884884
$(srcdir)/Doc/library/token-list.inc
885-
# Regenerate Include/token.h from Grammar/Tokens
885+
# Regenerate Include/cpython/token.h from Grammar/Tokens
886886
# using Tools/scripts/generate_token.py
887887
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_token.py h \
888888
$(srcdir)/Grammar/Tokens \
889-
$(srcdir)/Include/token.h
889+
$(srcdir)/Include/cpython/token.h
890890
# Regenerate Parser/token.c from Grammar/Tokens
891891
# using Tools/scripts/generate_token.py
892892
$(PYTHON_FOR_REGEN) $(srcdir)/Tools/scripts/generate_token.py c \
@@ -1081,7 +1081,6 @@ PYTHON_HEADERS= \
10811081
$(srcdir)/Include/structmember.h \
10821082
$(srcdir)/Include/structseq.h \
10831083
$(srcdir)/Include/sysmodule.h \
1084-
$(srcdir)/Include/token.h \
10851084
$(srcdir)/Include/traceback.h \
10861085
$(srcdir)/Include/tracemalloc.h \
10871086
$(srcdir)/Include/tupleobject.h \
@@ -1125,6 +1124,7 @@ PYTHON_HEADERS= \
11251124
$(srcdir)/Include/cpython/pytime.h \
11261125
$(srcdir)/Include/cpython/symtable.h \
11271126
$(srcdir)/Include/cpython/sysmodule.h \
1127+
$(srcdir)/Include/cpython/token.h \
11281128
$(srcdir)/Include/cpython/traceback.h \
11291129
$(srcdir)/Include/cpython/tupleobject.h \
11301130
$(srcdir)/Include/cpython/unicodeobject.h \

‎PCbuild/pythoncore.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
<ClInclude Include="..\Include\cpython\pytime.h" />
159159
<ClInclude Include="..\Include\cpython\symtable.h" />
160160
<ClInclude Include="..\Include\cpython\sysmodule.h" />
161+
<ClInclude Include="..\Include\cpython\token.h" />
161162
<ClInclude Include="..\Include\cpython\traceback.h" />
162163
<ClInclude Include="..\Include\cpython\tupleobject.h" />
163164
<ClInclude Include="..\Include\cpython\unicodeobject.h" />
@@ -253,7 +254,6 @@
253254
<ClInclude Include="..\Include\structmember.h" />
254255
<ClInclude Include="..\Include\structseq.h" />
255256
<ClInclude Include="..\Include\sysmodule.h" />
256-
<ClInclude Include="..\Include\token.h" />
257257
<ClInclude Include="..\Include\traceback.h" />
258258
<ClInclude Include="..\Include\tracemalloc.h" />
259259
<ClInclude Include="..\Include\tupleobject.h" />

‎PCbuild/pythoncore.vcxproj.filters‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,9 +234,6 @@
234234
<ClInclude Include="..\Include\sysmodule.h">
235235
<Filter>Include</Filter>
236236
</ClInclude>
237-
<ClInclude Include="..\Include\token.h">
238-
<Filter>Include</Filter>
239-
</ClInclude>
240237
<ClInclude Include="..\Include\traceback.h">
241238
<Filter>Include</Filter>
242239
</ClInclude>
@@ -471,6 +468,9 @@
471468
<ClInclude Include="..\Include\cpython\sysmodule.h">
472469
<Filter>Include\cpython</Filter>
473470
</ClInclude>
471+
<ClInclude Include="..\Include\cpython\token.h">
472+
<Filter>Include</Filter>
473+
</ClInclude>
474474
<ClInclude Include="..\Include\cpython\pystate.h">
475475
<Filter>Include\cpython</Filter>
476476
</ClInclude>

‎PCbuild/regen.vcxproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
</None>
134134
<None Include="..\Grammar\Tokens">
135135
</None>
136-
<None Include="..\Include\token.h">
136+
<None Include="..\Include\cpython\token.h">
137137
</None>
138138
<None Include="..\Include\opcode.h">
139139
</None>
@@ -187,8 +187,8 @@
187187
<Target Name="_RegenTokens" AfterTargets="_RegenOpcodes">
188188
<!-- Regenerate Doc/library/token-list.inc from Grammar/Tokens using Tools/scripts/generate_token.py-->
189189
<Exec Command="&quot;$(PythonExe)&quot; $(PySourcePath)Tools\scripts\generate_token.py rst &quot;$(PySourcePath)Grammar\Tokens&quot; &quot;$(PySourcePath)Doc\library\token-list.inc&quot;" />
190-
<!-- Regenerate Include/token.h from Grammar/Tokens using Tools/scripts/generate_token.py-->
191-
<Exec Command="&quot;$(PythonExe)&quot; $(PySourcePath)Tools\scripts\generate_token.py h &quot;$(PySourcePath)Grammar\Tokens&quot; &quot;$(PySourcePath)Include\token.h&quot;" />
190+
<!-- Regenerate Include/cpython/token.h from Grammar/Tokens using Tools/scripts/generate_token.py-->
191+
<Exec Command="&quot;$(PythonExe)&quot; $(PySourcePath)Tools\scripts\generate_token.py h &quot;$(PySourcePath)Grammar\Tokens&quot; &quot;$(PySourcePath)Include\cpython\token.h&quot;" />
192192
<!-- Regenerate Parser/token.c from Grammar/Tokens using Tools/scripts/generate_token.py-->
193193
<Exec Command="&quot;$(PythonExe)&quot; $(PySourcePath)Tools\scripts\generate_token.py c &quot;$(PySourcePath)Grammar\Tokens&quot; &quot;$(PySourcePath)Parser\token.c&quot;" />
194194
<!-- Regenerate Lib/token.py from Grammar/Tokens using Tools/scripts/generate_token.py -->

‎Parser/pegen.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#define PY_SSIZE_T_CLEAN
55
#include <Python.h>
6-
#include <token.h>
6+
#include <cpython/token.h>
77
#include <Python-ast.h>
88

99
#if 0

‎Parser/token.c‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Parser/tokenizer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ extern "C" {
88

99
/* Tokenizer interface */
1010

11-
#include "token.h" /* For token types */
11+
#include "cpython/token.h" /* For token types */
1212

1313
#define MAXINDENT 100 /* Max indentation level */
1414
#define MAXLEVEL 200 /* Max parentheses level */

‎Python/future.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "Python.h"
22
#include "Python-ast.h"
3-
#include "token.h"
3+
#include "cpython/token.h"
44
#include "code.h"
55
#include "ast.h"
66

‎Python/pythonrun.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "pycore_pystate.h" // _PyInterpreterState_GET()
2121
#include "pycore_sysmodule.h" // _PySys_Audit()
2222

23-
#include "token.h" // INDENT
23+
#include "cpython/token.h" // INDENT
2424
#include "errcode.h" // E_EOF
2525
#include "code.h" // PyCodeObject
2626
#include "marshal.h" // PyMarshal_ReadLongFromFile()

0 commit comments

Comments
 (0)