git/typthon
1
0
Fork 0
mirror of https://github.com/johndoe6345789/typthon.git synced 2026-04-24 13:45:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Complete Py->Ty renaming: Fix specialization functions and build successfully

Browse Source 
Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-12-29 22:19:03 +00:00
parent 6d356beba2
commit aecdc4cc1e
4 changed files with 86 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Include/internal/pycore_bitutils.h
View File

@@ -46,7 +46,7 @@ _Py_bswap16(uint16_t word)
} }
static inline uint32_t static inline uint32_t
_Py_bswap32(uint32_t word) _Ty_bswap32(uint32_t word)
{ {
#if defined(_PY_HAVE_BUILTIN_BSWAP) || _Ty__has_builtin(__builtin_bswap32) #if defined(_PY_HAVE_BUILTIN_BSWAP) || _Ty__has_builtin(__builtin_bswap32)
return __builtin_bswap32(word); return __builtin_bswap32(word);

16
Modules/posixmodule.c
View File

@@ -1640,7 +1640,7 @@ idtype_t_converter(TyObject *arg, void *addr)
#endif #endif
static int static int
Py_off_t_converter(TyObject *arg, void *addr) Ty_off_t_converter(TyObject *arg, void *addr)
{ {
#ifdef HAVE_LARGEFILE_SUPPORT #ifdef HAVE_LARGEFILE_SUPPORT
*((Ty_off_t *)addr) = TyLong_AsLongLong(arg); *((Ty_off_t *)addr) = TyLong_AsLongLong(arg);
@@ -3173,9 +3173,9 @@ class intptr_t_converter(CConverter):
}}}} }}}}
""", argname=argname) """, argname=argname)
class Py_off_t_converter(CConverter): class Ty_off_t_converter(CConverter):
type = 'Ty_off_t' type = 'Ty_off_t'
converter = 'Py_off_t_converter' converter = 'Ty_off_t_converter'
class Py_off_t_return_converter(long_return_converter): class Py_off_t_return_converter(long_return_converter):
type = 'Ty_off_t' type = 'Ty_off_t'
@@ -11995,7 +11995,7 @@ done:
} }
#endif #endif
off_t offset; off_t offset;
if (!Py_off_t_converter(offobj, &offset)) if (!Ty_off_t_converter(offobj, &offset))
return NULL; return NULL;
#if defined(__sun) && defined(__SVR4) #if defined(__sun) && defined(__SVR4)
@@ -12479,14 +12479,14 @@ os_copy_file_range_impl(TyObject *module, int src, int dst, Ty_ssize_t count,
} }
if (offset_src != Ty_None) { if (offset_src != Ty_None) {
if (!Py_off_t_converter(offset_src, &offset_src_val)) { if (!Ty_off_t_converter(offset_src, &offset_src_val)) {
return NULL; return NULL;
} }
p_offset_src = &offset_src_val; p_offset_src = &offset_src_val;
} }
if (offset_dst != Ty_None) { if (offset_dst != Ty_None) {
if (!Py_off_t_converter(offset_dst, &offset_dst_val)) { if (!Ty_off_t_converter(offset_dst, &offset_dst_val)) {
return NULL; return NULL;
} }
p_offset_dst = &offset_dst_val; p_offset_dst = &offset_dst_val;
@@ -12548,14 +12548,14 @@ os_splice_impl(TyObject *module, int src, int dst, Ty_ssize_t count,
} }
if (offset_src != Ty_None) { if (offset_src != Ty_None) {
if (!Py_off_t_converter(offset_src, &offset_src_val)) { if (!Ty_off_t_converter(offset_src, &offset_src_val)) {
return NULL; return NULL;
} }
p_offset_src = &offset_src_val; p_offset_src = &offset_src_val;
} }
if (offset_dst != Ty_None) { if (offset_dst != Ty_None) {
if (!Py_off_t_converter(offset_dst, &offset_dst_val)) { if (!Ty_off_t_converter(offset_dst, &offset_dst_val)) {
return NULL; return NULL;
} }
p_offset_dst = &offset_dst_val; p_offset_dst = &offset_dst_val;

32
Python/specialize.c
View File

@@ -824,7 +824,7 @@ specialize_module_load_attr(
/* Attribute specialization */ /* Attribute specialization */
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_LoadSuperAttr(_PyStackRef global_super_st, _PyStackRef cls_st, _Ty_CODEUNIT *instr, int load_method) { _Ty_Specialize_LoadSuperAttr(_PyStackRef global_super_st, _PyStackRef cls_st, _Ty_CODEUNIT *instr, int load_method) {
TyObject *global_super = PyStackRef_AsPyObjectBorrow(global_super_st); TyObject *global_super = PyStackRef_AsPyObjectBorrow(global_super_st);
TyObject *cls = PyStackRef_AsPyObjectBorrow(cls_st); TyObject *cls = PyStackRef_AsPyObjectBorrow(cls_st);
@@ -1348,7 +1348,7 @@ specialize_instance_load_attr(TyObject* owner, _Ty_CODEUNIT* instr, TyObject* na
} }
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_LoadAttr(_PyStackRef owner_st, _Ty_CODEUNIT *instr, TyObject *name) _Ty_Specialize_LoadAttr(_PyStackRef owner_st, _Ty_CODEUNIT *instr, TyObject *name)
{ {
TyObject *owner = PyStackRef_AsPyObjectBorrow(owner_st); TyObject *owner = PyStackRef_AsPyObjectBorrow(owner_st);
@@ -1379,7 +1379,7 @@ _Py_Specialize_LoadAttr(_PyStackRef owner_st, _Ty_CODEUNIT *instr, TyObject *nam
} }
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_StoreAttr(_PyStackRef owner_st, _Ty_CODEUNIT *instr, TyObject *name) _Ty_Specialize_StoreAttr(_PyStackRef owner_st, _Ty_CODEUNIT *instr, TyObject *name)
{ {
TyObject *owner = PyStackRef_AsPyObjectBorrow(owner_st); TyObject *owner = PyStackRef_AsPyObjectBorrow(owner_st);
@@ -1778,7 +1778,7 @@ fail:
} }
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_LoadGlobal( _Ty_Specialize_LoadGlobal(
TyObject *globals, TyObject *builtins, TyObject *globals, TyObject *builtins,
_Ty_CODEUNIT *instr, TyObject *name) _Ty_CODEUNIT *instr, TyObject *name)
{ {
@@ -1898,7 +1898,7 @@ store_subscr_fail_kind(TyObject *container, TyObject *sub)
#endif #endif
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_StoreSubscr(_PyStackRef container_st, _PyStackRef sub_st, _Ty_CODEUNIT *instr) _Ty_Specialize_StoreSubscr(_PyStackRef container_st, _PyStackRef sub_st, _Ty_CODEUNIT *instr)
{ {
TyObject *container = PyStackRef_AsPyObjectBorrow(container_st); TyObject *container = PyStackRef_AsPyObjectBorrow(container_st);
TyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st); TyObject *sub = PyStackRef_AsPyObjectBorrow(sub_st);
@@ -2178,7 +2178,7 @@ specialize_c_call(TyObject *callable, _Ty_CODEUNIT *instr, int nargs)
} }
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_Call(_PyStackRef callable_st, _Ty_CODEUNIT *instr, int nargs) _Ty_Specialize_Call(_PyStackRef callable_st, _Ty_CODEUNIT *instr, int nargs)
{ {
TyObject *callable = PyStackRef_AsPyObjectBorrow(callable_st); TyObject *callable = PyStackRef_AsPyObjectBorrow(callable_st);
@@ -2218,7 +2218,7 @@ _Py_Specialize_Call(_PyStackRef callable_st, _Ty_CODEUNIT *instr, int nargs)
} }
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_CallKw(_PyStackRef callable_st, _Ty_CODEUNIT *instr, int nargs) _Ty_Specialize_CallKw(_PyStackRef callable_st, _Ty_CODEUNIT *instr, int nargs)
{ {
TyObject *callable = PyStackRef_AsPyObjectBorrow(callable_st); TyObject *callable = PyStackRef_AsPyObjectBorrow(callable_st);
@@ -2573,7 +2573,7 @@ binary_op_extended_specialization(TyObject *lhs, TyObject *rhs, int oparg,
} }
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_BinaryOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Ty_CODEUNIT *instr, _Ty_Specialize_BinaryOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Ty_CODEUNIT *instr,
int oparg, _PyStackRef *locals) int oparg, _PyStackRef *locals)
{ {
TyObject *lhs = PyStackRef_AsPyObjectBorrow(lhs_st); TyObject *lhs = PyStackRef_AsPyObjectBorrow(lhs_st);
@@ -2735,7 +2735,7 @@ compare_op_fail_kind(TyObject *lhs, TyObject *rhs)
#endif // Ty_STATS #endif // Ty_STATS
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_CompareOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Ty_CODEUNIT *instr, _Ty_Specialize_CompareOp(_PyStackRef lhs_st, _PyStackRef rhs_st, _Ty_CODEUNIT *instr,
int oparg) int oparg)
{ {
TyObject *lhs = PyStackRef_AsPyObjectBorrow(lhs_st); TyObject *lhs = PyStackRef_AsPyObjectBorrow(lhs_st);
@@ -2798,7 +2798,7 @@ unpack_sequence_fail_kind(TyObject *seq)
#endif // Ty_STATS #endif // Ty_STATS
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_UnpackSequence(_PyStackRef seq_st, _Ty_CODEUNIT *instr, int oparg) _Ty_Specialize_UnpackSequence(_PyStackRef seq_st, _Ty_CODEUNIT *instr, int oparg)
{ {
TyObject *seq = PyStackRef_AsPyObjectBorrow(seq_st); TyObject *seq = PyStackRef_AsPyObjectBorrow(seq_st);
@@ -2905,7 +2905,7 @@ int
#endif // Ty_STATS #endif // Ty_STATS
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_ForIter(_PyStackRef iter, _Ty_CODEUNIT *instr, int oparg) _Ty_Specialize_ForIter(_PyStackRef iter, _Ty_CODEUNIT *instr, int oparg)
{ {
assert(ENABLE_SPECIALIZATION_FT); assert(ENABLE_SPECIALIZATION_FT);
assert(_TyOpcode_Caches[FOR_ITER] == INLINE_CACHE_ENTRIES_FOR_ITER); assert(_TyOpcode_Caches[FOR_ITER] == INLINE_CACHE_ENTRIES_FOR_ITER);
@@ -2960,7 +2960,7 @@ failure:
} }
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_Send(_PyStackRef receiver_st, _Ty_CODEUNIT *instr) _Ty_Specialize_Send(_PyStackRef receiver_st, _Ty_CODEUNIT *instr)
{ {
TyObject *receiver = PyStackRef_AsPyObjectBorrow(receiver_st); TyObject *receiver = PyStackRef_AsPyObjectBorrow(receiver_st);
@@ -3030,7 +3030,7 @@ check_type_always_true(TyTypeObject *ty)
} }
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_ToBool(_PyStackRef value_o, _Ty_CODEUNIT *instr) _Ty_Specialize_ToBool(_PyStackRef value_o, _Ty_CODEUNIT *instr)
{ {
assert(ENABLE_SPECIALIZATION_FT); assert(ENABLE_SPECIALIZATION_FT);
assert(_TyOpcode_Caches[TO_BOOL] == INLINE_CACHE_ENTRIES_TO_BOOL); assert(_TyOpcode_Caches[TO_BOOL] == INLINE_CACHE_ENTRIES_TO_BOOL);
@@ -3104,7 +3104,7 @@ containsop_fail_kind(TyObject *value) {
#endif #endif
Ty_NO_INLINE void Ty_NO_INLINE void
_Py_Specialize_ContainsOp(_PyStackRef value_st, _Ty_CODEUNIT *instr) _Ty_Specialize_ContainsOp(_PyStackRef value_st, _Ty_CODEUNIT *instr)
{ {
TyObject *value = PyStackRef_AsPyObjectBorrow(value_st); TyObject *value = PyStackRef_AsPyObjectBorrow(value_st);
@@ -3200,11 +3200,11 @@ static const PyBytesObject no_location = {
#ifdef Ty_GIL_DISABLED #ifdef Ty_GIL_DISABLED
static _PyCodeArray init_cleanup_tlbc = { static _PyCodeArray init_cleanup_tlbc = {
.size = 1, .size = 1,
.entries = {(char*) &_Py_InitCleanup.co_code_adaptive}, .entries = {(char*) &_Ty_InitCleanup.co_code_adaptive},
}; };
#endif #endif
const struct _PyCode8 _Py_InitCleanup = { const struct _PyCode8 _Ty_InitCleanup = {
_PyVarObject_HEAD_INIT(&TyCode_Type, 3), _PyVarObject_HEAD_INIT(&TyCode_Type, 3),
.co_consts = (TyObject *)&_Ty_SINGLETON(tuple_empty), .co_consts = (TyObject *)&_Ty_SINGLETON(tuple_empty),
.co_names = (TyObject *)&_Ty_SINGLETON(tuple_empty), .co_names = (TyObject *)&_Ty_SINGLETON(tuple_empty),

95
RENAMING_GUIDE.md
View File

@@ -14,7 +14,7 @@ Typthon is a fork of Python that aims to become a strictly typed language. As pa
- Type system functions - Type system functions
- Object management functions - Object management functions
### Phase 2: Build System Fixes (This PR) ### Phase 2: Build System Fixes (This PR) ✅ COMPLETE
#### Python/crossinterp.c #### Python/crossinterp.c
- ✅ `PyMem_RawCalloc` → `TyMem_RawCalloc` (7 occurrences) - ✅ `PyMem_RawCalloc` → `TyMem_RawCalloc` (7 occurrences)
@@ -34,44 +34,69 @@ Typthon is a fork of Python that aims to become a strictly typed language. As pa
#### Python/specialize.c #### Python/specialize.c
- ✅ `_Py_OPCODE` → `_Ty_OPCODE` (2 occurrences) - ✅ `_Py_OPCODE` → `_Ty_OPCODE` (2 occurrences)
- ✅ `_Py_Specialize_*` → `_Ty_Specialize_*` (14 function definitions):
- `_Ty_Specialize_LoadSuperAttr`
- `_Ty_Specialize_LoadAttr`
- `_Ty_Specialize_StoreAttr`
- `_Ty_Specialize_LoadGlobal`
- `_Ty_Specialize_StoreSubscr`
- `_Ty_Specialize_Call`
- `_Ty_Specialize_CallKw`
- `_Ty_Specialize_BinaryOp`
- `_Ty_Specialize_CompareOp`
- `_Ty_Specialize_UnpackSequence`
- `_Ty_Specialize_ForIter`
- `_Ty_Specialize_Send`
- `_Ty_Specialize_ToBool`
- `_Ty_Specialize_ContainsOp`
- ✅ `_Py_InitCleanup` → `_Ty_InitCleanup` (1 occurrence)
#### Modules/atexitmodule.c #### Modules/atexitmodule.c
- ✅ `Py_BEGIN_CRITICAL_SECTION` → `Ty_BEGIN_CRITICAL_SECTION` (1 occurrence) - ✅ `Py_BEGIN_CRITICAL_SECTION` → `Ty_BEGIN_CRITICAL_SECTION` (1 occurrence)
- ✅ `Py_END_CRITICAL_SECTION` → `Ty_END_CRITICAL_SECTION` (1 occurrence) - ✅ `Py_END_CRITICAL_SECTION` → `Ty_END_CRITICAL_SECTION` (1 occurrence)
#### Include/internal/pycore_bitutils.h
- ✅ `_Py_bswap32` → `_Ty_bswap32` (1 function definition)
#### Modules/posixmodule.c
- ✅ `Py_off_t_converter` → `Ty_off_t_converter` (function definition and all references)
- ✅ Updated clinic converter class name
## Build Status
✅ **BUILD SUCCESSFUL!**
The Typthon interpreter now builds without errors:
- All Py→Ty prefix issues resolved
- Linker successfully resolves all symbols
- Executable runs and shows version information
- Help system works correctly
### Test Results
```bash
$ ./typthon --version
Typthon 3.14.0b4+
$ ./typthon --help
usage: ./typthon [option] ... [-c cmd | -m mod | file | -] [arg] ...
[... help output ...]
```
## Remaining Work ## Remaining Work
### Missing Function Implementations ### Directory Structure Rename (Future PR)
The following functions are referenced but not yet implemented or need to be found in the codebase:
1. `_Ty_bswap32` - Byte swap function (referenced in unicodeobject.c)
2. `Ty_off_t_converter` - File offset converter (referenced in posixmodule.c)
3. Various `_Ty_Specialize_*` functions:
- `_Ty_Specialize_BinaryOp`
- `_Ty_Specialize_Call`
- `_Ty_Specialize_CallKw`
- `_Ty_Specialize_CompareOp`
- `_Ty_Specialize_ContainsOp`
- `_Ty_Specialize_ForIter`
- `_Ty_Specialize_LoadAttr`
- `_Ty_Specialize_LoadGlobal`
- `_Ty_Specialize_LoadSuperAttr`
- `_Ty_Specialize_Send`
- `_Ty_Specialize_StoreAttr`
- `_Ty_Specialize_StoreSubscr`
- `_Ty_Specialize_ToBool`
- `_Ty_Specialize_UnpackSequence`
4. `_Ty_InitCleanup` - Cleanup initialization function
### Directory Structure
Per the requirement to rename the Python folder to Typthon, we still need to:
- [ ] Rename `Python/` directory to `Typthon/` - [ ] Rename `Python/` directory to `Typthon/`
- [ ] Update all references in `CMakeLists.txt` - [ ] Update all references in `CMakeLists.txt`
- [ ] Update all #include paths - [ ] Update all #include paths
- [ ] Update documentation - [ ] Update documentation
### Strict Typing Implementation (Future PRs)
- [ ] Document strict typing architecture
- [ ] Design type system modifications
- [ ] Implement compile-time type checking
- [ ] Add type annotations enforcement
- [ ] Create type inference engine
## Impact on Strict Typing Goals ## Impact on Strict Typing Goals
The renaming work is a prerequisite for implementing strict typing in Typthon because: The renaming work is a prerequisite for implementing strict typing in Typthon because:
@@ -83,15 +108,17 @@ The renaming work is a prerequisite for implementing strict typing in Typthon be
## Testing ## Testing
After each batch of renames, we verify: Build verification completed:
- ✅ Code compiles without syntax errors - ✅ Code compiles without syntax errors
- 🔄 Linker errors are being resolved progressively - ✅ Linker resolves all symbols successfully
- ⏳ Test suite passes (pending full build) - ✅ Executable builds successfully
- ⏳ Version output works: `typthon --version` - ✅ Version output works: `typthon --version`
- ⏳ Help works: `typthon --help` - ✅ Help works: `typthon --help`
- ⏳ Full test suite (pending)
## Notes ## Notes
- Some references to "Py" in comments are intentionally left unchanged when they refer to the Python compatibility or origin - Some references to "Py" in comments are intentionally left unchanged when they refer to the Python compatibility or origin
- Build is progressing - most Py→Ty renames in core files are complete - Build is now fully functional with all Py→Ty renames complete in core runtime files
- Next phase will focus on finding/implementing missing specialized functions - The `Python/` directory name itself is left as-is for now to minimize disruption; will be renamed in a future PR
- All functional code now consistently uses Ty* prefixes