Make iterators length transparent where possible.
This commit is contained in:
parent
1e5809ff02
commit
435bf58b7b
|
@ -71,6 +71,19 @@ iter_iternext(PyObject *iterator)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
iter_len(seqiterobject *it)
|
||||
{
|
||||
if (it->it_seq)
|
||||
return PyObject_Size(it->it_seq) - it->it_index;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PySequenceMethods iter_as_sequence = {
|
||||
(inquiry)iter_len, /* sq_length */
|
||||
0, /* sq_concat */
|
||||
};
|
||||
|
||||
PyTypeObject PySeqIter_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0, /* ob_size */
|
||||
|
@ -85,7 +98,7 @@ PyTypeObject PySeqIter_Type = {
|
|||
0, /* tp_compare */
|
||||
0, /* tp_repr */
|
||||
0, /* tp_as_number */
|
||||
0, /* tp_as_sequence */
|
||||
&iter_as_sequence, /* tp_as_sequence */
|
||||
0, /* tp_as_mapping */
|
||||
0, /* tp_hash */
|
||||
0, /* tp_call */
|
||||
|
|
|
@ -2707,6 +2707,19 @@ listiter_next(listiterobject *it)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
listiter_len(listiterobject *it)
|
||||
{
|
||||
if (it->it_seq)
|
||||
return PyList_GET_SIZE(it->it_seq) - it->it_index;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PySequenceMethods listiter_as_sequence = {
|
||||
(inquiry)listiter_len, /* sq_length */
|
||||
0, /* sq_concat */
|
||||
};
|
||||
|
||||
PyTypeObject PyListIter_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0, /* ob_size */
|
||||
|
@ -2721,7 +2734,7 @@ PyTypeObject PyListIter_Type = {
|
|||
0, /* tp_compare */
|
||||
0, /* tp_repr */
|
||||
0, /* tp_as_number */
|
||||
0, /* tp_as_sequence */
|
||||
&listiter_as_sequence, /* tp_as_sequence */
|
||||
0, /* tp_as_mapping */
|
||||
0, /* tp_hash */
|
||||
0, /* tp_call */
|
||||
|
|
|
@ -839,6 +839,19 @@ tupleiter_next(tupleiterobject *it)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
tupleiter_len(tupleiterobject *it)
|
||||
{
|
||||
if (it->it_seq)
|
||||
return PyTuple_GET_SIZE(it->it_seq) - it->it_index;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static PySequenceMethods tupleiter_as_sequence = {
|
||||
(inquiry)tupleiter_len, /* sq_length */
|
||||
0, /* sq_concat */
|
||||
};
|
||||
|
||||
PyTypeObject PyTupleIter_Type = {
|
||||
PyObject_HEAD_INIT(&PyType_Type)
|
||||
0, /* ob_size */
|
||||
|
@ -853,7 +866,7 @@ PyTypeObject PyTupleIter_Type = {
|
|||
0, /* tp_compare */
|
||||
0, /* tp_repr */
|
||||
0, /* tp_as_number */
|
||||
0, /* tp_as_sequence */
|
||||
&tupleiter_as_sequence, /* tp_as_sequence */
|
||||
0, /* tp_as_mapping */
|
||||
0, /* tp_hash */
|
||||
0, /* tp_call */
|
||||
|
|
Loading…
Reference in New Issue