Skip to content

Commit e21a76a

Browse files
Fidget-SpinnerFidget-Spinner
committed
Use Sam's and Mark's naming scheme
1 parent a6bfc97 commit e21a76a

20 files changed

+1863
-1882
lines changed

‎Include/internal/pycore_frame.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static inline _PyStackRef *_PyFrame_Stackbase(_PyInterpreterFrame *f) {
8585

8686
static inline _PyStackRef _PyFrame_StackPeek(_PyInterpreterFrame *f) {
8787
assert(f->stacktop > _PyFrame_GetCode(f)->co_nlocalsplus);
88-
assert(PyStackRef_To_PyObject_Borrow(f->localsplus[f->stacktop-1]) != NULL);
88+
assert(PyStackRef_AsPyObjectBorrow(f->localsplus[f->stacktop-1]) != NULL);
8989
return f->localsplus[f->stacktop-1];
9090
}
9191

‎Include/internal/pycore_stackref.h

+21-38
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,26 @@ PyStackRef_IsDeferred(_PyStackRef ref)
4040

4141
// Gets a PyObject * from a _PyStackRef
4242
static inline PyObject *
43-
PyStackRef_To_PyObject_Borrow(_PyStackRef tagged)
43+
PyStackRef_AsPyObjectBorrow(_PyStackRef tagged)
4444
{
4545
PyObject *cleared = ((PyObject *)((tagged).bits & (~Py_TAG)));
4646
return cleared;
4747
}
4848

4949
// Converts a PyObject * to a PyStackRef, stealing the reference
5050
static inline _PyStackRef
51-
_PyObject_To_StackRef_Steal(PyObject *obj)
51+
_PyStackRef_FromPyObjectSteal(PyObject *obj)
5252
{
5353
// Make sure we don't take an already tagged value.
5454
assert(((uintptr_t)obj & Py_TAG) == 0);
5555
int tag = (obj == NULL || _Py_IsImmortal(obj)) ? (Py_TAG_DEFERRED) : Py_TAG_PTR;
5656
return ((_PyStackRef){.bits = ((uintptr_t)(obj)) | tag});
5757
}
58-
#define PyObject_To_StackRef_Steal(obj) _PyObject_To_StackRef_Steal(_PyObject_CAST(obj))
58+
#define PyStackRef_FromPyObjectSteal(obj) _PyStackRef_FromPyObjectSteal(_PyObject_CAST(obj))
5959

6060
// Converts a PyObject * to a PyStackRef, with a new reference
6161
static inline _PyStackRef
62-
PyObject_To_StackRef_New(PyObject *obj)
62+
PyStackRef_FromPyObjectNew(PyObject *obj)
6363
{
6464
// Make sure we don't take an already tagged value.
6565
assert(((uintptr_t)obj & Py_TAG) == 0);
@@ -72,53 +72,44 @@ PyObject_To_StackRef_New(PyObject *obj)
7272
return (_PyStackRef){ .bits = (uintptr_t)(Py_NewRef(obj)) | Py_TAG_PTR };
7373
}
7474
}
75-
#define PyObject_To_StackRef_New(obj) PyObject_To_StackRef_New(_PyObject_CAST(obj))
75+
#define PyStackRef_FromPyObjectNew(obj) PyStackRef_FromPyObjectNew(_PyObject_CAST(obj))
7676

7777

7878
// Converts a PyStackRef back to a PyObject *, converting deferred references
7979
// to new references.
8080
static inline PyObject *
81-
PyStackRef_To_PyObject_New(_PyStackRef tagged)
81+
PyStackRef_AsPyObjectNew(_PyStackRef tagged)
8282
{
8383
if (!PyStackRef_IsNull(tagged) && PyStackRef_IsDeferred(tagged)) {
8484
assert(PyStackRef_IsNull(tagged) ||
85-
_Py_IsImmortal(PyStackRef_To_PyObject_Borrow(tagged)));
86-
return Py_NewRef(PyStackRef_To_PyObject_Borrow(tagged));
85+
_Py_IsImmortal(PyStackRef_AsPyObjectBorrow(tagged)));
86+
return Py_NewRef(PyStackRef_AsPyObjectBorrow(tagged));
8787
}
88-
return PyStackRef_To_PyObject_Borrow(tagged);
88+
return PyStackRef_AsPyObjectBorrow(tagged);
8989
}
9090

