mirror of
https://github.com/johndoe6345789/typthon.git
synced 2026-04-28 07:35:16 +00:00
Fix incorrect replacements in Py_ to Ty_ renaming
Fixed several macros and constants that should not have been renamed: - _Py_CAST, _Py_NULL, _Py_RVALUE (internal utility macros) - Py_UNUSED (unused parameter macro) - Py_EQ, Py_NE, Py_LT, Py_LE, Py_GT, Py_GE (comparison constants) - Py_RETURN_* macros (NONE, TRUE, FALSE, NOTIMPLEMENTED, RICHCOMPARE) - Py_READONLY, Py_ULL, Py_CONTEXT_SWITCHED - TyGC_Head in generated clinic files Build is still in progress with some remaining issues to resolve. Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
This commit is contained in:
@@ -186,13 +186,13 @@ typedef struct {
|
||||
|
||||
#define _PyASCIIObject_CAST(op) \
|
||||
(assert(TyUnicode_Check(op)), \
|
||||
_Ty_CAST(PyASCIIObject*, (op)))
|
||||
_Py_CAST(PyASCIIObject*, (op)))
|
||||
#define _PyCompactUnicodeObject_CAST(op) \
|
||||
(assert(TyUnicode_Check(op)), \
|
||||
_Ty_CAST(PyCompactUnicodeObject*, (op)))
|
||||
_Py_CAST(PyCompactUnicodeObject*, (op)))
|
||||
#define _PyUnicodeObject_CAST(op) \
|
||||
(assert(TyUnicode_Check(op)), \
|
||||
_Ty_CAST(PyUnicodeObject*, (op)))
|
||||
_Py_CAST(PyUnicodeObject*, (op)))
|
||||
|
||||
|
||||
/* --- Flexible String Representation Helper Macros (PEP 393) -------------- */
|
||||
@@ -216,7 +216,7 @@ static inline unsigned int TyUnicode_CHECK_INTERNED(TyObject *op) {
|
||||
#define TyUnicode_CHECK_INTERNED(op) TyUnicode_CHECK_INTERNED(_TyObject_CAST(op))
|
||||
|
||||
/* For backward compatibility. Soft-deprecated. */
|
||||
static inline unsigned int TyUnicode_IS_READY(TyObject* Ty_UNUSED(op)) {
|
||||
static inline unsigned int TyUnicode_IS_READY(TyObject* Py_UNUSED(op)) {
|
||||
return 1;
|
||||
}
|
||||
#define TyUnicode_IS_READY(op) TyUnicode_IS_READY(_TyObject_CAST(op))
|
||||
@@ -257,7 +257,7 @@ PyAPI_FUNC(int) TyUnicode_KIND(TyObject *op);
|
||||
// new compiler warnings on "kind < TyUnicode_KIND(str)" (compare signed and
|
||||
// unsigned numbers) where kind type is an int or on
|
||||
// "unsigned int kind = TyUnicode_KIND(str)" (cast signed to unsigned).
|
||||
#define TyUnicode_KIND(op) _Ty_RVALUE(_PyASCIIObject_CAST(op)->state.kind)
|
||||
#define TyUnicode_KIND(op) _Py_RVALUE(_PyASCIIObject_CAST(op)->state.kind)
|
||||
|
||||
/* Return a void pointer to the raw unicode buffer. */
|
||||
static inline void* _TyUnicode_COMPACT_DATA(TyObject *op) {
|
||||
@@ -324,7 +324,7 @@ static inline void TyUnicode_WRITE(int kind, void *data,
|
||||
}
|
||||
}
|
||||
#define TyUnicode_WRITE(kind, data, index, value) \
|
||||
TyUnicode_WRITE(_Ty_STATIC_CAST(int, kind), _Ty_CAST(void*, data), \
|
||||
TyUnicode_WRITE(_Ty_STATIC_CAST(int, kind), _Py_CAST(void*, data), \
|
||||
(index), _Ty_STATIC_CAST(Ty_UCS4, value))
|
||||
|
||||
/* Read a code point from the string's canonical representation. No checks
|
||||
@@ -408,7 +408,7 @@ PyAPI_FUNC(TyObject*) TyUnicode_New(
|
||||
);
|
||||
|
||||
/* For backward compatibility. Soft-deprecated. */
|
||||
static inline int TyUnicode_READY(TyObject* Ty_UNUSED(op))
|
||||
static inline int TyUnicode_READY(TyObject* Py_UNUSED(op))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user