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

annotate Objects/tupleobject.c @ 80661:94de77bd0b4b 2.7

Issue #16194: document imp.load_dynamic problems when read several extension modules from the same binary object file.

author	Andrew Svetlov <andrew.svetlov@gmail.com>
date	Thu, 29 Nov 2012 19:51:28 +0200
parents	bb0390c1d3d4
children

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 */
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	7 #ifndef PyTuple_MAXSAVESIZE
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 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
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	10 #ifndef PyTuple_MAXFREELIST
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 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
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	14 #if PyTuple_MAXSAVESIZE > 0
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 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 */
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	18 static PyTupleObject *free_list[PyTuple_MAXSAVESIZE];
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 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
50627 f0e0c3536e22 Issue #4850: Change COUNT_ALLOCS variables to Py_ssize_t. Martin v. Löwis <martin@v.loewis.de> parents: 49431 diff changeset	22 Py_ssize_t fast_tuple_allocs;
f0e0c3536e22 Issue #4850: Change COUNT_ALLOCS variables to Py_ssize_t. Martin v. Löwis <martin@v.loewis.de> parents: 49431 diff changeset	23 Py_ssize_t tuple_zero_allocs;
1352 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
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	26 /* Debug statistic to count GC tracking of tuples.
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	27 Please note that tuples are only untracked when considered by the GC, and
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	28 many of them will be dead before. Therefore, a tracking rate close to 100%
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	29 does not necessarily prove that the heuristic is inefficient.
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	30 */
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	31 #ifdef SHOW_TRACK_COUNT
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	32 static Py_ssize_t count_untracked = 0;
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	33 static Py_ssize_t count_tracked = 0;
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	34
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	35 static void
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	36 show_track(void)
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	37 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	38 fprintf(stderr, "Tuples created: %" PY_FORMAT_SIZE_T "d\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	39 count_tracked + count_untracked);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	40 fprintf(stderr, "Tuples tracked by the GC: %" PY_FORMAT_SIZE_T
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	41 "d\n", count_tracked);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	42 fprintf(stderr, "%.2f%% tuple tracking rate\n\n",
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	43 (100.0*count_tracked/(count_untracked+count_tracked)));
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	44 }
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	45 #endif
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	46
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	47
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	48 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	49 PyTuple_New(register Py_ssize_t size)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	50 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	51 register PyTupleObject *op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	52 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	53 if (size < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	54 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	55 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	56 }
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	57 #if PyTuple_MAXSAVESIZE > 0
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	58 if (size == 0 && free_list[0]) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	59 op = free_list[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	60 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	61 #ifdef COUNT_ALLOCS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	62 tuple_zero_allocs++;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	63 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	64 return (PyObject *) op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	65 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	66 if (size < PyTuple_MAXSAVESIZE && (op = free_list[size]) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	67 free_list[size] = (PyTupleObject *) op->ob_item[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	68 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	69 #ifdef COUNT_ALLOCS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	70 fast_tuple_allocs++;
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	71 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	72 /* 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	73 #ifdef Py_TRACE_REFS
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	74 Py_SIZE(op) = size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	75 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	76 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	77 _Py_NewReference((PyObject *)op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	78 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	79 else
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	80 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	81 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	82 Py_ssize_t nbytes = size * sizeof(PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	83 /* Check for overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	84 if (nbytes / sizeof(PyObject *) != (size_t)size \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	85 (nbytes > PY_SSIZE_T_MAX - sizeof(PyTupleObject) - sizeof(PyObject *)))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	86 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	87 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	88 }
48113 0aafd1ae5120 Security patches from Apple: prevent int overflow when allocating memory Neal Norwitz <nnorwitz@gmail.com> parents: 46401 diff changeset	89
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	90 op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	91 if (op == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	92 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	93 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	94 for (i=0; i < size; i++)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	95 op->ob_item[i] = NULL;
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	96 #if PyTuple_MAXSAVESIZE > 0
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	97 if (size == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	98 free_list[0] = op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	99 ++numfree[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	100 Py_INCREF(op); /* extra INCREF so that this is never freed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	101 }
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	102 #endif
52292 b3791309e690 The tracking statistics were actually too pessimistic Antoine Pitrou <solipsis@pitrou.net> parents: 52288 diff changeset	103 #ifdef SHOW_TRACK_COUNT
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	104 count_tracked++;
52292 b3791309e690 The tracking statistics were actually too pessimistic Antoine Pitrou <solipsis@pitrou.net> parents: 52288 diff changeset	105 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	106 _PyObject_GC_TRACK(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	107 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	108 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	109
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	110 Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	111 PyTuple_Size(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	112 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	113 if (!PyTuple_Check(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	114 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	115 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	116 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	117 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	118 return Py_SIZE(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	119 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	120
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	121 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	122 PyTuple_GetItem(register PyObject *op, register Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	123 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	124 if (!PyTuple_Check(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	125 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	126 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	127 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	128 if (i < 0 \|\| i >= Py_SIZE(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	129 PyErr_SetString(PyExc_IndexError, "tuple index out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	130 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	131 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	132 return ((PyTupleObject *)op) -> ob_item[i];
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	133 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	134
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	135 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	136 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	137 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	138 register PyObject *olditem;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	139 register PyObject **p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	140 if (!PyTuple_Check(op) \|\| op->ob_refcnt != 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	141 Py_XDECREF(newitem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	142 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	143 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	144 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	145 if (i < 0 \|\| i >= Py_SIZE(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	146 Py_XDECREF(newitem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	147 PyErr_SetString(PyExc_IndexError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	148 "tuple assignment index out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	149 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	150 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	151 p = ((PyTupleObject *)op) -> ob_item + i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	152 olditem = *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	153 *p = newitem;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	154 Py_XDECREF(olditem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	155 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	156 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	157
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	158 void
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	159 _PyTuple_MaybeUntrack(PyObject *op)
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	160 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	161 PyTupleObject *t;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	162 Py_ssize_t i, n;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	163
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	164 if (!PyTuple_CheckExact(op) \|\| !_PyObject_GC_IS_TRACKED(op))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	165 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	166 t = (PyTupleObject *) op;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	167 n = Py_SIZE(t);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	168 for (i = 0; i < n; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	169 PyObject *elt = PyTuple_GET_ITEM(t, i);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	170 /* Tuple with NULL elements aren't
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	171 fully constructed, don't untrack
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	172 them yet. */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	173 if (!elt \|\|
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	174 _PyObject_GC_MAY_BE_TRACKED(elt))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	175 return;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	176 }
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	177 #ifdef SHOW_TRACK_COUNT
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	178 count_tracked--;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	179 count_untracked++;
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	180 #endif
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	181 _PyObject_GC_UNTRACK(op);
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	182 }
0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	183
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	184 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	185 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	186 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	187 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	188 PyObject *o;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	189 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	190 PyObject **items;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	191 va_list vargs;
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	192
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	193 va_start(vargs, n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	194 result = PyTuple_New(n);
78939 bb0390c1d3d4 PyTuple_Pack() was missing va_end() in its error branch which lead to a resource leak. Christian Heimes <christian@cheimes.de> parents: 73407 diff changeset	195 if (result == NULL) {
bb0390c1d3d4 PyTuple_Pack() was missing va_end() in its error branch which lead to a resource leak. Christian Heimes <christian@cheimes.de> parents: 73407 diff changeset	196 va_end(vargs);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	197 return NULL;
78939 bb0390c1d3d4 PyTuple_Pack() was missing va_end() in its error branch which lead to a resource leak. Christian Heimes <christian@cheimes.de> parents: 73407 diff changeset	198 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	199 items = ((PyTupleObject *)result)->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	200 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	201 o = va_arg(vargs, PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	202 Py_INCREF(o);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	203 items[i] = o;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	204 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	205 va_end(vargs);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	206 return result;
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	207 }
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	208
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	209
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	210 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	211
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	212 static void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	213 tupledealloc(register PyTupleObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	214 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	215 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	216 register Py_ssize_t len = Py_SIZE(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	217 PyObject_GC_UnTrack(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	218 Py_TRASHCAN_SAFE_BEGIN(op)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	219 if (len > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	220 i = len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	221 while (--i >= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	222 Py_XDECREF(op->ob_item[i]);
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	223 #if PyTuple_MAXSAVESIZE > 0
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	224 if (len < PyTuple_MAXSAVESIZE &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	225 numfree[len] < PyTuple_MAXFREELIST &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	226 Py_TYPE(op) == &PyTuple_Type)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	227 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	228 op->ob_item[0] = (PyObject *) free_list[len];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	229 numfree[len]++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	230 free_list[len] = op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	231 goto done; /* return */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	232 }
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	233 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	234 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	235 Py_TYPE(op)->tp_free((PyObject *)op);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11673 diff changeset	236 done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	237 Py_TRASHCAN_SAFE_END(op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	238 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	239
288 9b43a983124c printobject now returns an error code Guido van Rossum <guido@python.org> parents: 258 diff changeset	240 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	241 tupleprint(PyTupleObject op, FILE fp, int flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	242 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	243 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	244 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	245 fprintf(fp, "(");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	246 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	247 for (i = 0; i < Py_SIZE(op); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	248 if (i > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	249 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	250 fprintf(fp, ", ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	251 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	252 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	253 if (PyObject_Print(op->ob_item[i], fp, 0) != 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	254 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	255 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	256 i = Py_SIZE(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	257 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	258 if (i == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	259 fprintf(fp, ",");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	260 fprintf(fp, ")");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	261 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	262 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	263 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	264
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	265 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	266 tuplerepr(PyTupleObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	267 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	268 Py_ssize_t i, n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	269 PyObject s, temp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	270 PyObject pieces, result = NULL;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	271
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	272 n = Py_SIZE(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	273 if (n == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	274 return PyString_FromString("()");
46401 97974d967127 Correct previous checkin, probably a svn merge issue. Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46400 diff changeset	275
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	276 /* While not mutable, it is still possible to end up with a cycle in a
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	277 tuple through an object that stores itself within a tuple (and thus
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	278 infinitely asks for the repr of itself). This should only be
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	279 possible within a type. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	280 i = Py_ReprEnter((PyObject *)v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	281 if (i != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	282 return i > 0 ? PyString_FromString("(...)") : NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	283 }
46400 094a9ce4b9bd - Issue #1686386: Tuple's tp_repr did not take into account the possibility of Guido van Rossum <guido@python.org> parents: 39463 diff changeset	284
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	285 pieces = PyTuple_New(n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	286 if (pieces == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	287 return NULL;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	288
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	289 /* Do repr() on each element. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	290 for (i = 0; i < n; ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	291 if (Py_EnterRecursiveCall(" while getting the repr of a tuple"))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	292 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	293 s = PyObject_Repr(v->ob_item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	294 Py_LeaveRecursiveCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	295 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	296 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	297 PyTuple_SET_ITEM(pieces, i, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	298 }
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	299
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	300 /* Add "()" decorations to the first and last items. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	301 assert(n > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	302 s = PyString_FromString("(");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	303 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	304 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	305 temp = PyTuple_GET_ITEM(pieces, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	306 PyString_ConcatAndDel(&s, temp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	307 PyTuple_SET_ITEM(pieces, 0, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	308 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	309 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	310
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	311 s = PyString_FromString(n == 1 ? ",)" : ")");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	312 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	313 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	314 temp = PyTuple_GET_ITEM(pieces, n-1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	315 PyString_ConcatAndDel(&temp, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	316 PyTuple_SET_ITEM(pieces, n-1, temp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	317 if (temp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	318 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	319
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	320 /* Paste them all together with ", " between. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	321 s = PyString_FromString(", ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	322 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	323 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	324 result = _PyString_Join(s, pieces);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	325 Py_DECREF(s);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	326
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	327 Done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	328 Py_DECREF(pieces);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	329 Py_ReprLeave((PyObject *)v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	330 return result;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	331 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	332
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	333 /* The addend 82520, was selected from the range(0, 1000000) for
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	334 generating the greatest number of prime multipliers for tuples
32242 0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	335 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	336
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	337 1082527, 1165049, 1082531, 1165057, 1247581, 1330103, 1082533,
32242 0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	338 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	339 */
0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	340
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	341 static long
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	342 tuplehash(PyTupleObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	343 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	344 register long x, y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	345 register Py_ssize_t len = Py_SIZE(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	346 register PyObject **p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	347 long mult = 1000003L;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	348 x = 0x345678L;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	349 p = v->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	350 while (--len >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	351 y = PyObject_Hash(*p++);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	352 if (y == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	353 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	354 x = (x ^ y) * mult;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	355 /* the cast might truncate len; that doesn't change hash stability */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	356 mult += (long)(82520L + len + len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	357 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	358 x += 97531L;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	359 if (x == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	360 x = -2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	361 return x;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	362 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	363
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	364 static Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	365 tuplelength(PyTupleObject *a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	366 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	367 return Py_SIZE(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	368 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	369
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	370 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	371 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	372 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	373 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	374 int cmp;
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	375
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	376 for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(a); ++i)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	377 cmp = PyObject_RichCompareBool(el, PyTuple_GET_ITEM(a, i),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	378 Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	379 return cmp;
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	380 }
e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	381
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	382 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	383 tupleitem(register PyTupleObject *a, register Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	384 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	385 if (i < 0 \|\| i >= Py_SIZE(a)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	386 PyErr_SetString(PyExc_IndexError, "tuple index out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	387 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	388 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	389 Py_INCREF(a->ob_item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	390 return a->ob_item[i];
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	391 }
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 static PyObject *
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	394 tupleslice(register PyTupleObject *a, register Py_ssize_t ilow,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	395 register Py_ssize_t ihigh)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	396 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	397 register PyTupleObject *np;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	398 PyObject src, dest;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	399 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	400 Py_ssize_t len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	401 if (ilow < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	402 ilow = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	403 if (ihigh > Py_SIZE(a))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	404 ihigh = Py_SIZE(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	405 if (ihigh < ilow)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	406 ihigh = ilow;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	407 if (ilow == 0 && ihigh == Py_SIZE(a) && PyTuple_CheckExact(a)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	408 Py_INCREF(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	409 return (PyObject *)a;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	410 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	411 len = ihigh - ilow;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	412 np = (PyTupleObject *)PyTuple_New(len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	413 if (np == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	414 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	415 src = a->ob_item + ilow;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	416 dest = np->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	417 for (i = 0; i < len; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	418 PyObject *v = src[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	419 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	420 dest[i] = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	421 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	422 return (PyObject *)np;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	423 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	424
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	425 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	426 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	427 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	428 if (op == NULL \|\| !PyTuple_Check(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	429 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	430 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	431 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	432 return tupleslice((PyTupleObject *)op, i, j);
599 a347933a6d92 New function gettupleslice(v, i, j). Guido van Rossum <guido@python.org> parents: 288 diff changeset	433 }
a347933a6d92 New function gettupleslice(v, i, j). Guido van Rossum <guido@python.org> parents: 288 diff changeset	434
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	435 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	436 tupleconcat(register PyTupleObject a, register PyObject bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	437 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	438 register Py_ssize_t size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	439 register Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	440 PyObject src, dest;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	441 PyTupleObject *np;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	442 if (!PyTuple_Check(bb)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	443 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	444 "can only concatenate tuple (not \"%.200s\") to tuple",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	445 Py_TYPE(bb)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	446 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	447 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	448 #define b ((PyTupleObject *)bb)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	449 size = Py_SIZE(a) + Py_SIZE(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	450 if (size < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	451 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	452 np = (PyTupleObject *) PyTuple_New(size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	453 if (np == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	454 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	455 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	456 src = a->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	457 dest = np->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	458 for (i = 0; i < Py_SIZE(a); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	459 PyObject *v = src[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	460 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	461 dest[i] = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	462 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	463 src = b->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	464 dest = np->ob_item + Py_SIZE(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	465 for (i = 0; i < Py_SIZE(b); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	466 PyObject *v = src[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	467 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	468 dest[i] = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	469 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	470 return (PyObject *)np;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	471 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	472 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	473
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	474 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	475 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	476 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	477 Py_ssize_t i, j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	478 Py_ssize_t size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	479 PyTupleObject *np;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	480 PyObject p, items;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	481 if (n < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	482 n = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	483 if (Py_SIZE(a) == 0 \|\| n == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	484 if (PyTuple_CheckExact(a)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	485 /* Since tuples are immutable, we can return a shared
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	486 copy in this case */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	487 Py_INCREF(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	488 return (PyObject *)a;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	489 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	490 if (Py_SIZE(a) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	491 return PyTuple_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	492 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	493 size = Py_SIZE(a) * n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	494 if (size/Py_SIZE(a) != n)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	495 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	496 np = (PyTupleObject *) PyTuple_New(size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	497 if (np == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	498 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	499 p = np->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	500 items = a->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	501 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	502 for (j = 0; j < Py_SIZE(a); j++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	503 *p = items[j];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	504 Py_INCREF(*p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	505 p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	506 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	507 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	508 return (PyObject *) np;
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	509 }
3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	510
45207 3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	511 static PyObject *
3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	512 tupleindex(PyTupleObject self, PyObject args)
3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	513 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	514 Py_ssize_t i, start=0, stop=Py_SIZE(self);
73407 19ffa12ffdd4 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73389 diff changeset	515 PyObject *v;
45207 3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	516
73407 19ffa12ffdd4 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73389 diff changeset	517 if (!PyArg_ParseTuple(args, "O\|O&O&:index", &v,
19ffa12ffdd4 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73389 diff changeset	518 _PyEval_SliceIndex, &start,
19ffa12ffdd4 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73389 diff changeset	519 _PyEval_SliceIndex, &stop))
19ffa12ffdd4 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73389 diff changeset	520 return NULL;
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	521 if (start < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	522 start += Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	523 if (start < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	524 start = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	525 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	526 if (stop < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	527 stop += Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	528 if (stop < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	529 stop = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	530 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	531 for (i = start; i < stop && i < Py_SIZE(self); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	532 int cmp = PyObject_RichCompareBool(self->ob_item[i], v, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	533 if (cmp > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	534 return PyInt_FromSsize_t(i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	535 else if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	536 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	537 }
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	538 PyErr_SetString(PyExc_ValueError, "tuple.index(x): x not in tuple");
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	539 return NULL;
45207 3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	540 }
3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	541
3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	542 static PyObject *
3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	543 tuplecount(PyTupleObject self, PyObject v)
3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	544 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	545 Py_ssize_t count = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	546 Py_ssize_t i;
45207 3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	547
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	548 for (i = 0; i < Py_SIZE(self); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	549 int cmp = PyObject_RichCompareBool(self->ob_item[i], v, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	550 if (cmp > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	551 count++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	552 else if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	553 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	554 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	555 return PyInt_FromSsize_t(count);
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	556 }
3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	557
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	558 static int
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	559 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	560 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	561 Py_ssize_t i;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	562
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	563 for (i = Py_SIZE(o); --i >= 0; )
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	564 Py_VISIT(o->ob_item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	565 return 0;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	566 }
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	567
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	568 static PyObject *
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	569 tuplerichcompare(PyObject v, PyObject w, int op)
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	570 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	571 PyTupleObject vt, wt;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	572 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	573 Py_ssize_t vlen, wlen;
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	574
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	575 if (!PyTuple_Check(v) \|\| !PyTuple_Check(w)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	576 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	577 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	578 }
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	579
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	580 vt = (PyTupleObject *)v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	581 wt = (PyTupleObject *)w;
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	582
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	583 vlen = Py_SIZE(vt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	584 wlen = Py_SIZE(wt);
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	585
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	586 /* Note: the corresponding code for lists has an "early out" test
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	587 * here when op is EQ or NE and the lengths differ. That pays there,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	588 * but Tim was unable to find any real code where EQ/NE tuple
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	589 * compares don't have the same length, so testing for it here would
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	590 * have cost without benefit.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	591 */
17841 2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	592
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	593 /* Search for the first index where items are different.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	594 * Note that because tuples are immutable, it's safe to reuse
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	595 * vlen and wlen across the comparison calls.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	596 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	597 for (i = 0; i < vlen && i < wlen; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	598 int k = PyObject_RichCompareBool(vt->ob_item[i],
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	599 wt->ob_item[i], Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	600 if (k < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	601 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	602 if (!k)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	603 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	604 }
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	605
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	606 if (i >= vlen \|\| i >= wlen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	607 /* No more items to compare -- compare sizes */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	608 int cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	609 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	610 switch (op) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	611 case Py_LT: cmp = vlen < wlen; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	612 case Py_LE: cmp = vlen <= wlen; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	613 case Py_EQ: cmp = vlen == wlen; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	614 case Py_NE: cmp = vlen != wlen; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	615 case Py_GT: cmp = vlen > wlen; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	616 case Py_GE: cmp = vlen >= wlen; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	617 default: return NULL; /* cannot happen */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	618 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	619 if (cmp)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	620 res = Py_True;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	621 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	622 res = Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	623 Py_INCREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	624 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	625 }
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	626
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	627 /* We have an item that differs -- shortcuts for EQ/NE */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	628 if (op == Py_EQ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	629 Py_INCREF(Py_False);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	630 return Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	631 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	632 if (op == Py_NE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	633 Py_INCREF(Py_True);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	634 return Py_True;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	635 }
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	636
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	637 /* Compare the final item again using the proper operator */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	638 return PyObject_RichCompare(vt->ob_item[i], wt->ob_item[i], op);
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	639 }
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	640
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24184 diff changeset	641 static PyObject *
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	642 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	643
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	644 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	645 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	646 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	647 PyObject *arg = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	648 static char *kwlist[] = {"sequence", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	649
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	650 if (type != &PyTuple_Type)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	651 return tuple_subtype_new(type, args, kwds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	652 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|O:tuple", kwlist, &arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	653 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	654
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	655 if (arg == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	656 return PyTuple_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	657 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	658 return PySequence_Tuple(arg);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	659 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	660
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	661 static PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	662 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	663 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	664 PyObject tmp, newobj, *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	665 Py_ssize_t i, n;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	666
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	667 assert(PyType_IsSubtype(type, &PyTuple_Type));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	668 tmp = tuple_new(&PyTuple_Type, args, kwds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	669 if (tmp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	670 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	671 assert(PyTuple_Check(tmp));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	672 newobj = type->tp_alloc(type, n = PyTuple_GET_SIZE(tmp));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	673 if (newobj == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	674 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	675 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	676 item = PyTuple_GET_ITEM(tmp, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	677 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	678 PyTuple_SET_ITEM(newobj, i, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	679 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	680 Py_DECREF(tmp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	681 return newobj;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	682 }
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	683
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	684 PyDoc_STRVAR(tuple_doc,
59223 0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 49431 diff changeset	685 "tuple() -> empty tuple\n\
0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 49431 diff changeset	686 tuple(iterable) -> tuple initialized from iterable's items\n\
0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 49431 diff changeset	687 \n\
0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 49431 diff changeset	688 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	689
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	690 static PySequenceMethods tuple_as_sequence = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	691 (lenfunc)tuplelength, /* sq_length */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	692 (binaryfunc)tupleconcat, /* sq_concat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	693 (ssizeargfunc)tuplerepeat, /* sq_repeat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	694 (ssizeargfunc)tupleitem, /* sq_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	695 (ssizessizeargfunc)tupleslice, /* sq_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	696 0, /* sq_ass_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	697 0, /* sq_ass_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	698 (objobjproc)tuplecontains, /* sq_contains */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	699 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	700
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	701 static PyObject*
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	702 tuplesubscript(PyTupleObject* self, PyObject* item)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	703 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	704 if (PyIndex_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	705 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	706 if (i == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	707 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	708 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	709 i += PyTuple_GET_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	710 return tupleitem(self, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	711 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	712 else if (PySlice_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	713 Py_ssize_t start, stop, step, slicelength, cur, i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	714 PyObject* result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	715 PyObject* it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	716 PyObject src, dest;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	717
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	718 if (PySlice_GetIndicesEx((PySliceObject*)item,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	719 PyTuple_GET_SIZE(self),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	720 &start, &stop, &step, &slicelength) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	721 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	722 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	723
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	724 if (slicelength <= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	725 return PyTuple_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	726 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	727 else if (start == 0 && step == 1 &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	728 slicelength == PyTuple_GET_SIZE(self) &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	729 PyTuple_CheckExact(self)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	730 Py_INCREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	731 return (PyObject *)self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	732 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	733 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	734 result = PyTuple_New(slicelength);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	735 if (!result) return NULL;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	736
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	737 src = self->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	738 dest = ((PyTupleObject *)result)->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	739 for (cur = start, i = 0; i < slicelength;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	740 cur += step, i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	741 it = src[cur];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	742 Py_INCREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	743 dest[i] = it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	744 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	745
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	746 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	747 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	748 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	749 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	750 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	751 "tuple indices must be integers, not %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	752 Py_TYPE(item)->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	753 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	754 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	755 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	756
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	757 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	758 tuple_getnewargs(PyTupleObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	759 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	760 return Py_BuildValue("(N)", tupleslice(v, 0, Py_SIZE(v)));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	761
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	762 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	763
47682 2dfaa0683be8 Fixed: sys.getsizeof does not take the actual length of the tuples into account. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47527 diff changeset	764 static PyObject *
2dfaa0683be8 Fixed: sys.getsizeof does not take the actual length of the tuples into account. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47527 diff changeset	765 tuple_sizeof(PyTupleObject *self)
2dfaa0683be8 Fixed: sys.getsizeof does not take the actual length of the tuples into account. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47527 diff changeset	766 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	767 Py_ssize_t res;
47682 2dfaa0683be8 Fixed: sys.getsizeof does not take the actual length of the tuples into account. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47527 diff changeset	768
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	769 res = PyTuple_Type.tp_basicsize + Py_SIZE(self) * sizeof(PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	770 return PyInt_FromSsize_t(res);
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	771 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	772
45207 3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	773 PyDoc_STRVAR(index_doc,
49431 2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48114 diff changeset	774 "T.index(value, [start, [stop]]) -> integer -- return first index of value.\n"
2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48114 diff changeset	775 "Raises ValueError if the value is not present."
2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48114 diff changeset	776 );
45207 3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	777 PyDoc_STRVAR(count_doc,
3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	778 "T.count(value) -> integer -- return number of occurrences of value");
47682 2dfaa0683be8 Fixed: sys.getsizeof does not take the actual length of the tuples into account. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47527 diff changeset	779 PyDoc_STRVAR(sizeof_doc,
2dfaa0683be8 Fixed: sys.getsizeof does not take the actual length of the tuples into account. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47527 diff changeset	780 "T.__sizeof__() -- size of T in memory, in bytes");
45207 3f124975e099 Issue 2025: Add tuple.count() and tuple.index() to follow the ABC in collections.Sequence. Raymond Hettinger <python@rcn.com> parents: 45191 diff changeset	781
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	782 static PyMethodDef tuple_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	783 {"__getnewargs__", (PyCFunction)tuple_getnewargs, METH_NOARGS},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	784 {"__sizeof__", (PyCFunction)tuple_sizeof, METH_NOARGS, sizeof_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	785 {"index", (PyCFunction)tupleindex, METH_VARARGS, index_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	786 {"count", (PyCFunction)tuplecount, METH_O, count_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	787 {NULL, NULL} /* sentinel */
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	788 };
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	789
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	790 static PyMappingMethods tuple_as_mapping = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	791 (lenfunc)tuplelength,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	792 (binaryfunc)tuplesubscript,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	793 0
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	794 };
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	795
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	796 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	797
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	798 PyTypeObject PyTuple_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	799 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	800 "tuple",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	801 sizeof(PyTupleObject) - sizeof(PyObject *),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	802 sizeof(PyObject *),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	803 (destructor)tupledealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	804 (printfunc)tupleprint, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	805 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	806 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	807 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	808 (reprfunc)tuplerepr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	809 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	810 &tuple_as_sequence, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	811 &tuple_as_mapping, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	812 (hashfunc)tuplehash, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	813 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	814 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	815 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	816 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	817 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	818 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	819 Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_TUPLE_SUBCLASS, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	820 tuple_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	821 (traverseproc)tupletraverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	822 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	823 tuplerichcompare, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	824 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	825 tuple_iter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	826 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	827 tuple_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	828 0, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	829 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	830 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	831 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	832 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	833 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	834 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	835 0, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	836 0, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	837 tuple_new, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	838 PyObject_GC_Del, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	839 };
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	840
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	841 /* 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	842 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	843 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	844 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	845 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	846 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	847
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	848 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	849 _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	850 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	851 register PyTupleObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	852 register PyTupleObject *sv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	853 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	854 Py_ssize_t oldsize;
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1369 diff changeset	855
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	856 v = (PyTupleObject ) pv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	857 if (v == NULL \|\| Py_TYPE(v) != &PyTuple_Type \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	858 (Py_SIZE(v) != 0 && Py_REFCNT(v) != 1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	859 *pv = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	860 Py_XDECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	861 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	862 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	863 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	864 oldsize = Py_SIZE(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	865 if (oldsize == newsize)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	866 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	867
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	868 if (oldsize == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	869 /* Empty tuples are often shared, so we should never
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	870 resize them in-place even if we do own the only
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	871 (current) reference */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	872 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	873 *pv = PyTuple_New(newsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	874 return *pv == NULL ? -1 : 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	875 }
15037 c7d46eae95d8 Simplify _PyTuple_Resize by not using the tuple free list and dropping Neil Schemenauer <nascheme@enme.ucalgary.ca> parents: 14584 diff changeset	876
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	877 /* XXX UNREF/NEWREF interface should be more symmetrical */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	878 _Py_DEC_REFTOTAL;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	879 if (_PyObject_GC_IS_TRACKED(v))
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	880 _PyObject_GC_UNTRACK(v);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	881 _Py_ForgetReference((PyObject *) v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	882 /* DECREF items deleted by shrinkage */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	883 for (i = newsize; i < oldsize; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	884 Py_XDECREF(v->ob_item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	885 v->ob_item[i] = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	886 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	887 sv = PyObject_GC_Resize(PyTupleObject, v, newsize);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	888 if (sv == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	889 *pv = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	890 PyObject_GC_Del(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	891 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	892 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	893 _Py_NewReference((PyObject *) sv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	894 /* Zero out items added by growing */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	895 if (newsize > oldsize)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	896 memset(&sv->ob_item[oldsize], 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	897 sizeof(sv->ob_item) (newsize - oldsize));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	898 pv = (PyObject ) sv;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	899 _PyObject_GC_TRACK(sv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	900 return 0;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	901 }
17975 527d0ffdf099 _PyTuple_Resize: take into account the empty tuple. There can be only one. Thomas Wouters <thomas@python.org> parents: 17841 diff changeset	902
45341 65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45210 diff changeset	903 int
65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45210 diff changeset	904 PyTuple_ClearFreeList(void)
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	905 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	906 int freelist_size = 0;
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44350 diff changeset	907 #if PyTuple_MAXSAVESIZE > 0
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	908 int i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	909 for (i = 1; i < PyTuple_MAXSAVESIZE; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	910 PyTupleObject p, q;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	911 p = free_list[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	912 freelist_size += numfree[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	913 free_list[i] = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	914 numfree[i] = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	915 while (p) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	916 q = p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	917 p = (PyTupleObject *)(p->ob_item[0]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	918 PyObject_GC_Del(q);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	919 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	920 }
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	921 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	922 return freelist_size;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	923 }
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	924
80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	925 void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	926 PyTuple_Fini(void)
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	927 {
45341 65ae68c7aca3 Implemented Martin's suggestion to clear the free lists during the garbage collection of the highest generation. Christian Heimes <christian@cheimes.de> parents: 45210 diff changeset	928 #if PyTuple_MAXSAVESIZE > 0
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	929 /* empty tuples are used all over the place and applications may
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	930 * rely on the fact that an empty tuple is a singleton. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	931 Py_XDECREF(free_list[0]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	932 free_list[0] = NULL;
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	933
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	934 (void)PyTuple_ClearFreeList();
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	935 #endif
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	936 #ifdef SHOW_TRACK_COUNT
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 61265 diff changeset	937 show_track();
52288 0e498a9fde3c Issue #4688: Add a heuristic so that tuples and dicts containing only Antoine Pitrou <solipsis@pitrou.net> parents: 52173 diff changeset	938 #endif
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	939 }
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	940
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	941 /********************* Tuple Iterator ************************/
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	942
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	943 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	944 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	945 long it_index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	946 PyTupleObject it_seq; / Set to NULL when iterator is exhausted */
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	947 } tupleiterobject;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	948
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	949 static void
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	950 tupleiter_dealloc(tupleiterobject *it)
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	951 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	952 _PyObject_GC_UNTRACK(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	953 Py_XDECREF(it->it_seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	954 PyObject_GC_Del(it);
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	955 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	956
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	957 static int
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	958 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	959 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	960 Py_VISIT(it->it_seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	961 return 0;
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	962 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	963
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	964 static PyObject *
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	965 tupleiter_next(tupleiterobject *it)
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	966 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	967 PyTupleObject *seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	968 PyObject *item;
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	969
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	970 assert(it != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	971 seq = it->it_seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	972 if (seq == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	973 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	974 assert(PyTuple_Check(seq));
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	975
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	976 if (it->it_index < PyTuple_GET_SIZE(seq)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	977 item = PyTuple_GET_ITEM(seq, it->it_index);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	978 ++it->it_index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	979 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	980 return item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	981 }
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	982
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	983 Py_DECREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	984 it->it_seq = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	985 return NULL;
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	986 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	987
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	988 static PyObject *
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	989 tupleiter_len(tupleiterobject *it)
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	990 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	991 Py_ssize_t len = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	992 if (it->it_seq)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	993 len = PyTuple_GET_SIZE(it->it_seq) - it->it_index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	994 return PyInt_FromSsize_t(len);
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	995 }
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	996
36484 20f75d5e79e9 Renamed _length_cue() to __length_hint__(). See: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	997 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	998
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	999 static PyMethodDef tupleiter_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1000 {"__length_hint__", (PyCFunction)tupleiter_len, METH_NOARGS, length_hint_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1001 {NULL, NULL} /* sentinel */
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	1002 };
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	1003
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	1004 PyTypeObject PyTupleIter_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1005 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1006 "tupleiterator", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1007 sizeof(tupleiterobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1008 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1009 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1010 (destructor)tupleiter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1011 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1012 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1013 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1014 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1015 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1016 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1017 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1018 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1019 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1020 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1021 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1022 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1023 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1024 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1025 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1026 0, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1027 (traverseproc)tupleiter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1028 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1029 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1030 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1031 PyObject_SelfIter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1032 (iternextfunc)tupleiter_next, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1033 tupleiter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1034 0,
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	1035 };
37602 ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	1036
ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	1037 static PyObject *
ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	1038 tuple_iter(PyObject *seq)
ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	1039 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1040 tupleiterobject *it;
37602 ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	1041
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1042 if (!PyTuple_Check(seq)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1043 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1044 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1045 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1046 it = PyObject_GC_New(tupleiterobject, &PyTupleIter_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1047 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1048 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1049 it->it_index = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1050 Py_INCREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1051 it->it_seq = (PyTupleObject *)seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1052 _PyObject_GC_TRACK(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1053 return (PyObject *)it;
37602 ca95ad5b0fbc Remove "static forward" declaration. Move constructors Martin v. Löwis <martin@v.loewis.de> parents: 37596 diff changeset	1054 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/tupleobject.c @ 80661:94de77bd0b4b 2.7