Thanks to visit codestin.com
Credit goes to github.com

Skip to content

gh-112069: Adapt set/frozenset methods to Argument Clinic #115112

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 15 commits into from
Feb 8, 2024
Merged

gh-112069: Adapt set/frozenset methods to Argument Clinic #115112

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7deef19
Start converting set methods to AC
tomasr8 Jan 17, 2024
8159ef3
Convert all `METH_VARARGS` methods
tomasr8 Feb 6, 2024
50a9361
Add news entry
tomasr8 Feb 6, 2024
fd39e1e
Add missing @coexist
tomasr8 Feb 6, 2024
368cb27
Update news entry
tomasr8 Feb 7, 2024
fdce363
Rename default self parameter
tomasr8 Feb 8, 2024
7c8c981
Rename default self parameter part 2
tomasr8 Feb 8, 2024
4d7c7b9
Rename parameter
tomasr8 Feb 8, 2024
0bec7b4
Keep original parameter names
tomasr8 Feb 8, 2024
a4980de
Update indentation
tomasr8 Feb 8, 2024
de2ee5c
Update news entry
tomasr8 Feb 8, 2024
41512ef
Remove extra newlines
tomasr8 Feb 8, 2024
d965236
Fix tests
tomasr8 Feb 8, 2024
d10abef
Add forgotten docstring
tomasr8 Feb 8, 2024
9620fe8
Update clinic
tomasr8 Feb 8, 2024
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
Remove extra newlines
  • Loading branch information
@tomasr8
tomasr8 committed Feb 8, 2024
commit 41512efe7c71d148cccd2a41fabfa03c4b9a1198
63 changes: 21 additions & 42 deletions Objects/setobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,6 @@ set_merge(PySetObject *so, PyObject *otherset)