9191
static inline void
9292
_Py_untag_stack_borrowed(PyObject **dst, const _PyStackRef *src, size_t length)
9393
{
9494
for (size_t i = 0; i < length; i++) {
95-
dst[i] = PyStackRef_To_PyObject_Borrow(src[i]);
95+
dst[i] = PyStackRef_AsPyObjectBorrow(src[i]);
9696
}
9797
}
9898

9999
static inline void
100100
_Py_untag_stack_steal(PyObject **dst, const _PyStackRef *src, size_t length)
101101
{
102102
for (size_t i = 0; i < length; i++) {
103-
dst[i] = PyStackRef_To_PyObject_New(src[i]);
103+
dst[i] = PyStackRef_AsPyObjectNew(src[i]);
104104
}
105105
}
106106

107-
108-
#define PyStackRef_XSETREF(dst, src) \
107+
#define PyStackRef_SET(dst, src) \
109108
do { \
110109
_PyStackRef *_tmp_dst_ptr = &(dst); \
111110
_PyStackRef _tmp_old_dst = (*_tmp_dst_ptr); \
112111
*_tmp_dst_ptr = (src); \
113-
PyStackRef_DECREF(_tmp_old_dst); \
114-
} while (0)
115-
116-
#define PyStackRef_SETREF(dst, src) \
117-
do { \
118-
_PyStackRef *_tmp_dst_ptr = &(dst); \
119-
_PyStackRef _tmp_old_dst = (*_tmp_dst_ptr); \
120-
*_tmp_dst_ptr = (src); \
121-
PyStackRef_DECREF(_tmp_old_dst); \
112+
PyStackRef_CLOSE(_tmp_old_dst); \
122113
} while (0)
123114

124115
#define PyStackRef_CLEAR(op) \
@@ -127,48 +118,40 @@ _Py_untag_stack_steal(PyObject **dst, const _PyStackRef *src, size_t length)
127118
_PyStackRef _tmp_old_op = (*_tmp_op_ptr); \
128119
if (!PyStackRef_IsNull(_tmp_old_op)) { \
129120
*_tmp_op_ptr = Py_STACKREF_NULL; \
130-
PyStackRef_DECREF(_tmp_old_op); \
121+
PyStackRef_CLOSE(_tmp_old_op); \
131122
} \
132123
} while (0)
133124

134125
static inline void
135-
PyStackRef_DECREF(_PyStackRef tagged)
126+
PyStackRef_CLOSE(_PyStackRef tagged)
136127
{
137128
if (PyStackRef_IsDeferred(tagged)) {
138129
// No assert for being immortal or deferred here.
139130
// The GC unsets deferred objects right before clearing.
140131
return;
141132
}
142-
Py_DECREF(PyStackRef_To_PyObject_Borrow(tagged));
133+
Py_DECREF(PyStackRef_AsPyObjectBorrow(tagged));
143134
}
144135

145136
static inline void
146-
PyStackRef_INCREF(_PyStackRef tagged)
137+
PyStackRef_DUP(_PyStackRef tagged)
147138
{
148139
if (PyStackRef_IsDeferred(tagged)) {
149140
assert(PyStackRef_IsNull(tagged) ||
150-
_Py_IsImmortal(PyStackRef_To_PyObject_Borrow(tagged)));
141+
_Py_IsImmortal(PyStackRef_AsPyObjectBorrow(tagged)));
151142
return;
152143
}
153-
Py_INCREF(PyStackRef_To_PyObject_Borrow(tagged));
144+
Py_INCREF(PyStackRef_AsPyObjectBorrow(tagged));
154145
}
155146

156147

157148
static inline _PyStackRef
158-
PyStackRef_NewRef(_PyStackRef obj)
149+
PyStackRef_DUPNEW(_PyStackRef obj)
159150
{
160-
PyStackRef_INCREF(obj);
151+
PyStackRef_DUP(obj);
161152
return obj;
162153
}
163154

164-
static inline _PyStackRef
165-
PyStackRef_XNewRef(_PyStackRef obj)
166-
{
167-
if (PyStackRef_IsNull(obj)) {
168-
return obj;
169-
}
170-
return PyStackRef_NewRef(obj);
171-
}
172155

173156
#ifdef __cplusplus
174157
}

0 commit comments

Comments
 (0)