mirror of
https://github.com/python/cpython.git
synced 2025-09-03 15:31:08 +00:00
Iterators phase 1. This comprises:
new slot tp_iter in type object, plus new flag Py_TPFLAGS_HAVE_ITER new C API PyObject_GetIter(), calls tp_iter new builtin iter(), with two forms: iter(obj), and iter(function, sentinel) new internal object types iterobject and calliterobject new exception StopIteration new opcodes for "for" loops, GET_ITER and FOR_ITER (also supported by dis.py) new magic number for .pyc files new special method for instances: __iter__() returns an iterator iteration over dictionaries: "for x in dict" iterates over the keys iteration over files: "for x in file" iterates over lines TODO: documentation test suite decide whether to use a different way to spell iter(function, sentinal) decide whether "for key in dict" is a good idea use iterators in map/filter/reduce, min/max, and elsewhere (in/not in?) speed tuning (make next() a slot tp_next???)
This commit is contained in:
parent
12e73bb2f0
commit
59d1d2b434
16 changed files with 256 additions and 25 deletions
|
@ -1311,6 +1311,32 @@ static char float_doc[] =
|
|||
Convert a string or number to a floating point number, if possible.";
|
||||
|
||||
|
||||
static PyObject *
|
||||
builtin_iter(PyObject *self, PyObject *args)
|
||||
{
|
||||
PyObject *v, *w = NULL;
|
||||
|
||||
if (!PyArg_ParseTuple(args, "O|O:iter", &v, &w))
|
||||
return NULL;
|
||||
if (w == NULL)
|
||||
return PyObject_GetIter(v);
|
||||
if (!PyCallable_Check(v)) {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"iter(v, w): v must be callable");
|
||||
return NULL;
|
||||
}
|
||||
return PyCallIter_New(v, w);
|
||||
}
|
||||
|
||||
static char iter_doc[] =
|
||||
"iter(collection) -> iterator\n\
|
||||
iter(callable, sentinel) -> iterator\n\
|
||||
\n\
|
||||
Get an iterator from an object. In the first form, the argument must\n\
|
||||
supply its own iterator, or be a sequence.\n\
|
||||
In the second form, the callable is called until it returns the sentinel.";
|
||||
|
||||
|
||||
static PyObject *
|
||||
builtin_len(PyObject *self, PyObject *args)
|
||||
{
|
||||
|
@ -2148,6 +2174,7 @@ static PyMethodDef builtin_methods[] = {
|
|||
{"int", builtin_int, 1, int_doc},
|
||||
{"isinstance", builtin_isinstance, 1, isinstance_doc},
|
||||
{"issubclass", builtin_issubclass, 1, issubclass_doc},
|
||||
{"iter", builtin_iter, 1, iter_doc},
|
||||
{"len", builtin_len, 1, len_doc},
|
||||
{"list", builtin_list, 1, list_doc},
|
||||
{"locals", builtin_locals, 1, locals_doc},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue