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

annotate Objects/tupleobject.c @ 49961:e793fc3c8abe

More 3.0 -> 3.1 transistion in the Windows and OS/2 build files

author	Christian Heimes <christian@cheimes.de>
date	Thu, 04 Dec 2008 14:27:25 +0000
parents	bdf4da5d04ad
children	87fbbf22adf3 27db82a5cda9

rev	line source
145 853b736a6a9e Added copyright notice. Guido van Rossum <guido@python.org> parents: 86 diff changeset	1
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Tuple object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	4 #include "Python.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5
12439 456869eaa7d5 Patch by Charles G Waldman to avoid a sneaky memory leak in Guido van Rossum <guido@python.org> parents: 11999 diff changeset	6 /* Speed optimization to avoid frequent malloc/free of small tuples */
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	7 #ifndef PyTuple_MAXSAVESIZE
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	8 #define PyTuple_MAXSAVESIZE 20 /* Largest tuple to save on free list */
12439 456869eaa7d5 Patch by Charles G Waldman to avoid a sneaky memory leak in Guido van Rossum <guido@python.org> parents: 11999 diff changeset	9 #endif
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	10 #ifndef PyTuple_MAXFREELIST
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	11 #define PyTuple_MAXFREELIST 2000 /* Maximum number of tuples of each size to save */
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	12 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	13
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	14 #if PyTuple_MAXSAVESIZE > 0
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	15 /* Entries 1 up to PyTuple_MAXSAVESIZE are free lists, entry 0 is the empty
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	16 tuple () of which at most one instance will be allocated.
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	17 */
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	18 static PyTupleObject *free_list[PyTuple_MAXSAVESIZE];
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	19 static int numfree[PyTuple_MAXSAVESIZE];
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	20 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	21 #ifdef COUNT_ALLOCS
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	22 int fast_tuple_allocs;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	23 int tuple_zero_allocs;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	24 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	25
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	26 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	27 PyTuple_New(register Py_ssize_t size)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	28 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	29 register PyTupleObject *op;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	30 Py_ssize_t i;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	31 if (size < 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	32 PyErr_BadInternalCall();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	33 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	34 }
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	35 #if PyTuple_MAXSAVESIZE > 0
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	36 if (size == 0 && free_list[0]) {
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	37 op = free_list[0];
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	38 Py_INCREF(op);
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	39 #ifdef COUNT_ALLOCS
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	40 tuple_zero_allocs++;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	41 #endif
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	42 return (PyObject *) op;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	43 }
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	44 if (size < PyTuple_MAXSAVESIZE && (op = free_list[size]) != NULL) {
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	45 free_list[size] = (PyTupleObject *) op->ob_item[0];
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	46 numfree[size]--;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	47 #ifdef COUNT_ALLOCS
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	48 fast_tuple_allocs++;
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	49 #endif
24898 a869d2de536f Call me anal, but there was a particular phrase that was speading to Guido van Rossum <guido@python.org> parents: 24683 diff changeset	50 /* Inline PyObject_InitVar */
9632 ac5345814ba0 When tracing references, reset the type and size of tuples allocated Guido van Rossum <guido@python.org> parents: 9484 diff changeset	51 #ifdef Py_TRACE_REFS
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	52 Py_SIZE(op) = size;
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	53 Py_TYPE(op) = &PyTuple_Type;
9632 ac5345814ba0 When tracing references, reset the type and size of tuples allocated Guido van Rossum <guido@python.org> parents: 9484 diff changeset	54 #endif
12576 1c7c2dd1beb1 Vladimir Marangozov's long-awaited malloc restructuring. Guido van Rossum <guido@python.org> parents: 12516 diff changeset	55 _Py_NewReference((PyObject *)op);
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	56 }
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	57 else
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	58 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	59 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	60 Py_ssize_t nbytes = size * sizeof(PyObject *);
11127 9a20038f0b99 Appropriate overflow checks so that things like sys.maxint(1,) can't Guido van Rossum <guido@python.org>* parents: 9632 diff changeset	61 /* Check for overflow */
9a20038f0b99 Appropriate overflow checks so that things like sys.maxint(1,) can't Guido van Rossum <guido@python.org>* parents: 9632 diff changeset	62 if (nbytes / sizeof(PyObject *) != (size_t)size \|\|
48850 afb9808b0f30 Closes release blocker #3627. Neal Norwitz <nnorwitz@gmail.com> parents: 48321 diff changeset	63 (nbytes > PY_SSIZE_T_MAX - sizeof(PyTupleObject) - sizeof(PyObject *)))
11127 9a20038f0b99 Appropriate overflow checks so that things like sys.maxint(1,) can't Guido van Rossum <guido@python.org>* parents: 9632 diff changeset	64 {
9a20038f0b99 Appropriate overflow checks so that things like sys.maxint(1,) can't Guido van Rossum <guido@python.org>* parents: 9632 diff changeset	65 return PyErr_NoMemory();
9a20038f0b99 Appropriate overflow checks so that things like sys.maxint(1,) can't Guido van Rossum <guido@python.org>* parents: 9632 diff changeset	66 }
48850 afb9808b0f30 Closes release blocker #3627. Neal Norwitz <nnorwitz@gmail.com> parents: 48321 diff changeset	67 nbytes += sizeof(PyTupleObject) - sizeof(PyObject *);
afb9808b0f30 Closes release blocker #3627. Neal Norwitz <nnorwitz@gmail.com> parents: 48321 diff changeset	68
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18933 diff changeset	69 op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	70 if (op == NULL)
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18933 diff changeset	71 return NULL;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	72 }
31759 be5d2a07bc26 Restored revision 2.87. Armin Rigo <arigo@tunes.org> parents: 31756 diff changeset	73 for (i=0; i < size; i++)
be5d2a07bc26 Restored revision 2.87. Armin Rigo <arigo@tunes.org> parents: 31756 diff changeset	74 op->ob_item[i] = NULL;
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	75 #if PyTuple_MAXSAVESIZE > 0
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	76 if (size == 0) {
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	77 free_list[0] = op;
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	78 ++numfree[0];
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	79 Py_INCREF(op); /* extra INCREF so that this is never freed */
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	80 }
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	81 #endif
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18933 diff changeset	82 _PyObject_GC_TRACK(op);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	83 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	84 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	85
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	86 Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	87 PyTuple_Size(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	88 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	89 if (!PyTuple_Check(op)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	90 PyErr_BadInternalCall();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	91 return -1;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	92 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	93 else
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	94 return Py_SIZE(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	95 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	96
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	97 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	98 PyTuple_GetItem(register PyObject *op, register Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	99 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	100 if (!PyTuple_Check(op)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	101 PyErr_BadInternalCall();
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	102 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	103 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	104 if (i < 0 \|\| i >= Py_SIZE(op)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	105 PyErr_SetString(PyExc_IndexError, "tuple index out of range");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	106 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	107 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	108 return ((PyTupleObject *)op) -> ob_item[i];
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	109 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	110
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	111 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	112 PyTuple_SetItem(register PyObject op, register Py_ssize_t i, PyObject newitem)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	113 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	114 register PyObject *olditem;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	115 register PyObject **p;
6083 f159044530b1 PyTuple_SetItem should require that the tuple's refcnt is one! Guido van Rossum <guido@python.org> parents: 5936 diff changeset	116 if (!PyTuple_Check(op) \|\| op->ob_refcnt != 1) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	117 Py_XDECREF(newitem);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	118 PyErr_BadInternalCall();
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	119 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	120 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	121 if (i < 0 \|\| i >= Py_SIZE(op)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	122 Py_XDECREF(newitem);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	123 PyErr_SetString(PyExc_IndexError,
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	124 "tuple assignment index out of range");
27 82c7bab78bb1 New errors. Guido van Rossum <guido@python.org> parents: 6 diff changeset	125 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	126 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	127 p = ((PyTupleObject *)op) -> ob_item + i;
2504 425835b88099 a few peephole optimizations Guido van Rossum <guido@python.org> parents: 2059 diff changeset	128 olditem = *p;
425835b88099 a few peephole optimizations Guido van Rossum <guido@python.org> parents: 2059 diff changeset	129 *p = newitem;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	130 Py_XDECREF(olditem);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	131 return 0;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	132 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	133
30682 473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	134 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	135 PyTuple_Pack(Py_ssize_t n, ...)
30682 473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	136 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	137 Py_ssize_t i;
30682 473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	138 PyObject *o;
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	139 PyObject *result;
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	140 PyObject **items;
30682 473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	141 va_list vargs;
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	142
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	143 va_start(vargs, n);
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	144 result = PyTuple_New(n);
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	145 if (result == NULL)
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	146 return NULL;
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	147 items = ((PyTupleObject *)result)->ob_item;
30682 473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	148 for (i = 0; i < n; i++) {
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	149 o = va_arg(vargs, PyObject *);
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	150 Py_INCREF(o);
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	151 items[i] = o;
30682 473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	152 }
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	153 va_end(vargs);
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	154 return result;
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	155 }
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	156
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	157
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	158 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	159
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	160 static void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	161 tupledealloc(register PyTupleObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	162 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	163 register Py_ssize_t i;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	164 register Py_ssize_t len = Py_SIZE(op);
22626 0446eeb787b7 Backport to 2.2.1: Guido van Rossum <guido@python.org> parents: 21293 diff changeset	165 PyObject_GC_UnTrack(op);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11673 diff changeset	166 Py_TRASHCAN_SAFE_BEGIN(op)
12439 456869eaa7d5 Patch by Charles G Waldman to avoid a sneaky memory leak in Guido van Rossum <guido@python.org> parents: 11999 diff changeset	167 if (len > 0) {
456869eaa7d5 Patch by Charles G Waldman to avoid a sneaky memory leak in Guido van Rossum <guido@python.org> parents: 11999 diff changeset	168 i = len;
31759 be5d2a07bc26 Restored revision 2.87. Armin Rigo <arigo@tunes.org> parents: 31756 diff changeset	169 while (--i >= 0)
be5d2a07bc26 Restored revision 2.87. Armin Rigo <arigo@tunes.org> parents: 31756 diff changeset	170 Py_XDECREF(op->ob_item[i]);
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	171 #if PyTuple_MAXSAVESIZE > 0
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	172 if (len < PyTuple_MAXSAVESIZE &&
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	173 numfree[len] < PyTuple_MAXFREELIST &&
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	174 Py_TYPE(op) == &PyTuple_Type)
19612 c396afef1aa9 More stuff discovered while writing the simplest of testcases: Guido van Rossum <guido@python.org> parents: 19592 diff changeset	175 {
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	176 op->ob_item[0] = (PyObject *) free_list[len];
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	177 numfree[len]++;
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	178 free_list[len] = op;
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11673 diff changeset	179 goto done; /* return */
8559 92267838feb9 Slight rearrangement of some code to make it faster, by Vladimir Guido van Rossum <guido@python.org> parents: 6083 diff changeset	180 }
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	181 #endif
8559 92267838feb9 Slight rearrangement of some code to make it faster, by Vladimir Guido van Rossum <guido@python.org> parents: 6083 diff changeset	182 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	183 Py_TYPE(op)->tp_free((PyObject *)op);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11673 diff changeset	184 done:
c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11673 diff changeset	185 Py_TRASHCAN_SAFE_END(op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	186 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	187
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	188 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	189 tuplerepr(PyTupleObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	190 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	191 Py_ssize_t i, n;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	192 PyObject s, temp;
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	193 PyObject pieces, result = NULL;
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	194
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	195 n = Py_SIZE(v);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	196 if (n == 0)
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 40909 diff changeset	197 return PyUnicode_FromString("()");
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	198
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	199 /* While not mutable, it is still possible to end up with a cycle in a
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	200 tuple through an object that stores itself within a tuple (and thus
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	201 infinitely asks for the repr of itself). This should only be
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	202 possible within a type. */
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	203 i = Py_ReprEnter((PyObject *)v);
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	204 if (i != 0) {
46635 fd27ac5fcc81 Fixed a bug in the representation of self-referential tuples. Alexandre Vassalotti <alexandre@peadrop.com> parents: 45371 diff changeset	205 return i > 0 ? PyUnicode_FromString("(...)") : NULL;
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	206 }
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	207
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	208 pieces = PyTuple_New(n);
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	209 if (pieces == NULL)
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	210 return NULL;
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	211
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	212 /* Do repr() on each element. */
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	213 for (i = 0; i < n; ++i) {
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	214 if (Py_EnterRecursiveCall(" while getting the repr of a tuple"))
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	215 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	216 s = PyObject_Repr(v->ob_item[i]);
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	217 Py_LeaveRecursiveCall();
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	218 if (s == NULL)
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	219 goto Done;
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	220 PyTuple_SET_ITEM(pieces, i, s);
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	221 }
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	222
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	223 /* Add "()" decorations to the first and last items. */
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	224 assert(n > 0);
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 40909 diff changeset	225 s = PyUnicode_FromString("(");
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	226 if (s == NULL)
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	227 goto Done;
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	228 temp = PyTuple_GET_ITEM(pieces, 0);
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 40909 diff changeset	229 PyUnicode_AppendAndDel(&s, temp);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	230 PyTuple_SET_ITEM(pieces, 0, s);
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	231 if (s == NULL)
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	232 goto Done;
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	233
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 40909 diff changeset	234 s = PyUnicode_FromString(n == 1 ? ",)" : ")");
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	235 if (s == NULL)
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	236 goto Done;
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	237 temp = PyTuple_GET_ITEM(pieces, n-1);
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 40909 diff changeset	238 PyUnicode_AppendAndDel(&temp, s);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	239 PyTuple_SET_ITEM(pieces, n-1, temp);
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	240 if (temp == NULL)
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	241 goto Done;
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	242
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	243 /* Paste them all together with ", " between. */
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 40909 diff changeset	244 s = PyUnicode_FromString(", ");
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	245 if (s == NULL)
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	246 goto Done;
41769 b29d71d43c80 Add functions PyUnicode_Append() and PyUnicode_AppendAndDel() that mirror Walter Dörwald <walter@livinglogic.de> parents: 40909 diff changeset	247 result = PyUnicode_Join(s, pieces);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	248 Py_DECREF(s);
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	249
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	250 Done:
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	251 Py_DECREF(pieces);
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	252 Py_ReprLeave((PyObject *)v);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	253 return result;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	254 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	255
32242 0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	256 /* The addend 82520, was selected from the range(0, 1000000) for
0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	257 generating the greatest number of prime multipliers for tuples
0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	258 upto length eight:
0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	259
0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	260 1082527, 1165049, 1082531, 1165057, 1247581, 1330103, 1082533,
0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	261 1330111, 1412633, 1165069, 1247599, 1495177, 1577699
0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	262 */
0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	263
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	264 static long
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	265 tuplehash(PyTupleObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	266 {
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	267 register long x, y;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	268 register Py_ssize_t len = Py_SIZE(v);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	269 register PyObject **p;
32171 97b908a9971a SF bug #942952: Weakness in tuple hash Raymond Hettinger <python@rcn.com> parents: 31759 diff changeset	270 long mult = 1000003L;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	271 x = 0x345678L;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	272 p = v->ob_item;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	273 while (--len >= 0) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	274 y = PyObject_Hash(*p++);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	275 if (y == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	276 return -1;
32171 97b908a9971a SF bug #942952: Weakness in tuple hash Raymond Hettinger <python@rcn.com> parents: 31759 diff changeset	277 x = (x ^ y) * mult;
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	278 /* the cast might truncate len; that doesn't change hash stability */
d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	279 mult += (long)(82520L + len + len);
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	280 }
32318 418a0c6bdc7d Add a final permutation step to the tuple hash function. Raymond Hettinger <python@rcn.com> parents: 32242 diff changeset	281 x += 97531L;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	282 if (x == -1)
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	283 x = -2;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	284 return x;
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	285 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	286
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	287 static Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	288 tuplelength(PyTupleObject *a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	289 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	290 return Py_SIZE(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	291 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	292
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	293 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	294 tuplecontains(PyTupleObject a, PyObject el)
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	295 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	296 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	297 int cmp;
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	298
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	299 for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(a); ++i)
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	300 cmp = PyObject_RichCompareBool(el, PyTuple_GET_ITEM(a, i),
25125 172845c09afe Micro-optimization for list_contains. Factored double if test Raymond Hettinger <python@rcn.com> parents: 24898 diff changeset	301 Py_EQ);
25128 f1c69c32c42b PyObject_RichCompareBool() already returns -1, 0, or 1, so return its value Neal Norwitz <nnorwitz@gmail.com> parents: 25125 diff changeset	302 return cmp;
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	303 }
e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	304
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	305 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	306 tupleitem(register PyTupleObject *a, register Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	307 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	308 if (i < 0 \|\| i >= Py_SIZE(a)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	309 PyErr_SetString(PyExc_IndexError, "tuple index out of range");
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	310 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	311 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	312 Py_INCREF(a->ob_item[i]);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	313 return a->ob_item[i];
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	314 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	315
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	316 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	317 tupleslice(register PyTupleObject *a, register Py_ssize_t ilow,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	318 register Py_ssize_t ihigh)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	319 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	320 register PyTupleObject *np;
31623 d34e7eaf4cd6 Optimize tuple_slice() and make further improvements to list_slice() Raymond Hettinger <python@rcn.com> parents: 30682 diff changeset	321 PyObject src, dest;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	322 register Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	323 Py_ssize_t len;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	324 if (ilow < 0)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	325 ilow = 0;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	326 if (ihigh > Py_SIZE(a))
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	327 ihigh = Py_SIZE(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	328 if (ihigh < ilow)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	329 ihigh = ilow;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	330 if (ilow == 0 && ihigh == Py_SIZE(a) && PyTuple_CheckExact(a)) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	331 Py_INCREF(a);
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	332 return (PyObject *)a;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	333 }
31623 d34e7eaf4cd6 Optimize tuple_slice() and make further improvements to list_slice() Raymond Hettinger <python@rcn.com> parents: 30682 diff changeset	334 len = ihigh - ilow;
d34e7eaf4cd6 Optimize tuple_slice() and make further improvements to list_slice() Raymond Hettinger <python@rcn.com> parents: 30682 diff changeset	335 np = (PyTupleObject *)PyTuple_New(len);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	336 if (np == NULL)
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	337 return NULL;
31623 d34e7eaf4cd6 Optimize tuple_slice() and make further improvements to list_slice() Raymond Hettinger <python@rcn.com> parents: 30682 diff changeset	338 src = a->ob_item + ilow;
d34e7eaf4cd6 Optimize tuple_slice() and make further improvements to list_slice() Raymond Hettinger <python@rcn.com> parents: 30682 diff changeset	339 dest = np->ob_item;
d34e7eaf4cd6 Optimize tuple_slice() and make further improvements to list_slice() Raymond Hettinger <python@rcn.com> parents: 30682 diff changeset	340 for (i = 0; i < len; i++) {
d34e7eaf4cd6 Optimize tuple_slice() and make further improvements to list_slice() Raymond Hettinger <python@rcn.com> parents: 30682 diff changeset	341 PyObject *v = src[i];
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	342 Py_INCREF(v);
31623 d34e7eaf4cd6 Optimize tuple_slice() and make further improvements to list_slice() Raymond Hettinger <python@rcn.com> parents: 30682 diff changeset	343 dest[i] = v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	344 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	345 return (PyObject *)np;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	346 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	347
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	348 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	349 PyTuple_GetSlice(PyObject *op, Py_ssize_t i, Py_ssize_t j)
599 a347933a6d92 New function gettupleslice(v, i, j). Guido van Rossum <guido@python.org> parents: 288 diff changeset	350 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	351 if (op == NULL \|\| !PyTuple_Check(op)) {
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	352 PyErr_BadInternalCall();
599 a347933a6d92 New function gettupleslice(v, i, j). Guido van Rossum <guido@python.org> parents: 288 diff changeset	353 return NULL;
a347933a6d92 New function gettupleslice(v, i, j). Guido van Rossum <guido@python.org> parents: 288 diff changeset	354 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	355 return tupleslice((PyTupleObject *)op, i, j);
599 a347933a6d92 New function gettupleslice(v, i, j). Guido van Rossum <guido@python.org> parents: 288 diff changeset	356 }
a347933a6d92 New function gettupleslice(v, i, j). Guido van Rossum <guido@python.org> parents: 288 diff changeset	357
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	358 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	359 tupleconcat(register PyTupleObject a, register PyObject bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	360 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	361 register Py_ssize_t size;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	362 register Py_ssize_t i;
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	363 PyObject src, dest;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	364 PyTupleObject *np;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	365 if (!PyTuple_Check(bb)) {
12816 4272b368bf69 Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	366 PyErr_Format(PyExc_TypeError,
12929 2eef636ba1b6 Michael Hudson <mwh21@cam.ac.uk>: Marc-André Lemburg <mal@egenix.com> parents: 12925 diff changeset	367 "can only concatenate tuple (not \"%.200s\") to tuple",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	368 Py_TYPE(bb)->tp_name);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	369 return NULL;
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	370 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	371 #define b ((PyTupleObject *)bb)
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	372 size = Py_SIZE(a) + Py_SIZE(b);
25740 70f9026a2b16 Add checks for size overflow on listn, list+list, tuple+tuple. Guido van Rossum <guido@python.org>* parents: 25128 diff changeset	373 if (size < 0)
70f9026a2b16 Add checks for size overflow on listn, list+list, tuple+tuple. Guido van Rossum <guido@python.org>* parents: 25128 diff changeset	374 return PyErr_NoMemory();
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	375 np = (PyTupleObject *) PyTuple_New(size);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	376 if (np == NULL) {
288 9b43a983124c printobject now returns an error code Guido van Rossum <guido@python.org> parents: 258 diff changeset	377 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	378 }
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	379 src = a->ob_item;
5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	380 dest = np->ob_item;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	381 for (i = 0; i < Py_SIZE(a); i++) {
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	382 PyObject *v = src[i];
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	383 Py_INCREF(v);
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	384 dest[i] = v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	385 }
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	386 src = b->ob_item;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	387 dest = np->ob_item + Py_SIZE(a);
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	388 for (i = 0; i < Py_SIZE(b); i++) {
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	389 PyObject *v = src[i];
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	390 Py_INCREF(v);
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	391 dest[i] = v;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	392 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	393 return (PyObject *)np;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	394 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	395 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	396
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	397 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	398 tuplerepeat(PyTupleObject *a, Py_ssize_t n)
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	399 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	400 Py_ssize_t i, j;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	401 Py_ssize_t size;
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	402 PyTupleObject *np;
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	403 PyObject p, items;
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	404 if (n < 0)
3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	405 n = 0;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	406 if (Py_SIZE(a) == 0 \|\| n == 1) {
19872 51363348dcfa The endless 460020 bug. Tim Peters <tim.peters@gmail.com> parents: 19657 diff changeset	407 if (PyTuple_CheckExact(a)) {
51363348dcfa The endless 460020 bug. Tim Peters <tim.peters@gmail.com> parents: 19657 diff changeset	408 /* Since tuples are immutable, we can return a shared
51363348dcfa The endless 460020 bug. Tim Peters <tim.peters@gmail.com> parents: 19657 diff changeset	409 copy in this case */
51363348dcfa The endless 460020 bug. Tim Peters <tim.peters@gmail.com> parents: 19657 diff changeset	410 Py_INCREF(a);
51363348dcfa The endless 460020 bug. Tim Peters <tim.peters@gmail.com> parents: 19657 diff changeset	411 return (PyObject *)a;
51363348dcfa The endless 460020 bug. Tim Peters <tim.peters@gmail.com> parents: 19657 diff changeset	412 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	413 if (Py_SIZE(a) == 0)
19872 51363348dcfa The endless 460020 bug. Tim Peters <tim.peters@gmail.com> parents: 19657 diff changeset	414 return PyTuple_New(0);
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	415 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	416 size = Py_SIZE(a) * n;
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	417 if (size/Py_SIZE(a) != n)
11127 9a20038f0b99 Appropriate overflow checks so that things like sys.maxint(1,) can't Guido van Rossum <guido@python.org>* parents: 9632 diff changeset	418 return PyErr_NoMemory();
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	419 np = (PyTupleObject *) PyTuple_New(size);
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	420 if (np == NULL)
3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	421 return NULL;
3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	422 p = np->ob_item;
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	423 items = a->ob_item;
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	424 for (i = 0; i < n; i++) {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	425 for (j = 0; j < Py_SIZE(a); j++) {
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	426 *p = items[j];
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	427 Py_INCREF(*p);
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	428 p++;
3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	429 }
3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	430 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	431 return (PyObject *) np;
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	432 }
3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	433
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	434 static PyObject *
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	435 tupleindex(PyTupleObject self, PyObject args)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	436 {
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	437 Py_ssize_t i, start=0, stop=Py_SIZE(self);
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	438 PyObject *v;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	439
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	440 if (!PyArg_ParseTuple(args, "O\|O&O&:index", &v,
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	441 _PyEval_SliceIndex, &start,
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	442 _PyEval_SliceIndex, &stop))
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	443 return NULL;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	444 if (start < 0) {
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	445 start += Py_SIZE(self);
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	446 if (start < 0)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	447 start = 0;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	448 }
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	449 if (stop < 0) {
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	450 stop += Py_SIZE(self);
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	451 if (stop < 0)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	452 stop = 0;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	453 }
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	454 for (i = start; i < stop && i < Py_SIZE(self); i++) {
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	455 int cmp = PyObject_RichCompareBool(self->ob_item[i], v, Py_EQ);
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	456 if (cmp > 0)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	457 return PyLong_FromSsize_t(i);
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	458 else if (cmp < 0)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	459 return NULL;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	460 }
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	461 PyErr_SetString(PyExc_ValueError, "tuple.index(x): x not in list");
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	462 return NULL;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	463 }
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	464
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	465 static PyObject *
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	466 tuplecount(PyTupleObject self, PyObject v)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	467 {
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	468 Py_ssize_t count = 0;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	469 Py_ssize_t i;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	470
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	471 for (i = 0; i < Py_SIZE(self); i++) {
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	472 int cmp = PyObject_RichCompareBool(self->ob_item[i], v, Py_EQ);
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	473 if (cmp > 0)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	474 count++;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	475 else if (cmp < 0)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	476 return NULL;
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	477 }
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	478 return PyLong_FromSsize_t(count);
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	479 }
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	480
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	481 static int
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	482 tupletraverse(PyTupleObject o, visitproc visit, void arg)
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	483 {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	484 Py_ssize_t i;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	485
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	486 for (i = Py_SIZE(o); --i >= 0; )
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	487 Py_VISIT(o->ob_item[i]);
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	488 return 0;
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	489 }
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	490
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	491 static PyObject *
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	492 tuplerichcompare(PyObject v, PyObject w, int op)
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	493 {
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	494 PyTupleObject vt, wt;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	495 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	496 Py_ssize_t vlen, wlen;
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	497
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	498 if (!PyTuple_Check(v) \|\| !PyTuple_Check(w)) {
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	499 Py_INCREF(Py_NotImplemented);
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	500 return Py_NotImplemented;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	501 }
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	502
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	503 vt = (PyTupleObject *)v;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	504 wt = (PyTupleObject *)w;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	505
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	506 vlen = Py_SIZE(vt);
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	507 wlen = Py_SIZE(wt);
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	508
17841 2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	509 /* Note: the corresponding code for lists has an "early out" test
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	510 * here when op is EQ or NE and the lengths differ. That pays there,
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	511 * but Tim was unable to find any real code where EQ/NE tuple
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	512 * compares don't have the same length, so testing for it here would
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	513 * have cost without benefit.
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	514 */
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	515
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	516 /* Search for the first index where items are different.
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	517 * Note that because tuples are immutable, it's safe to reuse
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	518 * vlen and wlen across the comparison calls.
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	519 */
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	520 for (i = 0; i < vlen && i < wlen; i++) {
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	521 int k = PyObject_RichCompareBool(vt->ob_item[i],
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	522 wt->ob_item[i], Py_EQ);
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	523 if (k < 0)
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	524 return NULL;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	525 if (!k)
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	526 break;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	527 }
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	528
17841 2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	529 if (i >= vlen \|\| i >= wlen) {
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	530 /* No more items to compare -- compare sizes */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	531 int cmp;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	532 PyObject *res;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	533 switch (op) {
17841 2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	534 case Py_LT: cmp = vlen < wlen; break;
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	535 case Py_LE: cmp = vlen <= wlen; break;
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	536 case Py_EQ: cmp = vlen == wlen; break;
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	537 case Py_NE: cmp = vlen != wlen; break;
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	538 case Py_GT: cmp = vlen > wlen; break;
2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	539 case Py_GE: cmp = vlen >= wlen; break;
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	540 default: return NULL; /* cannot happen */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	541 }
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	542 if (cmp)
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	543 res = Py_True;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	544 else
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	545 res = Py_False;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	546 Py_INCREF(res);
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	547 return res;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	548 }
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	549
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	550 /* We have an item that differs -- shortcuts for EQ/NE */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	551 if (op == Py_EQ) {
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	552 Py_INCREF(Py_False);
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	553 return Py_False;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	554 }
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	555 if (op == Py_NE) {
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	556 Py_INCREF(Py_True);
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	557 return Py_True;
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	558 }
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	559
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	560 /* Compare the final item again using the proper operator */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	561 return PyObject_RichCompare(vt->ob_item[i], wt->ob_item[i], op);
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	562 }
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	563
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24184 diff changeset	564 static PyObject *
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	565 tuple_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds);
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	566
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	567 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	568 tuple_new(PyTypeObject type, PyObject args, PyObject *kwds)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	569 {
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	570 PyObject *arg = NULL;
36675 dba6494735d0 Revert backwards-incompatible const changes. Martin v. Löwis <martin@v.loewis.de> parents: 36519 diff changeset	571 static char *kwlist[] = {"sequence", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	572
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	573 if (type != &PyTuple_Type)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	574 return tuple_subtype_new(type, args, kwds);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	575 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|O:tuple", kwlist, &arg))
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	576 return NULL;
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	577
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	578 if (arg == NULL)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	579 return PyTuple_New(0);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	580 else
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	581 return PySequence_Tuple(arg);
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	582 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	583
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	584 static PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	585 tuple_subtype_new(PyTypeObject type, PyObject args, PyObject *kwds)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	586 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	587 PyObject tmp, newobj, *item;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	588 Py_ssize_t i, n;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	589
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	590 assert(PyType_IsSubtype(type, &PyTuple_Type));
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	591 tmp = tuple_new(&PyTuple_Type, args, kwds);
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	592 if (tmp == NULL)
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	593 return NULL;
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	594 assert(PyTuple_Check(tmp));
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	595 newobj = type->tp_alloc(type, n = PyTuple_GET_SIZE(tmp));
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	596 if (newobj == NULL)
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	597 return NULL;
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	598 for (i = 0; i < n; i++) {
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	599 item = PyTuple_GET_ITEM(tmp, i);
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	600 Py_INCREF(item);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	601 PyTuple_SET_ITEM(newobj, i, item);
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	602 }
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	603 Py_DECREF(tmp);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	604 return newobj;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	605 }
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	606
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	607 PyDoc_STRVAR(tuple_doc,
19657 937965516b54 Rewrite the tuple() docstring to parallel the list() docstring. Tim Peters <tim.peters@gmail.com> parents: 19656 diff changeset	608 "tuple() -> an empty tuple\n"
937965516b54 Rewrite the tuple() docstring to parallel the list() docstring. Tim Peters <tim.peters@gmail.com> parents: 19656 diff changeset	609 "tuple(sequence) -> tuple initialized from sequence's items\n"
937965516b54 Rewrite the tuple() docstring to parallel the list() docstring. Tim Peters <tim.peters@gmail.com> parents: 19656 diff changeset	610 "\n"
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	611 "If the argument is a tuple, the return value is the same object.");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	612
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	613 static PySequenceMethods tuple_as_sequence = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	614 (lenfunc)tuplelength, /* sq_length */
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	615 (binaryfunc)tupleconcat, /* sq_concat */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	616 (ssizeargfunc)tuplerepeat, /* sq_repeat */
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	617 (ssizeargfunc)tupleitem, /* sq_item */
43100 4e6b4ba60c3b Remove the simple slicing API. All slicing is now done with slice objects. Thomas Wouters <thomas@python.org> parents: 42954 diff changeset	618 0, /* sq_slice */
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	619 0, /* sq_ass_item */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	620 0, /* sq_ass_slice */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	621 (objobjproc)tuplecontains, /* sq_contains */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	622 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	623
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	624 static PyObject*
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	625 tuplesubscript(PyTupleObject* self, PyObject* item)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	626 {
39610 3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	627 if (PyIndex_Check(item)) {
3674f20ac781 Merge current trunk into p3yk. This includes the PyNumber_Index API change, Thomas Wouters <thomas@python.org> parents: 39222 diff changeset	628 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	629 if (i == -1 && PyErr_Occurred())
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	630 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	631 if (i < 0)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	632 i += PyTuple_GET_SIZE(self);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	633 return tupleitem(self, i);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	634 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	635 else if (PySlice_Check(item)) {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	636 Py_ssize_t start, stop, step, slicelength, cur, i;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	637 PyObject* result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	638 PyObject* it;
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	639 PyObject src, dest;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	640
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	641 if (PySlice_GetIndicesEx((PySliceObject*)item,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	642 PyTuple_GET_SIZE(self),
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	643 &start, &stop, &step, &slicelength) < 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	644 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	645 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	646
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	647 if (slicelength <= 0) {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	648 return PyTuple_New(0);
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	649 }
42954 27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42477 diff changeset	650 else if (start == 0 && step == 1 &&
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42477 diff changeset	651 slicelength == PyTuple_GET_SIZE(self) &&
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42477 diff changeset	652 PyTuple_CheckExact(self)) {
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42477 diff changeset	653 Py_INCREF(self);
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42477 diff changeset	654 return (PyObject *)self;
27f0289b6835 Merge the trunk changes in. Breaks socket.ssl for now. Thomas Wouters <thomas@python.org> parents: 42477 diff changeset	655 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	656 else {
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	657 result = PyTuple_New(slicelength);
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	658 if (!result) return NULL;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	659
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	660 src = self->ob_item;
5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	661 dest = ((PyTupleObject *)result)->ob_item;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	662 for (cur = start, i = 0; i < slicelength;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	663 cur += step, i++) {
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	664 it = src[cur];
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	665 Py_INCREF(it);
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31623 diff changeset	666 dest[i] = it;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	667 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	668
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	669 return result;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	670 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	671 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	672 else {
40450 cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	673 PyErr_Format(PyExc_TypeError,
cc992d75d5b3 Four months of trunk changes (including a few releases...) Thomas Wouters <thomas@python.org> parents: 39610 diff changeset	674 "tuple indices must be integers, not %.200s",
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	675 Py_TYPE(item)->tp_name);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	676 return NULL;
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	677 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	678 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	679
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	680 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	681 tuple_getnewargs(PyTupleObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	682 {
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	683 return Py_BuildValue("(N)", tupleslice(v, 0, Py_SIZE(v)));
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	684
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	685 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	686
48321 f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	687 static PyObject *
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	688 tuple_sizeof(PyTupleObject *self)
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	689 {
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	690 Py_ssize_t res;
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	691
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	692 res = PyTuple_Type.tp_basicsize + Py_SIZE(self) * sizeof(PyObject *);
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	693 return PyLong_FromSsize_t(res);
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	694 }
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	695
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	696 PyDoc_STRVAR(index_doc,
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 48850 diff changeset	697 "T.index(value, [start, [stop]]) -> integer -- return first index of value.\n"
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 48850 diff changeset	698 "Raises ValueError if the value is not present."
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 48850 diff changeset	699 );
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	700 PyDoc_STRVAR(count_doc,
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	701 "T.count(value) -> integer -- return number of occurrences of value");
48321 f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	702 PyDoc_STRVAR(sizeof_doc,
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	703 "T.__sizeof__() -- size of T in memory, in bytes");
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	704
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	705 static PyMethodDef tuple_methods[] = {
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	706 {"__getnewargs__", (PyCFunction)tuple_getnewargs, METH_NOARGS},
48321 f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	707 {"__sizeof__", (PyCFunction)tuple_sizeof, METH_NOARGS, sizeof_doc},
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	708 {"index", (PyCFunction)tupleindex, METH_VARARGS, index_doc},
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	709 {"count", (PyCFunction)tuplecount, METH_O, count_doc},
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	710 {NULL, NULL} /* sentinel */
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	711 };
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	712
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	713 static PyMappingMethods tuple_as_mapping = {
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	714 (lenfunc)tuplelength,
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	715 (binaryfunc)tuplesubscript,
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	716 0
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	717 };
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	718
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	719 static PyObject tuple_iter(PyObject seq);
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	720
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	721 PyTypeObject PyTuple_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41769 diff changeset	722 PyVarObject_HEAD_INIT(&PyType_Type, 0)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	723 "tuple",
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18933 diff changeset	724 sizeof(PyTupleObject) - sizeof(PyObject *),
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	725 sizeof(PyObject *),
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	726 (destructor)tupledealloc, /* tp_dealloc */
42477 e7fd327e0c19 Kill all uses and definitions of tp_print under Objects/. (Others will follow.) Guido van Rossum <guido@python.org> parents: 42334 diff changeset	727 0, /* tp_print */
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	728 0, /* tp_getattr */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	729 0, /* tp_setattr */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	730 0, /* tp_compare */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	731 (reprfunc)tuplerepr, /* tp_repr */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	732 0, /* tp_as_number */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	733 &tuple_as_sequence, /* tp_as_sequence */
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	734 &tuple_as_mapping, /* tp_as_mapping */
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	735 (hashfunc)tuplehash, /* tp_hash */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	736 0, /* tp_call */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	737 0, /* tp_str */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	738 PyObject_GenericGetAttr, /* tp_getattro */
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	739 0, /* tp_setattro */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	740 0, /* tp_as_buffer */
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	741 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
40909 f2f0b41f270d Merged revisions 53875-53911 via svnmerge from Thomas Wouters <thomas@python.org> parents: 40450 diff changeset	742 Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_TUPLE_SUBCLASS, /* tp_flags */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	743 tuple_doc, /* tp_doc */
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	744 (traverseproc)tupletraverse, /* tp_traverse */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	745 0, /* tp_clear */
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	746 tuplerichcompare, /* tp_richcompare */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	747 0, /* tp_weaklistoffset */
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	748 tuple_iter, /* tp_iter */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	749 0, /* tp_iternext */
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	750 tuple_methods, /* tp_methods */
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	751 0, /* tp_members */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	752 0, /* tp_getset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	753 0, /* tp_base */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	754 0, /* tp_dict */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	755 0, /* tp_descr_get */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	756 0, /* tp_descr_set */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	757 0, /* tp_dictoffset */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	758 0, /* tp_init */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	759 0, /* tp_alloc */
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	760 tuple_new, /* tp_new */
22979 9fe94c01eaf1 PyObject_GC_Del can now be used as a function designator. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 22626 diff changeset	761 PyObject_GC_Del, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	762 };
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	763
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	764 /* The following function breaks the notion that tuples are immutable:
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	765 it changes the size of a tuple. We get away with this only if there
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	766 is only one module referencing the object. You can also think of it
15037 c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	767 as creating a new tuple object and destroying the old one, only more
c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	768 efficiently. In any case, don't use this if the tuple may already be
17976 d579a5d8b3fe Cruft cleanup: Removed the unused last_is_sticky argument from the internal Tim Peters <tim.peters@gmail.com> parents: 17975 diff changeset	769 known to some other part of the code. */
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	770
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	771 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	772 _PyTuple_Resize(PyObject **pv, Py_ssize_t newsize)
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	773 {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	774 register PyTupleObject *v;
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	775 register PyTupleObject *sv;
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	776 Py_ssize_t i;
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	777 Py_ssize_t oldsize;
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1369 diff changeset	778
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	779 v = (PyTupleObject ) pv;
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	780 if (v == NULL \|\| Py_TYPE(v) != &PyTuple_Type \|\|
86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	781 (Py_SIZE(v) != 0 && Py_REFCNT(v) != 1)) {
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	782 *pv = 0;
15037 c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	783 Py_XDECREF(v);
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	784 PyErr_BadInternalCall();
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	785 return -1;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	786 }
44351 86a2679dca46 #1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Christian Heimes <christian@cheimes.de> parents: 44099 diff changeset	787 oldsize = Py_SIZE(v);
21293 b810c30b4aa1 _PyTuple_Resize(): this dumped core on tuple(globals()) for me. Turns Guido van Rossum <guido@python.org> parents: 20277 diff changeset	788 if (oldsize == newsize)
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1369 diff changeset	789 return 0;
15037 c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	790
21293 b810c30b4aa1 _PyTuple_Resize(): this dumped core on tuple(globals()) for me. Turns Guido van Rossum <guido@python.org> parents: 20277 diff changeset	791 if (oldsize == 0) {
17975 527d0ffdf099 _PyTuple_Resize: take into account the empty tuple. There can be only one. Thomas Wouters <thomas@python.org> parents: 17841 diff changeset	792 /* Empty tuples are often shared, so we should never
527d0ffdf099 _PyTuple_Resize: take into account the empty tuple. There can be only one. Thomas Wouters <thomas@python.org> parents: 17841 diff changeset	793 resize them in-place even if we do own the only
527d0ffdf099 _PyTuple_Resize: take into account the empty tuple. There can be only one. Thomas Wouters <thomas@python.org> parents: 17841 diff changeset	794 (current) reference */
527d0ffdf099 _PyTuple_Resize: take into account the empty tuple. There can be only one. Thomas Wouters <thomas@python.org> parents: 17841 diff changeset	795 Py_DECREF(v);
527d0ffdf099 _PyTuple_Resize: take into account the empty tuple. There can be only one. Thomas Wouters <thomas@python.org> parents: 17841 diff changeset	796 *pv = PyTuple_New(newsize);
17979 192d36869445 _PyTuple_Resize: guard against PyTuple_New() returning NULL, using Tim's Thomas Wouters <thomas@python.org> parents: 17976 diff changeset	797 return *pv == NULL ? -1 : 0;
17975 527d0ffdf099 _PyTuple_Resize: take into account the empty tuple. There can be only one. Thomas Wouters <thomas@python.org> parents: 17841 diff changeset	798 }
527d0ffdf099 _PyTuple_Resize: take into account the empty tuple. There can be only one. Thomas Wouters <thomas@python.org> parents: 17841 diff changeset	799
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	800 /* XXX UNREF/NEWREF interface should be more symmetrical */
24184 c4dcb80f48ea object.h special-build macro minefield: renamed all the new lexical Tim Peters <tim.peters@gmail.com> parents: 23952 diff changeset	801 _Py_DEC_REFTOTAL;
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18933 diff changeset	802 _PyObject_GC_UNTRACK(v);
15037 c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	803 _Py_ForgetReference((PyObject *) v);
21293 b810c30b4aa1 _PyTuple_Resize(): this dumped core on tuple(globals()) for me. Turns Guido van Rossum <guido@python.org> parents: 20277 diff changeset	804 /* DECREF items deleted by shrinkage */
b810c30b4aa1 _PyTuple_Resize(): this dumped core on tuple(globals()) for me. Turns Guido van Rossum <guido@python.org> parents: 20277 diff changeset	805 for (i = newsize; i < oldsize; i++) {
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	806 Py_XDECREF(v->ob_item[i]);
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1369 diff changeset	807 v->ob_item[i] = NULL;
a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1369 diff changeset	808 }
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18933 diff changeset	809 sv = PyObject_GC_Resize(PyTupleObject, v, newsize);
15037 c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	810 if (sv == NULL) {
c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	811 *pv = NULL;
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18933 diff changeset	812 PyObject_GC_Del(v);
15037 c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	813 return -1;
12439 456869eaa7d5 Patch by Charles G Waldman to avoid a sneaky memory leak in Guido van Rossum <guido@python.org> parents: 11999 diff changeset	814 }
15037 c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	815 _Py_NewReference((PyObject *) sv);
21293 b810c30b4aa1 _PyTuple_Resize(): this dumped core on tuple(globals()) for me. Turns Guido van Rossum <guido@python.org> parents: 20277 diff changeset	816 /* Zero out items added by growing */
23834 8ae26d9be1b4 SF #561244 Micro optimizations Neal Norwitz <nnorwitz@gmail.com> parents: 23832 diff changeset	817 if (newsize > oldsize)
23952 3834cb0e7be6 Fix for SF bug 571885 Jeremy Hylton <jeremy@alum.mit.edu> parents: 23834 diff changeset	818 memset(&sv->ob_item[oldsize], 0,
3834cb0e7be6 Fix for SF bug 571885 Jeremy Hylton <jeremy@alum.mit.edu> parents: 23834 diff changeset	819 sizeof(sv->ob_item) (newsize - oldsize));
15037 c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	820 pv = (PyObject ) sv;
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18933 diff changeset	821 _PyObject_GC_TRACK(sv);
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	822 return 0;
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	823 }
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	824
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	825 int
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	826 PyTuple_ClearFreeList(void)
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	827 {
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	828 int freelist_size = 0;
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	829 #if PyTuple_MAXSAVESIZE > 0
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	830 int i;
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	831 for (i = 1; i < PyTuple_MAXSAVESIZE; i++) {
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	832 PyTupleObject p, q;
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	833 p = free_list[i];
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	834 freelist_size += numfree[i];
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	835 free_list[i] = NULL;
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	836 numfree[i] = 0;
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	837 while (p) {
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	838 q = p;
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	839 p = (PyTupleObject *)(p->ob_item[0]);
19581 fd48a55ac364 Use new GC API. Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 18933 diff changeset	840 PyObject_GC_Del(q);
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	841 }
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	842 }
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	843 #endif
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	844 return freelist_size;
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	845 }
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	846
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	847 void
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	848 PyTuple_Fini(void)
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	849 {
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	850 #if PyTuple_MAXSAVESIZE > 0
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	851 /* empty tuples are used all over the place and applications may
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	852 * rely on the fact that an empty tuple is a singleton. */
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	853 Py_XDECREF(free_list[0]);
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	854 free_list[0] = NULL;
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	855
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	856 (void)PyTuple_ClearFreeList();
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	857 #endif
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	858 }
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	859
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	860 /********************* Tuple Iterator ************************/
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	861
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	862 typedef struct {
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	863 PyObject_HEAD
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	864 long it_index;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	865 PyTupleObject it_seq; / Set to NULL when iterator is exhausted */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	866 } tupleiterobject;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	867
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	868 static void
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	869 tupleiter_dealloc(tupleiterobject *it)
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	870 {
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	871 _PyObject_GC_UNTRACK(it);
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	872 Py_XDECREF(it->it_seq);
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	873 PyObject_GC_Del(it);
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	874 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	875
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	876 static int
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	877 tupleiter_traverse(tupleiterobject it, visitproc visit, void arg)
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	878 {
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	879 Py_VISIT(it->it_seq);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	880 return 0;
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	881 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	882
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	883 static PyObject *
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	884 tupleiter_next(tupleiterobject *it)
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	885 {
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	886 PyTupleObject *seq;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	887 PyObject *item;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	888
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	889 assert(it != NULL);
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	890 seq = it->it_seq;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	891 if (seq == NULL)
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	892 return NULL;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	893 assert(PyTuple_Check(seq));
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	894
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	895 if (it->it_index < PyTuple_GET_SIZE(seq)) {
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	896 item = PyTuple_GET_ITEM(seq, it->it_index);
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	897 ++it->it_index;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	898 Py_INCREF(item);
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	899 return item;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	900 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	901
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	902 Py_DECREF(seq);
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	903 it->it_seq = NULL;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	904 return NULL;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	905 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	906
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	907 static PyObject *
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	908 tupleiter_len(tupleiterobject *it)
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	909 {
36519 d6d415df0df0 Use Py_ssize_t for counts and sizes. Martin v. Löwis <martin@v.loewis.de> parents: 36501 diff changeset	910 Py_ssize_t len = 0;
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	911 if (it->it_seq)
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	912 len = PyTuple_GET_SIZE(it->it_seq) - it->it_index;
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	913 return PyLong_FromSsize_t(len);
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	914 }
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	915
36484 20f75d5e79e9 Renamed _length_cue() to __length_hint__(). See: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	916 PyDoc_STRVAR(length_hint_doc, "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: 32318 diff changeset	917
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	918 static PyMethodDef tupleiter_methods[] = {
36484 20f75d5e79e9 Renamed _length_cue() to __length_hint__(). See: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	919 {"__length_hint__", (PyCFunction)tupleiter_len, METH_NOARGS, length_hint_doc},
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	920 {NULL, NULL} /* sentinel */
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	921 };
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	922
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	923 PyTypeObject PyTupleIter_Type = {
42334 e70cdce0e8b2 Merged revisions 56467-56482 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 41769 diff changeset	924 PyVarObject_HEAD_INIT(&PyType_Type, 0)
44061 0cc552ab76bd Added all PyTypeObjects to the appropriate header files. Christian Heimes <christian@cheimes.de> parents: 43734 diff changeset	925 "tuple_iterator", /* tp_name */
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	926 sizeof(tupleiterobject), /* tp_basicsize */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	927 0, /* tp_itemsize */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	928 /* methods */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	929 (destructor)tupleiter_dealloc, /* tp_dealloc */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	930 0, /* tp_print */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	931 0, /* tp_getattr */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	932 0, /* tp_setattr */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	933 0, /* tp_compare */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	934 0, /* tp_repr */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	935 0, /* tp_as_number */
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	936 0, /* tp_as_sequence */
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	937 0, /* tp_as_mapping */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	938 0, /* tp_hash */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	939 0, /* tp_call */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	940 0, /* tp_str */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	941 PyObject_GenericGetAttr, /* tp_getattro */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	942 0, /* tp_setattro */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	943 0, /* tp_as_buffer */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	944 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	945 0, /* tp_doc */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	946 (traverseproc)tupleiter_traverse, /* tp_traverse */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	947 0, /* tp_clear */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	948 0, /* tp_richcompare */
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	949 0, /* tp_weaklistoffset */
28320 fd5ef7003469 Renamed PyObject_GenericGetIter to PyObject_SelfIter Raymond Hettinger <python@rcn.com> parents: 28308 diff changeset	950 PyObject_SelfIter, /* tp_iter */
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	951 (iternextfunc)tupleiter_next, /* tp_iternext */
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	952 tupleiter_methods, /* tp_methods */
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	953 0,
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	954 };
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	955
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	956 static PyObject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	957 tuple_iter(PyObject *seq)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	958 {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	959 tupleiterobject *it;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	960
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	961 if (!PyTuple_Check(seq)) {
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	962 PyErr_BadInternalCall();
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	963 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	964 }
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	965 it = PyObject_GC_New(tupleiterobject, &PyTupleIter_Type);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	966 if (it == NULL)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	967 return NULL;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	968 it->it_index = 0;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	969 Py_INCREF(seq);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	970 it->it_seq = (PyTupleObject *)seq;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	971 _PyObject_GC_TRACK(it);
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	972 return (PyObject *)it;
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	973 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/tupleobject.c @ 49961:e793fc3c8abe