mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-28 04:35:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Make the it_index field in the str/unicode iterators Py_ssize_t's.

Browse source 
Test the new iterators on str/unicode.
This commit is contained in:
Guido van Rossum 2006-08-17 21:11:47 +00:00
parent bf12cdbb28
commit 49d6b07c6b
4 changed files with 31 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Objects/unicodeobject.c
View file

@ -7969,7 +7969,7 @@ _PyUnicode_Fini(void)
typedef struct {
PyObject_HEAD
long it_index;
Py_ssize_t it_index;
PyUnicodeObject *it_seq; /* Set to NULL when iterator is exhausted */
} unicodeiterobject;
@ -8001,7 +8001,8 @@ unicodeiter_next(unicodeiterobject *it)
assert(PyUnicode_Check(seq));
if (it->it_index < PyUnicode_GET_SIZE(seq)) {
item = PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(seq)+it->it_index, 1);
item = PyUnicode_FromUnicode(
PyUnicode_AS_UNICODE(seq)+it->it_index, 1);
if (item != NULL)
++it->it_index;
return item;
@ -8024,7 +8025,8 @@ unicodeiter_len(unicodeiterobject *it)
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
static PyMethodDef unicodeiter_methods[] = {
{"__length_hint__", (PyCFunction)unicodeiter_len, METH_NOARGS, length_hint_doc},
{"__length_hint__", (PyCFunction)unicodeiter_len, METH_NOARGS,
length_hint_doc},
{NULL, NULL} /* sentinel */
};
@ -8035,7 +8037,7 @@ PyTypeObject PyUnicodeIter_Type = {
sizeof(unicodeiterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)unicodeiter_dealloc, /* tp_dealloc */
(destructor)unicodeiter_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */