cpython-lru_cache-weakref: Objects/rangeobject.c annotate

annotate Objects/rangeobject.c @ 55729:d91aff206dfd 3.1

Merged revisions 74551 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r74551 | benjamin.peterson | 2009-08-26 09:35:45 +0200 (Wed, 26 Aug 2009) | 1 line the old buffer object doesn't exist in Python 3 #6659 ........

author	Benjamin Peterson <benjamin@python.org>
date	Wed, 26 Aug 2009 07:38:00 +0000
parents	546aa134d773
children	afbb2b2ff6f7

rev	line source
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	1 /* Range object implementation */
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	2
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4588 diff changeset	3 #include "Python.h"
18436 9653272f036f Re-add 'advanced' xrange features, adding DeprecationWarnings as discussed Thomas Wouters <thomas@python.org> parents: 18391 diff changeset	4
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	5 /* Support objects whose length is > PY_SSIZE_T_MAX.
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	6
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	7 This could be sped up for small PyLongs if they fit in an Py_ssize_t.
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	8 This only matters on Win64. Though we could use PY_LONG_LONG which
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	9 would presumably help perf.
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	10 */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	11
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	12 typedef struct {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	13 PyObject_HEAD
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	14 PyObject *start;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	15 PyObject *stop;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	16 PyObject *step;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	17 } rangeobject;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	18
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	19 /* Helper function for validating step. Always returns a new reference or
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	20 NULL on error.
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	21 */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	22 static PyObject *
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	23 validate_step(PyObject *step)
23695 6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	24 {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	25 /* No step specified, use a step of 1. */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	26 if (!step)
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44061 diff changeset	27 return PyLong_FromLong(1);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	28
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	29 step = PyNumber_Index(step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	30 if (step) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	31 Py_ssize_t istep = PyNumber_AsSsize_t(step, NULL);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	32 if (istep == -1 && PyErr_Occurred()) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	33 /* Ignore OverflowError, we know the value isn't 0. */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	34 PyErr_Clear();
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	35 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	36 else if (istep == 0) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	37 PyErr_SetString(PyExc_ValueError,
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	38 "range() arg 3 must not be zero");
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	39 Py_CLEAR(step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	40 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	41 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	42
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	43 return step;
23695 6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	44 }
6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	45
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	46 /* XXX(nnorwitz): should we error check if the user passes any empty ranges?
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	47 range(-10)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	48 range(0, -5)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	49 range(0, 5, -1)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	50 */
23695 6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	51 static PyObject *
6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	52 range_new(PyTypeObject type, PyObject args, PyObject *kw)
6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	53 {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	54 rangeobject *obj = NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	55 PyObject start = NULL, stop = NULL, *step = NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	56
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	57 if (!_PyArg_NoKeywords("range()", kw))
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	58 return NULL;
23695 6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	59
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	60 if (PyTuple_Size(args) <= 1) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	61 if (!PyArg_UnpackTuple(args, "range", 1, 1, &stop))
54726 75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	62 return NULL;
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	63 stop = PyNumber_Index(stop);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	64 if (!stop)
54726 75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	65 return NULL;
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44061 diff changeset	66 start = PyLong_FromLong(0);
54726 75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	67 if (!start) {
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	68 Py_DECREF(stop);
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	69 return NULL;
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	70 }
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44061 diff changeset	71 step = PyLong_FromLong(1);
54726 75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	72 if (!step) {
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	73 Py_DECREF(stop);
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	74 Py_DECREF(start);
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	75 return NULL;
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	76 }
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	77 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	78 else {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	79 if (!PyArg_UnpackTuple(args, "range", 2, 3,
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	80 &start, &stop, &step))
54726 75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	81 return NULL;
35449 1fdfd0130e28 Disallow keyword arguments for type constructors that don't use them. Georg Brandl <georg@python.org> parents: 34087 diff changeset	82
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	83 /* Convert borrowed refs to owned refs */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	84 start = PyNumber_Index(start);
54726 75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	85 if (!start)
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	86 return NULL;
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	87 stop = PyNumber_Index(stop);
54726 75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	88 if (!stop) {
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	89 Py_DECREF(start);
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	90 return NULL;
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	91 }
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	92 step = validate_step(step); /* Caution, this can clear exceptions */
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	93 if (!step) {
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	94 Py_DECREF(start);
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	95 Py_DECREF(stop);
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	96 return NULL;
75c4d3bc6cc8 Backport 73392: Fix SystemError and ref counting issues. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	97 }
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	98 }
33047 c81ed079576f Bug 1003935: xrange overflows Tim Peters <tim.peters@gmail.com> parents: 33046 diff changeset	99
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	100 obj = PyObject_New(rangeobject, &PyRange_Type);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	101 if (obj == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	102 goto Fail;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	103 obj->start = start;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	104 obj->stop = stop;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	105 obj->step = step;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	106 return (PyObject *) obj;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	107
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	108 Fail:
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	109 Py_XDECREF(start);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	110 Py_XDECREF(stop);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	111 Py_XDECREF(step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	112 return NULL;
23695 6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	113 }
6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	114
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23702 diff changeset	115 PyDoc_STRVAR(range_doc,
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	116 "range([start,] stop[, step]) -> range object\n\
23695 6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	117 \n\
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	118 Returns an iterator that generates the numbers in the range on demand.");
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	119
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	120 static void
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	121 range_dealloc(rangeobject *r)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	122 {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	123 Py_DECREF(r->start);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	124 Py_DECREF(r->stop);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	125 Py_DECREF(r->step);
43867 f444e259341a Found another memory leak in longrangeiter. And redo the previous correction Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43861 diff changeset	126 PyObject_Del(r);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	127 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	128
55589 546aa134d773 Merged revisions 73656,73658,73663,73666 via svnmerge from Georg Brandl <georg@python.org> parents: 54847 diff changeset	129 /* Return number of items in range (lo, hi, step) as a PyLong object,
546aa134d773 Merged revisions 73656,73658,73663,73666 via svnmerge from Georg Brandl <georg@python.org> parents: 54847 diff changeset	130 * when arguments are PyLong objects. Arguments MUST return 1 with
546aa134d773 Merged revisions 73656,73658,73663,73666 via svnmerge from Georg Brandl <georg@python.org> parents: 54847 diff changeset	131 * PyLong_Check(). Return NULL when there is an error.
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	132 */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	133 static PyObject*
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	134 range_length_obj(rangeobject *r)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	135 {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	136 /* -------------------------------------------------------------
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	137 Algorithm is equal to that of get_len_of_range(), but it operates
54846 79a630da8f00 fix comment Benjamin Peterson <benjamin@python.org> parents: 54845 diff changeset	138 on PyObjects (which are assumed to be PyLong objects).
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	139 ---------------------------------------------------------------*/
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 47536 diff changeset	140 int cmp_result;
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	141 PyObject lo, hi;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	142 PyObject *step = NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	143 PyObject *diff = NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	144 PyObject *one = NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	145 PyObject tmp1 = NULL, tmp2 = NULL, *result;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	146 /* holds sub-expression evaluations */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	147
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	148 PyObject *zero = PyLong_FromLong(0);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	149 if (zero == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	150 return NULL;
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 47536 diff changeset	151 cmp_result = PyObject_RichCompareBool(r->step, zero, Py_GT);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	152 Py_DECREF(zero);
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 47536 diff changeset	153 if (cmp_result == -1)
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	154 return NULL;
23695 6266f1bd1ab9 Skip Montanaro's patch, SF 559833, exposing xrange type in builtins. Raymond Hettinger <python@rcn.com> parents: 23693 diff changeset	155
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 47536 diff changeset	156 if (cmp_result == 1) {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	157 lo = r->start;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	158 hi = r->stop;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	159 step = r->step;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	160 Py_INCREF(step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	161 } else {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	162 lo = r->stop;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	163 hi = r->start;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	164 step = PyNumber_Negative(r->step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	165 if (!step)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	166 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	167 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	168
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	169 /* if (lo >= hi), return length of 0. */
51244 e9675d72e3e3 Merged revisions 69181 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 47536 diff changeset	170 if (PyObject_RichCompareBool(lo, hi, Py_GE) == 1) {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	171 Py_XDECREF(step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	172 return PyLong_FromLong(0);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	173 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	174
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	175 if ((one = PyLong_FromLong(1L)) == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	176 goto Fail;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	177
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	178 if ((tmp1 = PyNumber_Subtract(hi, lo)) == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	179 goto Fail;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	180
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	181 if ((diff = PyNumber_Subtract(tmp1, one)) == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	182 goto Fail;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	183
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	184 if ((tmp2 = PyNumber_FloorDivide(diff, step)) == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	185 goto Fail;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	186
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	187 if ((result = PyNumber_Add(tmp2, one)) == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	188 goto Fail;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	189
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	190 Py_DECREF(tmp2);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	191 Py_DECREF(diff);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	192 Py_DECREF(step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	193 Py_DECREF(tmp1);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	194 Py_DECREF(one);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	195 return result;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	196
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	197 Fail:
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	198 Py_XDECREF(tmp2);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	199 Py_XDECREF(diff);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	200 Py_XDECREF(step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	201 Py_XDECREF(tmp1);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	202 Py_XDECREF(one);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	203 return NULL;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	204 }
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	205
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	206 static Py_ssize_t
13458 7908ec855665 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	207 range_length(rangeobject *r)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	208 {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	209 PyObject *len = range_length_obj(r);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	210 Py_ssize_t result = -1;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	211 if (len) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	212 result = PyLong_AsSsize_t(len);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	213 Py_DECREF(len);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	214 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	215 return result;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	216 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	217
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	218 /* range(...)[x] is necessary for: seq[:] = range(...) */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	219
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	220 static PyObject *
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	221 range_item(rangeobject *r, Py_ssize_t i)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	222 {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	223 Py_ssize_t len = range_length(r);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	224 PyObject rem, incr, *result;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	225
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	226 /* XXX(nnorwitz): should negative indices be supported? */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	227 /* XXX(nnorwitz): should support range[x] where x > PY_SSIZE_T_MAX? */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	228 if (i < 0 \|\| i >= len) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	229 if (!PyErr_Occurred())
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	230 PyErr_SetString(PyExc_IndexError,
41803 3d3bf27409e6 Rename test_xrange.py to test_range.py and fix the Walter Dörwald <walter@livinglogic.de> parents: 41800 diff changeset	231 "range object index out of range");
46564 2a31bc28c10f #2689 Fix indentation in Objects/rangeobject.c Benjamin Peterson <benjamin@python.org> parents: 45249 diff changeset	232 return NULL;
2a31bc28c10f #2689 Fix indentation in Objects/rangeobject.c Benjamin Peterson <benjamin@python.org> parents: 45249 diff changeset	233 }
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	234
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	235 /* XXX(nnorwitz): optimize for short ints. */
45249 aebd9c4d19ed Merge r60673 Raymond Hettinger <python@rcn.com> parents: 44366 diff changeset	236 rem = PyLong_FromSsize_t(i);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	237 if (!rem)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	238 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	239 incr = PyNumber_Multiply(rem, r->step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	240 Py_DECREF(rem);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	241 if (!incr)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	242 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	243 result = PyNumber_Add(r->start, incr);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	244 Py_DECREF(incr);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	245 return result;
1444 f2d04054c934 * rangeobject.[ch], bltinmodule.c: incorporate new version of range Guido van Rossum <guido@python.org> parents: 1387 diff changeset	246 }
f2d04054c934 * rangeobject.[ch], bltinmodule.c: incorporate new version of range Guido van Rossum <guido@python.org> parents: 1387 diff changeset	247
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4588 diff changeset	248 static PyObject *
13458 7908ec855665 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13256 diff changeset	249 range_repr(rangeobject *r)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	250 {
41800 993f8a9b8ab3 repr(range(10)) now returns 'range(0, 10)' for clarity. Walter Dörwald <walter@livinglogic.de> parents: 41785 diff changeset	251 Py_ssize_t istep;
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	252
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	253 /* Check for special case values for printing. We don't always
41800 993f8a9b8ab3 repr(range(10)) now returns 'range(0, 10)' for clarity. Walter Dörwald <walter@livinglogic.de> parents: 41785 diff changeset	254 need the step value. We don't care about errors
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	255 (it means overflow), so clear the errors. */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	256 istep = PyNumber_AsSsize_t(r->step, NULL);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	257 if (istep != 1 \|\| (istep == -1 && PyErr_Occurred())) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	258 PyErr_Clear();
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	259 }
13848 dd042f5a8fa2 Boost buffer sizes in the absence of snprintf on Windows. Tim Peters <tim.peters@gmail.com> parents: 13847 diff changeset	260
41800 993f8a9b8ab3 repr(range(10)) now returns 'range(0, 10)' for clarity. Walter Dörwald <walter@livinglogic.de> parents: 41785 diff changeset	261 if (istep == 1)
41785 d1c38af065bf Change range_repr() to use %R for the start/stop/step attributes. Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	262 return PyUnicode_FromFormat("range(%R, %R)", r->start, r->stop);
d1c38af065bf Change range_repr() to use %R for the start/stop/step attributes. Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	263 else
d1c38af065bf Change range_repr() to use %R for the start/stop/step attributes. Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	264 return PyUnicode_FromFormat("range(%R, %R, %R)",
d1c38af065bf Change range_repr() to use %R for the start/stop/step attributes. Walter Dörwald <walter@livinglogic.de> parents: 41769 diff changeset	265 r->start, r->stop, r->step);
18436 9653272f036f Re-add 'advanced' xrange features, adding DeprecationWarnings as discussed Thomas Wouters <thomas@python.org> parents: 18391 diff changeset	266 }
9653272f036f Re-add 'advanced' xrange features, adding DeprecationWarnings as discussed Thomas Wouters <thomas@python.org> parents: 18391 diff changeset	267
47536 33492c241dab Issue 2582: Fix pickling of range objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46564 diff changeset	268 /* Pickling support */
33492c241dab Issue 2582: Fix pickling of range objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46564 diff changeset	269 static PyObject *
33492c241dab Issue 2582: Fix pickling of range objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46564 diff changeset	270 range_reduce(rangeobject r, PyObject args)
33492c241dab Issue 2582: Fix pickling of range objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46564 diff changeset	271 {
33492c241dab Issue 2582: Fix pickling of range objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46564 diff changeset	272 return Py_BuildValue("(O(OOO))", Py_TYPE(r),
33492c241dab Issue 2582: Fix pickling of range objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46564 diff changeset	273 r->start, r->stop, r->step);
33492c241dab Issue 2582: Fix pickling of range objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46564 diff changeset	274 }
33492c241dab Issue 2582: Fix pickling of range objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46564 diff changeset	275
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4588 diff changeset	276 static PySequenceMethods range_as_sequence = {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	277 (lenfunc)range_length, /* sq_length */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	278 0, /* sq_concat */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	279 0, /* sq_repeat */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	280 (ssizeargfunc)range_item, /* sq_item */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	281 0, /* sq_slice */
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	282 };
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	283
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24260 diff changeset	284 static PyObject * range_iter(PyObject *seq);
30865 41c4e143e6e6 Implement and apply PEP 322, reverse iteration Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	285 static PyObject * range_reverse(PyObject *seq);
41c4e143e6e6 Implement and apply PEP 322, reverse iteration Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	286
41c4e143e6e6 Implement and apply PEP 322, reverse iteration Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	287 PyDoc_STRVAR(reverse_doc,
41c4e143e6e6 Implement and apply PEP 322, reverse iteration Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	288 "Returns a reverse iterator.");
41c4e143e6e6 Implement and apply PEP 322, reverse iteration Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	289
41c4e143e6e6 Implement and apply PEP 322, reverse iteration Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	290 static PyMethodDef range_methods[] = {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	291 {"__reversed__", (PyCFunction)range_reverse, METH_NOARGS,
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	292 reverse_doc},
47536 33492c241dab Issue 2582: Fix pickling of range objects. Alexandre Vassalotti <alexandre@peadrop.com> parents: 46564 diff changeset	293 {"__reduce__", (PyCFunction)range_reduce, METH_VARARGS},
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	294 {NULL, NULL} /* sentinel */
30865 41c4e143e6e6 Implement and apply PEP 322, reverse iteration Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	295 };
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	296
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4588 diff changeset	297 PyTypeObject PyRange_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41803 diff changeset	298 PyVarObject_HEAD_INIT(&PyType_Type, 0)
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	299 "range", /* Name of this type */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	300 sizeof(rangeobject), /* Basic object size */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	301 0, /* Item size for varobject */
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	302 (destructor)range_dealloc, /* tp_dealloc */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	303 0, /* tp_print */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	304 0, /* tp_getattr */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	305 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51244 diff changeset	306 0, /* tp_reserved */
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	307 (reprfunc)range_repr, /* tp_repr */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	308 0, /* tp_as_number */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	309 &range_as_sequence, /* tp_as_sequence */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	310 0, /* tp_as_mapping */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	311 0, /* tp_hash */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	312 0, /* tp_call */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	313 0, /* tp_str */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	314 PyObject_GenericGetAttr, /* tp_getattro */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	315 0, /* tp_setattro */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	316 0, /* tp_as_buffer */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	317 Py_TPFLAGS_DEFAULT, /* tp_flags */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	318 range_doc, /* tp_doc */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	319 0, /* tp_traverse */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	320 0, /* tp_clear */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	321 0, /* tp_richcompare */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	322 0, /* tp_weaklistoffset */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	323 range_iter, /* tp_iter */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	324 0, /* tp_iternext */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	325 range_methods, /* tp_methods */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	326 0, /* tp_members */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	327 0, /* tp_getset */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	328 0, /* tp_base */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	329 0, /* tp_dict */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	330 0, /* tp_descr_get */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	331 0, /* tp_descr_set */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	332 0, /* tp_dictoffset */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	333 0, /* tp_init */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	334 0, /* tp_alloc */
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	335 range_new, /* tp_new */
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: diff changeset	336 };
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	337
41803 3d3bf27409e6 Rename test_xrange.py to test_range.py and fix the Walter Dörwald <walter@livinglogic.de> parents: 41800 diff changeset	338 /********************* range Iterator ************************/
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	339
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	340 /* There are 2 types of iterators, one for C longs, the other for
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	341 Python longs (ie, PyObjects). This should make iteration fast
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	342 in the normal case, but possible for any numeric value.
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	343 */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	344
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	345 typedef struct {
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	346 PyObject_HEAD
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	347 long index;
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	348 long start;
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	349 long step;
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	350 long len;
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	351 } rangeiterobject;
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	352
30865 41c4e143e6e6 Implement and apply PEP 322, reverse iteration Raymond Hettinger <python@rcn.com> parents: 28320 diff changeset	353 static PyObject *
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	354 rangeiter_next(rangeiterobject *r)
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	355 {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	356 if (r->index < r->len)
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44061 diff changeset	357 return PyLong_FromLong(r->start + (r->index++) * r->step);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	358 return NULL;
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	359 }
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	360
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	361 static PyObject *
31635 04eb2ebb46e2 Tidied up the implementations of reversed (including the custom ones Raymond Hettinger <python@rcn.com> parents: 30865 diff changeset	362 rangeiter_len(rangeiterobject *r)
04eb2ebb46e2 Tidied up the implementations of reversed (including the custom ones Raymond Hettinger <python@rcn.com> parents: 30865 diff changeset	363 {
44099 f324631462a2 Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h Christian Heimes <christian@cheimes.de> parents: 44061 diff changeset	364 return PyLong_FromLong(r->len - r->index);
31635 04eb2ebb46e2 Tidied up the implementations of reversed (including the custom ones Raymond Hettinger <python@rcn.com> parents: 30865 diff changeset	365 }
04eb2ebb46e2 Tidied up the implementations of reversed (including the custom ones Raymond Hettinger <python@rcn.com> parents: 30865 diff changeset	366
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	367 typedef struct {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	368 PyObject_HEAD
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	369 PyObject *index;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	370 PyObject *start;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	371 PyObject *step;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	372 PyObject *len;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	373 } longrangeiterobject;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	374
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	375 static PyObject *
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	376 longrangeiter_len(longrangeiterobject r, PyObject no_args)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	377 {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	378 return PyNumber_Subtract(r->len, r->index);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	379 }
41644 9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	380
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	381 static PyObject rangeiter_new(PyTypeObject , PyObject args, PyObject kw);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	382
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	383 PyDoc_STRVAR(length_hint_doc,
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	384 "Private method returning an estimate of len(list(it)).");
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	385
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	386 static PyMethodDef rangeiter_methods[] = {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	387 {"__length_hint__", (PyCFunction)rangeiter_len, METH_NOARGS,
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	388 length_hint_doc},
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	389 {NULL, NULL} /* sentinel */
31635 04eb2ebb46e2 Tidied up the implementations of reversed (including the custom ones Raymond Hettinger <python@rcn.com> parents: 30865 diff changeset	390 };
04eb2ebb46e2 Tidied up the implementations of reversed (including the custom ones Raymond Hettinger <python@rcn.com> parents: 30865 diff changeset	391
44061 0cc552ab76bd Added all PyTypeObjects to the appropriate header files. Christian Heimes <christian@cheimes.de> parents: 44043 diff changeset	392 PyTypeObject PyRangeIter_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41803 diff changeset	393 PyVarObject_HEAD_INIT(&PyType_Type, 0)
44043 1f024a95e9d9 Added view and iterator types to collections / _abcoll Christian Heimes <christian@cheimes.de> parents: 43867 diff changeset	394 "range_iterator", /* tp_name */
23702 d4f6e2adde48 Pyrangeiter_Type && range_iter should be static Neal Norwitz <nnorwitz@gmail.com> parents: 23695 diff changeset	395 sizeof(rangeiterobject), /* tp_basicsize */
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	396 0, /* tp_itemsize */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	397 /* methods */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	398 (destructor)PyObject_Del, /* tp_dealloc */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	399 0, /* tp_print */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	400 0, /* tp_getattr */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	401 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51244 diff changeset	402 0, /* tp_reserved */
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	403 0, /* tp_repr */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	404 0, /* tp_as_number */
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	405 0, /* tp_as_sequence */
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	406 0, /* tp_as_mapping */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	407 0, /* tp_hash */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	408 0, /* tp_call */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	409 0, /* tp_str */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	410 PyObject_GenericGetAttr, /* tp_getattro */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	411 0, /* tp_setattro */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	412 0, /* tp_as_buffer */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	413 Py_TPFLAGS_DEFAULT, /* tp_flags */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	414 0, /* tp_doc */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	415 0, /* tp_traverse */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	416 0, /* tp_clear */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	417 0, /* tp_richcompare */
8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	418 0, /* tp_weaklistoffset */
28320 fd5ef7003469 Renamed PyObject_GenericGetIter to PyObject_SelfIter Raymond Hettinger <python@rcn.com> parents: 28308 diff changeset	419 PyObject_SelfIter, /* tp_iter */
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	420 (iternextfunc)rangeiter_next, /* tp_iternext */
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	421 rangeiter_methods, /* tp_methods */
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	422 0, /* tp_members */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	423 0, /* tp_getset */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	424 0, /* tp_base */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	425 0, /* tp_dict */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	426 0, /* tp_descr_get */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	427 0, /* tp_descr_set */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	428 0, /* tp_dictoffset */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	429 0, /* tp_init */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	430 0, /* tp_alloc */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	431 rangeiter_new, /* tp_new */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	432 };
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	433
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	434 /* Return number of items in range/xrange (lo, hi, step). step > 0
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	435 * required. Return a value < 0 if & only if the true value is too
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	436 * large to fit in a signed long.
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	437 */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	438 static long
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	439 get_len_of_range(long lo, long hi, long step)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	440 {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	441 /* -------------------------------------------------------------
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	442 If lo >= hi, the range is empty.
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	443 Else if n values are in the range, the last one is
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	444 lo + (n-1)*step, which must be <= hi-1. Rearranging,
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	445 n <= (hi - lo - 1)/step + 1, so taking the floor of the RHS gives
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	446 the proper value. Since lo < hi in this case, hi-lo-1 >= 0, so
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	447 the RHS is non-negative and so truncation is the same as the
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	448 floor. Letting M be the largest positive long, the worst case
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	449 for the RHS numerator is hi=M, lo=-M-1, and then
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	450 hi-lo-1 = M-(-M-1)-1 = 2*M. Therefore unsigned long has enough
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	451 precision to compute the RHS exactly.
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	452 ---------------------------------------------------------------*/
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	453 long n = 0;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	454 if (lo < hi) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	455 unsigned long uhi = (unsigned long)hi;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	456 unsigned long ulo = (unsigned long)lo;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	457 unsigned long diff = uhi - ulo - 1;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	458 n = (long)(diff / (unsigned long)step + 1);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	459 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	460 return n;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	461 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	462
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	463 static PyObject *
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	464 int_range_iter(long start, long stop, long step)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	465 {
44061 0cc552ab76bd Added all PyTypeObjects to the appropriate header files. Christian Heimes <christian@cheimes.de> parents: 44043 diff changeset	466 rangeiterobject *it = PyObject_New(rangeiterobject, &PyRangeIter_Type);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	467 if (it == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	468 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	469 it->start = start;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	470 it->step = step;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	471 if (step > 0)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	472 it->len = get_len_of_range(start, stop, step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	473 else
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	474 it->len = get_len_of_range(stop, start, -step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	475 it->index = 0;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	476 return (PyObject *)it;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	477 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	478
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	479 static PyObject *
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	480 rangeiter_new(PyTypeObject type, PyObject args, PyObject *kw)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	481 {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	482 long start, stop, step;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	483
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	484 if (!_PyArg_NoKeywords("rangeiter()", kw))
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	485 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	486
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	487 if (!PyArg_ParseTuple(args, "lll;rangeiter() requires 3 int arguments",
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	488 &start, &stop, &step))
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	489 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	490
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	491 return int_range_iter(start, stop, step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	492 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	493
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	494 static PyMethodDef longrangeiter_methods[] = {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	495 {"__length_hint__", (PyCFunction)longrangeiter_len, METH_NOARGS,
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	496 length_hint_doc},
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	497 {NULL, NULL} /* sentinel */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	498 };
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	499
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	500 static void
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	501 longrangeiter_dealloc(longrangeiterobject *r)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	502 {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	503 Py_XDECREF(r->index);
41644 9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	504 Py_XDECREF(r->start);
9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	505 Py_XDECREF(r->step);
9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	506 Py_XDECREF(r->len);
43867 f444e259341a Found another memory leak in longrangeiter. And redo the previous correction Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 43861 diff changeset	507 PyObject_Del(r);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	508 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	509
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	510 static PyObject *
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	511 longrangeiter_next(longrangeiterobject *r)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	512 {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	513 PyObject one, product, new_index, result;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	514 if (PyObject_RichCompareBool(r->index, r->len, Py_LT) != 1)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	515 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	516
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	517 one = PyLong_FromLong(1);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	518 if (!one)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	519 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	520
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	521 product = PyNumber_Multiply(r->index, r->step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	522 if (!product) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	523 Py_DECREF(one);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	524 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	525 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	526
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	527 new_index = PyNumber_Add(r->index, one);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	528 Py_DECREF(one);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	529 if (!new_index) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	530 Py_DECREF(product);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	531 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	532 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	533
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	534 result = PyNumber_Add(r->start, product);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	535 Py_DECREF(product);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	536 if (result) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	537 Py_DECREF(r->index);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	538 r->index = new_index;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	539 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	540
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	541 return result;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	542 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	543
44061 0cc552ab76bd Added all PyTypeObjects to the appropriate header files. Christian Heimes <christian@cheimes.de> parents: 44043 diff changeset	544 PyTypeObject PyLongRangeIter_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41803 diff changeset	545 PyVarObject_HEAD_INIT(&PyType_Type, 0)
44061 0cc552ab76bd Added all PyTypeObjects to the appropriate header files. Christian Heimes <christian@cheimes.de> parents: 44043 diff changeset	546 "longrange_iterator", /* tp_name */
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	547 sizeof(longrangeiterobject), /* tp_basicsize */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	548 0, /* tp_itemsize */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	549 /* methods */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	550 (destructor)longrangeiter_dealloc, /* tp_dealloc */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	551 0, /* tp_print */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	552 0, /* tp_getattr */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	553 0, /* tp_setattr */
51271 87fbbf22adf3 Merged revisions 69214 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 51244 diff changeset	554 0, /* tp_reserved */
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	555 0, /* tp_repr */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	556 0, /* tp_as_number */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	557 0, /* tp_as_sequence */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	558 0, /* tp_as_mapping */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	559 0, /* tp_hash */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	560 0, /* tp_call */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	561 0, /* tp_str */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	562 PyObject_GenericGetAttr, /* tp_getattro */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	563 0, /* tp_setattro */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	564 0, /* tp_as_buffer */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	565 Py_TPFLAGS_DEFAULT, /* tp_flags */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	566 0, /* tp_doc */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	567 0, /* tp_traverse */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	568 0, /* tp_clear */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	569 0, /* tp_richcompare */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	570 0, /* tp_weaklistoffset */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	571 PyObject_SelfIter, /* tp_iter */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	572 (iternextfunc)longrangeiter_next, /* tp_iternext */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	573 longrangeiter_methods, /* tp_methods */
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	574 0,
23693 8983158e9f11 SF 564601 adding rangeiterobject to make xrange() iterate like range(). Raymond Hettinger <python@rcn.com> parents: 23664 diff changeset	575 };
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	576
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	577 static PyObject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	578 range_iter(PyObject *seq)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	579 {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	580 rangeobject r = (rangeobject )seq;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	581 longrangeiterobject *it;
44366 83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	582 long lstart, lstop, lstep;
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	583
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	584 assert(PyRange_Check(seq));
44366 83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	585
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	586 /* If all three fields convert to long, use the int version */
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	587 lstart = PyLong_AsLong(r->start);
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	588 if (lstart != -1 \|\| !PyErr_Occurred()) {
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	589 lstop = PyLong_AsLong(r->stop);
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	590 if (lstop != -1 \|\| !PyErr_Occurred()) {
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	591 lstep = PyLong_AsLong(r->step);
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	592 if (lstep != -1 \|\| !PyErr_Occurred())
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	593 return int_range_iter(lstart, lstop, lstep);
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	594 }
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	595 }
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	596 /* Some conversion failed, so there is an error set. Clear it,
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	597 and try again with a long range. */
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	598 PyErr_Clear();
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	599
44061 0cc552ab76bd Added all PyTypeObjects to the appropriate header files. Christian Heimes <christian@cheimes.de> parents: 44043 diff changeset	600 it = PyObject_New(longrangeiterobject, &PyLongRangeIter_Type);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	601 if (it == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	602 return NULL;
41644 9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	603
9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	604 /* Do all initialization here, so we can DECREF on failure. */
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	605 it->start = r->start;
41644 9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	606 it->step = r->step;
9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	607 Py_INCREF(it->start);
9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	608 Py_INCREF(it->step);
9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	609
9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	610 it->len = it->index = NULL;
9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	611
54845 f4d84c4f289b Merged revisions 73547-73548 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 54726 diff changeset	612 it->len = range_length_obj(r);
f4d84c4f289b Merged revisions 73547-73548 via svnmerge from Mark Dickinson <dickinsm@gmail.com> parents: 54726 diff changeset	613 if (!it->len)
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	614 goto create_failure;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	615 it->index = PyLong_FromLong(0);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	616 if (!it->index)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	617 goto create_failure;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	618
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	619 return (PyObject *)it;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	620
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	621 create_failure:
41644 9cc4c3f0b580 Merged revisions 55180-55183 via svnmerge from Guido van Rossum <guido@python.org> parents: 41642 diff changeset	622 Py_DECREF(it);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	623 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	624 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	625
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	626 static PyObject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	627 range_reverse(PyObject *seq)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	628 {
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	629 rangeobject range = (rangeobject) seq;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	630 longrangeiterobject *it;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	631 PyObject one, sum, diff, len = NULL, *product;
44366 83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	632 long lstart, lstop, lstep;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	633
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	634 /* XXX(nnorwitz): do the calc for the new start/stop first,
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	635 then if they fit, call the proper iter()?
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	636 */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	637 assert(PyRange_Check(seq));
44366 83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	638
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	639 /* If all three fields convert to long, use the int version */
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	640 lstart = PyLong_AsLong(range->start);
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	641 if (lstart != -1 \|\| !PyErr_Occurred()) {
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	642 lstop = PyLong_AsLong(range->stop);
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	643 if (lstop != -1 \|\| !PyErr_Occurred()) {
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	644 lstep = PyLong_AsLong(range->step);
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	645 if (lstep != -1 \|\| !PyErr_Occurred()) {
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	646 /* XXX(nnorwitz): need to check for overflow and simplify. */
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	647 long len = get_len_of_range(lstart, lstop, lstep);
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	648 long new_start = lstart + (len - 1) * lstep;
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	649 long new_stop = lstart;
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	650 if (lstep > 0)
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	651 new_stop -= 1;
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	652 else
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	653 new_stop += 1;
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	654 return int_range_iter(new_start, new_stop, -lstep);
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	655 }
83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	656 }
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	657 }
44366 83ced4177eac Drop _PyLong_FitsInLong. Fixes #1666. Martin v. Löwis <martin@v.loewis.de> parents: 44099 diff changeset	658 PyErr_Clear();
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	659
44061 0cc552ab76bd Added all PyTypeObjects to the appropriate header files. Christian Heimes <christian@cheimes.de> parents: 44043 diff changeset	660 it = PyObject_New(longrangeiterobject, &PyLongRangeIter_Type);
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	661 if (it == NULL)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	662 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	663
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	664 /* start + (len - 1) * step */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	665 len = range_length_obj(range);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	666 if (!len)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	667 goto create_failure;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	668
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	669 one = PyLong_FromLong(1);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	670 if (!one)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	671 goto create_failure;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	672
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	673 diff = PyNumber_Subtract(len, one);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	674 Py_DECREF(one);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	675 if (!diff)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	676 goto create_failure;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	677
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	678 product = PyNumber_Multiply(len, range->step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	679 if (!product)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	680 goto create_failure;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	681
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	682 sum = PyNumber_Add(range->start, product);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	683 Py_DECREF(product);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	684 it->start = sum;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	685 if (!it->start)
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	686 goto create_failure;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	687 it->step = PyNumber_Negative(range->step);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	688 if (!it->step) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	689 Py_DECREF(it->start);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	690 PyObject_Del(it);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	691 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	692 }
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	693
41642 a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	694 /* Steal reference to len. */
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	695 it->len = len;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	696
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	697 it->index = PyLong_FromLong(0);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	698 if (!it->index) {
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	699 Py_DECREF(it);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	700 return NULL;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	701 }
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	702
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	703 return (PyObject *)it;
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	704
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	705 create_failure:
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	706 Py_XDECREF(len);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	707 PyObject_Del(it);
a6eb6acfe04a Merged revisions 55007-55179 via svnmerge from Guido van Rossum <guido@python.org> parents: 37879 diff changeset	708 return NULL;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36501 diff changeset	709 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/rangeobject.c @ 55729:d91aff206dfd 3.1