Fix more Py_ patterns - preconfig, stat, slots, strings

- Fixed PyPreConfig → TyPreConfig
- Fixed _Py_PreInitializeFromPyArgv → _Ty_PreInitializeFromPyArgv
- Fixed struct _Py_stat_struct → struct _Ty_stat_struct
- Fixed _Py_fstat_noraise → _Ty_fstat_noraise
- Fixed _Py_NO_RETURN → _Ty_NO_RETURN
- Fixed Py_tp_* slot patterns (tp_free, tp_dealloc, tp_repr, etc.)
- Fixed Py_mod_* module slot patterns
- Fixed Py_MAX_SCRIPT_PATH_SIZE, Py_RTFLAGS_FORK
- Fixed _Py_DECLARE_STR, _Py_STR → _Ty_DECLARE_STR, _Ty_STR

Build progressing further.

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>

Python/executor_cases.c.h

@@ -810,7 +810,7 @@
             value = stack_pointer[-1];
             STAT_INC(TO_BOOL, hit);
             TyObject *value_o = PyStackRef_AsPyObjectBorrow(value);
-            if (value_o == &_Py_STR(empty)) {
+            if (value_o == &_Ty_STR(empty)) {
                 assert(_Py_IsImmortal(value_o));
                 res = PyStackRef_False;
             }
@@ -2629,7 +2629,7 @@
                 assert(WITHIN_STACK_BOUNDS());
                 JUMP_TO_ERROR();
             }
-            TyObject *str_o = _TyUnicode_JoinArray(&_Py_STR(empty), pieces_o, oparg);
+            TyObject *str_o = _TyUnicode_JoinArray(&_Ty_STR(empty), pieces_o, oparg);
             STACKREFS_TO_PYOBJECTS_CLEANUP(pieces_o);
             _TyFrame_SetStackPointer(frame, stack_pointer);
             _PyStackRef tmp;
@@ -2668,7 +2668,7 @@
                 format_o = PyStackRef_AsPyObjectBorrow(format[0]);
             }
             else {
-                format_o = &_Py_STR(empty);
+                format_o = &_Ty_STR(empty);
             }
             _TyFrame_SetStackPointer(frame, stack_pointer);
             TyObject *interpolation_o = _PyInterpolation_Build(value_o, str_o, conversion, format_o);

Python/initconfig.c

