[Python-checkins] CVS: python/dist/src/Objects frameobject.c,2.49.4.5,2.49.4.6 intobject.c,2.56.6.6,2.56.6.7 iterobject.c,1.3.2.3,1.3.2.4 listobject.c,2.92.6.10,2.92.6.11 longobject.c,1.71.6.4,1.71.6.5 methodobject.c,2.33.8.5,2.33.8.6 rangeobject.c,2.24.6.4,2.24.6.5
Tim Peters
tim_one@users.sourceforge.net
Sat, 14 Jul 2001 00:47:37 -0700
Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv29618/descr/dist/src/Objects
Modified Files:
Tag: descr-branch
frameobject.c intobject.c iterobject.c listobject.c
longobject.c methodobject.c rangeobject.c
Log Message:
Merge of trunk tag date2001-07-13 into descr-branch. See PLAN.txt.
Index: frameobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/frameobject.c,v
retrieving revision 2.49.4.5
retrieving revision 2.49.4.6
diff -C2 -r2.49.4.5 -r2.49.4.6
*** frameobject.c 2001/07/07 22:55:30 2.49.4.5
--- frameobject.c 2001/07/14 07:47:35 2.49.4.6
***************
*** 69,72 ****
--- 69,73 ----
Py_TRASHCAN_SAFE_BEGIN(f)
+ PyObject_GC_Fini(f);
/* Kill all local variables */
slots = f->f_nlocals + f->f_ncells + f->f_nfreevars;
***************
*** 96,114 ****
}
PyTypeObject PyFrame_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0,
"frame",
! sizeof(PyFrameObject),
0,
! (destructor)frame_dealloc, /*tp_dealloc*/
! 0, /*tp_print*/
! 0, /*tp_getattr*/
! 0, /*tp_setattr*/
! 0, /*tp_compare*/
! 0, /*tp_repr*/
! 0, /*tp_as_number*/
! 0, /*tp_as_sequence*/
! 0, /*tp_as_mapping*/
0, /* tp_hash */
0, /* tp_call */
--- 97,186 ----
}
+ static int
+ frame_traverse(PyFrameObject *f, visitproc visit, void *arg)
+ {
+ PyObject **fastlocals, **p;
+ int i, err, slots;
+ #define VISIT(o) if (o) {if ((err = visit((PyObject *)(o), arg))) return err;}
+
+ VISIT(f->f_back);
+ VISIT(f->f_code);
+ VISIT(f->f_builtins);
+ VISIT(f->f_globals);
+ VISIT(f->f_locals);
+ VISIT(f->f_trace);
+ VISIT(f->f_exc_type);
+ VISIT(f->f_exc_value);
+ VISIT(f->f_exc_traceback);
+
+ /* locals */
+ slots = f->f_nlocals + f->f_ncells + f->f_nfreevars;
+ fastlocals = f->f_localsplus;
+ for (i = slots; --i >= 0; ++fastlocals) {
+ VISIT(*fastlocals);
+ }
+
+ /* stack */
+ if (f->f_stacktop != NULL) {
+ for (p = f->f_valuestack; p < f->f_stacktop; p++)
+ VISIT(*p);
+ }
+
+ return 0;
+ }
+
+ static void
+ frame_clear(PyFrameObject *f)
+ {
+ PyObject **fastlocals, **p;
+ int i, slots;
+
+ Py_XDECREF(f->f_exc_type);
+ f->f_exc_type = NULL;
+
+ Py_XDECREF(f->f_exc_value);
+ f->f_exc_value = NULL;
+
+ Py_XDECREF(f->f_exc_traceback);
+ f->f_exc_traceback = NULL;
+
+ Py_XDECREF(f->f_trace);
+ f->f_trace = NULL;
+
+ /* locals */
+ slots = f->f_nlocals + f->f_ncells + f->f_nfreevars;
+ fastlocals = f->f_localsplus;
+ for (i = slots; --i >= 0; ++fastlocals) {
+ if (*fastlocals != NULL) {
+ Py_XDECREF(*fastlocals);
+ *fastlocals = NULL;
+ }
+ }
+
+ /* stack */
+ if (f->f_stacktop != NULL) {
+ for (p = f->f_valuestack; p < f->f_stacktop; p++) {
+ Py_XDECREF(*p);
+ *p = NULL;
+ }
+ }
+ }
+
+
PyTypeObject PyFrame_Type = {
PyObject_HEAD_INIT(&PyType_Type)
0,
"frame",
! sizeof(PyFrameObject) + PyGC_HEAD_SIZE,
0,
! (destructor)frame_dealloc, /* tp_dealloc */
! 0, /* tp_print */
! 0, /* tp_getattr */
! 0, /* tp_setattr */
! 0, /* tp_compare */
! 0, /* tp_repr */
! 0, /* tp_as_number */
! 0, /* tp_as_sequence */
! 0, /* tp_as_mapping */
0, /* tp_hash */
0, /* tp_call */
***************
*** 117,124 ****
PyObject_GenericSetAttr, /* tp_setattro */
0, /* tp_as_buffer */
! Py_TPFLAGS_DEFAULT, /* tp_flags */
! 0, /* tp_doc */
! 0, /* tp_traverse */
! 0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
--- 189,196 ----
PyObject_GenericSetAttr, /* tp_setattro */
0, /* tp_as_buffer */
! Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /* tp_flags */
! 0, /* tp_doc */
! (traverseproc)frame_traverse, /* tp_traverse */
! (inquiry)frame_clear, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
***************
*** 173,179 ****
f = (PyFrameObject *)
PyObject_MALLOC(sizeof(PyFrameObject) +
! extras*sizeof(PyObject *));
if (f == NULL)
return (PyFrameObject *)PyErr_NoMemory();
PyObject_INIT(f, &PyFrame_Type);
f->f_size = extras;
--- 245,253 ----
f = (PyFrameObject *)
PyObject_MALLOC(sizeof(PyFrameObject) +
! extras*sizeof(PyObject *) +
! PyGC_HEAD_SIZE);
if (f == NULL)
return (PyFrameObject *)PyErr_NoMemory();
+ f = (PyFrameObject *) PyObject_FROM_GC(f);
PyObject_INIT(f, &PyFrame_Type);
f->f_size = extras;
***************
*** 183,191 ****
free_list = free_list->f_back;
if (f->f_size < extras) {
f = (PyFrameObject *)
PyObject_REALLOC(f, sizeof(PyFrameObject) +
! extras*sizeof(PyObject *));
if (f == NULL)
return (PyFrameObject *)PyErr_NoMemory();
f->f_size = extras;
}
--- 257,268 ----
free_list = free_list->f_back;
if (f->f_size < extras) {
+ f = (PyFrameObject *) PyObject_AS_GC(f);
f = (PyFrameObject *)
PyObject_REALLOC(f, sizeof(PyFrameObject) +
! extras*sizeof(PyObject *) +
! PyGC_HEAD_SIZE);
if (f == NULL)
return (PyFrameObject *)PyErr_NoMemory();
+ f = (PyFrameObject *) PyObject_FROM_GC(f);
f->f_size = extras;
}
***************
*** 248,251 ****
--- 325,329 ----
f->f_stacktop = f->f_valuestack;
+ PyObject_GC_Init(f);
return f;
}
***************
*** 409,412 ****
--- 487,491 ----
PyFrameObject *f = free_list;
free_list = free_list->f_back;
+ f = (PyFrameObject *) PyObject_AS_GC(f);
PyObject_DEL(f);
}
Index: intobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/intobject.c,v
retrieving revision 2.56.6.6
retrieving revision 2.56.6.7
diff -C2 -r2.56.6.6 -r2.56.6.7
*** intobject.c 2001/07/07 22:55:30 2.56.6.6
--- intobject.c 2001/07/14 07:47:35 2.56.6.7
***************
*** 511,521 ****
CONVERT_TO_LONG(w, iw);
if (iw < 0) {
! if (iv)
! PyErr_SetString(PyExc_ValueError,
! "cannot raise integer to a negative power");
! else
! PyErr_SetString(PyExc_ZeroDivisionError,
! "cannot raise 0 to a negative power");
! return NULL;
}
if ((PyObject *)z != Py_None) {
--- 511,519 ----
CONVERT_TO_LONG(w, iw);
if (iw < 0) {
! /* Return a float. This works because we know that
! this calls float_pow() which converts its
! arguments to double. */
! return PyFloat_Type.tp_as_number->nb_power(
! (PyObject *)v, (PyObject *)w, (PyObject *)z);
}
if ((PyObject *)z != Py_None) {
Index: iterobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/iterobject.c,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -C2 -r1.3.2.3 -r1.3.2.4
*** iterobject.c 2001/07/07 22:55:30 1.3.2.3
--- iterobject.c 2001/07/14 07:47:35 1.3.2.4
***************
*** 19,22 ****
--- 19,23 ----
Py_INCREF(seq);
it->it_seq = seq;
+ PyObject_GC_Init(it);
return (PyObject *)it;
}
***************
*** 24,31 ****
--- 25,40 ----
iter_dealloc(seqiterobject *it)
{
+ PyObject_GC_Fini(it);
Py_DECREF(it->it_seq);
+ it = (seqiterobject *) PyObject_AS_GC(it);
PyObject_DEL(it);
}
+ static int
+ iter_traverse(seqiterobject *it, visitproc visit, void *arg)
+ {
+ return visit(it->it_seq, arg);
+ }
+
static PyObject *
iter_next(seqiterobject *it, PyObject *args)
***************
*** 92,96 ****
0, /* ob_size */
"iterator", /* tp_name */
! sizeof(seqiterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
--- 101,105 ----
0, /* ob_size */
"iterator", /* tp_name */
! sizeof(seqiterobject) + PyGC_HEAD_SIZE, /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
***************
*** 110,116 ****
0, /* tp_setattro */
0, /* tp_as_buffer */
! Py_TPFLAGS_DEFAULT, /* tp_flags */
0, /* tp_doc */
! 0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
--- 119,125 ----
0, /* tp_setattro */
0, /* tp_as_buffer */
! Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /* tp_flags */
0, /* tp_doc */
! (traverseproc)iter_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
***************
*** 146,149 ****
--- 155,159 ----
Py_INCREF(sentinel);
it->it_sentinel = sentinel;
+ PyObject_GC_Init(it);
return (PyObject *)it;
}
***************
*** 151,159 ****
--- 161,182 ----
calliter_dealloc(calliterobject *it)
{
+ PyObject_GC_Fini(it);
Py_DECREF(it->it_callable);
Py_DECREF(it->it_sentinel);
+ it = (calliterobject *) PyObject_AS_GC(it);
PyObject_DEL(it);
}
+ static int
+ calliter_traverse(calliterobject *it, visitproc visit, void *arg)
+ {
+ int err;
+ if ((err = visit(it->it_callable, arg)))
+ return err;
+ if ((err = visit(it->it_sentinel, arg)))
+ return err;
+ return 0;
+ }
+
static PyObject *
calliter_next(calliterobject *it, PyObject *args)
***************
*** 196,200 ****
0, /* ob_size */
"callable-iterator", /* tp_name */
! sizeof(calliterobject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
--- 219,223 ----
0, /* ob_size */
"callable-iterator", /* tp_name */
! sizeof(calliterobject) + PyGC_HEAD_SIZE,/* tp_basicsize */
0, /* tp_itemsize */
/* methods */
***************
*** 214,220 ****
0, /* tp_setattro */
0, /* tp_as_buffer */
! Py_TPFLAGS_DEFAULT, /* tp_flags */
0, /* tp_doc */
! 0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
--- 237,243 ----
0, /* tp_setattro */
0, /* tp_as_buffer */
! Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /* tp_flags */
0, /* tp_doc */
! (traverseproc)calliter_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
Index: listobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/listobject.c,v
retrieving revision 2.92.6.10
retrieving revision 2.92.6.11
diff -C2 -r2.92.6.10 -r2.92.6.11
*** listobject.c 2001/07/07 22:55:30 2.92.6.10
--- listobject.c 2001/07/14 07:47:35 2.92.6.11
***************
*** 1519,1523 ****
switch (op) {
case Py_LT: cmp = vs < ws; break;
! case Py_LE: cmp = ws <= ws; break;
case Py_EQ: cmp = vs == ws; break;
case Py_NE: cmp = vs != ws; break;
--- 1519,1523 ----
switch (op) {
case Py_LT: cmp = vs < ws; break;
! case Py_LE: cmp = vs <= ws; break;
case Py_EQ: cmp = vs == ws; break;
case Py_NE: cmp = vs != ws; break;
Index: longobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/longobject.c,v
retrieving revision 1.71.6.4
retrieving revision 1.71.6.5
diff -C2 -r1.71.6.4 -r1.71.6.5
*** longobject.c 2001/07/07 22:55:30 1.71.6.4
--- longobject.c 2001/07/14 07:47:35 1.71.6.5
***************
*** 812,831 ****
}
else {
Py_INCREF(a);
do {
digit rem;
! PyLongObject *temp = divrem1(a, (digit)base, &rem);
if (temp == NULL) {
- Py_DECREF(a);
Py_DECREF(str);
return NULL;
}
- if (rem < 10)
- rem += '0';
- else
- rem += 'A'-10;
- assert(p > PyString_AS_STRING(str));
- *--p = (char) rem;
- Py_DECREF(a);
a = temp;
SIGCHECK({
--- 812,838 ----
}
else {
+ /* Not 0, and base not a power of 2. Divide repeatedly by
+ base, but for speed use the highest power of base that
+ fits in a digit. */
+ digit powbase = base; /* powbase == base ** power */
+ int power = 1;
+ for (;;) {
+ unsigned long newpow = powbase * (unsigned long)base;
+ if (newpow >> SHIFT) /* doesn't fit in a digit */
+ break;
+ powbase = (digit)newpow;
+ ++power;
+ }
+
Py_INCREF(a);
do {
+ int ntostore = power;
digit rem;
! PyLongObject *temp = divrem1(a, powbase, &rem);
! Py_DECREF(a);
if (temp == NULL) {
Py_DECREF(str);
return NULL;
}
a = temp;
SIGCHECK({
***************
*** 834,837 ****
--- 841,854 ----
return NULL;
})
+ while (--ntostore >= 0) {
+ digit nextrem = (digit)(rem / base);
+ char c = (char)(rem - nextrem * base);
+ assert(p > PyString_AS_STRING(str));
+ c += (c < 10) ? '0' : 'A'-10;
+ *--p = c;
+ rem = nextrem;
+ if (a->ob_size == 0 && rem == 0)
+ break; /* skip leading zeroes */
+ }
} while (ABS(a->ob_size) != 0);
Py_DECREF(a);
***************
*** 1544,1555 ****
size_b = b->ob_size;
if (size_b < 0) {
! if (a->ob_size)
! PyErr_SetString(PyExc_ValueError,
! "long integer to a negative power");
! else
! PyErr_SetString(PyExc_ZeroDivisionError,
! "zero to a negative power");
! z = NULL;
! goto error;
}
z = (PyLongObject *)PyLong_FromLong(1L);
--- 1561,1571 ----
size_b = b->ob_size;
if (size_b < 0) {
! /* Return a float. This works because we know that
! this calls float_pow() which converts its
! arguments to double. */
! Py_DECREF(a);
! Py_DECREF(b);
! Py_DECREF(c);
! return PyFloat_Type.tp_as_number->nb_power(v, w, x);
}
z = (PyLongObject *)PyLong_FromLong(1L);
Index: methodobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/methodobject.c,v
retrieving revision 2.33.8.5
retrieving revision 2.33.8.6
diff -C2 -r2.33.8.5 -r2.33.8.6
*** methodobject.c 2001/06/06 14:27:54 2.33.8.5
--- methodobject.c 2001/07/14 07:47:35 2.33.8.6
***************
*** 23,26 ****
--- 23,27 ----
Py_XINCREF(self);
op->m_self = self;
+ PyObject_GC_Init(op);
return (PyObject *)op;
}
***************
*** 61,64 ****
--- 62,66 ----
meth_dealloc(PyCFunctionObject *m)
{
+ PyObject_GC_Fini(m);
Py_XDECREF(m->m_self);
m->m_self = (PyObject *)free_list;
***************
*** 83,86 ****
--- 85,97 ----
}
+ static int
+ meth_traverse(PyCFunctionObject *m, visitproc visit, void *arg)
+ {
+ if (m->m_self != NULL)
+ return visit(m->m_self, arg);
+ else
+ return 0;
+ }
+
static PyObject *
meth_get__self__(PyCFunctionObject *m, void *closure)
***************
*** 192,203 ****
0,
"builtin_function_or_method",
! sizeof(PyCFunctionObject),
0,
! (destructor)meth_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
(cmpfunc)meth_compare, /* tp_compare */
! (reprfunc)meth_repr, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
--- 203,214 ----
0,
"builtin_function_or_method",
! sizeof(PyCFunctionObject) + PyGC_HEAD_SIZE,
0,
! (destructor)meth_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
(cmpfunc)meth_compare, /* tp_compare */
! (reprfunc)meth_repr, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
***************
*** 209,215 ****
0, /* tp_setattro */
0, /* tp_as_buffer */
! Py_TPFLAGS_DEFAULT, /* tp_flags */
! 0, /* tp_doc */
! 0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
--- 220,226 ----
0, /* tp_setattro */
0, /* tp_as_buffer */
! Py_TPFLAGS_DEFAULT | Py_TPFLAGS_GC, /* tp_flags */
! 0, /* tp_doc */
! (traverseproc)meth_traverse, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
***************
*** 303,306 ****
--- 314,318 ----
PyCFunctionObject *v = free_list;
free_list = (PyCFunctionObject *)(v->m_self);
+ v = (PyCFunctionObject *) PyObject_AS_GC(v);
PyObject_DEL(v);
}
Index: rangeobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/rangeobject.c,v
retrieving revision 2.24.6.4
retrieving revision 2.24.6.5
diff -C2 -r2.24.6.4 -r2.24.6.5
*** rangeobject.c 2001/07/07 22:55:30 2.24.6.4
--- rangeobject.c 2001/07/14 07:47:35 2.24.6.5
***************
*** 6,9 ****
--- 6,12 ----
#include <string.h>
+ #define WARN(msg) if (PyErr_Warn(PyExc_DeprecationWarning, msg) < 0) \
+ return NULL;
+
typedef struct {
PyObject_HEAD
***************
*** 11,37 ****
long step;
long len;
} rangeobject;
PyObject *
! PyRange_New(long start, long len, long step)
{
rangeobject *obj = PyObject_NEW(rangeobject, &PyRange_Type);
if (obj == NULL)
return NULL;
! if (len == 0) {
start = 0;
len = 0;
step = 1;
}
else {
long last = start + (len - 1) * step;
if ((step > 0) ?
! (last > (PyInt_GetMax() - step))
! :(last < (-1 - PyInt_GetMax() - step))) {
PyErr_SetString(PyExc_OverflowError,
"integer addition");
return NULL;
}
}
--- 14,87 ----
long step;
long len;
+ int reps;
+ long totlen;
} rangeobject;
+ static int
+ long_mul(long i, long j, long *kk)
+ {
+ PyObject *a;
+ PyObject *b;
+ PyObject *c;
+
+ if ((a = PyInt_FromLong(i)) == NULL)
+ return 0;
+
+ if ((b = PyInt_FromLong(j)) == NULL)
+ return 0;
+
+ c = PyNumber_Multiply(a, b);
+
+ Py_DECREF(a);
+ Py_DECREF(b);
+
+ if (c == NULL)
+ return 0;
+
+ *kk = PyInt_AS_LONG(c);
+ Py_DECREF(c);
+
+ if (*kk > INT_MAX) {
+ PyErr_SetString(PyExc_OverflowError,
+ "integer multiplication");
+ return 0;
+ }
+ else
+ return 1;
+ }
+
PyObject *
! PyRange_New(long start, long len, long step, int reps)
{
+ long totlen = -1;
rangeobject *obj = PyObject_NEW(rangeobject, &PyRange_Type);
if (obj == NULL)
return NULL;
+
+ if (reps != 1)
+ WARN("PyRange_New's 'repetitions' argument is deprecated");
! if (len == 0 || reps <= 0) {
start = 0;
len = 0;
step = 1;
+ reps = 1;
+ totlen = 0;
}
else {
long last = start + (len - 1) * step;
if ((step > 0) ?
! (last > (PyInt_GetMax() - step)) :
! (last < (-1 - PyInt_GetMax() - step))) {
PyErr_SetString(PyExc_OverflowError,
"integer addition");
return NULL;
+ }
+ if (! long_mul(len, (long) reps, &totlen)) {
+ if(!PyErr_ExceptionMatches(PyExc_OverflowError))
+ return NULL;
+ PyErr_Clear();
+ totlen = -1;
}
}
***************
*** 40,43 ****
--- 90,95 ----
obj->len = len;
obj->step = step;
+ obj->reps = reps;
+ obj->totlen = totlen;
return (PyObject *) obj;
***************
*** 53,61 ****
range_item(rangeobject *r, int i)
{
! if (i < 0 || i >= r->len) {
! PyErr_SetString(PyExc_IndexError,
"xrange object index out of range");
! return NULL;
! }
return PyInt_FromLong(r->start + (i % r->len) * r->step);
--- 105,114 ----
range_item(rangeobject *r, int i)
{
! if (i < 0 || i >= r->totlen)
! if (r->totlen!=-1) {
! PyErr_SetString(PyExc_IndexError,
"xrange object index out of range");
! return NULL;
! }
return PyInt_FromLong(r->start + (i % r->len) * r->step);
***************
*** 65,69 ****
range_length(rangeobject *r)
{
! return r->len;
}
--- 118,125 ----
range_length(rangeobject *r)
{
! if (r->totlen == -1)
! PyErr_SetString(PyExc_OverflowError,
! "xrange object has too many items");
! return r->totlen;
}
***************
*** 75,78 ****
--- 131,135 ----
*/
char buf1[250];
+ char buf2[250];
if (r->start == 0 && r->step == 1)
***************
*** 89,105 ****
r->start + r->len * r->step,
r->step);
! return PyString_FromString(buf1);
}
static PySequenceMethods range_as_sequence = {
(inquiry)range_length, /*sq_length*/
0, /*sq_concat*/
! 0, /*sq_repeat*/
! (intargfunc)range_item, /*sq_item*/
! 0, /*sq_slice*/
0, /*sq_ass_item*/
0, /*sq_ass_slice*/
! 0, /*sq_contains*/
};
--- 146,306 ----
r->start + r->len * r->step,
r->step);
+
+ if (r->reps != 1)
+ sprintf(buf2, "(%s * %d)", buf1, r->reps);
+
+ return PyString_FromString(r->reps == 1 ? buf1 : buf2);
+ }
+
+ static PyObject *
+ range_repeat(rangeobject *r, int n)
+ {
+ long lreps = 0;
+
+ WARN("xrange object multiplication is deprecated; "
+ "convert to list instead");
+
+ if (n <= 0)
+ return (PyObject *) PyRange_New(0, 0, 1, 1);
! else if (n == 1) {
! Py_INCREF(r);
! return (PyObject *) r;
! }
!
! else if (! long_mul((long) r->reps, (long) n, &lreps))
! return NULL;
!
! else
! return (PyObject *) PyRange_New(
! r->start,
! r->len,
! r->step,
! (int) lreps);
}
+ static int
+ range_compare(rangeobject *r1, rangeobject *r2)
+ {
+
+ if (PyErr_Warn(PyExc_DeprecationWarning,
+ "xrange object comparision is deprecated; "
+ "convert to list instead") < 0)
+ return -1;
+
+ if (r1->start != r2->start)
+ return r1->start - r2->start;
+
+ else if (r1->step != r2->step)
+ return r1->step - r2->step;
+
+ else if (r1->len != r2->len)
+ return r1->len - r2->len;
+
+ else
+ return r1->reps - r2->reps;
+ }
+
+ static PyObject *
+ range_slice(rangeobject *r, int low, int high)
+ {
+ WARN("xrange object slicing is deprecated; "
+ "convert to list instead");
+
+ if (r->reps != 1) {
+ PyErr_SetString(PyExc_TypeError,
+ "cannot slice a replicated xrange");
+ return NULL;
+ }
+ if (low < 0)
+ low = 0;
+ else if (low > r->len)
+ low = r->len;
+ if (high < 0)
+ high = 0;
+ if (high < low)
+ high = low;
+ else if (high > r->len)
+ high = r->len;
+
+ if (low == 0 && high == r->len) {
+ Py_INCREF(r);
+ return (PyObject *) r;
+ }
+
+ return (PyObject *) PyRange_New(
+ low * r->step + r->start,
+ high - low,
+ r->step,
+ 1);
+ }
+
+ static PyObject *
+ range_tolist(rangeobject *self, PyObject *args)
+ {
+ PyObject *thelist;
+ int j;
+
+ WARN("xrange.tolist() is deprecated; use list(xrange) instead");
+
+ if (! PyArg_ParseTuple(args, ":tolist"))
+ return NULL;
+
+ if (self->totlen == -1)
+ return PyErr_NoMemory();
+
+ if ((thelist = PyList_New(self->totlen)) == NULL)
+ return NULL;
+
+ for (j = 0; j < self->totlen; ++j)
+ if ((PyList_SetItem(thelist, j, (PyObject *) PyInt_FromLong(
+ self->start + (j % self->len) * self->step))) < 0)
+ return NULL;
+
+ return thelist;
+ }
+
+ static PyObject *
+ range_getattr(rangeobject *r, char *name)
+ {
+ PyObject *result;
+
+ static PyMethodDef range_methods[] = {
+ {"tolist", (PyCFunction)range_tolist, METH_VARARGS,
+ "tolist() -> list\n"
+ "Return a list object with the same values.\n"
+ "(This method is deprecated; use list() instead.)"},
+ {NULL, NULL}
+ };
+ static struct memberlist range_members[] = {
+ {"step", T_LONG, offsetof(rangeobject, step), RO},
+ {"start", T_LONG, offsetof(rangeobject, start), RO},
+ {"stop", T_LONG, 0, RO},
+ {NULL, 0, 0, 0}
+ };
+
+ result = Py_FindMethod(range_methods, (PyObject *) r, name);
+ if (result == NULL) {
+ PyErr_Clear();
+ if (strcmp("stop", name) == 0)
+ result = PyInt_FromLong(r->start + (r->len * r->step));
+ else
+ result = PyMember_Get((char *)r, range_members, name);
+ if (result)
+ WARN("xrange object's 'start', 'stop' and 'step' "
+ "attributes are deprecated");
+ }
+ return result;
+ }
+
static PySequenceMethods range_as_sequence = {
(inquiry)range_length, /*sq_length*/
0, /*sq_concat*/
! (intargfunc)range_repeat, /*sq_repeat*/
! (intargfunc)range_item, /*sq_item*/
! (intintargfunc)range_slice, /*sq_slice*/
0, /*sq_ass_item*/
0, /*sq_ass_slice*/
! 0, /*sq_contains*/
};
***************
*** 110,129 ****
sizeof(rangeobject), /* Basic object size */
0, /* Item size for varobject */
! (destructor)range_dealloc, /* tp_dealloc */
! 0, /* tp_print */
! 0, /* tp_getattr */
! 0, /* tp_setattr */
! 0, /* tp_compare */
! (reprfunc)range_repr, /* tp_repr */
! 0, /* tp_as_number */
! &range_as_sequence, /* tp_as_sequence */
! 0, /* tp_as_mapping */
! 0, /* tp_hash */
! 0, /* tp_call */
! 0, /* tp_str */
! PyObject_GenericGetAttr, /* tp_getattro */
! 0, /* tp_setattro */
! 0, /* tp_as_buffer */
! Py_TPFLAGS_DEFAULT, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */
--- 311,330 ----
sizeof(rangeobject), /* Basic object size */
0, /* Item size for varobject */
! (destructor)range_dealloc, /*tp_dealloc*/
! 0, /*tp_print*/
! (getattrfunc)range_getattr, /*tp_getattr*/
! 0, /*tp_setattr*/
! (cmpfunc)range_compare, /*tp_compare*/
! (reprfunc)range_repr, /*tp_repr*/
! 0, /*tp_as_number*/
! &range_as_sequence, /*tp_as_sequence*/
! 0, /*tp_as_mapping*/
! 0, /*tp_hash*/
! 0, /*tp_call*/
! 0, /*tp_str*/
! PyObject_GenericGetAttr, /*tp_getattro*/
! 0, /*tp_setattro*/
! 0, /*tp_as_buffer*/
! Py_TPFLAGS_DEFAULT, /*tp_flags*/
0, /* tp_doc */
0, /* tp_traverse */
***************
*** 139,140 ****
--- 340,343 ----
0, /* tp_dict */
};
+
+ #undef WARN