Skip to content

Minor refactoring of Object/abstract.c (UNARY_FUNC macro and more cases for BINARY_FUNC) #112145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 5, 2023
Merged

Minor refactoring of Object/abstract.c (UNARY_FUNC macro and more cases for BINARY_FUNC) #112145

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
56b5e1f
Minor refactoring of Object/abstract.c
skirpichev Nov 5, 2023
b0d2f78
+ last argument for UNARY_FUNC()
skirpichev Nov 16, 2023
8fc962e
Merge branch 'main' into abstract-refactor
skirpichev Dec 3, 2023
46620ed
revert ternary_op
skirpichev Dec 3, 2023
631259a
revert everything, except UNARY/BINARY_FUNC
skirpichev Dec 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 25 additions & 90 deletions Objects/abstract.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,29 +1180,10 @@ PyNumber_Multiply(PyObject *v, PyObject *w)
return result;
}

PyObject *
PyNumber_MatrixMultiply(PyObject *v, PyObject *w)
{
return binary_op(v, w, NB_SLOT(nb_matrix_multiply), "@");
}

PyObject *
PyNumber_FloorDivide(PyObject *v, PyObject *w)
{
return binary_op(v, w, NB_SLOT(nb_floor_divide), "//");
}

PyObject *
PyNumber_TrueDivide(PyObject *v, PyObject *w)
{
return binary_op(v, w, NB_SLOT(nb_true_divide), "/");
}

PyObject *
PyNumber_Remainder(PyObject *v, PyObject *w)
{
return binary_op(v, w, NB_SLOT(nb_remainder), "%");
}
BINARY_FUNC(PyNumber_MatrixMultiply, nb_matrix_multiply, "@")
BINARY_FUNC(PyNumber_FloorDivide, nb_floor_divide, "//")
BINARY_FUNC(PyNumber_TrueDivide, nb_true_divide, "/")
BINARY_FUNC(PyNumber_Remainder, nb_remainder, "%")

PyObject *
PyNumber_Power(PyObject *v, PyObject *w, PyObject *z)
Expand Down Expand Up @@ -1379,73 +1360,27 @@ _PyNumber_InPlacePowerNoMod(PyObject *lhs, PyObject *rhs)

/* Unary operators and functions */

PyObject *
PyNumber_Negative(PyObject *o)
{
if (o == NULL) {
return null_error();
}

PyNumberMethods *m = Py_TYPE(o)->tp_as_number;
if (m && m->nb_negative) {
PyObject *res = (*m->nb_negative)(o);
assert(_Py_CheckSlotResult(o, "__neg__", res != NULL));
return res;
}

return type_error("bad operand type for unary -: '%.200s'", o);
}

PyObject *
PyNumber_Positive(PyObject *o)
{
if (o == NULL) {
return null_error();
}

PyNumberMethods *m = Py_TYPE(o)->tp_as_number;
if (m && m->nb_positive) {
PyObject *res = (*m->nb_positive)(o);
assert(_Py_CheckSlotResult(o, "__pos__", res != NULL));
return res;
}

return type_error("bad operand type for unary +: '%.200s'", o);
}

PyObject *
PyNumber_Invert(PyObject *o)
{
if (o == NULL) {
return null_error();
}

PyNumberMethods *m = Py_TYPE(o)->tp_as_number;
if (m && m->nb_invert) {
PyObject *res = (*m->nb_invert)(o);
assert(_Py_CheckSlotResult(o, "__invert__", res != NULL));
return res;
}

return type_error("bad operand type for unary ~: '%.200s'", o);
}

PyObject *
PyNumber_Absolute(PyObject *o)
{
if (o == NULL) {
return null_error();
}

PyNumberMethods *m = Py_TYPE(o)->tp_as_number;
if (m && m->nb_absolute) {
PyObject *res = m->nb_absolute(o);
assert(_Py_CheckSlotResult(o, "__abs__", res != NULL));
return res;
}

return type_error("bad operand type for abs(): '%.200s'", o);
}
#define UNARY_FUNC(func, op, meth_name, descr) \
PyObject * \
func(PyObject *o) { \
if (o == NULL) { \
return null_error(); \
} \
\
PyNumberMethods *m = Py_TYPE(o)->tp_as_number; \
if (m && m->op) { \
PyObject *res = (*m->op)(o); \
assert(_Py_CheckSlotResult(o, #meth_name, res != NULL)); \
return res; \
} \
\
return type_error("bad operand type for "descr": '%.200s'", o); \
}

UNARY_FUNC(PyNumber_Negative, nb_negative, __neg__, "unary -")
UNARY_FUNC(PyNumber_Positive, nb_positive, __pow__, "unary +")
UNARY_FUNC(PyNumber_Invert, nb_invert, __invert__, "unary ~")
UNARY_FUNC(PyNumber_Absolute, nb_absolute, __abs__, "abs()")


int
Expand Down