mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Use PySequence_Contains() instead of direct access macro.

Browse source
This commit is contained in:
Raymond Hettinger 2003-11-18 14:15:31 +00:00
parent 50a4bb325c
commit 1b92fd5bca
1 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Objects/setobject.c
View file

@ -9,12 +9,6 @@
All rights reserved. All rights reserved.
*/ */
/* Fast access macros */
#define DICT_CONTAINS(d, k) (d->ob_type->tp_as_sequence->sq_contains(d, k))
/* set object **********************************************************/
static PyObject * static PyObject *
make_new_set(PyTypeObject *type, PyObject *iterable) make_new_set(PyTypeObject *type, PyObject *iterable)
{ {
@ -112,7 +106,7 @@ set_len(PySetObject *so)
static int static int
set_contains(PySetObject *so, PyObject *key) set_contains(PySetObject *so, PyObject *key)
{ {
return DICT_CONTAINS(so->data, key); return PySequence_Contains(so->data, key);
} }
static PyObject * static PyObject *
@ -247,7 +241,7 @@ set_intersection(PySetObject *so, PyObject *other)
selfdata = so->data; selfdata = so->data;
tgtdata = result->data; tgtdata = result->data;
while ((item = PyIter_Next(it)) != NULL) { while ((item = PyIter_Next(it)) != NULL) {
if (DICT_CONTAINS(selfdata, item)) { if (PySequence_Contains(selfdata, item)) {
if (PyDict_SetItem(tgtdata, item, Py_True) == -1) { if (PyDict_SetItem(tgtdata, item, Py_True) == -1) {
Py_DECREF(it); Py_DECREF(it);
Py_DECREF(result); Py_DECREF(result);
@ -287,7 +281,7 @@ set_intersection_update(PySetObject *so, PyObject *other)
selfdata = so->data; selfdata = so->data;
while ((item = PyIter_Next(it)) != NULL) { while ((item = PyIter_Next(it)) != NULL) {
if (DICT_CONTAINS(selfdata, item)) { if (PySequence_Contains(selfdata, item)) {
if (PyDict_SetItem(newdict, item, Py_True) == -1) { if (PyDict_SetItem(newdict, item, Py_True) == -1) {
Py_DECREF(newdict); Py_DECREF(newdict);
Py_DECREF(it); Py_DECREF(it);
@ -517,7 +511,7 @@ set_symmetric_difference_update(PySetObject *so, PyObject *other)
return NULL; return NULL;
while ((item = PyIter_Next(it)) != NULL) { while ((item = PyIter_Next(it)) != NULL) {
if (DICT_CONTAINS(selfdata, item)) { if (PySequence_Contains(selfdata, item)) {
if (PyDict_DelItem(selfdata, item) == -1) { if (PyDict_DelItem(selfdata, item) == -1) {
Py_XDECREF(otherset); Py_XDECREF(otherset);
Py_DECREF(it); Py_DECREF(it);
@ -589,7 +583,7 @@ set_issubset(PySetObject *so, PyObject *other)
otherdata = ((PySetObject *)other)->data; otherdata = ((PySetObject *)other)->data;
while ((item = PyIter_Next(it)) != NULL) { while ((item = PyIter_Next(it)) != NULL) {
if (!DICT_CONTAINS(otherdata, item)) { if (!PySequence_Contains(otherdata, item)) {
Py_DECREF(it); Py_DECREF(it);
Py_DECREF(item); Py_DECREF(item);
Py_RETURN_FALSE; Py_RETURN_FALSE;