mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-07 01:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Simplify use of NB_BINOP and NB_TERNOP by making them do the pointer

Browse source 
dereference rather than the caller.
This commit is contained in:
Neil Schemenauer 2002-11-24 01:34:49 +00:00
parent e6b49025c1
commit b808c5cf2d
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Objects/abstract.c
View file

@ -318,9 +318,9 @@ PyNumber_Check(PyObject *o)
#define NB_SLOT(x) offsetof(PyNumberMethods, x) #define NB_SLOT(x) offsetof(PyNumberMethods, x)
#define NB_BINOP(nb_methods, slot) \ #define NB_BINOP(nb_methods, slot) \
((binaryfunc*)(& ((char*)nb_methods)[slot] )) (*(binaryfunc*)(& ((char*)nb_methods)[slot]))
#define NB_TERNOP(nb_methods, slot) \ #define NB_TERNOP(nb_methods, slot) \
((ternaryfunc*)(& ((char*)nb_methods)[slot] )) (*(ternaryfunc*)(& ((char*)nb_methods)[slot]))
/* /*
Calling scheme used for binary operations: Calling scheme used for binary operations:
@ -352,10 +352,10 @@ binary_op1(PyObject *v, PyObject *w, const int op_slot)
binaryfunc slotw = NULL; binaryfunc slotw = NULL;
if (v->ob_type->tp_as_number != NULL && NEW_STYLE_NUMBER(v)) if (v->ob_type->tp_as_number != NULL && NEW_STYLE_NUMBER(v))
slotv = *NB_BINOP(v->ob_type->tp_as_number, op_slot); slotv = NB_BINOP(v->ob_type->tp_as_number, op_slot);
if (w->ob_type != v->ob_type && if (w->ob_type != v->ob_type &&
w->ob_type->tp_as_number != NULL && NEW_STYLE_NUMBER(w)) { w->ob_type->tp_as_number != NULL && NEW_STYLE_NUMBER(w)) {
slotw = *NB_BINOP(w->ob_type->tp_as_number, op_slot); slotw = NB_BINOP(w->ob_type->tp_as_number, op_slot);
if (slotw == slotv) if (slotw == slotv)
slotw = NULL; slotw = NULL;
} }
@ -387,7 +387,7 @@ binary_op1(PyObject *v, PyObject *w, const int op_slot)
PyNumberMethods *mv = v->ob_type->tp_as_number; PyNumberMethods *mv = v->ob_type->tp_as_number;
if (mv) { if (mv) {
binaryfunc slot; binaryfunc slot;
slot = *NB_BINOP(mv, op_slot); slot = NB_BINOP(mv, op_slot);
if (slot) { if (slot) {
PyObject *x = slot(v, w); PyObject *x = slot(v, w);
Py_DECREF(v); Py_DECREF(v);
@ -466,10 +466,10 @@ ternary_op(PyObject *v,
mv = v->ob_type->tp_as_number; mv = v->ob_type->tp_as_number;
mw = w->ob_type->tp_as_number; mw = w->ob_type->tp_as_number;
if (mv != NULL && NEW_STYLE_NUMBER(v)) if (mv != NULL && NEW_STYLE_NUMBER(v))
slotv = *NB_TERNOP(mv, op_slot); slotv = NB_TERNOP(mv, op_slot);
if (w->ob_type != v->ob_type && if (w->ob_type != v->ob_type &&
mv != NULL && NEW_STYLE_NUMBER(w)) { mv != NULL && NEW_STYLE_NUMBER(w)) {
slotw = *NB_TERNOP(mw, op_slot); slotw = NB_TERNOP(mw, op_slot);
if (slotw == slotv) if (slotw == slotv)
slotw = NULL; slotw = NULL;
} }
@ -494,7 +494,7 @@ ternary_op(PyObject *v,
} }
mz = z->ob_type->tp_as_number; mz = z->ob_type->tp_as_number;
if (mz != NULL && NEW_STYLE_NUMBER(z)) { if (mz != NULL && NEW_STYLE_NUMBER(z)) {
slotz = *NB_TERNOP(mz, op_slot); slotz = NB_TERNOP(mz, op_slot);
if (slotz == slotv || slotz == slotw) if (slotz == slotv || slotz == slotw)
slotz = NULL; slotz = NULL;
if (slotz) { if (slotz) {
@ -519,7 +519,7 @@ ternary_op(PyObject *v,
treated as absent argument and not coerced. */ treated as absent argument and not coerced. */
if (z == Py_None) { if (z == Py_None) {
if (v->ob_type->tp_as_number) { if (v->ob_type->tp_as_number) {
slotz = *NB_TERNOP(v->ob_type->tp_as_number, slotz = NB_TERNOP(v->ob_type->tp_as_number,
op_slot); op_slot);
if (slotz) if (slotz)
x = slotz(v, w, z); x = slotz(v, w, z);
@ -542,7 +542,7 @@ ternary_op(PyObject *v,
goto error1; goto error1;
if (v1->ob_type->tp_as_number != NULL) { if (v1->ob_type->tp_as_number != NULL) {
slotv = *NB_TERNOP(v1->ob_type->tp_as_number, slotv = NB_TERNOP(v1->ob_type->tp_as_number,
op_slot); op_slot);
if (slotv) if (slotv)
x = slotv(v1, w2, z2); x = slotv(v1, w2, z2);
@ -673,9 +673,9 @@ binary_iop(PyObject *v, PyObject *w, const int iop_slot, const int op_slot,
{ {
PyNumberMethods *mv = v->ob_type->tp_as_number; PyNumberMethods *mv = v->ob_type->tp_as_number;
if (mv != NULL && HASINPLACE(v)) { if (mv != NULL && HASINPLACE(v)) {
binaryfunc *slot = NB_BINOP(mv, iop_slot); binaryfunc slot = NB_BINOP(mv, iop_slot);
if (*slot) { if (slot) {
PyObject *x = (*slot)(v, w); PyObject *x = (slot)(v, w);
if (x != Py_NotImplemented) { if (x != Py_NotImplemented) {
return x; return x;
} }