/*[clinic input]
set.pop

so: setobject

Remove and return an arbitrary set element.
Expand All @@ -656,7 +655,7 @@ Raises KeyError if the set is empty.

static PyObject *
set_pop_impl(PySetObject *so)
/*[clinic end generated code: output=4d65180f1271871b input=a48194117ea1e63a]*/
/*[clinic end generated code: output=4d65180f1271871b input=4a3f5552e660a260]*/
{
/* Make sure the search finger is in bounds */
setentry *entry = so->table + (so->finger & so->mask);
Expand Down Expand Up @@ -958,7 +957,6 @@ set_update_internal(PySetObject *so, PyObject *other)

/*[clinic input]
set.update

so: setobject
*others as args: object
/
Expand All @@ -968,7 +966,7 @@ Update the set, adding elements from all others.

static PyObject *
set_update_impl(PySetObject *so, PyObject *args)
/*[clinic end generated code: output=34f6371704974c8a input=168d9ce3461b7d8d]*/
/*[clinic end generated code: output=34f6371704974c8a input=eb47c4fbaeb3286e]*/
{
Py_ssize_t i;

Expand Down Expand Up @@ -1129,30 +1127,28 @@ set_swap_bodies(PySetObject *a, PySetObject *b)

/*[clinic input]
set.copy

so: setobject

Return a shallow copy of a set.
[clinic start generated code]*/

static PyObject *
set_copy_impl(PySetObject *so)
/*[clinic end generated code: output=c9223a1e1cc6b041 input=9bb66f7d227269a5]*/
/*[clinic end generated code: output=c9223a1e1cc6b041 input=2b80b288d47b8cf1]*/
{
return make_new_set_basetype(Py_TYPE(so), (PyObject *)so);
}

/*[clinic input]
frozenset.copy

so: setobject

Return a shallow copy of a set.
[clinic start generated code]*/

static PyObject *
frozenset_copy_impl(PySetObject *so)
/*[clinic end generated code: output=b356263526af9e70 input=ed001ffd5277ddd3]*/
/*[clinic end generated code: output=b356263526af9e70 input=3dc65577d344eff7]*/
{
if (PyFrozenSet_CheckExact(so)) {
return Py_NewRef(so);
Expand All @@ -1162,23 +1158,21 @@ frozenset_copy_impl(PySetObject *so)

/*[clinic input]
set.clear

so: setobject

Remove all elements from this set.
[clinic start generated code]*/

static PyObject *
set_clear_impl(PySetObject *so)
/*[clinic end generated code: output=4e71d5a83904161a input=3c560e2f9ae62e5c]*/
/*[clinic end generated code: output=4e71d5a83904161a input=74ac19794da81a39]*/
{
set_clear_internal(so);
Py_RETURN_NONE;
}

/*[clinic input]
set.union

so: setobject
*others as args: object
/
Expand All @@ -1188,7 +1182,7 @@ Return a new set with elements from the set and all others.

static PyObject *
set_union_impl(PySetObject *so, PyObject *args)
/*[clinic end generated code: output=2c83d05a446a1477 input=8a088a2719769c81]*/
/*[clinic end generated code: output=2c83d05a446a1477 input=2e2024fa1e40ac84]*/
{
PySetObject *result;
PyObject *other;
Expand Down Expand Up @@ -1326,7 +1320,6 @@ set_intersection(PySetObject *so, PyObject *other)

/*[clinic input]
set.intersection as set_intersection_multi

so: setobject
*others as args: object
/
Expand All @@ -1336,7 +1329,7 @@ Return a new set with elements common to the set and all others.

static PyObject *
set_intersection_multi_impl(PySetObject *so, PyObject *args)
/*[clinic end generated code: output=2406ef3387adbe2f input=c0c49c1ebe63df11]*/
/*[clinic end generated code: output=2406ef3387adbe2f input=04108ea6d7f0532b]*/
{
Py_ssize_t i;

Expand Down Expand Up @@ -1371,7 +1364,6 @@ set_intersection_update(PySetObject *so, PyObject *other)

/*[clinic input]
set.intersection_update as set_intersection_update_multi

so: setobject
*others as args: object
/
Expand All @@ -1381,7 +1373,7 @@ Update the set, keeping only elements found in it and all others.

static PyObject *
set_intersection_update_multi_impl(PySetObject *so, PyObject *args)
/*[clinic end generated code: output=251c1f729063609d input=e502454eef02d349]*/
/*[clinic end generated code: output=251c1f729063609d input=ff8f119f97458d16]*/
{
PyObject *tmp;

Expand Down Expand Up @@ -1417,7 +1409,6 @@ set_iand(PySetObject *so, PyObject *other)

/*[clinic input]
set.isdisjoint

so: setobject
other: object
/
Expand All @@ -1427,7 +1418,7 @@ Return True if two sets have a null intersection.

static PyObject *
set_isdisjoint(PySetObject *so, PyObject *other)
/*[clinic end generated code: output=a92bbf9a2db6a3da input=370c62423287239a]*/
/*[clinic end generated code: output=a92bbf9a2db6a3da input=c254ddec8a2326e3]*/
{
PyObject *key, *it, *tmp;
int rv;
Expand Down Expand Up @@ -1545,7 +1536,6 @@ set_difference_update_internal(PySetObject *so, PyObject *other)

/*[clinic input]
set.difference_update

so: setobject
*others as args: object
/
Expand All @@ -1555,7 +1545,7 @@ Update the set, removing elements found in others.

static PyObject *
set_difference_update_impl(PySetObject *so, PyObject *args)
/*[clinic end generated code: output=28685b2fc63e41c4 input=7b7380a788c4bb7c]*/
/*[clinic end generated code: output=28685b2fc63e41c4 input=e7abb43c9f2c5a73]*/
{
Py_ssize_t i;

Expand Down Expand Up @@ -1659,7 +1649,6 @@ set_difference(PySetObject *so, PyObject *other)

/*[clinic input]
set.difference as set_difference_multi

so: setobject
*others as args: object
/
Expand All @@ -1669,7 +1658,7 @@ Return a new set with elements in the set that are not in the others.

static PyObject *
set_difference_multi_impl(PySetObject *so, PyObject *args)
/*[clinic end generated code: output=3130c3bb3cac873d input=03248e240ee359a2]*/
/*[clinic end generated code: output=3130c3bb3cac873d input=d8ae9bb6d518ab95]*/
{
Py_ssize_t i;
PyObject *result, *other;
Expand Down Expand Up @@ -1739,7 +1728,6 @@ set_symmetric_difference_update_dict(PySetObject *so, PyObject *other)

/*[clinic input]
set.symmetric_difference_update

so: setobject
other: object
/
Expand All @@ -1749,7 +1737,7 @@ Update the set, keeping only elements found in either set, but not in both.

static PyObject *
set_symmetric_difference_update(PySetObject *so, PyObject *other)
/*[clinic end generated code: output=fbb049c0806028de input=70e02c8b48a9a59e]*/
/*[clinic end generated code: output=fbb049c0806028de input=a50acf0365e1f0a5]*/
{
PySetObject *otherset;
PyObject *key;
Expand Down Expand Up @@ -1804,7 +1792,6 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other)

/*[clinic input]
set.symmetric_difference

so: setobject
other: object
/
Expand All @@ -1814,7 +1801,7 @@ Return a new set with elements in either the set or other but not both.

static PyObject *
set_symmetric_difference(PySetObject *so, PyObject *other)
/*[clinic end generated code: output=f95364211b88775a input=f43dc971880c8685]*/
/*[clinic end generated code: output=f95364211b88775a input=f18af370ad72ebac]*/
{
PyObject *rv;
PySetObject *otherset;
Expand Down Expand Up @@ -1855,7 +1842,6 @@ set_ixor(PySetObject *so, PyObject *other)

/*[clinic input]
set.issubset

so: setobject
other: object
/
Expand All @@ -1865,7 +1851,7 @@ Report whether another set contains this set.

static PyObject *
set_issubset(PySetObject *so, PyObject *other)
/*[clinic end generated code: output=78aef1f377aedef1 input=e141f29d1ac23b11]*/
/*[clinic end generated code: output=78aef1f377aedef1 input=37fbc579b609db0c]*/
{
setentry *entry;
Py_ssize_t pos = 0;
Expand Down Expand Up @@ -1900,7 +1886,6 @@ set_issubset(PySetObject *so, PyObject *other)

/*[clinic input]
set.issuperset

so: setobject
other: object
/
Expand All @@ -1910,7 +1895,7 @@ Report whether this set contains another set.

static PyObject *
set_issuperset(PySetObject *so, PyObject *other)
/*[clinic end generated code: output=7d2b71dd714a7ec7 input=d5ba4e35213dcbc6]*/
/*[clinic end generated code: output=7d2b71dd714a7ec7 input=fd5dab052f2e9bb3]*/
{
if (PyAnySet_Check(other)) {
return set_issubset((PySetObject *)other, (PyObject *)so);
Expand Down Expand Up @@ -1984,7 +1969,6 @@ set_richcompare(PySetObject *v, PyObject *w, int op)

/*[clinic input]
set.add

so: setobject
key: object
/
Expand All @@ -1996,7 +1980,7 @@ This has no effect if the element is already present.

static PyObject *
set_add(PySetObject *so, PyObject *key)
/*[clinic end generated code: output=cd9c2d5c2069c2ba input=ba32da84433b0020]*/
/*[clinic end generated code: output=cd9c2d5c2069c2ba input=fc19e5024a02a819]*/
{
if (set_add_key(so, key))
return NULL;
Expand Down Expand Up @@ -2026,7 +2010,6 @@ set_contains(PySetObject *so, PyObject *key)
/*[clinic input]
@coexist
set.__contains__

so: setobject
key: object
/
Expand All @@ -2036,7 +2019,7 @@ x.__contains__(y) <==> y in x.

static PyObject *
set___contains__(PySetObject *so, PyObject *key)
/*[clinic end generated code: output=b5948bc5c590d3ca input=f21c9825df8663e2]*/
/*[clinic end generated code: output=b5948bc5c590d3ca input=95c79b822b6e6823]*/
{
long result;

Expand All @@ -2048,7 +2031,6 @@ set___contains__(PySetObject *so, PyObject *key)

/*[clinic input]
set.remove

so: setobject
key: object
/
Expand All @@ -2060,7 +2042,7 @@ If the element is not a member, raise a KeyError.

static PyObject *
set_remove(PySetObject *so, PyObject *key)
/*[clinic end generated code: output=08ae496d0cd2b8c1 input=9f46b172495667d3]*/
/*[clinic end generated code: output=08ae496d0cd2b8c1 input=a792bc2b76d2d98d]*/
{
PyObject *tmpkey;
int rv;
Expand Down Expand Up @@ -2088,7 +2070,6 @@ set_remove(PySetObject *so, PyObject *key)

/*[clinic input]
set.discard

so: setobject
key: object
/
Expand All @@ -2101,7 +2082,7 @@ an exception when an element is missing from the set.

static PyObject *
set_discard(PySetObject *so, PyObject *key)
/*[clinic end generated code: output=9181b60d7bb7d480 input=02d39a71285ea0ba]*/
/*[clinic end generated code: output=9181b60d7bb7d480 input=e05529cea3b4b295]*/
{
PyObject *tmpkey;
int rv;
Expand All @@ -2124,14 +2105,13 @@ set_discard(PySetObject *so, PyObject *key)

/*[clinic input]
set.__reduce__

so: setobject

[clinic start generated code]*/

static PyObject *
set___reduce___impl(PySetObject *so)
/*[clinic end generated code: output=9af7d0e029df87ee input=4706de8175a7ba2e]*/
/*[clinic end generated code: output=9af7d0e029df87ee input=afaa92e0850f63f9]*/
{
PyObject *keys=NULL, *args=NULL, *result=NULL, *state=NULL;

Expand All @@ -2154,15 +2134,14 @@ set___reduce___impl(PySetObject *so)

/*[clinic input]
set.__sizeof__

so: setobject

S.__sizeof__() -> size of S in memory, in bytes.
[clinic start generated code]*/

static PyObject *
set___sizeof___impl(PySetObject *so)
/*[clinic end generated code: output=4bfa3df7bd38ed88 input=9e20ae73953cacf2]*/
/*[clinic end generated code: output=4bfa3df7bd38ed88 input=0f214fc2225319fc]*/
{
size_t res = _PyObject_SIZE(Py_TYPE(so));
if (so->table != so->smalltable) {
Expand Down