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

annotate Objects/sliceobject.c @ 58765:2ba7677bfa95 legacy-trunk

testCopysign was defined twice in test_math; combine the definitions

author	Mark Dickinson <dickinsm@gmail.com>
date	Sat, 06 Feb 2010 23:11:25 +0000
parents	42bf56e34825
children	fd25030223b0

rev	line source
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	1 /*
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	2 Written by Jim Hugunin and Chris Chase.
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	3
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 3861 diff changeset	4 This includes both the singular ellipsis object and slice objects.
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	5
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	6 Guido, feel free to do whatever you want in the way of copyrights
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	7 for this file.
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	8 */
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	9
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	10 /*
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 3861 diff changeset	11 Py_Ellipsis encodes the '...' rubber index token. It is similar to
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	12 the Py_NoneStruct in that there is no way to create other objects of
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	13 this type and there is exactly one in existence.
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	14 */
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	15
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	16 #include "Python.h"
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	17 #include "structmember.h"
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	18
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	19 static PyObject *
13458 7908ec855665 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	20 ellipsis_repr(PyObject *op)
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	21 {
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	22 return PyString_FromString("Ellipsis");
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	23 }
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	24
53273 42bf56e34825 Merged revisions 71734,71738-71739 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47781 diff changeset	25 PyTypeObject PyEllipsis_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41436 diff changeset	26 PyVarObject_HEAD_INIT(&PyType_Type, 0)
37304 79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	27 "ellipsis", /* tp_name */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	28 0, /* tp_basicsize */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	29 0, /* tp_itemsize */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	30 0, /never called/ /* tp_dealloc */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	31 0, /* tp_print */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	32 0, /* tp_getattr */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	33 0, /* tp_setattr */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	34 0, /* tp_compare */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	35 ellipsis_repr, /* tp_repr */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	36 0, /* tp_as_number */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	37 0, /* tp_as_sequence */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	38 0, /* tp_as_mapping */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	39 0, /* tp_hash */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	40 0, /* tp_call */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	41 0, /* tp_str */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	42 PyObject_GenericGetAttr, /* tp_getattro */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	43 0, /* tp_setattro */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	44 0, /* tp_as_buffer */
79a0f080f898 Remove unnecessary casts in type object initializers. Georg Brandl <georg@python.org> parents: 37165 diff changeset	45 Py_TPFLAGS_DEFAULT, /* tp_flags */
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	46 };
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	47
4403 3b3f7c3f6da2 Ellipses -> Ellipsis rename (the dictionary really says that it should Guido van Rossum <guido@python.org> parents: 3861 diff changeset	48 PyObject _Py_EllipsisObject = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41436 diff changeset	49 _PyObject_EXTRA_INIT
6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41436 diff changeset	50 1, &PyEllipsis_Type
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	51 };
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	52
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	53
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	54 /* Slice object implementation
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	55
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	56 start, stop, and step are python objects with None indicating no
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	57 index is present.
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	58 */
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	59
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	60 PyObject *
13458 7908ec855665 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	61 PySlice_New(PyObject start, PyObject stop, PyObject *step)
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	62 {
22978 363c7fc174ac Remove PyMalloc_New and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22446 diff changeset	63 PySliceObject *obj = PyObject_New(PySliceObject, &PySlice_Type);
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	64
15563 35e8a29e5488 Test for NULL returned from PyObject_NEW(). Guido van Rossum <guido@python.org> parents: 13458 diff changeset	65 if (obj == NULL)
35e8a29e5488 Test for NULL returned from PyObject_NEW(). Guido van Rossum <guido@python.org> parents: 13458 diff changeset	66 return NULL;
35e8a29e5488 Test for NULL returned from PyObject_NEW(). Guido van Rossum <guido@python.org> parents: 13458 diff changeset	67
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	68 if (step == NULL) step = Py_None;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	69 Py_INCREF(step);
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	70 if (start == NULL) start = Py_None;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	71 Py_INCREF(start);
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	72 if (stop == NULL) stop = Py_None;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	73 Py_INCREF(stop);
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	74
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	75 obj->step = step;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	76 obj->start = start;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	77 obj->stop = stop;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	78
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	79 return (PyObject *) obj;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	80 }
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	81
37165 45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	82 PyObject *
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	83 _PySlice_FromIndices(Py_ssize_t istart, Py_ssize_t istop)
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	84 {
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	85 PyObject start, end, *slice;
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	86 start = PyInt_FromSsize_t(istart);
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	87 if (!start)
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	88 return NULL;
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	89 end = PyInt_FromSsize_t(istop);
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	90 if (!end) {
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	91 Py_DECREF(start);
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	92 return NULL;
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	93 }
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	94
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	95 slice = PySlice_New(start, end, NULL);
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	96 Py_DECREF(start);
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	97 Py_DECREF(end);
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	98 return slice;
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	99 }
45dd938b7feb Stop duplicating code and handle slice indices consistently and correctly Neal Norwitz <nnorwitz@gmail.com> parents: 36501 diff changeset	100
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	101 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35450 diff changeset	102 PySlice_GetIndices(PySliceObject *r, Py_ssize_t length,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35450 diff changeset	103 Py_ssize_t start, Py_ssize_t stop, Py_ssize_t *step)
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	104 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35450 diff changeset	105 /* XXX support long ints */
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	106 if (r->step == Py_None) {
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	107 *step = 1;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	108 } else {
37425 5133b5b0b4a8 Allow long integers in PySlice_GetIndices. Martin v. Löwis <martin@v.loewis.de> parents: 37409 diff changeset	109 if (!PyInt_Check(r->step) && !PyLong_Check(r->step)) return -1;
37409 9c2a462d66bb Use Py_ssize_t in slices Neal Norwitz <nnorwitz@gmail.com> parents: 37304 diff changeset	110 *step = PyInt_AsSsize_t(r->step);
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	111 }
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	112 if (r->start == Py_None) {
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	113 start = step < 0 ? length-1 : 0;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	114 } else {
37425 5133b5b0b4a8 Allow long integers in PySlice_GetIndices. Martin v. Löwis <martin@v.loewis.de> parents: 37409 diff changeset	115 if (!PyInt_Check(r->start) && !PyLong_Check(r->step)) return -1;
37409 9c2a462d66bb Use Py_ssize_t in slices Neal Norwitz <nnorwitz@gmail.com> parents: 37304 diff changeset	116 *start = PyInt_AsSsize_t(r->start);
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	117 if (start < 0) start += length;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	118 }
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	119 if (r->stop == Py_None) {
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	120 stop = step < 0 ? -1 : length;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	121 } else {
37425 5133b5b0b4a8 Allow long integers in PySlice_GetIndices. Martin v. Löwis <martin@v.loewis.de> parents: 37409 diff changeset	122 if (!PyInt_Check(r->stop) && !PyLong_Check(r->step)) return -1;
37409 9c2a462d66bb Use Py_ssize_t in slices Neal Norwitz <nnorwitz@gmail.com> parents: 37304 diff changeset	123 *stop = PyInt_AsSsize_t(r->stop);
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	124 if (stop < 0) stop += length;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	125 }
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	126 if (*stop > length) return -1;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	127 if (*start >= length) return -1;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	128 if (*step == 0) return -1;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	129 return 0;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	130 }
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	131
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	132 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35450 diff changeset	133 PySlice_GetIndicesEx(PySliceObject *r, Py_ssize_t length,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35450 diff changeset	134 Py_ssize_t start, Py_ssize_t stop, Py_ssize_t step, Py_ssize_t slicelength)
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	135 {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	136 /* this is harder to get right than you might think */
26035 6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	137
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35450 diff changeset	138 Py_ssize_t defstart, defstop;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	139
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	140 if (r->step == Py_None) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	141 *step = 1;
26035 6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	142 }
6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	143 else {
26079 cab167613e43 Handle really big steps in extended slices. Michael W. Hudson <mwh@python.net> parents: 26035 diff changeset	144 if (!_PyEval_SliceIndex(r->step, step)) return -1;
cab167613e43 Handle really big steps in extended slices. Michael W. Hudson <mwh@python.net> parents: 26035 diff changeset	145 if (*step == 0) {
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	146 PyErr_SetString(PyExc_ValueError,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	147 "slice step cannot be zero");
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	148 return -1;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	149 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	150 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	151
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	152 defstart = *step < 0 ? length-1 : 0;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	153 defstop = *step < 0 ? -1 : length;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	154
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	155 if (r->start == Py_None) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	156 *start = defstart;
26035 6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	157 }
6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	158 else {
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	159 if (!_PyEval_SliceIndex(r->start, start)) return -1;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	160 if (start < 0) start += length;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	161 if (start < 0) start = (*step < 0) ? -1 : 0;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	162 if (*start >= length)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	163 start = (step < 0) ? length - 1 : length;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	164 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	165
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	166 if (r->stop == Py_None) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	167 *stop = defstop;
26035 6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	168 }
6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	169 else {
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	170 if (!_PyEval_SliceIndex(r->stop, stop)) return -1;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	171 if (stop < 0) stop += length;
47781 d1a46350b047 Issue #3004: Minor fix to slice.indices(). slice(-10).indices(9) now Mark Dickinson <dickinsm@gmail.com> parents: 47527 diff changeset	172 if (stop < 0) stop = (*step < 0) ? -1 : 0;
d1a46350b047 Issue #3004: Minor fix to slice.indices(). slice(-10).indices(9) now Mark Dickinson <dickinsm@gmail.com> parents: 47527 diff changeset	173 if (*stop >= length)
d1a46350b047 Issue #3004: Minor fix to slice.indices(). slice(-10).indices(9) now Mark Dickinson <dickinsm@gmail.com> parents: 47527 diff changeset	174 stop = (step < 0) ? length - 1 : length;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	175 }
26035 6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	176
6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	177 if ((step < 0 && stop >= *start)
6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	178 \|\| (step > 0 && start >= *stop)) {
23780 c7cda63a007e Fix for problem reported by Neal Norwitz. Tighten up calculation of Michael W. Hudson <mwh@python.net> parents: 23778 diff changeset	179 *slicelength = 0;
c7cda63a007e Fix for problem reported by Neal Norwitz. Tighten up calculation of Michael W. Hudson <mwh@python.net> parents: 23778 diff changeset	180 }
c7cda63a007e Fix for problem reported by Neal Norwitz. Tighten up calculation of Michael W. Hudson <mwh@python.net> parents: 23778 diff changeset	181 else if (*step < 0) {
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	182 slicelength = (stop-start+1)/(step)+1;
26035 6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	183 }
6ed2e23aae45 Some days, I think my comment of Michael W. Hudson <mwh@python.net> parents: 25228 diff changeset	184 else {
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	185 slicelength = (stop-start-1)/(step)+1;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	186 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	187
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	188 return 0;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	189 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22978 diff changeset	190
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	191 static PyObject *
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	192 slice_new(PyTypeObject type, PyObject args, PyObject *kw)
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	193 {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	194 PyObject start, stop, *step;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	195
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	196 start = stop = step = NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	197
35450 97c97194e64b Disallow keyword arguments for type constructors that don't use them Georg Brandl <georg@python.org> parents: 30332 diff changeset	198 if (!_PyArg_NoKeywords("slice()", kw))
97c97194e64b Disallow keyword arguments for type constructors that don't use them Georg Brandl <georg@python.org> parents: 30332 diff changeset	199 return NULL;
97c97194e64b Disallow keyword arguments for type constructors that don't use them Georg Brandl <georg@python.org> parents: 30332 diff changeset	200
26818 e094a03a80ff SF patch #659536: Use PyArg_UnpackTuple where possible. Raymond Hettinger <python@rcn.com> parents: 26079 diff changeset	201 if (!PyArg_UnpackTuple(args, "slice", 1, 3, &start, &stop, &step))
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	202 return NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	203
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	204 /* This swapping of stop and start is to maintain similarity with
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	205 range(). */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	206 if (stop == NULL) {
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	207 stop = start;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	208 start = NULL;
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	209 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	210 return PySlice_New(start, stop, step);
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	211 }
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	212
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	213 PyDoc_STRVAR(slice_doc,
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	214 "slice([start,] stop[, step])\n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	215 \n\
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	216 Create a slice object. This is used for extended slicing (e.g. a[0:10:2]).");
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	217
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	218 static void
13458 7908ec855665 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	219 slice_dealloc(PySliceObject *r)
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	220 {
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	221 Py_DECREF(r->step);
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	222 Py_DECREF(r->start);
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	223 Py_DECREF(r->stop);
22978 363c7fc174ac Remove PyMalloc_New and PyMalloc_Del. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22446 diff changeset	224 PyObject_Del(r);
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	225 }
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	226
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	227 static PyObject *
13458 7908ec855665 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	228 slice_repr(PySliceObject *r)
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	229 {
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	230 PyObject s, comma;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	231
47527 52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	232 s = PyString_FromString("slice(");
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	233 comma = PyString_FromString(", ");
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	234 PyString_ConcatAndDel(&s, PyObject_Repr(r->start));
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	235 PyString_Concat(&s, comma);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	236 PyString_ConcatAndDel(&s, PyObject_Repr(r->stop));
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	237 PyString_Concat(&s, comma);
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	238 PyString_ConcatAndDel(&s, PyObject_Repr(r->step));
52294af4b663 This reverts r63675 based on the discussion in this thread: Gregory P. Smith <greg@mad-scientist.com> parents: 47294 diff changeset	239 PyString_ConcatAndDel(&s, PyString_FromString(")"));
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	240 Py_DECREF(comma);
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	241 return s;
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	242 }
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	243
20012 3faabf54b8b8 Add optional docstrings to member descriptors. For backwards Guido van Rossum <guido@python.org> parents: 18933 diff changeset	244 static PyMemberDef slice_members[] = {
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	245 {"start", T_OBJECT, offsetof(PySliceObject, start), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	246 {"stop", T_OBJECT, offsetof(PySliceObject, stop), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	247 {"step", T_OBJECT, offsetof(PySliceObject, step), READONLY},
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	248 {0}
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	249 };
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	250
24319 c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	251 static PyObject*
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	252 slice_indices(PySliceObject* self, PyObject* len)
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	253 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 35450 diff changeset	254 Py_ssize_t ilen, start, stop, step, slicelength;
24319 c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	255
39463 6cafdc81cfde Patch #1538606, Patch to fix __index__() clipping. Neal Norwitz <nnorwitz@gmail.com> parents: 37425 diff changeset	256 ilen = PyNumber_AsSsize_t(len, PyExc_OverflowError);
24319 c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	257
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	258 if (ilen == -1 && PyErr_Occurred()) {
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	259 return NULL;
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	260 }
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	261
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	262 if (PySlice_GetIndicesEx(self, ilen, &start, &stop,
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	263 &step, &slicelength) < 0) {
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	264 return NULL;
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	265 }
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	266
37409 9c2a462d66bb Use Py_ssize_t in slices Neal Norwitz <nnorwitz@gmail.com> parents: 37304 diff changeset	267 return Py_BuildValue("(nnn)", start, stop, step);
24319 c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	268 }
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	269
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	270 PyDoc_STRVAR(slice_indices_doc,
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	271 "S.indices(len) -> (start, stop, stride)\n\
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	272 \n\
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	273 Assuming a sequence of length len, calculate the start and stop\n\
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	274 indices, and the stride length of the extended slice described by\n\
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	275 S. Out of bounds indices are clipped in a manner consistent with the\n\
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	276 handling of normal slices.");
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	277
41436 0dfa2a564076 SF 1191699: Make slices picklable Raymond Hettinger <python@rcn.com> parents: 39463 diff changeset	278 static PyObject *
0dfa2a564076 SF 1191699: Make slices picklable Raymond Hettinger <python@rcn.com> parents: 39463 diff changeset	279 slice_reduce(PySliceObject* self)
0dfa2a564076 SF 1191699: Make slices picklable Raymond Hettinger <python@rcn.com> parents: 39463 diff changeset	280 {
44350 26384b8180c7 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available. Christian Heimes <christian@cheimes.de> parents: 42333 diff changeset	281 return Py_BuildValue("O(OOO)", Py_TYPE(self), self->start, self->stop, self->step);
41436 0dfa2a564076 SF 1191699: Make slices picklable Raymond Hettinger <python@rcn.com> parents: 39463 diff changeset	282 }
0dfa2a564076 SF 1191699: Make slices picklable Raymond Hettinger <python@rcn.com> parents: 39463 diff changeset	283
0dfa2a564076 SF 1191699: Make slices picklable Raymond Hettinger <python@rcn.com> parents: 39463 diff changeset	284 PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
0dfa2a564076 SF 1191699: Make slices picklable Raymond Hettinger <python@rcn.com> parents: 39463 diff changeset	285
24319 c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	286 static PyMethodDef slice_methods[] = {
24321 31227353cbbc Silly typo. Not sure how that got in. Michael W. Hudson <mwh@python.net> parents: 24319 diff changeset	287 {"indices", (PyCFunction)slice_indices,
24319 c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	288 METH_O, slice_indices_doc},
41436 0dfa2a564076 SF 1191699: Make slices picklable Raymond Hettinger <python@rcn.com> parents: 39463 diff changeset	289 {"__reduce__", (PyCFunction)slice_reduce,
0dfa2a564076 SF 1191699: Make slices picklable Raymond Hettinger <python@rcn.com> parents: 39463 diff changeset	290 METH_NOARGS, reduce_doc},
24319 c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	291 {NULL, NULL}
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	292 };
c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	293
17080 52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	294 static int
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	295 slice_compare(PySliceObject v, PySliceObject w)
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	296 {
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	297 int result = 0;
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	298
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	299 if (v == w)
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	300 return 0;
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	301
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	302 if (PyObject_Cmp(v->start, w->start, &result) < 0)
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	303 return -2;
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	304 if (result != 0)
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	305 return result;
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	306 if (PyObject_Cmp(v->stop, w->stop, &result) < 0)
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	307 return -2;
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	308 if (result != 0)
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	309 return result;
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	310 if (PyObject_Cmp(v->step, w->step, &result) < 0)
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	311 return -2;
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	312 return result;
52cb0c5fdf23 SF patch #408326 by Robin Thomas: slice objects comparable, not Guido van Rossum <guido@python.org> parents: 15563 diff changeset	313 }
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	314
30332 6b84802c9524 SF bug #800796: Difference between hash() and __hash__() Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	315 static long
6b84802c9524 SF bug #800796: Difference between hash() and __hash__() Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	316 slice_hash(PySliceObject *v)
6b84802c9524 SF bug #800796: Difference between hash() and __hash__() Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	317 {
6b84802c9524 SF bug #800796: Difference between hash() and __hash__() Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	318 PyErr_SetString(PyExc_TypeError, "unhashable type");
6b84802c9524 SF bug #800796: Difference between hash() and __hash__() Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	319 return -1L;
6b84802c9524 SF bug #800796: Difference between hash() and __hash__() Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	320 }
6b84802c9524 SF bug #800796: Difference between hash() and __hash__() Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	321
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	322 PyTypeObject PySlice_Type = {
42333 6620a510e9a9 PEP 3123: Provide forward compatibility with Python 3.0, while keeping Martin v. Löwis <martin@v.loewis.de> parents: 41436 diff changeset	323 PyVarObject_HEAD_INIT(&PyType_Type, 0)
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	324 "slice", /* Name of this type */
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	325 sizeof(PySliceObject), /* Basic object size */
2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	326 0, /* Item size for varobject */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	327 (destructor)slice_dealloc, /* tp_dealloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	328 0, /* tp_print */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	329 0, /* tp_getattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	330 0, /* tp_setattr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	331 (cmpfunc)slice_compare, /* tp_compare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	332 (reprfunc)slice_repr, /* tp_repr */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	333 0, /* tp_as_number */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	334 0, /* tp_as_sequence */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	335 0, /* tp_as_mapping */
30332 6b84802c9524 SF bug #800796: Difference between hash() and __hash__() Raymond Hettinger <python@rcn.com> parents: 26818 diff changeset	336 (hashfunc)slice_hash, /* tp_hash */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	337 0, /* tp_call */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	338 0, /* tp_str */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	339 PyObject_GenericGetAttr, /* tp_getattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	340 0, /* tp_setattro */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	341 0, /* tp_as_buffer */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	342 Py_TPFLAGS_DEFAULT, /* tp_flags */
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	343 slice_doc, /* tp_doc */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	344 0, /* tp_traverse */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	345 0, /* tp_clear */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	346 0, /* tp_richcompare */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	347 0, /* tp_weaklistoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	348 0, /* tp_iter */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	349 0, /* tp_iternext */
24319 c43466f7dae8 A few days ago, Guido said (in the thread "[Python-Dev] Python Michael W. Hudson <mwh@python.net> parents: 23868 diff changeset	350 slice_methods, /* tp_methods */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	351 slice_members, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	352 0, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	353 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 17080 diff changeset	354 0, /* tp_dict */
23868 8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	355 0, /* tp_descr_get */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	356 0, /* tp_descr_set */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	357 0, /* tp_dictoffset */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	358 0, /* tp_init */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	359 0, /* tp_alloc */
8e6760bf1884 SF patch 568629 by Oren Tirosh: types made callable. Guido van Rossum <guido@python.org> parents: 23780 diff changeset	360 slice_new, /* tp_new */
3837 2b2efa48f28d Added sliceobject.c Guido van Rossum <guido@python.org> parents: diff changeset	361 };

Mercurial > cpython-lru_cache-weakref

annotate Objects/sliceobject.c @ 58765:2ba7677bfa95 legacy-trunk