@@ -203,7 +203,7 @@ static const PyConfigSpec PYCONFIG_SPEC[] = {
 
 #undef SPEC
 #define SPEC(MEMBER, TYPE, VISIBILITY) \
-    {#MEMBER, offsetof(PyPreConfig, MEMBER), PyConfig_MEMBER_##TYPE, \
+    {#MEMBER, offsetof(TyPreConfig, MEMBER), PyConfig_MEMBER_##TYPE, \
      PyConfig_MEMBER_##VISIBILITY, NO_SYS}
 
 static const PyConfigSpec PYPRECONFIG_SPEC[] = {
@@ -1220,7 +1220,7 @@ config_get_spec_member(const PyConfig *config, const PyConfigSpec *spec)
 
 
 static inline void*
-preconfig_get_spec_member(const PyPreConfig *preconfig, const PyConfigSpec *spec)
+preconfig_get_spec_member(const TyPreConfig *preconfig, const PyConfigSpec *spec)
 {
     return (char *)preconfig + spec->offset;
 }
@@ -2375,7 +2375,7 @@ config_read_complex_options(PyConfig *config)
 
 
 static const wchar_t *
-config_get_stdio_errors(const PyPreConfig *preconfig)
+config_get_stdio_errors(const TyPreConfig *preconfig)
 {
     if (preconfig->utf8_mode) {
         /* UTF-8 Mode uses UTF-8/surrogateescape */
@@ -2408,7 +2408,7 @@ config_get_stdio_errors(const PyPreConfig *preconfig)
 
 // See also config_get_fs_encoding()
 static TyStatus
-config_get_locale_encoding(PyConfig *config, const PyPreConfig *preconfig,
+config_get_locale_encoding(PyConfig *config, const TyPreConfig *preconfig,
                            wchar_t **locale_encoding)
 {
     wchar_t *encoding;
@@ -2429,7 +2429,7 @@ config_get_locale_encoding(PyConfig *config, const PyPreConfig *preconfig,
 
 static TyStatus
 config_init_stdio_encoding(PyConfig *config,
-                           const PyPreConfig *preconfig)
+                           const TyPreConfig *preconfig)
 {
     TyStatus status;
 
@@ -2513,7 +2513,7 @@ config_init_stdio_encoding(PyConfig *config,
 
 // See also config_get_locale_encoding()
 static TyStatus
-config_get_fs_encoding(PyConfig *config, const PyPreConfig *preconfig,
+config_get_fs_encoding(PyConfig *config, const TyPreConfig *preconfig,
                        wchar_t **fs_encoding)
 {
 #ifdef _Ty_FORCE_UTF8_FS_ENCODING
@@ -2544,7 +2544,7 @@ config_get_fs_encoding(PyConfig *config, const PyPreConfig *preconfig,
 
 
 static TyStatus
-config_init_fs_encoding(PyConfig *config, const PyPreConfig *preconfig)
+config_init_fs_encoding(PyConfig *config, const TyPreConfig *preconfig)
 {
     TyStatus status;
 
@@ -2634,7 +2634,7 @@ static TyStatus
 config_read(PyConfig *config, int compute_path_config)
 {
     TyStatus status;
-    const PyPreConfig *preconfig = &_PyRuntime.preconfig;
+    const TyPreConfig *preconfig = &_PyRuntime.preconfig;
 
     if (config->use_environment) {
         status = config_read_env_vars(config);
@@ -2796,7 +2796,7 @@ _TyConfig_Write(const PyConfig *config, _PyRuntimeState *runtime)
     }
 
     /* Write the new pre-configuration into _PyRuntime */
-    PyPreConfig *preconfig = &runtime->preconfig;
+    TyPreConfig *preconfig = &runtime->preconfig;
     preconfig->isolated = config->isolated;
     preconfig->use_environment = config->use_environment;
     preconfig->dev_mode = config->dev_mode;
@@ -3281,7 +3281,7 @@ core_read_precmdline(PyConfig *config, _PyPreCmdline *precmdline)
         }
     }
 
-    PyPreConfig preconfig;
+    TyPreConfig preconfig;
 
     status = _TyPreConfig_InitFromPreConfig(&preconfig, &_PyRuntime.preconfig);
     if (_TyStatus_EXCEPTION(status)) {
@@ -3553,7 +3553,7 @@ _Ty_GetConfigsAsDict(void)
 
     /* pre config */
     TyInterpreterState *interp = _TyInterpreterState_GET();
-    const PyPreConfig *pre_config = &interp->runtime->preconfig;
+    const TyPreConfig *pre_config = &interp->runtime->preconfig;
     dict = _TyPreConfig_AsDict(pre_config);
     if (dict == NULL) {
         goto error;
@@ -3690,7 +3690,7 @@ _Ty_DumpPathConfig(TyThreadState *tstate)
 // --- PyInitConfig API ---------------------------------------------------
 
 struct PyInitConfig {
-    PyPreConfig preconfig;
+    TyPreConfig preconfig;
     PyConfig config;
     struct _inittab *inittab;
     Ty_ssize_t inittab_size;
@@ -4383,7 +4383,7 @@ config_get(const PyConfig *config, const PyConfigSpec *spec,
 
 
 static TyObject*
-preconfig_get(const PyPreConfig *preconfig, const PyConfigSpec *spec)
+preconfig_get(const TyPreConfig *preconfig, const PyConfigSpec *spec)
 {
     // The type of all PYPRECONFIG_SPEC members is INT or BOOL.
     assert(spec->type == PyConfig_MEMBER_INT
@@ -4419,7 +4419,7 @@ PyConfig_Get(const char *name)
 
     spec = preconfig_find_spec(name);
     if (spec != NULL) {
-        const PyPreConfig *preconfig = &_PyRuntime.preconfig;
+        const TyPreConfig *preconfig = &_PyRuntime.preconfig;
         return preconfig_get(preconfig, spec);
     }
 

Python/optimizer_symbols.c

@@ -512,7 +512,7 @@ _Py_uop_sym_truthiness(JitOptContext *ctx, JitOptSymbol *sym)
         return !_TyLong_IsZero((PyLongObject *)value);
     }
     if (tp == &TyUnicode_Type) {
-        return value != &_Py_STR(empty);
+        return value != &_Ty_STR(empty);
     }
     if (tp == &TyBool_Type) {
         return value == Ty_True;

Python/preconfig.c

@@ -12,7 +12,7 @@
 
 /* Forward declarations */
 static void
-preconfig_copy(PyPreConfig *config, const PyPreConfig *config2);
+preconfig_copy(TyPreConfig *config, const TyPreConfig *config2);
 
 
 /* --- File system encoding/errors -------------------------------- */
@@ -129,7 +129,7 @@ _PyPreCmdline_SetArgv(_PyPreCmdline *cmdline, const _PyArgv *args)
 
 
 static void
-precmdline_get_preconfig(_PyPreCmdline *cmdline, const PyPreConfig *config)
+precmdline_get_preconfig(_PyPreCmdline *cmdline, const TyPreConfig *config)
 {
 #define COPY_ATTR(ATTR) \
     if (config->ATTR != -1) { \
@@ -145,7 +145,7 @@ precmdline_get_preconfig(_PyPreCmdline *cmdline, const PyPreConfig *config)
 
 
 static void
-precmdline_set_preconfig(const _PyPreCmdline *cmdline, PyPreConfig *config)
+precmdline_set_preconfig(const _PyPreCmdline *cmdline, TyPreConfig *config)
 {
 #define COPY_ATTR(ATTR) \
     config->ATTR = cmdline->ATTR
@@ -228,7 +228,7 @@ precmdline_parse_cmdline(_PyPreCmdline *cmdline)
 
 
 TyStatus
-_PyPreCmdline_Read(_PyPreCmdline *cmdline, const PyPreConfig *preconfig)
+_PyPreCmdline_Read(_PyPreCmdline *cmdline, const TyPreConfig *preconfig)
 {
     precmdline_get_preconfig(cmdline, preconfig);
 
@@ -277,11 +277,11 @@ _PyPreCmdline_Read(_PyPreCmdline *cmdline, const PyPreConfig *preconfig)
 }
 
 
-/* --- PyPreConfig ----------------------------------------------- */
+/* --- TyPreConfig ----------------------------------------------- */
 
 
 void
-_TyPreConfig_InitCompatConfig(PyPreConfig *config)
+_TyPreConfig_InitCompatConfig(TyPreConfig *config)
 {
     memset(config, 0, sizeof(*config));
 
@@ -309,7 +309,7 @@ _TyPreConfig_InitCompatConfig(PyPreConfig *config)
 
 
 void
-TyPreConfig_InitPythonConfig(PyPreConfig *config)
+TyPreConfig_InitPythonConfig(TyPreConfig *config)
 {
     _TyPreConfig_InitCompatConfig(config);
 
@@ -330,7 +330,7 @@ TyPreConfig_InitPythonConfig(PyPreConfig *config)
 
 
 void
-TyPreConfig_InitIsolatedConfig(PyPreConfig *config)
+TyPreConfig_InitIsolatedConfig(TyPreConfig *config)
 {
     _TyPreConfig_InitCompatConfig(config);
 
@@ -347,8 +347,8 @@ TyPreConfig_InitIsolatedConfig(PyPreConfig *config)
 
 
 TyStatus
-_TyPreConfig_InitFromPreConfig(PyPreConfig *config,
-                               const PyPreConfig *config2)
+_TyPreConfig_InitFromPreConfig(TyPreConfig *config,
+                               const TyPreConfig *config2)
 {
     TyPreConfig_InitPythonConfig(config);
     preconfig_copy(config, config2);
@@ -357,7 +357,7 @@ _TyPreConfig_InitFromPreConfig(PyPreConfig *config,
 
 
 void
-_TyPreConfig_InitFromConfig(PyPreConfig *preconfig, const PyConfig *config)
+_TyPreConfig_InitFromConfig(TyPreConfig *preconfig, const PyConfig *config)
 {
     _PyConfigInitEnum config_init = (_PyConfigInitEnum)config->_config_init;
     switch (config_init) {
@@ -377,7 +377,7 @@ _TyPreConfig_InitFromConfig(PyPreConfig *preconfig, const PyConfig *config)
 
 
 static void
-preconfig_copy(PyPreConfig *config, const PyPreConfig *config2)
+preconfig_copy(TyPreConfig *config, const TyPreConfig *config2)
 {
 #define COPY_ATTR(ATTR) config->ATTR = config2->ATTR
 
@@ -400,7 +400,7 @@ preconfig_copy(PyPreConfig *config, const PyPreConfig *config2)
 
 
 TyObject*
-_TyPreConfig_AsDict(const PyPreConfig *config)
+_TyPreConfig_AsDict(const TyPreConfig *config)
 {
     TyObject *dict;
 
@@ -446,7 +446,7 @@ fail:
 
 
 void
-_TyPreConfig_GetConfig(PyPreConfig *preconfig, const PyConfig *config)
+_TyPreConfig_GetConfig(TyPreConfig *preconfig, const PyConfig *config)
 {
 #define COPY_ATTR(ATTR) \
     if (config->ATTR != -1) { \
@@ -463,7 +463,7 @@ _TyPreConfig_GetConfig(PyPreConfig *preconfig, const PyConfig *config)
 
 
 static void
-preconfig_get_global_vars(PyPreConfig *config)
+preconfig_get_global_vars(TyPreConfig *config)
 {
     if (config->_config_init != _TyConfig_INIT_COMPAT) {
         /* Python and Isolated configuration ignore global variables */
@@ -497,7 +497,7 @@ _Ty_COMP_DIAG_POP
 
 
 static void
-preconfig_set_global_vars(const PyPreConfig *config)
+preconfig_set_global_vars(const TyPreConfig *config)
 {
 #define COPY_FLAG(ATTR, VAR) \
     if (config->ATTR >= 0) { \
@@ -600,7 +600,7 @@ _Ty_get_xoption(const PyWideStringList *xoptions, const wchar_t *name)
 
 
 static TyStatus
-preconfig_init_utf8_mode(PyPreConfig *config, const _PyPreCmdline *cmdline)
+preconfig_init_utf8_mode(TyPreConfig *config, const _PyPreCmdline *cmdline)
 {
 #ifdef MS_WINDOWS
     if (config->legacy_windows_fs_encoding) {
@@ -671,7 +671,7 @@ preconfig_init_utf8_mode(PyPreConfig *config, const _PyPreCmdline *cmdline)
 
 
 static void
-preconfig_init_coerce_c_locale(PyPreConfig *config)
+preconfig_init_coerce_c_locale(TyPreConfig *config)
 {
     if (!config->configure_locale) {
         config->coerce_c_locale = 0;
@@ -718,7 +718,7 @@ preconfig_init_coerce_c_locale(PyPreConfig *config)
 
 
 static TyStatus
-preconfig_init_allocator(PyPreConfig *config)
+preconfig_init_allocator(TyPreConfig *config)
 {
     if (config->allocator == PYMEM_ALLOCATOR_NOT_SET) {
         /* bpo-34247. The PYTHONMALLOC environment variable has the priority
@@ -743,7 +743,7 @@ preconfig_init_allocator(PyPreConfig *config)
 
 
 static TyStatus
-preconfig_read(PyPreConfig *config, _PyPreCmdline *cmdline)
+preconfig_read(TyPreConfig *config, _PyPreCmdline *cmdline)
 {
     TyStatus status;
 
@@ -795,7 +795,7 @@ preconfig_read(PyPreConfig *config, _PyPreCmdline *cmdline)
    - Ty_xxx global configuration variables
    - the LC_CTYPE locale */
 TyStatus
-_TyPreConfig_Read(PyPreConfig *config, const _PyArgv *args)
+_TyPreConfig_Read(TyPreConfig *config, const _PyArgv *args)
 {
     TyStatus status;
 
@@ -817,7 +817,7 @@ _TyPreConfig_Read(PyPreConfig *config, const _PyArgv *args)
     }
 
     /* Save the config to be able to restore it if encodings change */
-    PyPreConfig save_config;
+    TyPreConfig save_config;
 
     status = _TyPreConfig_InitFromPreConfig(&save_config, config);
     if (_TyStatus_EXCEPTION(status)) {
@@ -829,7 +829,7 @@ _TyPreConfig_Read(PyPreConfig *config, const _PyArgv *args)
         _Ty_SetLocaleFromEnv(LC_CTYPE);
     }
 
-    PyPreConfig save_runtime_config;
+    TyPreConfig save_runtime_config;
     preconfig_copy(&save_runtime_config, &_PyRuntime.preconfig);
 
     _PyPreCmdline cmdline = _PyPreCmdline_INIT;
@@ -935,9 +935,9 @@ done:
    Do nothing if called after Ty_Initialize(): ignore the new
    pre-configuration. */
 TyStatus
-_TyPreConfig_Write(const PyPreConfig *src_config)
+_TyPreConfig_Write(const TyPreConfig *src_config)
 {
-    PyPreConfig config;
+    TyPreConfig config;
 
     TyStatus status = _TyPreConfig_InitFromPreConfig(&config, src_config);
     if (_TyStatus_EXCEPTION(status)) {

Python/pylifecycle.c

@@ -226,7 +226,7 @@ static const char *_C_LOCALE_WARNING =
 static void
 emit_stderr_warning_for_legacy_locale(_PyRuntimeState *runtime)
 {
-    const PyPreConfig *preconfig = &runtime->preconfig;
+    const TyPreConfig *preconfig = &runtime->preconfig;
     if (preconfig->coerce_c_locale_warn && _Ty_LegacyLocaleDetected(1)) {
         TySys_FormatStderr("%s", _C_LOCALE_WARNING);
     }
@@ -963,7 +963,7 @@ pyinit_config(_PyRuntimeState *runtime,
 
 
 TyStatus
-_Ty_PreInitializeFromPyArgv(const PyPreConfig *src_config, const _PyArgv *args)
+_Ty_PreInitializeFromPyArgv(const TyPreConfig *src_config, const _PyArgv *args)
 {
     TyStatus status;
 
@@ -986,7 +986,7 @@ _Ty_PreInitializeFromPyArgv(const PyPreConfig *src_config, const _PyArgv *args)
        at exit on success. */
     runtime->preinitializing = 1;
 
-    PyPreConfig config;
+    TyPreConfig config;
 
     status = _TyPreConfig_InitFromPreConfig(&config, src_config);
     if (_TyStatus_EXCEPTION(status)) {
@@ -1010,7 +1010,7 @@ _Ty_PreInitializeFromPyArgv(const PyPreConfig *src_config, const _PyArgv *args)
 
 
 TyStatus
-Ty_PreInitializeFromBytesArgs(const PyPreConfig *src_config, Ty_ssize_t argc, char **argv)
+Ty_PreInitializeFromBytesArgs(const TyPreConfig *src_config, Ty_ssize_t argc, char **argv)
 {
     _PyArgv args = {.use_bytes_argv = 1, .argc = argc, .bytes_argv = argv};
     return _Ty_PreInitializeFromPyArgv(src_config, &args);
@@ -1018,7 +1018,7 @@ Ty_PreInitializeFromBytesArgs(const PyPreConfig *src_config, Ty_ssize_t argc, ch
 
 
 TyStatus
-Ty_PreInitializeFromArgs(const PyPreConfig *src_config, Ty_ssize_t argc, wchar_t **argv)
+Ty_PreInitializeFromArgs(const TyPreConfig *src_config, Ty_ssize_t argc, wchar_t **argv)
 {
     _PyArgv args = {.use_bytes_argv = 0, .argc = argc, .wchar_argv = argv};
     return _Ty_PreInitializeFromPyArgv(src_config, &args);
@@ -1026,7 +1026,7 @@ Ty_PreInitializeFromArgs(const PyPreConfig *src_config, Ty_ssize_t argc, wchar_t
 
 
 TyStatus
-Ty_PreInitialize(const PyPreConfig *src_config)
+Ty_PreInitialize(const TyPreConfig *src_config)
 {
     return _Ty_PreInitializeFromPyArgv(src_config, NULL);
 }
@@ -1049,7 +1049,7 @@ _Ty_PreInitializeFromConfig(const PyConfig *config,
         return _TyStatus_OK();
     }
 
-    PyPreConfig preconfig;
+    TyPreConfig preconfig;
 
     _TyPreConfig_InitFromConfig(&preconfig, config);
 

Python/sysmodule.c

@@ -3405,7 +3405,7 @@ _TySys_SetFlagInt(Ty_ssize_t pos, int value)
 static int
 set_flags_from_config(TyInterpreterState *interp, TyObject *flags)
 {
-    const PyPreConfig *preconfig = &interp->runtime->preconfig;
+    const TyPreConfig *preconfig = &interp->runtime->preconfig;
     const PyConfig *config = _TyInterpreterState_GetConfig(interp);
 
     // _TySys_UpdateConfig() modifies sys.flags in-place: