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

annotate Objects/tupleobject.c @ 79063:2bdc8c8ea42e

Issue #15977: Fix memory leak in Modules/_ssl.c when the function _set_npn_protocols() is called multiple times

author	Christian Heimes <christian@cheimes.de>
date	Thu, 20 Sep 2012 12:42:54 +0200
parents	033b409f7cd6
children	152d85b2da3a

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"
75875 f34ac2e9d5cf Issue #14387: Do not include accu.h from Python.h. Antoine Pitrou <solipsis@pitrou.net> parents: 74415 diff changeset	5 #include "accu.h"
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
12439 456869eaa7d5 Patch by Charles G Waldman to avoid a sneaky memory leak in Guido van Rossum <guido@python.org> parents: 11999 diff changeset	7 /* Speed optimization to avoid frequent malloc/free of small tuples */
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	8 #ifndef PyTuple_MAXSAVESIZE
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	9 #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	10 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	11 #ifndef PyTuple_MAXFREELIST
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	12 #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	13 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	14
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	15 #if PyTuple_MAXSAVESIZE > 0
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	16 /* 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	17 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	18 */
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	19 static PyTupleObject *free_list[PyTuple_MAXSAVESIZE];
142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	20 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	21 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	22 #ifdef COUNT_ALLOCS
50735 27db82a5cda9 Merged revisions 68381 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49493 diff changeset	23 Py_ssize_t fast_tuple_allocs;
27db82a5cda9 Merged revisions 68381 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 49493 diff changeset	24 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	25 #endif
4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	26
52291 94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	27 /* Debug statistic to count GC tracking of tuples.
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	28 Please note that tuples are only untracked when considered by the GC, and
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	29 many of them will be dead before. Therefore, a tracking rate close to 100%
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	30 does not necessarily prove that the heuristic is inefficient.
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	31 */
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	32 #ifdef SHOW_TRACK_COUNT
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	33 static Py_ssize_t count_untracked = 0;
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	34 static Py_ssize_t count_tracked = 0;
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	35
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	36 static void
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	37 show_track(void)
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	38 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	39 fprintf(stderr, "Tuples created: %" PY_FORMAT_SIZE_T "d\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	40 count_tracked + count_untracked);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	41 fprintf(stderr, "Tuples tracked by the GC: %" PY_FORMAT_SIZE_T
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	42 "d\n", count_tracked);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	43 fprintf(stderr, "%.2f%% tuple tracking rate\n\n",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	44 (100.0*count_tracked/(count_untracked+count_tracked)));
52291 94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	45 }
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	46 #endif
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	47
77577 d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	48 /* Print summary info about the state of the optimized allocator */
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	49 void
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	50 _PyTuple_DebugMallocStats(FILE *out)
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	51 {
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	52 #if PyTuple_MAXSAVESIZE > 0
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	53 int i;
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	54 char buf[128];
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	55 for (i = 1; i < PyTuple_MAXSAVESIZE; i++) {
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	56 PyOS_snprintf(buf, sizeof(buf),
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	57 "free %d-sized PyTupleObject", i);
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	58 _PyDebugAllocatorStats(out,
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	59 buf,
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	60 numfree[i], _PyObject_VAR_SIZE(&PyTuple_Type, i));
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	61 }
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	62 #endif
d63a80abfbec Issue #14785: Add sys._debugmallocstats() to help debug low-level memory allocation issues David Malcolm <dmalcolm@redhat.com> parents: 76105 diff changeset	63 }
52291 94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	64
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	65 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	66 PyTuple_New(register Py_ssize_t size)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	67 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	68 register PyTupleObject *op;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	69 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	70 if (size < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	71 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	72 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	73 }
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	74 #if PyTuple_MAXSAVESIZE > 0
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	75 if (size == 0 && free_list[0]) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	76 op = free_list[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	77 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	78 #ifdef COUNT_ALLOCS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	79 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	80 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	81 return (PyObject *) op;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	82 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	83 if (size < PyTuple_MAXSAVESIZE && (op = free_list[size]) != NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	84 free_list[size] = (PyTupleObject *) op->ob_item[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	85 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	86 #ifdef COUNT_ALLOCS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	87 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	88 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	89 /* 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	90 #ifdef Py_TRACE_REFS
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	91 Py_SIZE(op) = size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	92 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	93 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	94 _Py_NewReference((PyObject *)op);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	95 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	96 else
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	97 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	98 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	99 Py_ssize_t nbytes = size * sizeof(PyObject *);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	100 /* Check for overflow */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	101 if (nbytes / sizeof(PyObject *) != (size_t)size \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	102 (nbytes > PY_SSIZE_T_MAX - sizeof(PyTupleObject) - sizeof(PyObject *)))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	103 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	104 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	105 }
68102 e2f96bd29252 Issue #8914: fix various warnings from the Clang static analyzer v254. Brett Cannon <bcannon@gmail.com> parents: 66664 diff changeset	106 /* nbytes += sizeof(PyTupleObject) - sizeof(PyObject ); /
48850 afb9808b0f30 Closes release blocker #3627. Neal Norwitz <nnorwitz@gmail.com> parents: 48321 diff changeset	107
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	108 op = PyObject_GC_NewVar(PyTupleObject, &PyTuple_Type, size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	109 if (op == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	110 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	111 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	112 for (i=0; i < size; i++)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	113 op->ob_item[i] = NULL;
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	114 #if PyTuple_MAXSAVESIZE > 0
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	115 if (size == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	116 free_list[0] = op;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	117 ++numfree[0];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	118 Py_INCREF(op); /* extra INCREF so that this is never freed */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	119 }
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	120 #endif
52293 67fb9032d43a Merged revisions 70550 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52291 diff changeset	121 #ifdef SHOW_TRACK_COUNT
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	122 count_tracked++;
52293 67fb9032d43a Merged revisions 70550 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52291 diff changeset	123 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	124 _PyObject_GC_TRACK(op);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	125 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	126 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	127
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	128 Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	129 PyTuple_Size(register PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	130 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	131 if (!PyTuple_Check(op)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	132 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	133 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	134 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	135 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	136 return Py_SIZE(op);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	137 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	138
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	139 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	140 PyTuple_GetItem(register PyObject *op, register Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	141 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	142 if (!PyTuple_Check(op)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	143 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	144 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	145 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	146 if (i < 0 \|\| i >= Py_SIZE(op)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	147 PyErr_SetString(PyExc_IndexError, "tuple index out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	148 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	149 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	150 return ((PyTupleObject *)op) -> ob_item[i];
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	151 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	152
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	153 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	154 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	155 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	156 register PyObject *olditem;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	157 register PyObject **p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	158 if (!PyTuple_Check(op) \|\| op->ob_refcnt != 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	159 Py_XDECREF(newitem);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	160 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	161 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	162 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	163 if (i < 0 \|\| i >= Py_SIZE(op)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	164 Py_XDECREF(newitem);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	165 PyErr_SetString(PyExc_IndexError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	166 "tuple assignment index out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	167 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	168 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	169 p = ((PyTupleObject *)op) -> ob_item + i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	170 olditem = *p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	171 *p = newitem;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	172 Py_XDECREF(olditem);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	173 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	174 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	175
52291 94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	176 void
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	177 _PyTuple_MaybeUntrack(PyObject *op)
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	178 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	179 PyTupleObject *t;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	180 Py_ssize_t i, n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	181
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	182 if (!PyTuple_CheckExact(op) \|\| !_PyObject_GC_IS_TRACKED(op))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	183 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	184 t = (PyTupleObject *) op;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	185 n = Py_SIZE(t);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	186 for (i = 0; i < n; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	187 PyObject *elt = PyTuple_GET_ITEM(t, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	188 /* Tuple with NULL elements aren't
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	189 fully constructed, don't untrack
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	190 them yet. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	191 if (!elt \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	192 _PyObject_GC_MAY_BE_TRACKED(elt))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	193 return;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	194 }
52291 94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	195 #ifdef SHOW_TRACK_COUNT
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	196 count_tracked--;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	197 count_untracked++;
52291 94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	198 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	199 _PyObject_GC_UNTRACK(op);
52291 94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	200 }
94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	201
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	202 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	203 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	204 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	205 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	206 PyObject *o;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	207 PyObject *result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	208 PyObject **items;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	209 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	210
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	211 va_start(vargs, n);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	212 result = PyTuple_New(n);
78937 bbc580e004d7 PyTuple_Pack() was missing va_end() in its error branch which lead to a resource leak. Christian Heimes <christian@cheimes.de> parents: 75875 diff changeset	213 if (result == NULL) {
bbc580e004d7 PyTuple_Pack() was missing va_end() in its error branch which lead to a resource leak. Christian Heimes <christian@cheimes.de> parents: 75875 diff changeset	214 va_end(vargs);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	215 return NULL;
78937 bbc580e004d7 PyTuple_Pack() was missing va_end() in its error branch which lead to a resource leak. Christian Heimes <christian@cheimes.de> parents: 75875 diff changeset	216 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	217 items = ((PyTupleObject *)result)->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	218 for (i = 0; i < n; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	219 o = va_arg(vargs, PyObject *);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	220 Py_INCREF(o);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	221 items[i] = o;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	222 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	223 va_end(vargs);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	224 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	225 }
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	226
473f4e2959a8 Extended tuple's C API to include a new function, PyTuple_Pack() that is Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	227
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	228 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	229
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	230 static void
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	231 tupledealloc(register PyTupleObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	232 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	233 register Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	234 register Py_ssize_t len = Py_SIZE(op);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	235 PyObject_GC_UnTrack(op);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	236 Py_TRASHCAN_SAFE_BEGIN(op)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	237 if (len > 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	238 i = len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	239 while (--i >= 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	240 Py_XDECREF(op->ob_item[i]);
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	241 #if PyTuple_MAXSAVESIZE > 0
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	242 if (len < PyTuple_MAXSAVESIZE &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	243 numfree[len] < PyTuple_MAXFREELIST &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	244 Py_TYPE(op) == &PyTuple_Type)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	245 {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	246 op->ob_item[0] = (PyObject *) free_list[len];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	247 numfree[len]++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	248 free_list[len] = op;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	249 goto done; /* return */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	250 }
1352 4d1a15fc4748 intobject.c: Save references to small integers, so that they can be Sjoerd Mullender <sjoerd@acm.org> parents: 1347 diff changeset	251 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	252 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	253 Py_TYPE(op)->tp_free((PyObject *)op);
11999 c94247b5c355 Christian Tismer's "trashcan" patch: Guido van Rossum <guido@python.org> parents: 11673 diff changeset	254 done:
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	255 Py_TRASHCAN_SAFE_END(op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	256 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	257
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	258 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	259 tuplerepr(PyTupleObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	260 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	261 Py_ssize_t i, n;
72755 f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	262 PyObject *s = NULL;
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	263 _PyAccu acc;
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	264 static PyObject *sep = NULL;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	265
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	266 n = Py_SIZE(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	267 if (n == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	268 return PyUnicode_FromString("()");
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	269
72755 f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	270 if (sep == NULL) {
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	271 sep = PyUnicode_FromString(", ");
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	272 if (sep == NULL)
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	273 return NULL;
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	274 }
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	275
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	276 /* While not mutable, it is still possible to end up with a cycle in a
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	277 tuple through an object that stores itself within a tuple (and thus
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	278 infinitely asks for the repr of itself). This should only be
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	279 possible within a type. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	280 i = Py_ReprEnter((PyObject *)v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	281 if (i != 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	282 return i > 0 ? PyUnicode_FromString("(...)") : NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	283 }
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 43100 diff changeset	284
72755 f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	285 if (_PyAccu_Init(&acc))
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	286 goto error;
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	287
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	288 s = PyUnicode_FromString("(");
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	289 if (s == NULL \|\| _PyAccu_Accumulate(&acc, s))
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	290 goto error;
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	291 Py_CLEAR(s);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	292
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	293 /* Do repr() on each element. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	294 for (i = 0; i < n; ++i) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	295 if (Py_EnterRecursiveCall(" while getting the repr of a tuple"))
72755 f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	296 goto error;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	297 s = PyObject_Repr(v->ob_item[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	298 Py_LeaveRecursiveCall();
72755 f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	299 if (i > 0 && _PyAccu_Accumulate(&acc, sep))
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	300 goto error;
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	301 if (s == NULL \|\| _PyAccu_Accumulate(&acc, s))
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	302 goto error;
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	303 Py_CLEAR(s);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	304 }
72755 f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	305 if (n > 1)
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	306 s = PyUnicode_FromString(")");
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	307 else
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	308 s = PyUnicode_FromString(",)");
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	309 if (s == NULL \|\| _PyAccu_Accumulate(&acc, s))
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	310 goto error;
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	311 Py_CLEAR(s);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	312
72755 f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	313 Py_ReprLeave((PyObject *)v);
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	314 return _PyAccu_Finish(&acc);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17979 diff changeset	315
72755 f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	316 error:
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	317 _PyAccu_Destroy(&acc);
f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	318 Py_XDECREF(s);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	319 Py_ReprLeave((PyObject *)v);
72755 f9f782f2369e Issue #12911: Fix memory consumption when calculating the repr() of huge tuples or lists. Antoine Pitrou <solipsis@pitrou.net> parents: 66664 diff changeset	320 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	321 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	322
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	323 /* The addend 82520, was selected from the range(0, 1000000) for
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	324 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	325 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	326
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	327 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	328 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	329 */
0bdb49a5a8fa Replaced arbitrary addend in tuple_hash with one that is known to generate Raymond Hettinger <python@rcn.com> parents: 32171 diff changeset	330
65494 e8969fb822fc make hashes always the size of pointers; introduce Py_hash_t #9778 Benjamin Peterson <benjamin@python.org> parents: 61466 diff changeset	331 static Py_hash_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	332 tuplehash(PyTupleObject *v)
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	333 {
72464 698fa089ce70 Issue #1621: Fix undefined behaviour in bytes.__hash__, str.__hash__, tuple.__hash__, frozenset.__hash__ and set indexing operations. Mark Dickinson <mdickinson@enthought.com> parents: 71810 diff changeset	334 register Py_uhash_t x;
698fa089ce70 Issue #1621: Fix undefined behaviour in bytes.__hash__, str.__hash__, tuple.__hash__, frozenset.__hash__ and set indexing operations. Mark Dickinson <mdickinson@enthought.com> parents: 71810 diff changeset	335 register Py_hash_t y;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	336 register Py_ssize_t len = Py_SIZE(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	337 register PyObject **p;
74416 40e1be1e0707 Consolidate the occurrances of the prime used as the multiplier when hashing. Gregory P. Smith <greg@krypto.org> parents: 73409 74415 diff changeset	338 Py_uhash_t mult = _PyHASH_MULTIPLIER;
72464 698fa089ce70 Issue #1621: Fix undefined behaviour in bytes.__hash__, str.__hash__, tuple.__hash__, frozenset.__hash__ and set indexing operations. Mark Dickinson <mdickinson@enthought.com> parents: 71810 diff changeset	339 x = 0x345678;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	340 p = v->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	341 while (--len >= 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	342 y = PyObject_Hash(*p++);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	343 if (y == -1)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	344 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	345 x = (x ^ y) * mult;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	346 /* the cast might truncate len; that doesn't change hash stability */
65603 be8ae6b17539 follow up to #9778: define and use an unsigned hash type Benjamin Peterson <benjamin@python.org> parents: 65494 diff changeset	347 mult += (Py_hash_t)(82520L + len + len);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	348 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	349 x += 97531L;
72464 698fa089ce70 Issue #1621: Fix undefined behaviour in bytes.__hash__, str.__hash__, tuple.__hash__, frozenset.__hash__ and set indexing operations. Mark Dickinson <mdickinson@enthought.com> parents: 71810 diff changeset	350 if (x == (Py_uhash_t)-1)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	351 x = -2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	352 return x;
1257 1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	353 }
1cabc2b6c970 * Changed all copyright messages to include 1993. Guido van Rossum <guido@python.org> parents: 795 diff changeset	354
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	355 static Py_ssize_t
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	356 tuplelength(PyTupleObject *a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	357 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	358 return Py_SIZE(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	359 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	360
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	361 static int
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	362 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	363 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	364 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	365 int cmp;
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	366
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	367 for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(a); ++i)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	368 cmp = PyObject_RichCompareBool(el, PyTuple_GET_ITEM(a, i),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	369 Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	370 return cmp;
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	371 }
e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 12439 diff changeset	372
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	373 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	374 tupleitem(register PyTupleObject *a, register Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	375 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	376 if (i < 0 \|\| i >= Py_SIZE(a)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	377 PyErr_SetString(PyExc_IndexError, "tuple index out of range");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	378 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	379 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	380 Py_INCREF(a->ob_item[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	381 return a->ob_item[i];
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	382 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	383
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	384 static PyObject *
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	385 tupleslice(register PyTupleObject *a, register Py_ssize_t ilow,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	386 register Py_ssize_t ihigh)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	387 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	388 register PyTupleObject *np;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	389 PyObject src, dest;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	390 register Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	391 Py_ssize_t len;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	392 if (ilow < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	393 ilow = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	394 if (ihigh > Py_SIZE(a))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	395 ihigh = Py_SIZE(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	396 if (ihigh < ilow)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	397 ihigh = ilow;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	398 if (ilow == 0 && ihigh == Py_SIZE(a) && PyTuple_CheckExact(a)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	399 Py_INCREF(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	400 return (PyObject *)a;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	401 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	402 len = ihigh - ilow;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	403 np = (PyTupleObject *)PyTuple_New(len);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	404 if (np == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	405 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	406 src = a->ob_item + ilow;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	407 dest = np->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	408 for (i = 0; i < len; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	409 PyObject *v = src[i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	410 Py_INCREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	411 dest[i] = v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	412 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	413 return (PyObject *)np;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	414 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	415
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	416 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	417 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	418 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	419 if (op == NULL \|\| !PyTuple_Check(op)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	420 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	421 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	422 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	423 return tupleslice((PyTupleObject *)op, i, j);
599 a347933a6d92 New function gettupleslice(v, i, j). Guido van Rossum <guido@python.org> parents: 288 diff changeset	424 }
a347933a6d92 New function gettupleslice(v, i, j). Guido van Rossum <guido@python.org> parents: 288 diff changeset	425
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	426 static PyObject *
13459 0f95c93f200b ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	427 tupleconcat(register PyTupleObject a, register PyObject bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	428 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	429 register Py_ssize_t size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	430 register Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	431 PyObject src, dest;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	432 PyTupleObject *np;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	433 if (!PyTuple_Check(bb)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	434 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	435 "can only concatenate tuple (not \"%.200s\") to tuple",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	436 Py_TYPE(bb)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	437 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	438 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	439 #define b ((PyTupleObject *)bb)
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	440 size = Py_SIZE(a) + Py_SIZE(b);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	441 if (size < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	442 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	443 np = (PyTupleObject *) PyTuple_New(size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	444 if (np == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	445 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	446 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	447 src = a->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	448 dest = np->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	449 for (i = 0; i < Py_SIZE(a); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	450 PyObject *v = src[i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	451 Py_INCREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	452 dest[i] = v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	453 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	454 src = b->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	455 dest = np->ob_item + Py_SIZE(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	456 for (i = 0; i < Py_SIZE(b); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	457 PyObject *v = src[i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	458 Py_INCREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	459 dest[i] = v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	460 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	461 return (PyObject *)np;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	462 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	463 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	464
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	465 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	466 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	467 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	468 Py_ssize_t i, j;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	469 Py_ssize_t size;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	470 PyTupleObject *np;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	471 PyObject p, items;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	472 if (n < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	473 n = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	474 if (Py_SIZE(a) == 0 \|\| n == 1) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	475 if (PyTuple_CheckExact(a)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	476 /* Since tuples are immutable, we can return a shared
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	477 copy in this case */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	478 Py_INCREF(a);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	479 return (PyObject *)a;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	480 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	481 if (Py_SIZE(a) == 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	482 return PyTuple_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	483 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	484 size = Py_SIZE(a) * n;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	485 if (size/Py_SIZE(a) != n)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	486 return PyErr_NoMemory();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	487 np = (PyTupleObject *) PyTuple_New(size);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	488 if (np == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	489 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	490 p = np->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	491 items = a->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	492 for (i = 0; i < n; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	493 for (j = 0; j < Py_SIZE(a); j++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	494 *p = items[j];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	495 Py_INCREF(*p);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	496 p++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	497 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	498 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	499 return (PyObject *) np;
258 3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	500 }
3b93bcea10f6 Finally implement tuplenumber. From now on all sequence types Guido van Rossum <guido@python.org>* parents: 145 diff changeset	501
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	502 static PyObject *
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	503 tupleindex(PyTupleObject self, PyObject args)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	504 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	505 Py_ssize_t i, start=0, stop=Py_SIZE(self);
73408 ed0e85efac47 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73390 diff changeset	506 PyObject *v;
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	507
73408 ed0e85efac47 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73390 diff changeset	508 if (!PyArg_ParseTuple(args, "O\|O&O&:index", &v,
ed0e85efac47 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73390 diff changeset	509 _PyEval_SliceIndex, &start,
ed0e85efac47 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73390 diff changeset	510 _PyEval_SliceIndex, &stop))
ed0e85efac47 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73390 diff changeset	511 return NULL;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	512 if (start < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	513 start += Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	514 if (start < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	515 start = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	516 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	517 if (stop < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	518 stop += Py_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	519 if (stop < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	520 stop = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	521 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	522 for (i = start; i < stop && i < Py_SIZE(self); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	523 int cmp = PyObject_RichCompareBool(self->ob_item[i], v, Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	524 if (cmp > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	525 return PyLong_FromSsize_t(i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	526 else if (cmp < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	527 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	528 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	529 PyErr_SetString(PyExc_ValueError, "tuple.index(x): x not in tuple");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	530 return NULL;
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	531 }
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	532
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	533 static PyObject *
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	534 tuplecount(PyTupleObject self, PyObject v)
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	535 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	536 Py_ssize_t count = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	537 Py_ssize_t i;
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	538
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	539 for (i = 0; i < Py_SIZE(self); i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	540 int cmp = PyObject_RichCompareBool(self->ob_item[i], v, Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	541 if (cmp > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	542 count++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	543 else if (cmp < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	544 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	545 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	546 return PyLong_FromSsize_t(count);
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	547 }
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	548
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	549 static int
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	550 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	551 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	552 Py_ssize_t i;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	553
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	554 for (i = Py_SIZE(o); --i >= 0; )
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	555 Py_VISIT(o->ob_item[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	556 return 0;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	557 }
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12929 diff changeset	558
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	559 static PyObject *
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	560 tuplerichcompare(PyObject v, PyObject w, int op)
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	561 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	562 PyTupleObject vt, wt;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	563 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	564 Py_ssize_t vlen, wlen;
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	565
71810 d0b0fcbb40db Replace Py_NotImplemented returns with the macro form Py_RETURN_NOTIMPLEMENTED. Brian Curtin <brian@python.org> parents: 68102 diff changeset	566 if (!PyTuple_Check(v) \|\| !PyTuple_Check(w))
d0b0fcbb40db Replace Py_NotImplemented returns with the macro form Py_RETURN_NOTIMPLEMENTED. Brian Curtin <brian@python.org> parents: 68102 diff changeset	567 Py_RETURN_NOTIMPLEMENTED;
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	568
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	569 vt = (PyTupleObject *)v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	570 wt = (PyTupleObject *)w;
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	571
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	572 vlen = Py_SIZE(vt);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	573 wlen = Py_SIZE(wt);
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	574
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	575 /* Note: the corresponding code for lists has an "early out" test
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	576 * here when op is EQ or NE and the lengths differ. That pays there,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	577 * but Tim was unable to find any real code where EQ/NE tuple
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	578 * compares don't have the same length, so testing for it here would
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	579 * have cost without benefit.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	580 */
17841 2b5a9bff1b11 Speed tuple comparisons in two ways: Tim Peters <tim.peters@gmail.com> parents: 15973 diff changeset	581
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	582 /* Search for the first index where items are different.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	583 * Note that because tuples are immutable, it's safe to reuse
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	584 * vlen and wlen across the comparison calls.
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	585 */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	586 for (i = 0; i < vlen && i < wlen; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	587 int k = PyObject_RichCompareBool(vt->ob_item[i],
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	588 wt->ob_item[i], Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	589 if (k < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	590 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	591 if (!k)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	592 break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	593 }
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	594
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	595 if (i >= vlen \|\| i >= wlen) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	596 /* No more items to compare -- compare sizes */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	597 int cmp;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	598 PyObject *res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	599 switch (op) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	600 case Py_LT: cmp = vlen < wlen; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	601 case Py_LE: cmp = vlen <= wlen; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	602 case Py_EQ: cmp = vlen == wlen; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	603 case Py_NE: cmp = vlen != wlen; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	604 case Py_GT: cmp = vlen > wlen; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	605 case Py_GE: cmp = vlen >= wlen; break;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	606 default: return NULL; /* cannot happen */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	607 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	608 if (cmp)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	609 res = Py_True;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	610 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	611 res = Py_False;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	612 Py_INCREF(res);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	613 return res;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	614 }
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	615
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	616 /* We have an item that differs -- shortcuts for EQ/NE */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	617 if (op == Py_EQ) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	618 Py_INCREF(Py_False);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	619 return Py_False;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	620 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	621 if (op == Py_NE) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	622 Py_INCREF(Py_True);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	623 return Py_True;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	624 }
15973 72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	625
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	626 /* Compare the final item again using the proper operator */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	627 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	628 }
72139263f8a7 Same treatment as listobject.c: Guido van Rossum <guido@python.org> parents: 15037 diff changeset	629
24280 1598a1e473e2 staticforward bites the dust. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24184 diff changeset	630 static PyObject *
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	631 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	632
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	633 static PyObject *
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	634 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	635 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	636 PyObject *arg = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	637 static char *kwlist[] = {"sequence", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	638
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	639 if (type != &PyTuple_Type)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	640 return tuple_subtype_new(type, args, kwds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	641 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|O:tuple", kwlist, &arg))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	642 return NULL;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	643
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	644 if (arg == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	645 return PyTuple_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	646 else
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	647 return PySequence_Tuple(arg);
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	648 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18129 diff changeset	649
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	650 static PyObject *
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	651 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	652 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	653 PyObject tmp, newobj, *item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	654 Py_ssize_t i, n;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	655
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	656 assert(PyType_IsSubtype(type, &PyTuple_Type));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	657 tmp = tuple_new(&PyTuple_Type, args, kwds);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	658 if (tmp == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	659 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	660 assert(PyTuple_Check(tmp));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	661 newobj = type->tp_alloc(type, n = PyTuple_GET_SIZE(tmp));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	662 if (newobj == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	663 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	664 for (i = 0; i < n; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	665 item = PyTuple_GET_ITEM(tmp, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	666 Py_INCREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	667 PyTuple_SET_ITEM(newobj, i, item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	668 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	669 Py_DECREF(tmp);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	670 return newobj;
19592 85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	671 }
85765e61deb0 Make str and tuple types subclassable. Guido van Rossum <guido@python.org> parents: 19581 diff changeset	672
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23778 diff changeset	673 PyDoc_STRVAR(tuple_doc,
59224 8d48f9b59689 Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 57667 diff changeset	674 "tuple() -> empty tuple\n\
8d48f9b59689 Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 57667 diff changeset	675 tuple(iterable) -> tuple initialized from iterable's items\n\
8d48f9b59689 Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 57667 diff changeset	676 \n\
8d48f9b59689 Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 57667 diff changeset	677 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	678
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	679 static PySequenceMethods tuple_as_sequence = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	680 (lenfunc)tuplelength, /* sq_length */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	681 (binaryfunc)tupleconcat, /* sq_concat */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	682 (ssizeargfunc)tuplerepeat, /* sq_repeat */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	683 (ssizeargfunc)tupleitem, /* sq_item */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	684 0, /* sq_slice */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	685 0, /* sq_ass_item */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	686 0, /* sq_ass_slice */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	687 (objobjproc)tuplecontains, /* sq_contains */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	688 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	689
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	690 static PyObject*
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	691 tuplesubscript(PyTupleObject* self, PyObject* item)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	692 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	693 if (PyIndex_Check(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	694 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	695 if (i == -1 && PyErr_Occurred())
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	696 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	697 if (i < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	698 i += PyTuple_GET_SIZE(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	699 return tupleitem(self, i);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	700 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	701 else if (PySlice_Check(item)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	702 Py_ssize_t start, stop, step, slicelength, cur, i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	703 PyObject* result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	704 PyObject* it;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	705 PyObject src, dest;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	706
66664 62b61abd02b8 Merge branches/pep-0384. Martin v. Löwis <martin@v.loewis.de> parents: 65603 diff changeset	707 if (PySlice_GetIndicesEx(item,
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	708 PyTuple_GET_SIZE(self),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	709 &start, &stop, &step, &slicelength) < 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	710 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	711 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	712
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	713 if (slicelength <= 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	714 return PyTuple_New(0);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	715 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	716 else if (start == 0 && step == 1 &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	717 slicelength == PyTuple_GET_SIZE(self) &&
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	718 PyTuple_CheckExact(self)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	719 Py_INCREF(self);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	720 return (PyObject *)self;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	721 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	722 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	723 result = PyTuple_New(slicelength);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	724 if (!result) return NULL;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	725
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	726 src = self->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	727 dest = ((PyTupleObject *)result)->ob_item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	728 for (cur = start, i = 0; i < slicelength;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	729 cur += step, i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	730 it = src[cur];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	731 Py_INCREF(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	732 dest[i] = it;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	733 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	734
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	735 return result;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	736 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	737 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	738 else {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	739 PyErr_Format(PyExc_TypeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	740 "tuple indices must be integers, not %.200s",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	741 Py_TYPE(item)->tp_name);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	742 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	743 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	744 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	745
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	746 static PyObject *
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	747 tuple_getnewargs(PyTupleObject *v)
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	748 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	749 return Py_BuildValue("(N)", tupleslice(v, 0, Py_SIZE(v)));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	750
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	751 }
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	752
48321 f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	753 static PyObject *
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	754 tuple_sizeof(PyTupleObject *self)
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	755 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	756 Py_ssize_t res;
48321 f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	757
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	758 res = PyTuple_Type.tp_basicsize + Py_SIZE(self) * sizeof(PyObject *);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	759 return PyLong_FromSsize_t(res);
48321 f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	760 }
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	761
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	762 PyDoc_STRVAR(index_doc,
49493 bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 48850 diff changeset	763 "T.index(value, [start, [stop]]) -> integer -- return first index of value.\n"
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 48850 diff changeset	764 "Raises ValueError if the value is not present."
bdf4da5d04ad merge from trunk Benjamin Peterson <benjamin@python.org> parents: 48850 diff changeset	765 );
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	766 PyDoc_STRVAR(count_doc,
063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	767 "T.count(value) -> integer -- return number of occurrences of value");
48321 f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	768 PyDoc_STRVAR(sizeof_doc,
f6726f32ef70 Merged revisions 64119,64147,64150,64165,64219-64221,64229-64230,64233,64235,64253,64278,64280,64301,64303,64320,64328,64338-64339 via svnmerge from Amaury Forgeot d'Arc <amauryfa@gmail.com> parents: 46635 diff changeset	769 "T.__sizeof__() -- size of T in memory, in bytes");
45206 063d022ac011 Issue 2025: Add index() and count() methods to tuple so that it will follow Raymond Hettinger <python@rcn.com> parents: 45192 diff changeset	770
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	771 static PyMethodDef tuple_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	772 {"__getnewargs__", (PyCFunction)tuple_getnewargs, METH_NOARGS},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	773 {"__sizeof__", (PyCFunction)tuple_sizeof, METH_NOARGS, sizeof_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	774 {"index", (PyCFunction)tupleindex, METH_VARARGS, index_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	775 {"count", (PyCFunction)tuplecount, METH_O, count_doc},
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	776 {NULL, NULL} /* sentinel */
27521 17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	777 };
17bfd5dbc0f1 Implement appropriate __getnewargs__ for all immutable subclassable builtin Guido van Rossum <guido@python.org> parents: 25740 diff changeset	778
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	779 static PyMappingMethods tuple_as_mapping = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	780 (lenfunc)tuplelength,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	781 (binaryfunc)tuplesubscript,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	782 0
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	783 };
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 22979 diff changeset	784
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	785 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	786
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 4733 diff changeset	787 PyTypeObject PyTuple_Type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	788 PyVarObject_HEAD_INIT(&PyType_Type, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	789 "tuple",
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	790 sizeof(PyTupleObject) - sizeof(PyObject *),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	791 sizeof(PyObject *),
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	792 (destructor)tupledealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	793 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	794 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	795 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	796 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	797 (reprfunc)tuplerepr, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	798 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	799 &tuple_as_sequence, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	800 &tuple_as_mapping, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	801 (hashfunc)tuplehash, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	802 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	803 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	804 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	805 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	806 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	807 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	808 Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_TUPLE_SUBCLASS, /* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	809 tuple_doc, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	810 (traverseproc)tupletraverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	811 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	812 tuplerichcompare, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	813 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	814 tuple_iter, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	815 0, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	816 tuple_methods, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	817 0, /* tp_members */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	818 0, /* tp_getset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	819 0, /* tp_base */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	820 0, /* tp_dict */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	821 0, /* tp_descr_get */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	822 0, /* tp_descr_set */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	823 0, /* tp_dictoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	824 0, /* tp_init */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	825 0, /* tp_alloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	826 tuple_new, /* tp_new */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	827 PyObject_GC_Del, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	828 };
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	829
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	830 /* 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	831 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	832 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	833 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	834 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	835 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	836
89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	837 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	838 _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	839 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	840 register PyTupleObject *v;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	841 register PyTupleObject *sv;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	842 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	843 Py_ssize_t oldsize;
1380 a4aa83012af3 Fixed bugs in resizetuple and extended the interface. Sjoerd Mullender <sjoerd@acm.org> parents: 1369 diff changeset	844
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	845 v = (PyTupleObject ) pv;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	846 if (v == NULL \|\| Py_TYPE(v) != &PyTuple_Type \|\|
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	847 (Py_SIZE(v) != 0 && Py_REFCNT(v) != 1)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	848 *pv = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	849 Py_XDECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	850 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	851 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	852 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	853 oldsize = Py_SIZE(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	854 if (oldsize == newsize)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	855 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	856
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	857 if (oldsize == 0) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	858 /* Empty tuples are often shared, so we should never
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	859 resize them in-place even if we do own the only
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	860 (current) reference */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	861 Py_DECREF(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	862 *pv = PyTuple_New(newsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	863 return *pv == NULL ? -1 : 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	864 }
17975 527d0ffdf099 _PyTuple_Resize: take into account the empty tuple. There can be only one. Thomas Wouters <thomas@python.org> parents: 17841 diff changeset	865
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	866 /* XXX UNREF/NEWREF interface should be more symmetrical */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	867 _Py_DEC_REFTOTAL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	868 if (_PyObject_GC_IS_TRACKED(v))
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	869 _PyObject_GC_UNTRACK(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	870 _Py_ForgetReference((PyObject *) v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	871 /* DECREF items deleted by shrinkage */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	872 for (i = newsize; i < oldsize; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	873 Py_XDECREF(v->ob_item[i]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	874 v->ob_item[i] = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	875 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	876 sv = PyObject_GC_Resize(PyTupleObject, v, newsize);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	877 if (sv == NULL) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	878 *pv = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	879 PyObject_GC_Del(v);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	880 return -1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	881 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	882 _Py_NewReference((PyObject *) sv);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	883 /* Zero out items added by growing */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	884 if (newsize > oldsize)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	885 memset(&sv->ob_item[oldsize], 0,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	886 sizeof(sv->ob_item) (newsize - oldsize));
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	887 pv = (PyObject ) sv;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	888 _PyObject_GC_TRACK(sv);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	889 return 0;
1369 89e1e5d9ccbf * compile.[ch]: support for lambda() Guido van Rossum <guido@python.org> parents: 1352 diff changeset	890 }
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	891
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	892 int
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	893 PyTuple_ClearFreeList(void)
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	894 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	895 int freelist_size = 0;
45192 142a11b3057e Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60568-60598,60600-60616 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 44351 diff changeset	896 #if PyTuple_MAXSAVESIZE > 0
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	897 int i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	898 for (i = 1; i < PyTuple_MAXSAVESIZE; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	899 PyTupleObject p, q;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	900 p = free_list[i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	901 freelist_size += numfree[i];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	902 free_list[i] = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	903 numfree[i] = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	904 while (p) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	905 q = p;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	906 p = (PyTupleObject *)(p->ob_item[0]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	907 PyObject_GC_Del(q);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	908 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	909 }
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	910 #endif
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	911 return freelist_size;
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	912 }
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	913
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	914 void
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	915 PyTuple_Fini(void)
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	916 {
7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	917 #if PyTuple_MAXSAVESIZE > 0
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	918 /* empty tuples are used all over the place and applications may
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	919 * rely on the fact that an empty tuple is a singleton. */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	920 Py_XDECREF(free_list[0]);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	921 free_list[0] = NULL;
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	922
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	923 (void)PyTuple_ClearFreeList();
45371 7c4c46342137 Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60845 via svnmerge from Christian Heimes <christian@cheimes.de> parents: 45206 diff changeset	924 #endif
52291 94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	925 #ifdef SHOW_TRACK_COUNT
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	926 show_track();
52291 94bd0666ffa7 Merged revisions 70546 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 52258 diff changeset	927 #endif
5936 80d24364b932 Added _Fini() routines to free up some memory Guido van Rossum <guido@python.org> parents: 5396 diff changeset	928 }
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	929
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	930 /********************* Tuple Iterator ************************/
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	931
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	932 typedef struct {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	933 PyObject_HEAD
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	934 long it_index;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	935 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	936 } tupleiterobject;
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	937
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	938 static void
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	939 tupleiter_dealloc(tupleiterobject *it)
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	940 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	941 _PyObject_GC_UNTRACK(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	942 Py_XDECREF(it->it_seq);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	943 PyObject_GC_Del(it);
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	944 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	945
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	946 static int
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	947 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	948 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	949 Py_VISIT(it->it_seq);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	950 return 0;
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	951 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	952
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	953 static PyObject *
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	954 tupleiter_next(tupleiterobject *it)
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	955 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	956 PyTupleObject *seq;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	957 PyObject *item;
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	958
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	959 assert(it != NULL);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	960 seq = it->it_seq;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	961 if (seq == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	962 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	963 assert(PyTuple_Check(seq));
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	964
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	965 if (it->it_index < PyTuple_GET_SIZE(seq)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	966 item = PyTuple_GET_ITEM(seq, it->it_index);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	967 ++it->it_index;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	968 Py_INCREF(item);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	969 return item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	970 }
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	971
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	972 Py_DECREF(seq);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	973 it->it_seq = NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	974 return NULL;
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	975 }
567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	976
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	977 static PyObject *
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	978 tupleiter_len(tupleiterobject *it)
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	979 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	980 Py_ssize_t len = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	981 if (it->it_seq)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	982 len = PyTuple_GET_SIZE(it->it_seq) - it->it_index;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	983 return PyLong_FromSsize_t(len);
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	984 }
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	985
36484 20f75d5e79e9 Renamed _length_cue() to __length_hint__(). See: Armin Rigo <arigo@tunes.org> parents: 35999 diff changeset	986 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	987
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	988 static PyObject *
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	989 tupleiter_reduce(tupleiterobject *it)
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	990 {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	991 if (it->it_seq)
76105 fb907ee4fdfa Rename _PyIter_GetBuiltin to _PyObject_GetBuiltin, and do not include it in the stable ABI. Antoine Pitrou <solipsis@pitrou.net> parents: 76091 diff changeset	992 return Py_BuildValue("N(O)l", _PyObject_GetBuiltin("iter"),
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	993 it->it_seq, it->it_index);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	994 else
76105 fb907ee4fdfa Rename _PyIter_GetBuiltin to _PyObject_GetBuiltin, and do not include it in the stable ABI. Antoine Pitrou <solipsis@pitrou.net> parents: 76091 diff changeset	995 return Py_BuildValue("N(())", _PyObject_GetBuiltin("iter"));
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	996 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	997
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	998 static PyObject *
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	999 tupleiter_setstate(tupleiterobject it, PyObject state)
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1000 {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1001 long index = PyLong_AsLong(state);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1002 if (index == -1 && PyErr_Occurred())
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1003 return NULL;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1004 if (it->it_seq != NULL) {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1005 if (index < 0)
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1006 index = 0;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1007 else if (it->it_seq != NULL && index > PyTuple_GET_SIZE(it->it_seq))
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1008 index = PyTuple_GET_SIZE(it->it_seq);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1009 it->it_index = index;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1010 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1011 Py_RETURN_NONE;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1012 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1013
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1014 PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1015 PyDoc_STRVAR(setstate_doc, "Set state information for unpickling.");
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1016
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 32318 diff changeset	1017 static PyMethodDef tupleiter_methods[] = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1018 {"__length_hint__", (PyCFunction)tupleiter_len, METH_NOARGS, length_hint_doc},
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1019 {"__reduce__", (PyCFunction)tupleiter_reduce, METH_NOARGS, reduce_doc},
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 75876 diff changeset	1020 {"__setstate__", (PyCFunction)tupleiter_setstate, METH_O, setstate_doc},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1021 {NULL, NULL} /* sentinel */
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	1022 };
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31663 diff changeset	1023
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	1024 PyTypeObject PyTupleIter_Type = {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1025 PyVarObject_HEAD_INIT(&PyType_Type, 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1026 "tuple_iterator", /* tp_name */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1027 sizeof(tupleiterobject), /* tp_basicsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1028 0, /* tp_itemsize */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1029 /* methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1030 (destructor)tupleiter_dealloc, /* tp_dealloc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1031 0, /* tp_print */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1032 0, /* tp_getattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1033 0, /* tp_setattr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1034 0, /* tp_reserved */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1035 0, /* tp_repr */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1036 0, /* tp_as_number */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1037 0, /* tp_as_sequence */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1038 0, /* tp_as_mapping */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1039 0, /* tp_hash */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1040 0, /* tp_call */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1041 0, /* tp_str */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1042 PyObject_GenericGetAttr, /* tp_getattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1043 0, /* tp_setattro */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1044 0, /* tp_as_buffer */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1045 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1046 0, /* tp_doc */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1047 (traverseproc)tupleiter_traverse, /* tp_traverse */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1048 0, /* tp_clear */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1049 0, /* tp_richcompare */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1050 0, /* tp_weaklistoffset */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1051 PyObject_SelfIter, /* tp_iter */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1052 (iternextfunc)tupleiter_next, /* tp_iternext */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1053 tupleiter_methods, /* tp_methods */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1054 0,
24683 567704bfa595 Moved special case for tuples from iterobject.c to Raymond Hettinger <python@rcn.com> parents: 24280 diff changeset	1055 };
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	1056
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	1057 static PyObject *
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	1058 tuple_iter(PyObject *seq)
f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	1059 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1060 tupleiterobject *it;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	1061
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1062 if (!PyTuple_Check(seq)) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1063 PyErr_BadInternalCall();
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1064 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1065 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1066 it = PyObject_GC_New(tupleiterobject, &PyTupleIter_Type);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1067 if (it == NULL)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1068 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1069 it->it_index = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1070 Py_INCREF(seq);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1071 it->it_seq = (PyTupleObject *)seq;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1072 _PyObject_GC_TRACK(it);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59224 diff changeset	1073 return (PyObject *)it;
37879 f731859e9b3b Merge p3yk branch with the trunk up to revision 45595. This breaks a fair Thomas Wouters <thomas@python.org> parents: 36882 diff changeset	1074 }

Mercurial > cpython-lru_cache-weakref

annotate Objects/tupleobject.c @ 79063:2bdc8c8ea42e