Skip to content

Commit

Permalink
Make StopIteration a sink state. This is done by clearing out the
Browse files Browse the repository at this point in the history
it_seq field when the end of the list is reached.

Also remove the next() method -- one is supplied automatically by
PyType_Ready() because the tp_iternext slot is set.  That's a good
thing, because the implementation given here was buggy (it never
raised StopIteration).
  • Loading branch information
gvanrossum committed Jul 16, 2002
1 parent 9534e14 commit 86103ae
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions Objects/listobject.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* List object implementation */

#include "Python.h"
Expand Down Expand Up @@ -2016,7 +2015,7 @@ static PyTypeObject immutable_list_type = {
typedef struct {
PyObject_HEAD
long it_index;
PyListObject *it_seq;
PyListObject *it_seq; /* Set to NULL when iterator is exhausted */
} listiterobject;

PyTypeObject PyListIter_Type;
Expand Down Expand Up @@ -2044,13 +2043,15 @@ static void
listiter_dealloc(listiterobject *it)
{
_PyObject_GC_UNTRACK(it);
Py_DECREF(it->it_seq);
Py_XDECREF(it->it_seq);
PyObject_GC_Del(it);
}

static int
listiter_traverse(listiterobject *it, visitproc visit, void *arg)
{
if (it->it_seq == NULL)
return 0;
return visit((PyObject *)it->it_seq, arg);
}

Expand All @@ -2070,6 +2071,8 @@ listiter_next(listiterobject *it)

assert(it != NULL);
seq = it->it_seq;
if (seq == NULL)
return NULL;
assert(PyList_Check(seq));

if (it->it_index < PyList_GET_SIZE(seq)) {
Expand All @@ -2078,15 +2081,12 @@ listiter_next(listiterobject *it)
Py_INCREF(item);
return item;
}

Py_DECREF(seq);
it->it_seq = NULL;
return NULL;
}

static PyMethodDef listiter_methods[] = {
{"next", (PyCFunction)listiter_next, METH_NOARGS,
"it.next() -- get the next value, or raise StopIteration"},
{NULL, NULL} /* sentinel */
};

PyTypeObject PyListIter_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0, /* ob_size */
Expand Down Expand Up @@ -2117,12 +2117,11 @@ PyTypeObject PyListIter_Type = {
0, /* tp_weaklistoffset */
(getiterfunc)listiter_getiter, /* tp_iter */
(iternextfunc)listiter_next, /* tp_iternext */
listiter_methods, /* tp_methods */
0, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
};

0 comments on commit 86103ae

Please sign in to comment.