[Python-checkins] CVS: python/dist/src/Objects iterobject.c,NONE,1.1.2.1 abstract.c,2.57,2.57.2.1

2001年3月13日 02:07:44 -0800

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv16532/Objects
Modified Files:
 Tag: iter-branch
	abstract.c 
Added Files:
 Tag: iter-branch
	iterobject.c 
Log Message:
This is the first iteration of my iterator patches. Don't worry, this
is on a branch (iter-branch), and it may still change.
Caveats:
- It's incomplete: class instances don't support __iter__ yet.
- It's currently using call notation to get the next item from the
 iterator; there have been arguments for making this use the next()
 method.
- The iter() built-in function is overloaded: iter(x) returns the
 iterator from x, iter(func, value) returns an iterator that calls a
 function until it returns or raises value. Note: the 'raises' part
 is experimental.
- There is no test suite or documentation yet.
Enjoy!
--- NEW FILE: iterobject.c ---
/* Iterator objects */
#include "Python.h"
typedef struct {
	PyObject_HEAD
	long it_index;
	PyObject *it_seq;
} iterobject;
PyObject *
PyIter_New(PyObject *seq)
{
	iterobject *it;
	it = PyObject_NEW(iterobject, &PyIter_Type);
	if (it == NULL)
		return NULL;
	it->it_index = 0;
	Py_INCREF(seq);
	it->it_seq = seq;
	return (PyObject *)it;
}
static void
iter_dealloc(iterobject *it)
{
	Py_DECREF(it->it_seq);
	PyObject_DEL(it);
}
static PyObject *
iter_call(iterobject *it, PyObject *args)
{
	PyObject *seq = it->it_seq;
	if (PyList_Check(seq)) {
		PyObject *item;
		if (it->it_index >= PyList_GET_SIZE(seq)) {
			PyErr_SetObject(PyExc_IndexError, Py_None);
			return NULL;
		}
		item = PyList_GET_ITEM(seq, it->it_index);
		it->it_index++;
		Py_INCREF(item);
		return item;
	}
	return PySequence_GetItem(seq, it->it_index++);
}
static PyObject *
iter_getiter(PyObject *it)
{
	Py_INCREF(it);
	return it;
}
PyTypeObject PyIter_Type = {
	PyObject_HEAD_INIT(&PyType_Type)
	0,					/* ob_size */
	"iterator",				/* tp_name */
	sizeof(iterobject),			/* tp_basicsize */
	0,					/* tp_itemsize */
	/* methods */
	(destructor)iter_dealloc, 		/* tp_dealloc */
	0,					/* tp_print */
	(getattrfunc)0,				/* tp_getattr */
	(setattrfunc)0,				/* tp_setattr */
	0,					/* tp_compare */
	0,					/* tp_repr */
	0,					/* tp_as_number */
	0,					/* tp_as_sequence */
	0,					/* tp_as_mapping */
	0,					/* tp_hash */
	iter_call,				/* tp_call */
	0,					/* tp_str */
	0,					/* tp_getattro */
	0,					/* tp_setattro */
	0,					/* tp_as_buffer */
	Py_TPFLAGS_DEFAULT,			/* tp_flags */
 	0,					/* tp_doc */
 	0,					/* tp_traverse */
 	0,					/* tp_clear */
	0,					/* tp_richcompare */
	0,					/* tp_weaklistoffset */
	(getiterfunc)iter_getiter,		/* tp_iter */
};
/* -------------------------------------- */
typedef struct {
	PyObject_HEAD
	PyObject *it_callable;
	PyObject *it_sentinel;
} calliterobject;
PyObject *
PyCallIter_New(PyObject *callable, PyObject *sentinel)
{
	calliterobject *it;
	it = PyObject_NEW(calliterobject, &PyCallIter_Type);
	if (it == NULL)
		return NULL;
	Py_INCREF(callable);
	it->it_callable = callable;
	Py_INCREF(sentinel);
	it->it_sentinel = sentinel;
	return (PyObject *)it;
}
static void
calliter_dealloc(calliterobject *it)
{
	Py_DECREF(it->it_callable);
	Py_DECREF(it->it_sentinel);
	PyObject_DEL(it);
}
static PyObject *
calliter_call(calliterobject *it, PyObject *args)
{
	PyObject *result = PyObject_CallObject(it->it_callable, NULL);
	if (result != NULL) {
		if (PyObject_RichCompareBool(result, it->it_sentinel, Py_EQ)) {
			PyErr_SetObject(PyExc_IndexError, Py_None);
			Py_DECREF(result);
			result = NULL;
		}
	}
	else {
		if (PyErr_ExceptionMatches(it->it_sentinel))
			PyErr_SetObject(PyExc_IndexError, Py_None);
		else if (PyErr_ExceptionMatches(PyExc_IndexError) &&
		 !PyErr_GivenExceptionMatches(
				PyExc_IndexError, it->it_sentinel))
			PyErr_SetString(PyExc_TypeError,
				"callable in iterator raised unexpected IndexError");
	}
	return result;
}
PyTypeObject PyCallIter_Type = {
	PyObject_HEAD_INIT(&PyType_Type)
	0,					/* ob_size */
	"callable-iterator",			/* tp_name */
	sizeof(calliterobject),			/* tp_basicsize */
	0,					/* tp_itemsize */
	/* methods */
	(destructor)calliter_dealloc, 		/* tp_dealloc */
	0,					/* tp_print */
	0,					/* tp_getattr */
	0,					/* tp_setattr */
	0,					/* tp_compare */
	0,					/* tp_repr */
	0,					/* tp_as_number */
	0,					/* tp_as_sequence */
	0,					/* tp_as_mapping */
	0,					/* tp_hash */
	calliter_call,				/* tp_call */
	0,					/* tp_str */
	0,					/* tp_getattro */
	0,					/* tp_setattro */
	0,					/* tp_as_buffer */
	Py_TPFLAGS_DEFAULT,			/* tp_flags */
 	0,					/* tp_doc */
 	0,					/* tp_traverse */
 	0,					/* tp_clear */
	0,					/* tp_richcompare */
	0,					/* tp_weaklistoffset */
	(getiterfunc)iter_getiter,		/* tp_iter */
};
Index: abstract.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/abstract.c,v
retrieving revision 2.57
retrieving revision 2.57.2.1
diff -C2 -r2.57 -r2.57.2.1
*** abstract.c	2001年01月17日 15:29:42	2.57
--- abstract.c	2001年03月13日 10:07:42	2.57.2.1
***************
*** 1627,1628 ****
--- 1627,1652 ----
 	return retval;
 }
+ 
+ PyObject *
+ PyObject_GetIter(PyObject *o)
+ {
+ 	PyTypeObject *t = o->ob_type;
+ 	getiterfunc f = NULL;
+ 	if (PyType_HasFeature(t, Py_TPFLAGS_HAVE_ITER))
+ 		f = t->tp_iter;
+ 	if (f == NULL) {
+ #if 0
+ 		if (PyCallable_Check(o)) {
+ 			Py_INCREF(o);
+ 			return o;
+ 		}
+ #endif
+ 		if (PySequence_Check(o))
+ 			return PyIter_New(o);
+ 		PyErr_SetString(PyExc_TypeError,
+ 				"getiter() of non-sequence");
+ 		return NULL;
+ 	}
+ 	else
+ 		return (*f)(o);
+ }