Skip to content

bpo-45636: Merge BINARY_*/INPLACE_* into BINARY_OP/INPLACE_OP #29255

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

Closed
brandtbucher wants to merge 12 commits into from
Closed

bpo-45636: Merge BINARY_*/INPLACE_* into BINARY_OP/INPLACE_OP #29255

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4b7125f
Merge BINARY_*/INPLACE_* into BINARY_OP/INPLACE_OP
brandtbucher Oct 27, 2021
3a87083
Clean things up a bit
brandtbucher Oct 27, 2021
a2df29a
Improve the new _PyNumber_*Op implementations
brandtbucher Oct 27, 2021
1b8934e
Add docs
brandtbucher Oct 27, 2021
3137973
blurb add
brandtbucher Oct 27, 2021
9905549
Fix API leak
brandtbucher Oct 27, 2021
f697036
Clean up the nb_info struct
brandtbucher Oct 28, 2021
33f6e7c
Clean up some comments
brandtbucher Oct 28, 2021
befdc3f
Use slot offsets for opargs
brandtbucher Oct 31, 2021
61e0173
Update docs for nb_reserved change
brandtbucher Nov 1, 2021
4f7bfff
blurb add
brandtbucher Nov 1, 2021
2b5398d
Apply feedback from code review
brandtbucher Nov 1, 2021
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
Prev Previous commit
Next Next commit
Improve the new _PyNumber_*Op implementations
  • Loading branch information
@brandtbucher
brandtbucher committed Oct 27, 2021
commit a2df29ae881bb1acc0c9196ed29187644e02cad0
4 changes: 2 additions & 2 deletions Include/abstract.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,9 +633,9 @@ PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2);
If n is not an int object, it is converted with PyNumber_Index first. */
PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base);

PyAPI_FUNC(PyObject *) _PyNumber_Op(PyObject *o1, PyObject *o2, int op);
PyAPI_FUNC(PyObject *) _PyNumber_Op(PyObject *o1, PyObject *o2, unsigned op);

PyAPI_FUNC(PyObject *) _PyNumber_InPlaceOp(PyObject *o1, PyObject *o2, int op);
PyAPI_FUNC(PyObject *) _PyNumber_InPlaceOp(PyObject *o1, PyObject *o2, unsigned op);


/* === Sequence protocol ================================================ */
Expand Down
12 changes: 7 additions & 5 deletions Objects/abstract.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1716,14 +1716,14 @@ PyNumber_ToBase(PyObject *n, int base)
}

typedef struct {
Comment thread
brandtbucher marked this conversation as resolved.
Outdated
const char *iname;
const char *name;
size_t islot;
size_t slot;
const char *iname;
size_t islot;
} nb_info;
Comment thread
brandtbucher marked this conversation as resolved.
Outdated

#define NB_INFO(name, slot) \
{name "=", name, NB_SLOT(nb_inplace_##slot), NB_SLOT(nb_##slot)}
{name, NB_SLOT(nb_##slot), name "=", NB_SLOT(nb_inplace_##slot)}

static nb_info nb_infos[] = {
Comment thread
brandtbucher marked this conversation as resolved.
Outdated
[NB_AND] = NB_INFO("&", and),
Expand All @@ -1740,15 +1740,17 @@ static nb_info nb_infos[] = {
#undef NB_INFO

PyObject *
_PyNumber_Op(PyObject *o1, PyObject *o2, int op)
_PyNumber_Op(PyObject *o1, PyObject *o2, unsigned op)
Comment thread
brandtbucher marked this conversation as resolved.
Outdated
{
assert(op < sizeof(nb_infos) / sizeof(nb_info));
nb_info *ni = &nb_infos[op];
return binary_op(o1, o2, ni->slot, ni->name);
}

PyObject *
_PyNumber_InPlaceOp(PyObject *o1, PyObject *o2, int op)
_PyNumber_InPlaceOp(PyObject *o1, PyObject *o2, unsigned op)
{
assert(op < sizeof(nb_infos) / sizeof(nb_info));
nb_info *ni = &nb_infos[op];
return binary_iop(o1, o2, ni->islot, ni->slot, ni->iname);
}
Expand Down