Skip to content

gh-136757: More immortal strings #140235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
+410 −2
Draft

gh-136757: More immortal strings #140235

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3700a04
?
Jul 15, 2025
d3cc03d
Merge branch 'python:main' into main
albertedwardson Oct 10, 2025
44475ec
testing: will this work or not
albertedwardson Oct 10, 2025
63000ab
I'm not sure how where to put `_Py_DECLARE_STR`
albertedwardson Oct 17, 2025
2ab472b
in token.c
albertedwardson Oct 17, 2025
b7e9668
?
albertedwardson Oct 17, 2025
c169e98
fix
albertedwardson Oct 17, 2025
6c065f3
fix
albertedwardson Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions Include/internal/pycore_global_objects_fini_generated.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions Include/internal/pycore_global_strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#define STRUCT_FOR_STR(NAME, LITERAL) \
STRUCT_FOR_ASCII_STR(LITERAL) _py_ ## NAME;
#define STRUCT_FOR_ID(NAME) \
STRUCT_FOR_ASCII_STR(#NAME) _py_ ## NAME;

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

pasting "_py_" and "->" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

pasting "_py_" and "-=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

pasting "_py_" and "+=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

pasting "_py_" and "*=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

pasting "_py_" and "&=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

pasting "_py_" and "%=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

pasting "_py_" and "!=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

pasting "_py_" and "->" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

pasting "_py_" and "-=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

pasting "_py_" and "+=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

pasting "_py_" and "*=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

pasting "_py_" and "&=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

pasting "_py_" and "%=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

pasting "_py_" and "!=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

pasting "_py_" and "->" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

pasting "_py_" and "-=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

pasting "_py_" and "+=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

pasting "_py_" and "*=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

pasting "_py_" and "&=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

pasting "_py_" and "%=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

pasting "_py_" and "!=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

pasting "_py_" and "->" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

pasting "_py_" and "-=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

pasting "_py_" and "+=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

pasting "_py_" and "*=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

pasting "_py_" and "&=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

pasting "_py_" and "%=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

pasting "_py_" and "!=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "->" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "-=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "+=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "*=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "&=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "%=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "!=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

pasting "_py_" and "->" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

pasting "_py_" and "-=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

pasting "_py_" and "+=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

pasting "_py_" and "*=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

pasting "_py_" and "&=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

pasting "_py_" and "%=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

pasting "_py_" and "!=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

pasting "_py_" and "->" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

pasting "_py_" and "-=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

pasting "_py_" and "+=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

pasting "_py_" and "*=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

pasting "_py_" and "&=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

pasting "_py_" and "%=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

pasting "_py_" and "!=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "->" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "-=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "+=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "*=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "*" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "&=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "%=" does not give a valid preprocessing token

Check failure on line 26 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

pasting "_py_" and "!=" does not give a valid preprocessing token

// XXX Order by frequency of use?

Expand Down Expand Up @@ -56,6 +56,28 @@
} literals;

struct {
STRUCT_FOR_ID(!=)

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: '!=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: '!=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: missing ';' before '!=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: missing ';' before '!=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: '!=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: missing ';' before '!=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: '!=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: missing ';' before '!=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Hypothesis tests on Ubuntu 

expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘!=’ token

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: '!=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: '!=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: missing ';' before '!=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: missing ';' before '!=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Cross build Linux 

expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘!=’ token

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (bolt) / build and test (ubuntu-24.04) 

expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘!=’ token

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04) 

expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘!=’ token

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04-arm) 

expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘!=’ token

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu / build and test (ubuntu-24.04) 

expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘!=’ token

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Address sanitizer (ubuntu-24.04) 

expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘!=’ token

Check failure on line 59 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Ubuntu (free-threading) / build and test (ubuntu-24.04-arm) 

