mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Tighten-up code in the set iterator to use an entry pointer rather than indexing.

Browse source
This commit is contained in:
Raymond Hettinger 2015-07-06 19:03:01 -07:00
parent 6d7cfadc6b
commit 3dbc11cadd
1 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Objects/setobject.c
View file

@ -766,8 +766,8 @@ typedef struct {
PyObject_HEAD PyObject_HEAD
PySetObject *si_set; /* Set to NULL when iterator is exhausted */ PySetObject *si_set; /* Set to NULL when iterator is exhausted */
Py_ssize_t si_used; Py_ssize_t si_used;
Py_ssize_t si_pos;
Py_ssize_t len; Py_ssize_t len;
setentry *entry;
} setiterobject; } setiterobject;
static void static void
@ -845,8 +845,6 @@ static PyMethodDef setiter_methods[] = {
static PyObject *setiter_iternext(setiterobject *si) static PyObject *setiter_iternext(setiterobject *si)
{ {
PyObject *key;
Py_ssize_t i, mask;
setentry *entry; setentry *entry;
PySetObject *so = si->si_set; PySetObject *so = si->si_set;
@ -860,25 +858,18 @@ static PyObject *setiter_iternext(setiterobject *si)
si->si_used = -1; /* Make this state sticky */ si->si_used = -1; /* Make this state sticky */
return NULL; return NULL;
} }
if (si->len <= 0) {
i = si->si_pos; Py_DECREF(so);
assert(i>=0); si->si_set = NULL;
entry = so->table; return NULL;
mask = so->mask; }
while (i <= mask && (entry[i].key == NULL || entry[i].key == dummy)) entry = si->entry;
i++; while (entry->key == NULL || entry->key == dummy)
si->si_pos = i+1; entry++;
if (i > mask)
goto fail;
si->len--; si->len--;
key = entry[i].key; si->entry = entry + 1;
Py_INCREF(key); Py_INCREF(entry->key);
return key; return entry->key;
fail:
Py_DECREF(so);
si->si_set = NULL;
return NULL;
} }
PyTypeObject PySetIter_Type = { PyTypeObject PySetIter_Type = {
@ -923,8 +914,8 @@ set_iter(PySetObject *so)
Py_INCREF(so); Py_INCREF(so);
si->si_set = so; si->si_set = so;
si->si_used = so->used; si->si_used = so->used;
si->si_pos = 0;
si->len = so->used; si->len = so->used;
si->entry = so->table;
_PyObject_GC_TRACK(si); _PyObject_GC_TRACK(si);
return (PyObject *)si; return (PyObject *)si;
} }