Skip to content

bpo-45636: Simpler design for BINARY_OP/INPLACE_OP #29418

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 11 commits into from
Closed

bpo-45636: Simpler design for BINARY_OP/INPLACE_OP #29418

Changes from 1 commit
Commits
Show all changes
11 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
bd8e9c7
Split up operator slots and names
brandtbucher Nov 5, 2021
4cac17a
Apply feedback from code review
brandtbucher Nov 9, 2021
3c2957b
Fix comment
brandtbucher Nov 9, 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
Apply feedback from code review
  • Loading branch information
@brandtbucher
brandtbucher committed Nov 9, 2021
commit 4cac17a4c9557d8c9833b2fdf2c5845f72039223
6 changes: 5 additions & 1 deletion Objects/abstract.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1737,7 +1737,9 @@ static const nb_slot_info nb_slot_infos[] = {
#undef NB_SLOT_INFO

typedef struct {
const char name[3];
// We only really need 3 characters for name, but we're using 4 here to
// avoid having an awkward 7-byte structure:
const char name[4];
const char iname[4];
} nb_name_info;

Expand All @@ -1760,12 +1762,14 @@ static const nb_name_info nb_name_infos[] = {
PyObject *
_PyNumber_Op(PyObject *o1, PyObject *o2, unsigned op)
Copy link
Copy Markdown
Member

@markshannon markshannon Nov 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This just forwards to binary_op. You might want to consider:

  1. Make this the function that does the work (effectively inlining binary_op here).
  2. Make the old API PyNumber_TrueDivide, etc. call _PyNumber_Op
  3. Delete binary_op.

{
// TODO: Just convert binary_op to _PyNumber_Op!
return binary_op(o1, o2, nb_slot_infos[op].slot, nb_name_infos[op].name);
}

PyObject *
_PyNumber_InPlaceOp(PyObject *o1, PyObject *o2, unsigned op)
Copy link
Copy Markdown
Member

@markshannon markshannon Nov 8, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as for _PyNumber_Op.

{
// TODO: Just convert binary_iop to _PyNumber_InPlaceOp!
return binary_iop(o1, o2, nb_slot_infos[op].islot, nb_slot_infos[op].slot,
nb_name_infos[op].iname);
}
Expand Down