expected ‘:’, ‘,’, ‘;’, ‘}’ or ‘__attribute__’ before ‘!=’ token
STRUCT_FOR_ID(%=)

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: '%=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: '%=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: missing '{' before '%=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: missing '{' before '%=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: '%=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: missing '{' before '%=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: '%=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: missing '{' before '%=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: '%=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: '%=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: missing '{' before '%=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 60 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: missing '{' before '%=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]
STRUCT_FOR_ID(&=)

Check failure on line 61 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: missing '{' before '&=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 61 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (x64) 

syntax error: missing '{' before '&=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 61 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: '&=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 61 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: missing '{' before '&=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 61 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: '&=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 61 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: missing '{' before '&=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 61 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: missing '{' before '&=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 61 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (x64) 

syntax error: missing '{' before '&=' [D:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]
STRUCT_FOR_ID(**)

Check failure on line 62 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: ';' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 62 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: missing '{' before '*' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 62 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: ';' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 62 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: missing '{' before '*' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]
STRUCT_FOR_ID(**=)

Check failure on line 63 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: '*=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 63 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows / Build and test (arm64) 

syntax error: missing '{' before '*' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 63 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: '*=' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]

Check failure on line 63 in Include/internal/pycore_global_strings.h

View workflow job for this annotation

GitHub Actions / Windows (free-threading) / Build and test (arm64) 

syntax error: missing '{' before '*' [C:\a\cpython\cpython\PCbuild\_freeze_module.vcxproj]
STRUCT_FOR_ID(*=)
STRUCT_FOR_ID(+=)
STRUCT_FOR_ID(-=)
STRUCT_FOR_ID(->)
STRUCT_FOR_ID(...)
STRUCT_FOR_ID(//)
STRUCT_FOR_ID(//=)
STRUCT_FOR_ID(/=)
STRUCT_FOR_ID(:=)
STRUCT_FOR_ID(<<)
STRUCT_FOR_ID(<<=)
STRUCT_FOR_ID(<=)
STRUCT_FOR_ID(==)
STRUCT_FOR_ID(>=)
STRUCT_FOR_ID(>>)
STRUCT_FOR_ID(>>=)
STRUCT_FOR_ID(>>>)
STRUCT_FOR_ID(CANCELLED)
STRUCT_FOR_ID(Emax)
STRUCT_FOR_ID(Emin)
Expand All @@ -67,6 +89,7 @@
STRUCT_FOR_ID(TextIOWrapper)
STRUCT_FOR_ID(True)
STRUCT_FOR_ID(WarningMessage)
STRUCT_FOR_ID(^=)
STRUCT_FOR_ID(_WindowsConsoleIO)
STRUCT_FOR_ID(__IOBase_closed)
STRUCT_FOR_ID(__abc_tpflags__)
Expand Down Expand Up @@ -851,6 +874,7 @@
STRUCT_FOR_ID(year)
STRUCT_FOR_ID(zdict)
STRUCT_FOR_ID(zstd_dict)
STRUCT_FOR_ID(|=)
} identifiers;
struct {
PyASCIIObject _ascii;
Expand Down
24 changes: 24 additions & 0 deletions Include/internal/pycore_runtime_init_generated.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

96 changes: 96 additions & 0 deletions Include/internal/pycore_unicodeobject_generated.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 28 additions & 2 deletions Tools/build/generate_global_objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,32 @@
'exc_value',
'self',
'traceback',

# Syntactic symbols with len() > 2
'...',
'**',
':=',
'//',
'==',
'!=',
'>=',
'<=',
'+=',
'-=',
'*=',
'/=',
'//=',
'%=',
'**=',
'<<',
'>>',
'>>>',
'<<=',
'>>=',
'&=',
'|=',
'^=',
'->',
]

NON_GENERATED_IMMORTAL_OBJECTS = [
Expand Down Expand Up @@ -261,7 +287,7 @@ def generate_global_strings(identifiers, strings):
outfile.write('\n')
with printer.block('struct', ' identifiers;'):
for name in sorted(identifiers):
assert name.isidentifier(), name
# assert name.isidentifier(), name
printer.write(f'STRUCT_FOR_ID({name})')
with printer.block('struct', ' ascii[128];'):
printer.write("PyASCIIObject _ascii;")
Expand Down Expand Up @@ -324,7 +350,7 @@ def generate_runtime_init(identifiers, strings):
printer.write('')
with printer.block('#define _Py_str_identifiers_INIT', continuation=True):
for name in sorted(identifiers):
assert name.isidentifier(), name
# assert name.isidentifier(), name
printer.write(f'INIT_ID({name}),')
immortal_objects.append(f'(PyObject *)&_Py_ID({name})')
printer.write('')
Expand Down
Loading