| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | /* Iterator objects */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #include "Python.h"
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | typedef struct { | 
					
						
							|  |  |  | 	PyObject_HEAD | 
					
						
							|  |  |  | 	long      it_index; | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 	PyObject *it_seq; /* Set to NULL when iterator is exhausted */ | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | } seqiterobject; | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | PyObject * | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | PySeqIter_New(PyObject *seq) | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | 	seqiterobject *it; | 
					
						
							| 
									
										
										
										
											2002-05-08 08:44:21 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (!PySequence_Check(seq)) { | 
					
						
							|  |  |  | 		PyErr_BadInternalCall(); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	}	 | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	it = PyObject_GC_New(seqiterobject, &PySeqIter_Type); | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	if (it == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	it->it_index = 0; | 
					
						
							|  |  |  | 	Py_INCREF(seq); | 
					
						
							|  |  |  | 	it->it_seq = seq; | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	_PyObject_GC_TRACK(it); | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	return (PyObject *)it; | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | static void | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | iter_dealloc(seqiterobject *it) | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	_PyObject_GC_UNTRACK(it); | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 	Py_XDECREF(it->it_seq); | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	PyObject_GC_Del(it); | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-07-12 13:27:25 +00:00
										 |  |  | static int | 
					
						
							|  |  |  | iter_traverse(seqiterobject *it, visitproc visit, void *arg) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2006-04-21 10:40:58 +00:00
										 |  |  | 	Py_VISIT(it->it_seq); | 
					
						
							|  |  |  | 	return 0; | 
					
						
							| 
									
										
										
										
											2001-07-12 13:27:25 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | static PyObject * | 
					
						
							|  |  |  | iter_iternext(PyObject *iterator) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	seqiterobject *it; | 
					
						
							|  |  |  | 	PyObject *seq; | 
					
						
							| 
									
										
										
										
											2002-08-09 01:30:17 +00:00
										 |  |  | 	PyObject *result; | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	assert(PySeqIter_Check(iterator)); | 
					
						
							|  |  |  | 	it = (seqiterobject *)iterator; | 
					
						
							|  |  |  | 	seq = it->it_seq; | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 	if (seq == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2002-08-09 01:30:17 +00:00
										 |  |  | 	result = PySequence_GetItem(seq, it->it_index); | 
					
						
							|  |  |  | 	if (result != NULL) { | 
					
						
							|  |  |  | 		it->it_index++; | 
					
						
							|  |  |  | 		return result; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	if (PyErr_ExceptionMatches(PyExc_IndexError) || | 
					
						
							|  |  |  | 	    PyErr_ExceptionMatches(PyExc_StopIteration)) | 
					
						
							|  |  |  | 	{ | 
					
						
							|  |  |  | 		PyErr_Clear(); | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 		Py_DECREF(seq); | 
					
						
							|  |  |  | 		it->it_seq = NULL; | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2002-08-09 01:30:17 +00:00
										 |  |  | 	return NULL; | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-09-24 21:23:05 +00:00
										 |  |  | static PyObject * | 
					
						
							| 
									
										
										
										
											2004-03-18 22:43:10 +00:00
										 |  |  | iter_len(seqiterobject *it) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2006-02-15 17:27:45 +00:00
										 |  |  | 	Py_ssize_t seqsize, len; | 
					
						
							| 
									
										
										
										
											2004-04-12 18:10:01 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	if (it->it_seq) { | 
					
						
							|  |  |  | 		seqsize = PySequence_Size(it->it_seq); | 
					
						
							|  |  |  | 		if (seqsize == -1) | 
					
						
							| 
									
										
										
										
											2005-09-24 21:23:05 +00:00
										 |  |  | 			return NULL; | 
					
						
							| 
									
										
										
										
											2004-04-12 18:10:01 +00:00
										 |  |  | 		len = seqsize - it->it_index; | 
					
						
							|  |  |  | 		if (len >= 0) | 
					
						
							| 
									
										
										
										
											2007-12-02 14:31:20 +00:00
										 |  |  | 			return PyLong_FromSsize_t(len); | 
					
						
							| 
									
										
										
										
											2004-04-12 18:10:01 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2007-12-02 14:31:20 +00:00
										 |  |  | 	return PyLong_FromLong(0); | 
					
						
							| 
									
										
										
										
											2004-03-18 22:43:10 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-02-11 21:32:43 +00:00
										 |  |  | PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it))."); | 
					
						
							| 
									
										
										
										
											2005-09-24 21:23:05 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | static PyMethodDef seqiter_methods[] = { | 
					
						
							| 
									
										
										
										
											2006-02-11 21:32:43 +00:00
										 |  |  | 	{"__length_hint__", (PyCFunction)iter_len, METH_NOARGS, length_hint_doc}, | 
					
						
							| 
									
										
										
										
											2005-09-24 21:23:05 +00:00
										 |  |  |  	{NULL,		NULL}		/* sentinel */ | 
					
						
							| 
									
										
										
										
											2004-03-18 22:43:10 +00:00
										 |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | PyTypeObject PySeqIter_Type = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 56467-56482 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
  r56477 | martin.v.loewis | 2007-07-21 09:04:38 +0200 (Sa, 21 Jul 2007) | 11 lines
  Merged revisions 56466-56476 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r56476 | martin.v.loewis | 2007-07-21 08:55:02 +0200 (Sa, 21 Jul 2007) | 4 lines
    PEP 3123: Provide forward compatibility with Python 3.0, while keeping
    backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
    PyVarObject_HEAD_INIT.
  ........
................
  r56478 | martin.v.loewis | 2007-07-21 09:47:23 +0200 (Sa, 21 Jul 2007) | 2 lines
  PEP 3123: Use proper C inheritance for PyObject.
................
  r56479 | martin.v.loewis | 2007-07-21 10:06:55 +0200 (Sa, 21 Jul 2007) | 3 lines
  Add longintrepr.h to Python.h, so that the compiler can
  see that PyFalse is really some kind of PyObject*.
................
  r56480 | martin.v.loewis | 2007-07-21 10:47:18 +0200 (Sa, 21 Jul 2007) | 2 lines
  Qualify SHIFT, MASK, BASE.
................
  r56482 | martin.v.loewis | 2007-07-21 19:10:57 +0200 (Sa, 21 Jul 2007) | 2 lines
  Correctly refer to _ob_next.
................
											
										 
											2007-07-21 17:22:18 +00:00
										 |  |  | 	PyVarObject_HEAD_INIT(&PyType_Type, 0) | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	"iterator",				/* tp_name */ | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	sizeof(seqiterobject),			/* tp_basicsize */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	0,					/* tp_itemsize */ | 
					
						
							|  |  |  | 	/* methods */ | 
					
						
							|  |  |  | 	(destructor)iter_dealloc, 		/* tp_dealloc */ | 
					
						
							|  |  |  | 	0,					/* tp_print */ | 
					
						
							| 
									
										
										
										
											2001-08-02 04:15:00 +00:00
										 |  |  | 	0,					/* tp_getattr */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	0,					/* tp_setattr */ | 
					
						
							|  |  |  | 	0,					/* tp_compare */ | 
					
						
							|  |  |  | 	0,					/* tp_repr */ | 
					
						
							|  |  |  | 	0,					/* tp_as_number */ | 
					
						
							| 
									
										
										
										
											2005-09-24 21:23:05 +00:00
										 |  |  | 	0,					/* tp_as_sequence */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	0,					/* tp_as_mapping */ | 
					
						
							|  |  |  | 	0,					/* tp_hash */ | 
					
						
							|  |  |  | 	0,					/* tp_call */ | 
					
						
							|  |  |  | 	0,					/* tp_str */ | 
					
						
							| 
									
										
										
										
											2001-08-02 04:15:00 +00:00
										 |  |  | 	PyObject_GenericGetAttr,		/* tp_getattro */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	0,					/* tp_setattro */ | 
					
						
							|  |  |  | 	0,					/* tp_as_buffer */ | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  |  	0,					/* tp_doc */ | 
					
						
							| 
									
										
										
										
											2001-07-12 13:27:25 +00:00
										 |  |  |  	(traverseproc)iter_traverse,		/* tp_traverse */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  |  	0,					/* tp_clear */ | 
					
						
							|  |  |  | 	0,					/* tp_richcompare */ | 
					
						
							|  |  |  | 	0,					/* tp_weaklistoffset */ | 
					
						
							| 
									
										
										
										
											2003-03-17 19:46:11 +00:00
										 |  |  | 	PyObject_SelfIter,			/* tp_iter */ | 
					
						
							| 
									
										
										
										
											2006-04-21 10:40:58 +00:00
										 |  |  | 	iter_iternext,				/* tp_iternext */ | 
					
						
							| 
									
										
										
										
											2005-09-24 21:23:05 +00:00
										 |  |  | 	seqiter_methods,			/* tp_methods */ | 
					
						
							| 
									
										
										
										
											2001-08-02 04:15:00 +00:00
										 |  |  | 	0,					/* tp_members */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* -------------------------------------- */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | typedef struct { | 
					
						
							|  |  |  | 	PyObject_HEAD | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 	PyObject *it_callable; /* Set to NULL when iterator is exhausted */ | 
					
						
							|  |  |  | 	PyObject *it_sentinel; /* Set to NULL when iterator is exhausted */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | } calliterobject; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | PyObject * | 
					
						
							|  |  |  | PyCallIter_New(PyObject *callable, PyObject *sentinel) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	calliterobject *it; | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	it = PyObject_GC_New(calliterobject, &PyCallIter_Type); | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	if (it == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	Py_INCREF(callable); | 
					
						
							|  |  |  | 	it->it_callable = callable; | 
					
						
							|  |  |  | 	Py_INCREF(sentinel); | 
					
						
							|  |  |  | 	it->it_sentinel = sentinel; | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	_PyObject_GC_TRACK(it); | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	return (PyObject *)it; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | static void | 
					
						
							|  |  |  | calliter_dealloc(calliterobject *it) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	_PyObject_GC_UNTRACK(it); | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 	Py_XDECREF(it->it_callable); | 
					
						
							|  |  |  | 	Py_XDECREF(it->it_sentinel); | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	PyObject_GC_Del(it); | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-07-12 13:27:25 +00:00
										 |  |  | static int | 
					
						
							|  |  |  | calliter_traverse(calliterobject *it, visitproc visit, void *arg) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2006-04-21 10:40:58 +00:00
										 |  |  | 	Py_VISIT(it->it_callable); | 
					
						
							|  |  |  | 	Py_VISIT(it->it_sentinel); | 
					
						
							| 
									
										
										
										
											2001-07-12 13:27:25 +00:00
										 |  |  | 	return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | static PyObject * | 
					
						
							|  |  |  | calliter_iternext(calliterobject *it) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 	if (it->it_callable != NULL) { | 
					
						
							| 
									
										
										
										
											2002-08-16 17:01:09 +00:00
										 |  |  | 		PyObject *args = PyTuple_New(0); | 
					
						
							|  |  |  | 		PyObject *result; | 
					
						
							|  |  |  | 		if (args == NULL) | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		result = PyObject_Call(it->it_callable, args, NULL); | 
					
						
							|  |  |  | 		Py_DECREF(args); | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 		if (result != NULL) { | 
					
						
							|  |  |  | 			int ok; | 
					
						
							|  |  |  | 			ok = PyObject_RichCompareBool(result, | 
					
						
							|  |  |  | 						      it->it_sentinel, | 
					
						
							|  |  |  | 						      Py_EQ); | 
					
						
							|  |  |  | 			if (ok == 0) | 
					
						
							|  |  |  | 				return result; /* Common case, fast path */ | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | 			Py_DECREF(result); | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 			if (ok > 0) { | 
					
						
							| 
									
										
										
										
											2004-09-01 07:02:44 +00:00
										 |  |  | 				Py_CLEAR(it->it_callable); | 
					
						
							|  |  |  | 				Py_CLEAR(it->it_sentinel); | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 			} | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		else if (PyErr_ExceptionMatches(PyExc_StopIteration)) { | 
					
						
							|  |  |  | 			PyErr_Clear(); | 
					
						
							| 
									
										
										
										
											2004-09-01 07:02:44 +00:00
										 |  |  | 			Py_CLEAR(it->it_callable); | 
					
						
							|  |  |  | 			Py_CLEAR(it->it_sentinel); | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 	return NULL; | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | PyTypeObject PyCallIter_Type = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 56467-56482 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
  r56477 | martin.v.loewis | 2007-07-21 09:04:38 +0200 (Sa, 21 Jul 2007) | 11 lines
  Merged revisions 56466-56476 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r56476 | martin.v.loewis | 2007-07-21 08:55:02 +0200 (Sa, 21 Jul 2007) | 4 lines
    PEP 3123: Provide forward compatibility with Python 3.0, while keeping
    backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
    PyVarObject_HEAD_INIT.
  ........
................
  r56478 | martin.v.loewis | 2007-07-21 09:47:23 +0200 (Sa, 21 Jul 2007) | 2 lines
  PEP 3123: Use proper C inheritance for PyObject.
................
  r56479 | martin.v.loewis | 2007-07-21 10:06:55 +0200 (Sa, 21 Jul 2007) | 3 lines
  Add longintrepr.h to Python.h, so that the compiler can
  see that PyFalse is really some kind of PyObject*.
................
  r56480 | martin.v.loewis | 2007-07-21 10:47:18 +0200 (Sa, 21 Jul 2007) | 2 lines
  Qualify SHIFT, MASK, BASE.
................
  r56482 | martin.v.loewis | 2007-07-21 19:10:57 +0200 (Sa, 21 Jul 2007) | 2 lines
  Correctly refer to _ob_next.
................
											
										 
											2007-07-21 17:22:18 +00:00
										 |  |  | 	PyVarObject_HEAD_INIT(&PyType_Type, 0) | 
					
						
							| 
									
										
										
										
											2007-11-29 22:35:39 +00:00
										 |  |  | 	"callable_iterator",			/* tp_name */ | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	sizeof(calliterobject),			/* tp_basicsize */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	0,					/* tp_itemsize */ | 
					
						
							|  |  |  | 	/* methods */ | 
					
						
							|  |  |  | 	(destructor)calliter_dealloc, 		/* tp_dealloc */ | 
					
						
							|  |  |  | 	0,					/* tp_print */ | 
					
						
							| 
									
										
										
										
											2001-08-02 04:15:00 +00:00
										 |  |  | 	0,					/* tp_getattr */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	0,					/* tp_setattr */ | 
					
						
							|  |  |  | 	0,					/* tp_compare */ | 
					
						
							|  |  |  | 	0,					/* tp_repr */ | 
					
						
							|  |  |  | 	0,					/* tp_as_number */ | 
					
						
							|  |  |  | 	0,					/* tp_as_sequence */ | 
					
						
							|  |  |  | 	0,					/* tp_as_mapping */ | 
					
						
							|  |  |  | 	0,					/* tp_hash */ | 
					
						
							|  |  |  | 	0,					/* tp_call */ | 
					
						
							|  |  |  | 	0,					/* tp_str */ | 
					
						
							| 
									
										
										
										
											2001-08-02 04:15:00 +00:00
										 |  |  | 	PyObject_GenericGetAttr,		/* tp_getattro */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	0,					/* tp_setattro */ | 
					
						
							|  |  |  | 	0,					/* tp_as_buffer */ | 
					
						
							| 
									
										
										
										
											2002-03-18 20:43:51 +00:00
										 |  |  | 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ | 
					
						
							| 
									
										
										
										
											2003-06-25 13:12:18 +00:00
										 |  |  | 	0,					/* tp_doc */ | 
					
						
							|  |  |  | 	(traverseproc)calliter_traverse,	/* tp_traverse */ | 
					
						
							|  |  |  | 	0,					/* tp_clear */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | 	0,					/* tp_richcompare */ | 
					
						
							|  |  |  | 	0,					/* tp_weaklistoffset */ | 
					
						
							| 
									
										
										
										
											2003-03-17 19:46:11 +00:00
										 |  |  | 	PyObject_SelfIter,			/* tp_iter */ | 
					
						
							| 
									
										
										
										
											2001-04-23 14:08:49 +00:00
										 |  |  | 	(iternextfunc)calliter_iternext,	/* tp_iternext */ | 
					
						
							| 
									
										
										
										
											2002-07-16 20:24:46 +00:00
										 |  |  | 	0,					/* tp_methods */ | 
					
						
							| 
									
										
										
										
											2001-04-20 21:06:46 +00:00
										 |  |  | }; | 
					
						
							| 
									
										
										
										
											2006-08-25 23:26:40 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*********************** Zip Iterator **************************/ | 
					
						
							|  |  |  | /* Largely copied from itertools.c by Brian Holmes */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | typedef struct zipiterobject_t { | 
					
						
							|  |  |  | 	PyObject_HEAD | 
					
						
							|  |  |  | 	PyTupleObject *it_tuple;  /* Set to NULL when iterator is exhausted */ | 
					
						
							|  |  |  |         Py_ssize_t resultsize;	 | 
					
						
							|  |  |  | 	PyTupleObject *result;	/* Reusable tuple for optimization */ | 
					
						
							|  |  |  | } zipiterobject; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-11-29 22:35:39 +00:00
										 |  |  |  /* Forward */ | 
					
						
							| 
									
										
										
										
											2006-08-25 23:26:40 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | PyObject * | 
					
						
							|  |  |  | _PyZip_CreateIter(PyObject* args) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	Py_ssize_t i; | 
					
						
							|  |  |  |         Py_ssize_t tuplesize; | 
					
						
							|  |  |  | 	PyObject* ziptuple; | 
					
						
							|  |  |  | 	PyObject* result; | 
					
						
							|  |  |  | 	struct zipiterobject_t* zipiter; | 
					
						
							|  |  |  |          | 
					
						
							|  |  |  |         assert(PyTuple_Check(args)); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												Merged revisions 56467-56482 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
  r56477 | martin.v.loewis | 2007-07-21 09:04:38 +0200 (Sa, 21 Jul 2007) | 11 lines
  Merged revisions 56466-56476 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r56476 | martin.v.loewis | 2007-07-21 08:55:02 +0200 (Sa, 21 Jul 2007) | 4 lines
    PEP 3123: Provide forward compatibility with Python 3.0, while keeping
    backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
    PyVarObject_HEAD_INIT.
  ........
................
  r56478 | martin.v.loewis | 2007-07-21 09:47:23 +0200 (Sa, 21 Jul 2007) | 2 lines
  PEP 3123: Use proper C inheritance for PyObject.
................
  r56479 | martin.v.loewis | 2007-07-21 10:06:55 +0200 (Sa, 21 Jul 2007) | 3 lines
  Add longintrepr.h to Python.h, so that the compiler can
  see that PyFalse is really some kind of PyObject*.
................
  r56480 | martin.v.loewis | 2007-07-21 10:47:18 +0200 (Sa, 21 Jul 2007) | 2 lines
  Qualify SHIFT, MASK, BASE.
................
  r56482 | martin.v.loewis | 2007-07-21 19:10:57 +0200 (Sa, 21 Jul 2007) | 2 lines
  Correctly refer to _ob_next.
................
											
										 
											2007-07-21 17:22:18 +00:00
										 |  |  | 	if (Py_Type(&PyZipIter_Type) == NULL) { | 
					
						
							| 
									
										
										
										
											2006-08-25 23:26:40 +00:00
										 |  |  | 		if (PyType_Ready(&PyZipIter_Type) < 0) | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	tuplesize = PySequence_Length((PyObject*) args); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	ziptuple = PyTuple_New(tuplesize); | 
					
						
							|  |  |  | 	if (ziptuple == NULL) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	for (i = 0; i < tuplesize; i++) { | 
					
						
							|  |  |  | 		PyObject *o = PyTuple_GET_ITEM(args, i); | 
					
						
							|  |  |  | 		PyObject *it = PyObject_GetIter(o); | 
					
						
							|  |  |  | 		if (it == NULL) { | 
					
						
							|  |  |  | 			/* XXX Should we do this?
 | 
					
						
							|  |  |  | 			if (PyErr_ExceptionMatches(PyExc_TypeError)) | 
					
						
							|  |  |  | 				PyErr_Format(PyExc_TypeError,  | 
					
						
							|  |  |  | 				  "zip argument #%zd must support iteration", | 
					
						
							|  |  |  | 					I+1); | 
					
						
							|  |  |  | 			*/ | 
					
						
							|  |  |  | 			Py_DECREF(ziptuple); | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		PyTuple_SET_ITEM(ziptuple, i, it); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         /* create a reusable result holder */ | 
					
						
							|  |  |  |         result = PyTuple_New(tuplesize); | 
					
						
							|  |  |  |         if (result == NULL) { | 
					
						
							|  |  |  |                 Py_DECREF(ziptuple); | 
					
						
							|  |  |  |                 return NULL; | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  |         for (i = 0; i < tuplesize; i++) { | 
					
						
							|  |  |  |                 Py_INCREF(Py_None); | 
					
						
							|  |  |  |                 PyTuple_SET_ITEM(result, i, Py_None); | 
					
						
							|  |  |  |         } | 
					
						
							|  |  |  | 	 | 
					
						
							|  |  |  | 	zipiter = PyObject_GC_New(zipiterobject, &PyZipIter_Type); | 
					
						
							|  |  |  | 	if (zipiter == NULL) { | 
					
						
							|  |  |  | 		Py_DECREF(ziptuple); | 
					
						
							|  |  |  | 		Py_DECREF(result); | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	zipiter->result = (PyTupleObject*) result; | 
					
						
							|  |  |  |         zipiter->resultsize = tuplesize; | 
					
						
							|  |  |  | 	zipiter->it_tuple = (PyTupleObject *) ziptuple; | 
					
						
							|  |  |  | 	_PyObject_GC_TRACK(zipiter); | 
					
						
							|  |  |  | 	return (PyObject *)zipiter; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void | 
					
						
							|  |  |  | zipiter_dealloc(zipiterobject *it) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	_PyObject_GC_UNTRACK(it); | 
					
						
							|  |  |  | 	Py_XDECREF(it->it_tuple); | 
					
						
							|  |  |  | 	Py_XDECREF(it->result); | 
					
						
							|  |  |  | 	PyObject_GC_Del(it); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static int | 
					
						
							|  |  |  | zipiter_traverse(zipiterobject *it, visitproc visit, void *arg) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	Py_VISIT(it->it_tuple); | 
					
						
							|  |  |  | 	Py_VISIT(it->result); | 
					
						
							|  |  |  | 	return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyObject * | 
					
						
							|  |  |  | zipiter_next(zipiterobject *zit) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |         Py_ssize_t i; | 
					
						
							|  |  |  |         Py_ssize_t tuplesize = zit->resultsize; | 
					
						
							|  |  |  |         PyObject *result = (PyObject*) zit->result; | 
					
						
							|  |  |  |         PyObject *olditem; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         if (tuplesize == 0) | 
					
						
							|  |  |  |                 return NULL; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         if (result->ob_refcnt == 1) { | 
					
						
							|  |  |  | 		Py_INCREF(result); | 
					
						
							|  |  |  | 		for (i = 0; i < tuplesize; i++) { | 
					
						
							|  |  |  | 			PyObject *it = PyTuple_GET_ITEM(zit->it_tuple, i); | 
					
						
							| 
									
										
										
										
											2006-08-26 02:54:40 +00:00
										 |  |  | 			PyObject *item; | 
					
						
							| 
									
										
										
										
											2006-08-25 23:26:40 +00:00
										 |  |  | 			assert(PyIter_Check(it)); | 
					
						
							| 
									
										
										
										
											2006-08-26 02:54:40 +00:00
										 |  |  | 			item = (*it->ob_type->tp_iternext)(it); | 
					
						
							| 
									
										
										
										
											2006-08-25 23:26:40 +00:00
										 |  |  | 			if (item == NULL) { | 
					
						
							|  |  |  | 				Py_DECREF(result); | 
					
						
							|  |  |  | 				return NULL; | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 			olditem = PyTuple_GET_ITEM(result, i); | 
					
						
							|  |  |  | 			PyTuple_SET_ITEM(result, i, item); | 
					
						
							|  |  |  | 			Py_DECREF(olditem); | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} else { | 
					
						
							|  |  |  | 		result = PyTuple_New(tuplesize); | 
					
						
							|  |  |  | 		if (result == NULL) | 
					
						
							|  |  |  | 			return NULL; | 
					
						
							|  |  |  | 		for (i = 0; i < tuplesize; i++) { | 
					
						
							|  |  |  | 			PyObject *it = PyTuple_GET_ITEM(zit->it_tuple, i); | 
					
						
							| 
									
										
										
										
											2006-08-26 02:54:40 +00:00
										 |  |  | 			PyObject *item; | 
					
						
							| 
									
										
										
										
											2006-08-25 23:26:40 +00:00
										 |  |  | 			assert(PyIter_Check(it)); | 
					
						
							| 
									
										
										
										
											2006-08-26 02:54:40 +00:00
										 |  |  | 			item = (*it->ob_type->tp_iternext)(it); | 
					
						
							| 
									
										
										
										
											2006-08-25 23:26:40 +00:00
										 |  |  | 			if (item == NULL) { | 
					
						
							|  |  |  | 				Py_DECREF(result); | 
					
						
							|  |  |  | 				return NULL; | 
					
						
							|  |  |  | 			} | 
					
						
							|  |  |  | 			PyTuple_SET_ITEM(result, i, item); | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return result; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2007-11-29 22:35:39 +00:00
										 |  |  | PyTypeObject PyZipIter_Type = { | 
					
						
							| 
									
										
											  
											
												Merged revisions 56467-56482 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk
................
  r56477 | martin.v.loewis | 2007-07-21 09:04:38 +0200 (Sa, 21 Jul 2007) | 11 lines
  Merged revisions 56466-56476 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk
  ........
    r56476 | martin.v.loewis | 2007-07-21 08:55:02 +0200 (Sa, 21 Jul 2007) | 4 lines
    PEP 3123: Provide forward compatibility with Python 3.0, while keeping
    backwards compatibility. Add Py_Refcnt, Py_Type, Py_Size, and
    PyVarObject_HEAD_INIT.
  ........
................
  r56478 | martin.v.loewis | 2007-07-21 09:47:23 +0200 (Sa, 21 Jul 2007) | 2 lines
  PEP 3123: Use proper C inheritance for PyObject.
................
  r56479 | martin.v.loewis | 2007-07-21 10:06:55 +0200 (Sa, 21 Jul 2007) | 3 lines
  Add longintrepr.h to Python.h, so that the compiler can
  see that PyFalse is really some kind of PyObject*.
................
  r56480 | martin.v.loewis | 2007-07-21 10:47:18 +0200 (Sa, 21 Jul 2007) | 2 lines
  Qualify SHIFT, MASK, BASE.
................
  r56482 | martin.v.loewis | 2007-07-21 19:10:57 +0200 (Sa, 21 Jul 2007) | 2 lines
  Correctly refer to _ob_next.
................
											
										 
											2007-07-21 17:22:18 +00:00
										 |  |  | 	PyVarObject_HEAD_INIT(0, 0) | 
					
						
							| 
									
										
										
										
											2007-11-28 09:44:38 +00:00
										 |  |  | 	"zip_iterator",				/* tp_name */ | 
					
						
							| 
									
										
										
										
											2006-08-25 23:26:40 +00:00
										 |  |  | 	sizeof(zipiterobject),			/* tp_basicsize */ | 
					
						
							|  |  |  | 	0,					/* tp_itemsize */ | 
					
						
							|  |  |  | 	/* methods */ | 
					
						
							|  |  |  | 	(destructor)zipiter_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 */ | 
					
						
							|  |  |  | 	0,					/* tp_call */ | 
					
						
							|  |  |  | 	0,					/* tp_str */ | 
					
						
							|  |  |  | 	PyObject_GenericGetAttr,		/* tp_getattro */ | 
					
						
							|  |  |  | 	0,					/* tp_setattro */ | 
					
						
							|  |  |  | 	0,					/* tp_as_buffer */ | 
					
						
							|  |  |  | 	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ | 
					
						
							|  |  |  | 	0,					/* tp_doc */ | 
					
						
							|  |  |  | 	(traverseproc)zipiter_traverse,		/* tp_traverse */ | 
					
						
							|  |  |  | 	0,					/* tp_clear */ | 
					
						
							|  |  |  | 	0,					/* tp_richcompare */ | 
					
						
							|  |  |  | 	0,					/* tp_weakzipoffset */ | 
					
						
							|  |  |  | 	PyObject_SelfIter,			/* tp_iter */ | 
					
						
							|  |  |  | 	(iternextfunc)zipiter_next,		/* tp_iternext */ | 
					
						
							|  |  |  | 	0,					/* tp_methods */ | 
					
						
							|  |  |  | 	0,					/* tp_members */ | 
					
						
							|  |  |  | }; |