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

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

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

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

rev	line source
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1 /* List object implementation */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	3 #include "Python.h"
d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	4
1836 1203f0629527 Correct problems found by THINK C 6.0 Guido van Rossum <guido@python.org> parents: 1405 diff changeset	5 #ifdef STDC_HEADERS
1203f0629527 Correct problems found by THINK C 6.0 Guido van Rossum <guido@python.org> parents: 1405 diff changeset	6 #include <stddef.h>
1203f0629527 Correct problems found by THINK C 6.0 Guido van Rossum <guido@python.org> parents: 1405 diff changeset	7 #else
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	8 #include <sys/types.h> /* For size_t */
1836 1203f0629527 Correct problems found by THINK C 6.0 Guido van Rossum <guido@python.org> parents: 1405 diff changeset	9 #endif
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	10
32868 bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	11 /* Ensure ob_item has room for at least newsize elements, and set
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	12 * ob_size to newsize. If newsize > ob_size on entry, the content
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	13 * of the new slots at exit is undefined heap trash; it's the caller's
68588 cd8d3c2d3bce #11565: Fix several typos. Patch by Piotr Kasprzyk. Ezio Melotti <ezio.melotti@gmail.com> parents: 68256 diff changeset	14 * responsibility to overwrite them with sane values.
32868 bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	15 * The number of allocated elements may grow, shrink, or stay the same.
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	16 * Failure is impossible if newsize <= self.allocated on entry, although
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	17 * that partly relies on an assumption that the system realloc() never
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	18 * fails when passed a number of bytes <= the number of bytes last
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	19 * allocated (the C standard doesn't guarantee this, but it's hard to
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	20 * imagine a realloc implementation where it wouldn't be true).
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	21 * Note that self->ob_item may change, and even if newsize is less
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	22 * than ob_size on entry.
bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	23 */
2257 ee4c954cd5df round up list item counts to improve realloc performance Guido van Rossum <guido@python.org> parents: 2188 diff changeset	24 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	25 list_resize(PyListObject *self, Py_ssize_t newsize)
2257 ee4c954cd5df round up list item counts to improve realloc performance Guido van Rossum <guido@python.org> parents: 2188 diff changeset	26 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	27 PyObject **items;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	28 size_t new_allocated;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	29 Py_ssize_t allocated = self->allocated;
17969 ed8b79c6cb4b roundupsize() and friends: fiddle over-allocation strategy for list Tim Peters <tim.peters@gmail.com> parents: 16581 diff changeset	30
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	31 /* Bypass realloc() when a previous overallocation is large enough
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	32 to accommodate the newsize. If the newsize falls lower than half
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	33 the allocated size, then proceed with the realloc() to shrink the list.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	34 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	35 if (allocated >= newsize && newsize >= (allocated >> 1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	36 assert(self->ob_item != NULL \|\| newsize == 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	37 Py_SIZE(self) = newsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	38 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	39 }
31519 bd0acc42829e * Optimized list appends and pops by making fewer calls the underlying system Raymond Hettinger <python@rcn.com> parents: 31390 diff changeset	40
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	41 /* This over-allocates proportional to the list size, making room
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	42 * for additional growth. The over-allocation is mild, but is
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	43 * enough to give linear-time amortized behavior over a long
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	44 * sequence of appends() in the presence of a poorly-performing
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	45 * system realloc().
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	46 * The growth pattern is: 0, 4, 8, 16, 25, 35, 46, 58, 72, 88, ...
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	47 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	48 new_allocated = (newsize >> 3) + (newsize < 9 ? 3 : 6);
45337 8cbe0bd93c28 Added checks for integer overflows, contributed by Google. Some are Martin v. Löwis <martin@v.loewis.de> parents: 44953 diff changeset	49
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	50 /* check for integer overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	51 if (new_allocated > PY_SIZE_MAX - newsize) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	52 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	53 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	54 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	55 new_allocated += newsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	56 }
45337 8cbe0bd93c28 Added checks for integer overflows, contributed by Google. Some are Martin v. Löwis <martin@v.loewis.de> parents: 44953 diff changeset	57
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	58 if (newsize == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	59 new_allocated = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	60 items = self->ob_item;
72419 f8280cf63d9e Backport issue #12973 list_repeat fix from 3.x. Mark Dickinson <mdickinson@enthought.com> parents: 68588 diff changeset	61 if (new_allocated <= (PY_SIZE_MAX / sizeof(PyObject *)))
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	62 PyMem_RESIZE(items, PyObject *, new_allocated);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	63 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	64 items = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	65 if (items == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	66 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	67 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	68 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	69 self->ob_item = items;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	70 Py_SIZE(self) = newsize;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	71 self->allocated = new_allocated;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	72 return 0;
31519 bd0acc42829e * Optimized list appends and pops by making fewer calls the underlying system Raymond Hettinger <python@rcn.com> parents: 31390 diff changeset	73 }
2257 ee4c954cd5df round up list item counts to improve realloc performance Guido van Rossum <guido@python.org> parents: 2188 diff changeset	74
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	75 /* Debug statistic to compare allocations with reuse through the free list */
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	76 #undef SHOW_ALLOC_COUNT
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	77 #ifdef SHOW_ALLOC_COUNT
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	78 static size_t count_alloc = 0;
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	79 static size_t count_reuse = 0;
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	80
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	81 static void
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	82 show_alloc(void)
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	83 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	84 fprintf(stderr, "List allocations: %" PY_FORMAT_SIZE_T "d\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	85 count_alloc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	86 fprintf(stderr, "List reuse through freelist: %" PY_FORMAT_SIZE_T
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	87 "d\n", count_reuse);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	88 fprintf(stderr, "%.2f%% reuse rate\n\n",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	89 (100.0*count_reuse/(count_alloc+count_reuse)));
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	90 }
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	91 #endif
5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	92
31982 51a5fb60934d SF patch #947476: Apply freelist technique to lists Raymond Hettinger <python@rcn.com> parents: 31907 diff changeset	93 /* Empty list reuse scheme to save calls to malloc and free */
45191 920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44954 diff changeset	94 #ifndef PyList_MAXFREELIST
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44954 diff changeset	95 #define PyList_MAXFREELIST 80
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44954 diff changeset	96 #endif
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44954 diff changeset	97 static PyListObject *free_list[PyList_MAXFREELIST];
920a7633ae08 Unified naming convention for free lists and their limits. All free lists Christian Heimes <christian@cheimes.de> parents: 44954 diff changeset	98 static int numfree = 0;
31982 51a5fb60934d SF patch #947476: Apply freelist technique to lists Raymond Hettinger <python@rcn.com> parents: 31907 diff changeset	99
33679 55fba88930bc Finalize the freelist of list objects. Raymond Hettinger <python@rcn.com> parents: 33589 diff changeset	100 void
55fba88930bc Finalize the freelist of list objects. Raymond Hettinger <python@rcn.com> parents: 33589 diff changeset	101 PyList_Fini(void)
55fba88930bc Finalize the freelist of list objects. Raymond Hettinger <python@rcn.com> parents: 33589 diff changeset	102 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	103 PyListObject *op;
33679 55fba88930bc Finalize the freelist of list objects. Raymond Hettinger <python@rcn.com> parents: 33589 diff changeset	104
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	105 while (numfree) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	106 op = free_list[--numfree];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	107 assert(PyList_CheckExact(op));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	108 PyObject_GC_Del(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	109 }
33679 55fba88930bc Finalize the freelist of list objects. Raymond Hettinger <python@rcn.com> parents: 33589 diff changeset	110 }
55fba88930bc Finalize the freelist of list objects. Raymond Hettinger <python@rcn.com> parents: 33589 diff changeset	111
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	112 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	113 PyList_New(Py_ssize_t size)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	114 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	115 PyListObject *op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	116 size_t nbytes;
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	117 #ifdef SHOW_ALLOC_COUNT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	118 static int initialized = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	119 if (!initialized) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	120 Py_AtExit(show_alloc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	121 initialized = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	122 }
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	123 #endif
32848 e3a35fbce8ec PyList_New(): we went to all the trouble of computing and bounds-checking Tim Peters <tim.peters@gmail.com> parents: 32695 diff changeset	124
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	125 if (size < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	126 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	127 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	128 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	129 /* Check for overflow without an actual overflow,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	130 * which can cause compiler to optimise out */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	131 if ((size_t)size > PY_SIZE_MAX / sizeof(PyObject *))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	132 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	133 nbytes = size * sizeof(PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	134 if (numfree) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	135 numfree--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	136 op = free_list[numfree];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	137 _Py_NewReference((PyObject *)op);
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	138 #ifdef SHOW_ALLOC_COUNT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	139 count_reuse++;
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	140 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	141 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	142 op = PyObject_GC_New(PyListObject, &PyList_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	143 if (op == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	144 return NULL;
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	145 #ifdef SHOW_ALLOC_COUNT
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	146 count_alloc++;
45217 5ac605c0f27c Added some statistics code to dict and list object code. I wanted to test how a larger freelist affects the reusage of freed objects. Contrary to my gut feelings 80 objects is more than fine for small apps. I haven't profiled a large app yet. Christian Heimes <christian@cheimes.de> parents: 45191 diff changeset	147 #endif
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	148 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	149 if (size <= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	150 op->ob_item = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	151 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	152 op->ob_item = (PyObject **) PyMem_MALLOC(nbytes);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	153 if (op->ob_item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	154 Py_DECREF(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	155 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	156 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	157 memset(op->ob_item, 0, nbytes);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	158 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	159 Py_SIZE(op) = size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	160 op->allocated = size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	161 _PyObject_GC_TRACK(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	162 return (PyObject *) op;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	163 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	164
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	165 Py_ssize_t
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	166 PyList_Size(PyObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	167 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	168 if (!PyList_Check(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	169 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	170 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	171 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	172 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	173 return Py_SIZE(op);
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
31983 222908dfbf58 Nits: Raymond Hettinger <python@rcn.com> parents: 31982 diff changeset	176 static PyObject *indexerr = NULL;
3985 011cfe7490eb Use pre-created string objects for most common exceptions Guido van Rossum <guido@python.org> parents: 2827 diff changeset	177
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	178 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	179 PyList_GetItem(PyObject *op, Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	180 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	181 if (!PyList_Check(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	182 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	183 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	184 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	185 if (i < 0 \|\| i >= Py_SIZE(op)) {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	186 if (indexerr == NULL) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	187 indexerr = PyString_FromString(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	188 "list index out of range");
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	189 if (indexerr == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	190 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	191 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	192 PyErr_SetObject(PyExc_IndexError, indexerr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	193 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	194 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	195 return ((PyListObject *)op) -> ob_item[i];
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	196 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	197
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	198 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	199 PyList_SetItem(register PyObject *op, register Py_ssize_t i,
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	200 register PyObject *newitem)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	201 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	202 register PyObject *olditem;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	203 register PyObject **p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	204 if (!PyList_Check(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	205 Py_XDECREF(newitem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	206 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	207 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	208 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	209 if (i < 0 \|\| i >= Py_SIZE(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	210 Py_XDECREF(newitem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	211 PyErr_SetString(PyExc_IndexError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	212 "list assignment index out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	213 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	214 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	215 p = ((PyListObject *)op) -> ob_item + i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	216 olditem = *p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	217 *p = newitem;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	218 Py_XDECREF(olditem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	219 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	220 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	221
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	222 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	223 ins1(PyListObject self, Py_ssize_t where, PyObject v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	224 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	225 Py_ssize_t i, n = Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	226 PyObject **items;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	227 if (v == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	228 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	229 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	230 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	231 if (n == PY_SSIZE_T_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	232 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	233 "cannot add more objects to list");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	234 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	235 }
32850 09e633c52730 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32848 diff changeset	236
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	237 if (list_resize(self, n+1) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	238 return -1;
31519 bd0acc42829e * Optimized list appends and pops by making fewer calls the underlying system Raymond Hettinger <python@rcn.com> parents: 31390 diff changeset	239
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	240 if (where < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	241 where += n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	242 if (where < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	243 where = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	244 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	245 if (where > n)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	246 where = n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	247 items = self->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	248 for (i = n; --i >= where; )
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	249 items[i+1] = items[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	250 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	251 items[where] = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	252 return 0;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	253 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	254
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	255 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	256 PyList_Insert(PyObject op, Py_ssize_t where, PyObject newitem)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	257 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	258 if (!PyList_Check(op)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	259 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	260 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	261 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	262 return ins1((PyListObject *)op, where, newitem);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	263 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	264
31905 e76092d4902c * Specialize ins1() into app1() for appends. Saves several unnecessary Raymond Hettinger <python@rcn.com> parents: 31718 diff changeset	265 static int
e76092d4902c * Specialize ins1() into app1() for appends. Saves several unnecessary Raymond Hettinger <python@rcn.com> parents: 31718 diff changeset	266 app1(PyListObject self, PyObject v)
e76092d4902c * Specialize ins1() into app1() for appends. Saves several unnecessary Raymond Hettinger <python@rcn.com> parents: 31718 diff changeset	267 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	268 Py_ssize_t n = PyList_GET_SIZE(self);
31905 e76092d4902c * Specialize ins1() into app1() for appends. Saves several unnecessary Raymond Hettinger <python@rcn.com> parents: 31718 diff changeset	269
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	270 assert (v != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	271 if (n == PY_SSIZE_T_MAX) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	272 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	273 "cannot add more objects to list");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	274 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	275 }
31905 e76092d4902c * Specialize ins1() into app1() for appends. Saves several unnecessary Raymond Hettinger <python@rcn.com> parents: 31718 diff changeset	276
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	277 if (list_resize(self, n+1) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	278 return -1;
31905 e76092d4902c * Specialize ins1() into app1() for appends. Saves several unnecessary Raymond Hettinger <python@rcn.com> parents: 31718 diff changeset	279
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	280 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	281 PyList_SET_ITEM(self, n, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	282 return 0;
31905 e76092d4902c * Specialize ins1() into app1() for appends. Saves several unnecessary Raymond Hettinger <python@rcn.com> parents: 31718 diff changeset	283 }
e76092d4902c * Specialize ins1() into app1() for appends. Saves several unnecessary Raymond Hettinger <python@rcn.com> parents: 31718 diff changeset	284
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	285 int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	286 PyList_Append(PyObject op, PyObject newitem)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	287 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	288 if (PyList_Check(op) && (newitem != NULL))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	289 return app1((PyListObject *)op, newitem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	290 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	291 return -1;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	292 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	293
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	294 /* Methods */
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	295
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	296 static void
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	297 list_dealloc(PyListObject *op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	298 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	299 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	300 PyObject_GC_UnTrack(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	301 Py_TRASHCAN_SAFE_BEGIN(op)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	302 if (op->ob_item != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	303 /* Do it backwards, for Christian Tismer.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	304 There's a simple test case where somehow this reduces
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	305 thrashing when a very large list is created and
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	306 immediately deleted. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	307 i = Py_SIZE(op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	308 while (--i >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	309 Py_XDECREF(op->ob_item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	310 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	311 PyMem_FREE(op->ob_item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	312 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	313 if (numfree < PyList_MAXFREELIST && PyList_CheckExact(op))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	314 free_list[numfree++] = op;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	315 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	316 Py_TYPE(op)->tp_free((PyObject *)op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	317 Py_TRASHCAN_SAFE_END(op)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	318 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	319
284 6ac402023cac printobject now returns an error code Guido van Rossum <guido@python.org> parents: 205 diff changeset	320 static int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	321 list_print(PyListObject op, FILE fp, int flags)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	322 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	323 int rc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	324 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	325 PyObject *item;
7986 971b5bbd92ec Use Py_Repr{Enter,Leave} to display recursive lists in finite space. Guido van Rossum <guido@python.org> parents: 7482 diff changeset	326
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	327 rc = Py_ReprEnter((PyObject*)op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	328 if (rc != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	329 if (rc < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	330 return rc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	331 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	332 fprintf(fp, "[...]");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	333 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	334 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	335 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	336 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	337 fprintf(fp, "[");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	338 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	339 for (i = 0; i < Py_SIZE(op); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	340 item = op->ob_item[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	341 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	342 if (i > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	343 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	344 fprintf(fp, ", ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	345 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	346 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	347 if (PyObject_Print(item, fp, 0) != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	348 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	349 Py_ReprLeave((PyObject *)op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	350 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	351 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	352 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	353 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	354 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	355 fprintf(fp, "]");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	356 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	357 Py_ReprLeave((PyObject *)op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	358 return 0;
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
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	361 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	362 list_repr(PyListObject *v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	363 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	364 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	365 PyObject s, temp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	366 PyObject pieces = NULL, result = NULL;
7986 971b5bbd92ec Use Py_Repr{Enter,Leave} to display recursive lists in finite space. Guido van Rossum <guido@python.org> parents: 7482 diff changeset	367
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	368 i = Py_ReprEnter((PyObject*)v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	369 if (i != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	370 return i > 0 ? PyString_FromString("[...]") : NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	371 }
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17971 diff changeset	372
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	373 if (Py_SIZE(v) == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	374 result = PyString_FromString("[]");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	375 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	376 }
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17971 diff changeset	377
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	378 pieces = PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	379 if (pieces == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	380 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17971 diff changeset	381
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	382 /* Do repr() on each element. Note that this may mutate the list,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	383 so must refetch the list size on each iteration. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	384 for (i = 0; i < Py_SIZE(v); ++i) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	385 int status;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	386 if (Py_EnterRecursiveCall(" while getting the repr of a list"))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	387 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	388 s = PyObject_Repr(v->ob_item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	389 Py_LeaveRecursiveCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	390 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	391 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	392 status = PyList_Append(pieces, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	393 Py_DECREF(s); /* append created a new ref */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	394 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	395 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	396 }
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17971 diff changeset	397
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	398 /* Add "[]" decorations to the first and last items. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	399 assert(PyList_GET_SIZE(pieces) > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	400 s = PyString_FromString("[");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	401 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	402 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	403 temp = PyList_GET_ITEM(pieces, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	404 PyString_ConcatAndDel(&s, temp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	405 PyList_SET_ITEM(pieces, 0, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	406 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	407 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17971 diff changeset	408
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	409 s = PyString_FromString("]");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	410 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	411 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	412 temp = PyList_GET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	413 PyString_ConcatAndDel(&temp, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	414 PyList_SET_ITEM(pieces, PyList_GET_SIZE(pieces) - 1, temp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	415 if (temp == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	416 goto Done;
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17971 diff changeset	417
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	418 /* Paste them all together with ", " between. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	419 s = PyString_FromString(", ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	420 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	421 goto Done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	422 result = _PyString_Join(s, pieces);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	423 Py_DECREF(s);
18129 9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17971 diff changeset	424
9d533ae574d2 SF bug 433228: repr(list) woes when len(list) big. Tim Peters <tim.peters@gmail.com> parents: 17971 diff changeset	425 Done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	426 Py_XDECREF(pieces);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	427 Py_ReprLeave((PyObject *)v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	428 return result;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	429 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	430
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	431 static Py_ssize_t
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	432 list_length(PyListObject *a)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	433 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	434 return Py_SIZE(a);
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	435 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	436
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	437 static int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	438 list_contains(PyListObject a, PyObject el)
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	439 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	440 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	441 int cmp;
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	442
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	443 for (i = 0, cmp = 0 ; cmp == 0 && i < Py_SIZE(a); ++i)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	444 cmp = PyObject_RichCompareBool(el, PyList_GET_ITEM(a, i),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	445 Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	446 return cmp;
12516 e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	447 }
e6e914d5b207 add list_contains and tuplecontains: efficient implementations of tp_contains Jeremy Hylton <jeremy@alum.mit.edu> parents: 11999 diff changeset	448
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	449 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	450 list_item(PyListObject *a, Py_ssize_t i)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	451 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	452 if (i < 0 \|\| i >= Py_SIZE(a)) {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	453 if (indexerr == NULL) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	454 indexerr = PyString_FromString(
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	455 "list index out of range");
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	456 if (indexerr == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	457 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	458 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	459 PyErr_SetObject(PyExc_IndexError, indexerr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	460 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	461 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	462 Py_INCREF(a->ob_item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	463 return a->ob_item[i];
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	464 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	465
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	466 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	467 list_slice(PyListObject *a, Py_ssize_t ilow, Py_ssize_t ihigh)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	468 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	469 PyListObject *np;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	470 PyObject src, dest;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	471 Py_ssize_t i, len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	472 if (ilow < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	473 ilow = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	474 else if (ilow > Py_SIZE(a))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	475 ilow = Py_SIZE(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	476 if (ihigh < ilow)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	477 ihigh = ilow;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	478 else if (ihigh > Py_SIZE(a))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	479 ihigh = Py_SIZE(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	480 len = ihigh - ilow;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	481 np = (PyListObject *) PyList_New(len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	482 if (np == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	483 return NULL;
31621 635eebc473b0 Small optimizations for list_slice() and list_extend_internal(). Raymond Hettinger <python@rcn.com> parents: 31550 diff changeset	484
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	485 src = a->ob_item + ilow;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	486 dest = np->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	487 for (i = 0; i < len; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	488 PyObject *v = src[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	489 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	490 dest[i] = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	491 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	492 return (PyObject *)np;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	493 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	494
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	495 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	496 PyList_GetSlice(PyObject *a, Py_ssize_t ilow, Py_ssize_t ihigh)
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1211 diff changeset	497 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	498 if (!PyList_Check(a)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	499 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	500 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	501 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	502 return list_slice((PyListObject *)a, ilow, ihigh);
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1211 diff changeset	503 }
6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1211 diff changeset	504
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	505 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	506 list_concat(PyListObject a, PyObject bb)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	507 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	508 Py_ssize_t size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	509 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	510 PyObject src, dest;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	511 PyListObject *np;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	512 if (!PyList_Check(bb)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	513 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	514 "can only concatenate list (not \"%.200s\") to list",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	515 bb->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	516 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	517 }
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	518 #define b ((PyListObject *)bb)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	519 size = Py_SIZE(a) + Py_SIZE(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	520 if (size < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	521 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	522 np = (PyListObject *) PyList_New(size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	523 if (np == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	524 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	525 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	526 src = a->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	527 dest = np->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	528 for (i = 0; i < Py_SIZE(a); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	529 PyObject *v = src[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	530 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	531 dest[i] = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	532 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	533 src = b->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	534 dest = np->ob_item + Py_SIZE(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	535 for (i = 0; i < Py_SIZE(b); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	536 PyObject *v = src[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	537 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	538 dest[i] = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	539 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	540 return (PyObject *)np;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	541 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	542 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	543
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	544 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	545 list_repeat(PyListObject *a, Py_ssize_t n)
155 896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	546 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	547 Py_ssize_t i, j;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	548 Py_ssize_t size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	549 PyListObject *np;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	550 PyObject p, items;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	551 PyObject *elem;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	552 if (n < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	553 n = 0;
72419 f8280cf63d9e Backport issue #12973 list_repeat fix from 3.x. Mark Dickinson <mdickinson@enthought.com> parents: 68588 diff changeset	554 if (n > 0 && Py_SIZE(a) > PY_SSIZE_T_MAX / n)
f8280cf63d9e Backport issue #12973 list_repeat fix from 3.x. Mark Dickinson <mdickinson@enthought.com> parents: 68588 diff changeset	555 return PyErr_NoMemory();
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	556 size = Py_SIZE(a) * n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	557 if (size == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	558 return PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	559 np = (PyListObject *) PyList_New(size);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	560 if (np == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	561 return NULL;
29198 b9762f003f30 SF bug #604716: faster [None]n or []n Raymond Hettinger <python@rcn.com> parents: 29008 diff changeset	562
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	563 items = np->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	564 if (Py_SIZE(a) == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	565 elem = a->ob_item[0];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	566 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	567 items[i] = elem;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	568 Py_INCREF(elem);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	569 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	570 return (PyObject *) np;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	571 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	572 p = np->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	573 items = a->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	574 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	575 for (j = 0; j < Py_SIZE(a); j++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	576 *p = items[j];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	577 Py_INCREF(*p);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	578 p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	579 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	580 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	581 return (PyObject *) np;
155 896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	582 }
896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	583
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	584 static int
32858 fa0526c30da8 * drop the unreasonable list invariant that ob_item should never come back Armin Rigo <arigo@tunes.org> parents: 32857 diff changeset	585 list_clear(PyListObject *a)
fa0526c30da8 * drop the unreasonable list invariant that ob_item should never come back Armin Rigo <arigo@tunes.org> parents: 32857 diff changeset	586 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	587 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	588 PyObject **item = a->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	589 if (item != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	590 /* Because XDECREF can recursively invoke operations on
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	591 this list, we make it empty first. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	592 i = Py_SIZE(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	593 Py_SIZE(a) = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	594 a->ob_item = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	595 a->allocated = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	596 while (--i >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	597 Py_XDECREF(item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	598 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	599 PyMem_FREE(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	600 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	601 /* Never fails; the return value can be ignored.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	602 Note that there is no guarantee that the list is actually empty
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	603 at this point, because XDECREF may have populated it again! */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	604 return 0;
32858 fa0526c30da8 * drop the unreasonable list invariant that ob_item should never come back Armin Rigo <arigo@tunes.org> parents: 32857 diff changeset	605 }
fa0526c30da8 * drop the unreasonable list invariant that ob_item should never come back Armin Rigo <arigo@tunes.org> parents: 32857 diff changeset	606
32874 62c53b8e4aeb list_ass_slice(): Document the obscure new intent that deleting a slice Tim Peters <tim.peters@gmail.com> parents: 32869 diff changeset	607 /* a[ilow:ihigh] = v if v != NULL.
62c53b8e4aeb list_ass_slice(): Document the obscure new intent that deleting a slice Tim Peters <tim.peters@gmail.com> parents: 32869 diff changeset	608 * del a[ilow:ihigh] if v == NULL.
62c53b8e4aeb list_ass_slice(): Document the obscure new intent that deleting a slice Tim Peters <tim.peters@gmail.com> parents: 32869 diff changeset	609 *
62c53b8e4aeb list_ass_slice(): Document the obscure new intent that deleting a slice Tim Peters <tim.peters@gmail.com> parents: 32869 diff changeset	610 * Special speed gimmick: when v is NULL and ihigh - ilow <= 8, it's
62c53b8e4aeb list_ass_slice(): Document the obscure new intent that deleting a slice Tim Peters <tim.peters@gmail.com> parents: 32869 diff changeset	611 * guaranteed the call cannot fail.
62c53b8e4aeb list_ass_slice(): Document the obscure new intent that deleting a slice Tim Peters <tim.peters@gmail.com> parents: 32869 diff changeset	612 */
32858 fa0526c30da8 * drop the unreasonable list invariant that ob_item should never come back Armin Rigo <arigo@tunes.org> parents: 32857 diff changeset	613 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	614 list_ass_slice(PyListObject a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	615 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	616 /* Because [X]DECREF can recursively invoke list operations on
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	617 this list, we must postpone all [X]DECREF activity until
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	618 after the list is back in its canonical shape. Therefore
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	619 we must allocate an additional array, 'recycle', into which
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	620 we temporarily copy the items that are deleted from the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	621 list. :-( */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	622 PyObject *recycle_on_stack[8];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	623 PyObject *recycle = recycle_on_stack; / will allocate more if needed */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	624 PyObject **item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	625 PyObject **vitem = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	626 PyObject v_as_SF = NULL; / PySequence_Fast(v) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	627 Py_ssize_t n; /* # of elements in replacement list */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	628 Py_ssize_t norig; /* # of elements in list getting replaced */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	629 Py_ssize_t d; /* Change in size */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	630 Py_ssize_t k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	631 size_t s;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	632 int result = -1; /* guilty until proved innocent */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	633 #define b ((PyListObject *)v)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	634 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	635 n = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	636 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	637 if (a == b) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	638 /* Special case "a[i:j] = a" -- copy b first */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	639 v = list_slice(b, 0, Py_SIZE(b));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	640 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	641 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	642 result = list_ass_slice(a, ilow, ihigh, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	643 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	644 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	645 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	646 v_as_SF = PySequence_Fast(v, "can only assign an iterable");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	647 if(v_as_SF == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	648 goto Error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	649 n = PySequence_Fast_GET_SIZE(v_as_SF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	650 vitem = PySequence_Fast_ITEMS(v_as_SF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	651 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	652 if (ilow < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	653 ilow = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	654 else if (ilow > Py_SIZE(a))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	655 ilow = Py_SIZE(a);
32868 bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	656
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	657 if (ihigh < ilow)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	658 ihigh = ilow;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	659 else if (ihigh > Py_SIZE(a))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	660 ihigh = Py_SIZE(a);
32858 fa0526c30da8 * drop the unreasonable list invariant that ob_item should never come back Armin Rigo <arigo@tunes.org> parents: 32857 diff changeset	661
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	662 norig = ihigh - ilow;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	663 assert(norig >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	664 d = n - norig;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	665 if (Py_SIZE(a) + d == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	666 Py_XDECREF(v_as_SF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	667 return list_clear(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	668 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	669 item = a->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	670 /* recycle the items that we are about to remove */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	671 s = norig * sizeof(PyObject *);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	672 if (s > sizeof(recycle_on_stack)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	673 recycle = (PyObject **)PyMem_MALLOC(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	674 if (recycle == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	675 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	676 goto Error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	677 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	678 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	679 memcpy(recycle, &item[ilow], s);
32868 bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	680
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	681 if (d < 0) { /* Delete -d items */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	682 memmove(&item[ihigh+d], &item[ihigh],
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	683 (Py_SIZE(a) - ihigh)sizeof(PyObject ));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	684 list_resize(a, Py_SIZE(a) + d);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	685 item = a->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	686 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	687 else if (d > 0) { /* Insert d items */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	688 k = Py_SIZE(a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	689 if (list_resize(a, k+d) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	690 goto Error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	691 item = a->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	692 memmove(&item[ihigh+d], &item[ihigh],
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	693 (k - ihigh)sizeof(PyObject ));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	694 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	695 for (k = 0; k < n; k++, ilow++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	696 PyObject *w = vitem[k];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	697 Py_XINCREF(w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	698 item[ilow] = w;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	699 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	700 for (k = norig - 1; k >= 0; --k)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	701 Py_XDECREF(recycle[k]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	702 result = 0;
32868 bd46e6f80623 Armin asked for a list_ass_slice review in his checkin, so here's the Tim Peters <tim.peters@gmail.com> parents: 32861 diff changeset	703 Error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	704 if (recycle != recycle_on_stack)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	705 PyMem_FREE(recycle);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	706 Py_XDECREF(v_as_SF);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	707 return result;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	708 #undef b
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	709 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	710
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1211 diff changeset	711 int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	712 PyList_SetSlice(PyObject a, Py_ssize_t ilow, Py_ssize_t ihigh, PyObject v)
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1211 diff changeset	713 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	714 if (!PyList_Check(a)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	715 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	716 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	717 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	718 return list_ass_slice((PyListObject *)a, ilow, ihigh, v);
1313 6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1211 diff changeset	719 }
6ee380349c84 * Added gmtime/localtime/mktime and SYSV timezone globals to timemodule.c. Guido van Rossum <guido@python.org> parents: 1211 diff changeset	720
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	721 static PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	722 list_inplace_repeat(PyListObject *self, Py_ssize_t n)
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	723 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	724 PyObject **items;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	725 Py_ssize_t size, i, j, p;
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	726
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	727
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	728 size = PyList_GET_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	729 if (size == 0 \|\| n == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	730 Py_INCREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	731 return (PyObject *)self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	732 }
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	733
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	734 if (n < 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	735 (void)list_clear(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	736 Py_INCREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	737 return (PyObject *)self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	738 }
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	739
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	740 if (size > PY_SSIZE_T_MAX / n) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	741 return PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	742 }
44950 42449f682885 Rewrite the list_inline_repeat overflow check slightly differently. Guido van Rossum <guido@python.org> parents: 44172 diff changeset	743
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	744 if (list_resize(self, size*n) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	745 return NULL;
31519 bd0acc42829e * Optimized list appends and pops by making fewer calls the underlying system Raymond Hettinger <python@rcn.com> parents: 31390 diff changeset	746
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	747 p = size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	748 items = self->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	749 for (i = 1; i < n; i++) { /* Start counting at 1, not 0 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	750 for (j = 0; j < size; j++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	751 PyObject *o = items[j];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	752 Py_INCREF(o);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	753 items[p++] = o;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	754 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	755 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	756 Py_INCREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	757 return (PyObject *)self;
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	758 }
52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	759
167 3fa2b14be270 Swapped list_ass_item and list_ass_slice to satisfy Standard C. Guido van Rossum <guido@python.org> parents: 155 diff changeset	760 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	761 list_ass_item(PyListObject a, Py_ssize_t i, PyObject v)
167 3fa2b14be270 Swapped list_ass_item and list_ass_slice to satisfy Standard C. Guido van Rossum <guido@python.org> parents: 155 diff changeset	762 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	763 PyObject *old_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	764 if (i < 0 \|\| i >= Py_SIZE(a)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	765 PyErr_SetString(PyExc_IndexError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	766 "list assignment index out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	767 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	768 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	769 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	770 return list_ass_slice(a, i, i+1, v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	771 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	772 old_value = a->ob_item[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	773 a->ob_item[i] = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	774 Py_DECREF(old_value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	775 return 0;
167 3fa2b14be270 Swapped list_ass_item and list_ass_slice to satisfy Standard C. Guido van Rossum <guido@python.org> parents: 155 diff changeset	776 }
3fa2b14be270 Swapped list_ass_item and list_ass_slice to satisfy Standard C. Guido van Rossum <guido@python.org> parents: 155 diff changeset	777
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	778 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	779 listinsert(PyListObject self, PyObject args)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	780 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	781 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	782 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	783 if (!PyArg_ParseTuple(args, "nO:insert", &i, &v))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	784 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	785 if (ins1(self, i, v) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	786 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	787 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	788 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	789
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	790 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	791 listappend(PyListObject self, PyObject v)
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	792 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	793 if (app1(self, v) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	794 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	795 return NULL;
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	796 }
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	797
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	798 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	799 listextend(PyListObject self, PyObject b)
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	800 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	801 PyObject it; / iter(v) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	802 Py_ssize_t m; /* size of self */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	803 Py_ssize_t n; /* guess for size of b */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	804 Py_ssize_t mn; /* m + n */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	805 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	806 PyObject (iternext)(PyObject *);
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	807
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	808 /* Special cases:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	809 1) lists and tuples which can use PySequence_Fast ops
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	810 2) extending self to self requires making a copy first
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	811 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	812 if (PyList_CheckExact(b) \|\| PyTuple_CheckExact(b) \|\| (PyObject *)self == b) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	813 PyObject src, dest;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	814 b = PySequence_Fast(b, "argument must be iterable");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	815 if (!b)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	816 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	817 n = PySequence_Fast_GET_SIZE(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	818 if (n == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	819 /* short circuit when b is empty */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	820 Py_DECREF(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	821 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	822 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	823 m = Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	824 if (list_resize(self, m + n) == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	825 Py_DECREF(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	826 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	827 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	828 /* note that we may still have self == b here for the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	829 * situation a.extend(a), but the following code works
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	830 * in that case too. Just make sure to resize self
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	831 * before calling PySequence_Fast_ITEMS.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	832 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	833 /* populate the end of self with b's items */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	834 src = PySequence_Fast_ITEMS(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	835 dest = self->ob_item + m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	836 for (i = 0; i < n; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	837 PyObject *o = src[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	838 Py_INCREF(o);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	839 dest[i] = o;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	840 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	841 Py_DECREF(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	842 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	843 }
31528 1233bd95da1a Refactor list_extend() and list_fill() for gains in code size, memory Raymond Hettinger <python@rcn.com> parents: 31527 diff changeset	844
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	845 it = PyObject_GetIter(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	846 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	847 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	848 iternext = *it->ob_type->tp_iternext;
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	849
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	850 /* Guess a result list size. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	851 n = _PyObject_LengthHint(b, 8);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	852 if (n == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	853 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	854 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	855 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	856 m = Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	857 mn = m + n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	858 if (mn >= m) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	859 /* Make room. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	860 if (list_resize(self, mn) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	861 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	862 /* Make the list sane again. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	863 Py_SIZE(self) = m;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	864 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	865 /* Else m + n overflowed; on the chance that n lied, and there really
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	866 * is enough room, ignore it. If n was telling the truth, we'll
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	867 * eventually run out of memory during the loop.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	868 */
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	869
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	870 /* Run iterator to exhaustion. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	871 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	872 PyObject *item = iternext(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	873 if (item == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	874 if (PyErr_Occurred()) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	875 if (PyErr_ExceptionMatches(PyExc_StopIteration))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	876 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	877 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	878 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	879 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	880 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	881 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	882 if (Py_SIZE(self) < self->allocated) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	883 /* steals ref */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	884 PyList_SET_ITEM(self, Py_SIZE(self), item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	885 ++Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	886 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	887 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	888 int status = app1(self, item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	889 Py_DECREF(item); /* append creates a new ref */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	890 if (status < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	891 goto error;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	892 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	893 }
31528 1233bd95da1a Refactor list_extend() and list_fill() for gains in code size, memory Raymond Hettinger <python@rcn.com> parents: 31527 diff changeset	894
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	895 /* Cut back result list if initial guess was too large. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	896 if (Py_SIZE(self) < self->allocated)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	897 list_resize(self, Py_SIZE(self)); /* shrinking can't fail */
33589 23036c7af687 Checkin Tim's fix to an error discussed on python-dev. Raymond Hettinger <python@rcn.com> parents: 33464 diff changeset	898
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	899 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	900 Py_RETURN_NONE;
31528 1233bd95da1a Refactor list_extend() and list_fill() for gains in code size, memory Raymond Hettinger <python@rcn.com> parents: 31527 diff changeset	901
1233bd95da1a Refactor list_extend() and list_fill() for gains in code size, memory Raymond Hettinger <python@rcn.com> parents: 31527 diff changeset	902 error:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	903 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	904 return NULL;
14161 52fd496d3532 Support for the in-place operations introduced by augmented assignment. Only Thomas Wouters <thomas@python.org> parents: 14125 diff changeset	905 }
9317 003b42c9f24d listextend(): New method which implements L.extend(L2). Barry Warsaw <barry@python.org> parents: 9275 diff changeset	906
31642 30e305bfdddb Eliminate a big block of duplicate code in PySequence_List() by Raymond Hettinger <python@rcn.com> parents: 31641 diff changeset	907 PyObject *
30e305bfdddb Eliminate a big block of duplicate code in PySequence_List() by Raymond Hettinger <python@rcn.com> parents: 31641 diff changeset	908 _PyList_Extend(PyListObject self, PyObject b)
30e305bfdddb Eliminate a big block of duplicate code in PySequence_List() by Raymond Hettinger <python@rcn.com> parents: 31641 diff changeset	909 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	910 return listextend(self, b);
31642 30e305bfdddb Eliminate a big block of duplicate code in PySequence_List() by Raymond Hettinger <python@rcn.com> parents: 31641 diff changeset	911 }
30e305bfdddb Eliminate a big block of duplicate code in PySequence_List() by Raymond Hettinger <python@rcn.com> parents: 31641 diff changeset	912
9317 003b42c9f24d listextend(): New method which implements L.extend(L2). Barry Warsaw <barry@python.org> parents: 9275 diff changeset	913 static PyObject *
31641 eea674bf7b59 list_inplace_concat() is now expressed in terms of list_extend() which Raymond Hettinger <python@rcn.com> parents: 31636 diff changeset	914 list_inplace_concat(PyListObject self, PyObject other)
eea674bf7b59 list_inplace_concat() is now expressed in terms of list_extend() which Raymond Hettinger <python@rcn.com> parents: 31636 diff changeset	915 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	916 PyObject *result;
31641 eea674bf7b59 list_inplace_concat() is now expressed in terms of list_extend() which Raymond Hettinger <python@rcn.com> parents: 31636 diff changeset	917
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	918 result = listextend(self, other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	919 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	920 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	921 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	922 Py_INCREF(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	923 return (PyObject *)self;
31641 eea674bf7b59 list_inplace_concat() is now expressed in terms of list_extend() which Raymond Hettinger <python@rcn.com> parents: 31636 diff changeset	924 }
eea674bf7b59 list_inplace_concat() is now expressed in terms of list_extend() which Raymond Hettinger <python@rcn.com> parents: 31636 diff changeset	925
eea674bf7b59 list_inplace_concat() is now expressed in terms of list_extend() which Raymond Hettinger <python@rcn.com> parents: 31636 diff changeset	926 static PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	927 listpop(PyListObject self, PyObject args)
8595 635c3d94a948 Added doc strings for methods and a new pop() method. Guido van Rossum <guido@python.org> parents: 8515 diff changeset	928 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	929 Py_ssize_t i = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	930 PyObject *v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	931 int status;
31544 72e970c0accc Double the speed of list.pop() which was spending most of its time parsing Raymond Hettinger <python@rcn.com> parents: 31528 diff changeset	932
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	933 if (!PyArg_ParseTuple(args, "\|n:pop", &i))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	934 return NULL;
39994 798935e1295e Forward-port of r52136: a review of overflow-detecting code. Armin Rigo <arigo@tunes.org> parents: 39463 diff changeset	935
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	936 if (Py_SIZE(self) == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	937 /* Special-case most common failure cause */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	938 PyErr_SetString(PyExc_IndexError, "pop from empty list");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	939 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	940 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	941 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	942 i += Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	943 if (i < 0 \|\| i >= Py_SIZE(self)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	944 PyErr_SetString(PyExc_IndexError, "pop index out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	945 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	946 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	947 v = self->ob_item[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	948 if (i == Py_SIZE(self) - 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	949 status = list_resize(self, Py_SIZE(self) - 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	950 assert(status >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	951 return v; /* and v now owns the reference the list had */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	952 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	953 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	954 status = list_ass_slice(self, i, i+1, (PyObject *)NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	955 assert(status >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	956 /* Use status, so that in a release build compilers don't
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	957 * complain about the unused name.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	958 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	959 (void) status;
33053 1af3ad49d06f Previous commit was viewed as "perverse". Changed to just cast the unused Brett Cannon <bcannon@gmail.com> parents: 32908 diff changeset	960
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	961 return v;
8595 635c3d94a948 Added doc strings for methods and a new pop() method. Guido van Rossum <guido@python.org> parents: 8515 diff changeset	962 }
635c3d94a948 Added doc strings for methods and a new pop() method. Guido van Rossum <guido@python.org> parents: 8515 diff changeset	963
24309 08d307cbccd9 Cleanup: Define one internal utility for reversing a list slice, and Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	964 /* Reverse a slice of a list in place, from lo up to (exclusive) hi. */
08d307cbccd9 Cleanup: Define one internal utility for reversing a list slice, and Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	965 static void
08d307cbccd9 Cleanup: Define one internal utility for reversing a list slice, and Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	966 reverse_slice(PyObject lo, PyObject hi)
08d307cbccd9 Cleanup: Define one internal utility for reversing a list slice, and Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	967 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	968 assert(lo && hi);
24309 08d307cbccd9 Cleanup: Define one internal utility for reversing a list slice, and Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	969
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	970 --hi;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	971 while (lo < hi) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	972 PyObject t = lo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	973 lo = hi;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	974 *hi = t;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	975 ++lo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	976 --hi;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	977 }
24309 08d307cbccd9 Cleanup: Define one internal utility for reversing a list slice, and Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	978 }
08d307cbccd9 Cleanup: Define one internal utility for reversing a list slice, and Tim Peters <tim.peters@gmail.com> parents: 24280 diff changeset	979
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	980 /* Lots of code for an adaptive, stable, natural mergesort. There are many
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	981 * pieces to this algorithm; read listsort.txt for overviews and details.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	982 */
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	983
a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	984 /* Comparison function. Takes care of calling a user-supplied
24540 614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	985 * comparison function (any callable Python object), which must not be
614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	986 * NULL (use the ISLT macro if you don't know, or call PyObject_RichCompareBool
614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	987 * with Py_LT if you know it's NULL).
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	988 * Returns -1 on error, 1 if x < y, 0 if x >= y.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	989 */
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	990 static int
24311 a353d6a45276 Cleanup yielding a small speed boost: before rich comparisons were Tim Peters <tim.peters@gmail.com> parents: 24310 diff changeset	991 islt(PyObject x, PyObject y, PyObject *compare)
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	992 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	993 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	994 PyObject *args;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	995 Py_ssize_t i;
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	996
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	997 assert(compare != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	998 /* Call the user's comparison function and translate the 3-way
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	999 * result into true or false (or error).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1000 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1001 args = PyTuple_New(2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1002 if (args == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1003 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1004 Py_INCREF(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1005 Py_INCREF(y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1006 PyTuple_SET_ITEM(args, 0, x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1007 PyTuple_SET_ITEM(args, 1, y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1008 res = PyObject_Call(compare, args, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1009 Py_DECREF(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1010 if (res == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1011 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1012 if (!PyInt_Check(res)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1013 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1014 "comparison function must return int, not %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1015 res->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1016 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1017 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1018 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1019 i = PyInt_AsLong(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1020 Py_DECREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1021 return i < 0;
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1022 }
a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1023
24540 614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	1024 /* If COMPARE is NULL, calls PyObject_RichCompareBool with Py_LT, else calls
614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	1025 * islt. This avoids a layer of function call in the usual case, and
614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	1026 * sorting does many comparisons.
614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	1027 * Returns -1 on error, 1 if x < y, 0 if x >= y.
614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	1028 */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1029 #define ISLT(X, Y, COMPARE) ((COMPARE) == NULL ? \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1030 PyObject_RichCompareBool(X, Y, Py_LT) : \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1031 islt(X, Y, COMPARE))
24540 614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	1032
614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	1033 /* Compare X to Y via "<". Goto "fail" if the comparison raises an
24311 a353d6a45276 Cleanup yielding a small speed boost: before rich comparisons were Tim Peters <tim.peters@gmail.com> parents: 24310 diff changeset	1034 error. Else "k" is set to true iff X<Y, and an "if (k)" block is
a353d6a45276 Cleanup yielding a small speed boost: before rich comparisons were Tim Peters <tim.peters@gmail.com> parents: 24310 diff changeset	1035 started. It makes more sense in context <wink>. X and Y are PyObject*s.
a353d6a45276 Cleanup yielding a small speed boost: before rich comparisons were Tim Peters <tim.peters@gmail.com> parents: 24310 diff changeset	1036 */
24540 614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	1037 #define IFLT(X, Y) if ((k = ISLT(X, Y, compare)) < 0) goto fail; \
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1038 if (k)
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1039
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1040 /* binarysort is the best method for sorting small arrays: it does
69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1041 few compares, but can do data movement quadratic in the number of
69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1042 elements.
8515 16b3a121ff77 Minor cleanup by Tim after my changes: Guido van Rossum <guido@python.org> parents: 8511 diff changeset	1043 [lo, hi) is a contiguous slice of a list, and is sorted via
24311 a353d6a45276 Cleanup yielding a small speed boost: before rich comparisons were Tim Peters <tim.peters@gmail.com> parents: 24310 diff changeset	1044 binary insertion. This sort is stable.
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1045 On entry, must have lo <= start <= hi, and that [lo, start) is already
69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1046 sorted (pass start == lo if you don't know!).
24311 a353d6a45276 Cleanup yielding a small speed boost: before rich comparisons were Tim Peters <tim.peters@gmail.com> parents: 24310 diff changeset	1047 If islt() complains return -1, else 0.
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1048 Even in case of error, the output slice will be some permutation of
69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1049 the input (nothing is lost or duplicated).
69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1050 */
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1051 static int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	1052 binarysort(PyObject lo, PyObject hi, PyObject *start, PyObject compare)
dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	1053 /* compare -- comparison function object, or NULL for default */
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1054 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1055 register Py_ssize_t k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1056 register PyObject l, p, **r;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1057 register PyObject *pivot;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1058
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1059 assert(lo <= start && start <= hi);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1060 /* assert [lo, start) is sorted */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1061 if (lo == start)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1062 ++start;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1063 for (; start < hi; ++start) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1064 /* set l to where start belongs /
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1065 l = lo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1066 r = start;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1067 pivot = *r;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1068 /* Invariants:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1069 * pivot >= all in [lo, l).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1070 * pivot < all in [r, start).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1071 * The second is vacuously true at the start.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1072 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1073 assert(l < r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1074 do {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1075 p = l + ((r - l) >> 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1076 IFLT(pivot, *p)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1077 r = p;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1078 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1079 l = p+1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1080 } while (l < r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1081 assert(l == r);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1082 /* The invariants still hold, so pivot >= all in [lo, l) and
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1083 pivot < all in [l, start), so pivot belongs at l. Note
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1084 that if there are elements equal to pivot, l points to the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1085 first slot after them -- that's why this sort is stable.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1086 Slide over to make room.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1087 Caution: using memmove is much slower under MSVC 5;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1088 we're not usually moving many slots. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1089 for (p = start; p > l; --p)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1090 p = (p-1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1091 *l = pivot;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1092 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1093 return 0;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1094
69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1095 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1096 return -1;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1097 }
69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1098
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1099 /*
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1100 Return the length of the run beginning at lo, in the slice [lo, hi). lo < hi
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1101 is required on entry. "A run" is the longest ascending sequence, with
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1102
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1103 lo[0] <= lo[1] <= lo[2] <= ...
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1104
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1105 or the longest descending sequence, with
24310 5ede9bcc651e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 24309 diff changeset	1106
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1107 lo[0] > lo[1] > lo[2] > ...
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1108
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1109 Boolean *descending is set to 0 in the former case, or to 1 in the latter.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1110 For its intended use in a stable mergesort, the strictness of the defn of
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1111 "descending" is needed so that the caller can safely reverse a descending
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1112 sequence without violating stability (strict > ensures there are no equal
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1113 elements to get out of order).
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1114
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1115 Returns -1 in case of error.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1116 */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1117 static Py_ssize_t
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1118 count_run(PyObject lo, PyObject hi, PyObject compare, int descending)
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1119 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1120 Py_ssize_t k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1121 Py_ssize_t n;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1122
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1123 assert(lo < hi);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1124 *descending = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1125 ++lo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1126 if (lo == hi)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1127 return 1;
8457 af48887c9717 Tim's revision of the previous patch. He also added some sparts to Guido van Rossum <guido@python.org> parents: 8440 diff changeset	1128
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1129 n = 2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1130 IFLT(lo, (lo-1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1131 *descending = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1132 for (lo = lo+1; lo < hi; ++lo, ++n) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1133 IFLT(lo, (lo-1))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1134 ;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1135 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1136 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1137 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1138 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1139 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1140 for (lo = lo+1; lo < hi; ++lo, ++n) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1141 IFLT(lo, (lo-1))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1142 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1143 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1144 }
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1145
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1146 return n;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1147 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1148 return -1;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1149 }
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1150
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1151 /*
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1152 Locate the proper position of key in a sorted vector; if the vector contains
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1153 an element equal to key, return the position immediately to the left of
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1154 the leftmost equal element. [gallop_right() does the same except returns
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1155 the position to the right of the rightmost equal element (if any).]
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1156
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1157 "a" is a sorted vector with n elements, starting at a[0]. n must be > 0.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1158
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1159 "hint" is an index at which to begin the search, 0 <= hint < n. The closer
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1160 hint is to the final result, the faster this runs.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1161
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1162 The return value is the int k in 0..n such that
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1163
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1164 a[k-1] < key <= a[k]
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1165
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1166 pretending that *(a-1) is minus infinity and a[n] is plus infinity. IOW,
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1167 key belongs at index k; or, IOW, the first k elements of a should precede
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1168 key, and the last n-k should follow key.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1169
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1170 Returns -1 on error. See listsort.txt for info on the method.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1171 */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1172 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1173 gallop_left(PyObject key, PyObject a, Py_ssize_t n, Py_ssize_t hint, PyObject compare)
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1174 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1175 Py_ssize_t ofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1176 Py_ssize_t lastofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1177 Py_ssize_t k;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1178
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1179 assert(key && a && n > 0 && hint >= 0 && hint < n);
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1180
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1181 a += hint;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1182 lastofs = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1183 ofs = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1184 IFLT(*a, key) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1185 /* a[hint] < key -- gallop right, until
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1186 * a[hint + lastofs] < key <= a[hint + ofs]
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1187 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1188 const Py_ssize_t maxofs = n - hint; /* &a[n-1] is highest */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1189 while (ofs < maxofs) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1190 IFLT(a[ofs], key) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1191 lastofs = ofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1192 ofs = (ofs << 1) + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1193 if (ofs <= 0) /* int overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1194 ofs = maxofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1195 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1196 else /* key <= a[hint + ofs] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1197 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1198 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1199 if (ofs > maxofs)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1200 ofs = maxofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1201 /* Translate back to offsets relative to &a[0]. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1202 lastofs += hint;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1203 ofs += hint;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1204 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1205 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1206 /* key <= a[hint] -- gallop left, until
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1207 * a[hint - ofs] < key <= a[hint - lastofs]
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1208 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1209 const Py_ssize_t maxofs = hint + 1; /* &a[0] is lowest */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1210 while (ofs < maxofs) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1211 IFLT(*(a-ofs), key)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1212 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1213 /* key <= a[hint - ofs] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1214 lastofs = ofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1215 ofs = (ofs << 1) + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1216 if (ofs <= 0) /* int overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1217 ofs = maxofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1218 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1219 if (ofs > maxofs)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1220 ofs = maxofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1221 /* Translate back to positive offsets relative to &a[0]. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1222 k = lastofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1223 lastofs = hint - ofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1224 ofs = hint - k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1225 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1226 a -= hint;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1227
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1228 assert(-1 <= lastofs && lastofs < ofs && ofs <= n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1229 /* Now a[lastofs] < key <= a[ofs], so key belongs somewhere to the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1230 * right of lastofs but no farther right than ofs. Do a binary
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1231 * search, with invariant a[lastofs-1] < key <= a[ofs].
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1232 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1233 ++lastofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1234 while (lastofs < ofs) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1235 Py_ssize_t m = lastofs + ((ofs - lastofs) >> 1);
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1236
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1237 IFLT(a[m], key)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1238 lastofs = m+1; /* a[m] < key */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1239 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1240 ofs = m; /* key <= a[m] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1241 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1242 assert(lastofs == ofs); /* so a[ofs-1] < key <= a[ofs] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1243 return ofs;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1244
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1245 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1246 return -1;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1247 }
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1248
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1249 /*
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1250 Exactly like gallop_left(), except that if key already exists in a[0:n],
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1251 finds the position immediately to the right of the rightmost equal value.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1252
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1253 The return value is the int k in 0..n such that
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1254
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1255 a[k-1] <= key < a[k]
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1256
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1257 or -1 if error.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1258
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1259 The code duplication is massive, but this is enough different given that
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1260 we're sticking to "<" comparisons that it's much harder to follow if
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1261 written as one routine with yet another "left or right?" flag.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1262 */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1263 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1264 gallop_right(PyObject key, PyObject a, Py_ssize_t n, Py_ssize_t hint, PyObject compare)
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1265 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1266 Py_ssize_t ofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1267 Py_ssize_t lastofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1268 Py_ssize_t k;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1269
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1270 assert(key && a && n > 0 && hint >= 0 && hint < n);
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1271
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1272 a += hint;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1273 lastofs = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1274 ofs = 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1275 IFLT(key, *a) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1276 /* key < a[hint] -- gallop left, until
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1277 * a[hint - ofs] <= key < a[hint - lastofs]
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1278 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1279 const Py_ssize_t maxofs = hint + 1; /* &a[0] is lowest */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1280 while (ofs < maxofs) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1281 IFLT(key, *(a-ofs)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1282 lastofs = ofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1283 ofs = (ofs << 1) + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1284 if (ofs <= 0) /* int overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1285 ofs = maxofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1286 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1287 else /* a[hint - ofs] <= key */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1288 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1289 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1290 if (ofs > maxofs)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1291 ofs = maxofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1292 /* Translate back to positive offsets relative to &a[0]. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1293 k = lastofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1294 lastofs = hint - ofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1295 ofs = hint - k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1296 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1297 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1298 /* a[hint] <= key -- gallop right, until
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1299 * a[hint + lastofs] <= key < a[hint + ofs]
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1300 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1301 const Py_ssize_t maxofs = n - hint; /* &a[n-1] is highest */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1302 while (ofs < maxofs) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1303 IFLT(key, a[ofs])
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1304 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1305 /* a[hint + ofs] <= key */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1306 lastofs = ofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1307 ofs = (ofs << 1) + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1308 if (ofs <= 0) /* int overflow */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1309 ofs = maxofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1310 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1311 if (ofs > maxofs)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1312 ofs = maxofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1313 /* Translate back to offsets relative to &a[0]. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1314 lastofs += hint;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1315 ofs += hint;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1316 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1317 a -= hint;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1318
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1319 assert(-1 <= lastofs && lastofs < ofs && ofs <= n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1320 /* Now a[lastofs] <= key < a[ofs], so key belongs somewhere to the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1321 * right of lastofs but no farther right than ofs. Do a binary
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1322 * search, with invariant a[lastofs-1] <= key < a[ofs].
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1323 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1324 ++lastofs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1325 while (lastofs < ofs) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1326 Py_ssize_t m = lastofs + ((ofs - lastofs) >> 1);
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1327
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1328 IFLT(key, a[m])
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1329 ofs = m; /* key < a[m] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1330 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1331 lastofs = m+1; /* a[m] <= key */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1332 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1333 assert(lastofs == ofs); /* so a[ofs-1] <= key < a[ofs] */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1334 return ofs;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1335
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1336 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1337 return -1;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1338 }
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1339
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1340 /* The maximum number of entries in a MergeState's pending-runs stack.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1341 * This is enough to sort arrays of size up to about
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1342 * 32 * phi ** MAX_MERGE_PENDING
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1343 * where phi ~= 1.618. 85 is ridiculouslylarge enough, good for an array
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1344 * with 2**64 elements.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1345 */
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1346 #define MAX_MERGE_PENDING 85
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1347
24727 b5640e74aa5c 1. Combined the base and length arrays into a single array of structs. Tim Peters <tim.peters@gmail.com> parents: 24657 diff changeset	1348 /* When we get into galloping mode, we stay there until both runs win less
b5640e74aa5c 1. Combined the base and length arrays into a single array of structs. Tim Peters <tim.peters@gmail.com> parents: 24657 diff changeset	1349 * often than MIN_GALLOP consecutive times. See listsort.txt for more info.
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1350 */
24727 b5640e74aa5c 1. Combined the base and length arrays into a single array of structs. Tim Peters <tim.peters@gmail.com> parents: 24657 diff changeset	1351 #define MIN_GALLOP 7
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1352
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1353 /* Avoid malloc for small temp arrays. */
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1354 #define MERGESTATE_TEMP_SIZE 256
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1355
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1356 /* One MergeState exists on the stack per invocation of mergesort. It's just
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1357 * a convenient way to pass state around among the helper functions.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1358 */
24727 b5640e74aa5c 1. Combined the base and length arrays into a single array of structs. Tim Peters <tim.peters@gmail.com> parents: 24657 diff changeset	1359 struct s_slice {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1360 PyObject **base;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1361 Py_ssize_t len;
24727 b5640e74aa5c 1. Combined the base and length arrays into a single array of structs. Tim Peters <tim.peters@gmail.com> parents: 24657 diff changeset	1362 };
b5640e74aa5c 1. Combined the base and length arrays into a single array of structs. Tim Peters <tim.peters@gmail.com> parents: 24657 diff changeset	1363
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1364 typedef struct s_MergeState {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1365 /* The user-supplied comparison function. or NULL if none given. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1366 PyObject *compare;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1367
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1368 /* This controls when we get into galloping mode. It's initialized
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1369 * to MIN_GALLOP. merge_lo and merge_hi tend to nudge it higher for
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1370 * random data, and lower for highly structured data.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1371 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1372 Py_ssize_t min_gallop;
24727 b5640e74aa5c 1. Combined the base and length arrays into a single array of structs. Tim Peters <tim.peters@gmail.com> parents: 24657 diff changeset	1373
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1374 /* 'a' is temp storage to help with merges. It contains room for
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1375 * alloced entries.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1376 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1377 PyObject *a; / may point to temparray below */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1378 Py_ssize_t alloced;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1379
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1380 /* A stack of n pending runs yet to be merged. Run #i starts at
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1381 * address base[i] and extends for len[i] elements. It's always
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1382 * true (so long as the indices are in bounds) that
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1383 *
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1384 * pending[i].base + pending[i].len == pending[i+1].base
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1385 *
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1386 * so we could cut the storage for this, but it's a minor amount,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1387 * and keeping all the info explicit simplifies the code.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1388 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1389 int n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1390 struct s_slice pending[MAX_MERGE_PENDING];
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1391
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1392 /* 'a' points to this when possible, rather than muck with malloc. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1393 PyObject *temparray[MERGESTATE_TEMP_SIZE];
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1394 } MergeState;
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1395
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1396 /* Conceptually a MergeState's constructor. */
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1397 static void
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1398 merge_init(MergeState ms, PyObject compare)
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1399 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1400 assert(ms != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1401 ms->compare = compare;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1402 ms->a = ms->temparray;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1403 ms->alloced = MERGESTATE_TEMP_SIZE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1404 ms->n = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1405 ms->min_gallop = MIN_GALLOP;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1406 }
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1407
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1408 /* Free all the temp memory owned by the MergeState. This must be called
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1409 * when you're done with a MergeState, and may be called before then if
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1410 * you want to free the temp memory early.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1411 */
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1412 static void
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1413 merge_freemem(MergeState *ms)
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1414 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1415 assert(ms != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1416 if (ms->a != ms->temparray)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1417 PyMem_Free(ms->a);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1418 ms->a = ms->temparray;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1419 ms->alloced = MERGESTATE_TEMP_SIZE;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1420 }
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1421
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1422 /* Ensure enough temp memory for 'need' array slots is available.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1423 * Returns 0 on success and -1 if the memory can't be gotten.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1424 */
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1425 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1426 merge_getmem(MergeState *ms, Py_ssize_t need)
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1427 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1428 assert(ms != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1429 if (need <= ms->alloced)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1430 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1431 /* Don't realloc! That can cost cycles to copy the old data, but
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1432 * we don't care what's in the block.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1433 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1434 merge_freemem(ms);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1435 if ((size_t)need > PY_SSIZE_T_MAX / sizeof(PyObject*)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1436 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1437 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1438 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1439 ms->a = (PyObject *)PyMem_Malloc(need sizeof(PyObject*));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1440 if (ms->a) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1441 ms->alloced = need;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1442 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1443 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1444 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1445 merge_freemem(ms); /* reset to sane state */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1446 return -1;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1447 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1448 #define MERGE_GETMEM(MS, NEED) ((NEED) <= (MS)->alloced ? 0 : \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1449 merge_getmem(MS, NEED))
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1450
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1451 /* Merge the na elements starting at pa with the nb elements starting at pb
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1452 * in a stable way, in-place. na and nb must be > 0, and pa + na == pb.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1453 * Must also have that pb < pa, that pa[na-1] belongs at the end of the
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1454 * merge, and should have na <= nb. See listsort.txt for more info.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1455 * Return 0 if successful, -1 if error.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1456 */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1457 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1458 merge_lo(MergeState ms, PyObject *pa, Py_ssize_t na,
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1459 PyObject **pb, Py_ssize_t nb)
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1460 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1461 Py_ssize_t k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1462 PyObject *compare;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1463 PyObject **dest;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1464 int result = -1; /* guilty until proved innocent */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1465 Py_ssize_t min_gallop;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1466
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1467 assert(ms && pa && pb && na > 0 && nb > 0 && pa + na == pb);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1468 if (MERGE_GETMEM(ms, na) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1469 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1470 memcpy(ms->a, pa, na * sizeof(PyObject*));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1471 dest = pa;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1472 pa = ms->a;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1473
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1474 dest++ = pb++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1475 --nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1476 if (nb == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1477 goto Succeed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1478 if (na == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1479 goto CopyB;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1480
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1481 min_gallop = ms->min_gallop;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1482 compare = ms->compare;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1483 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1484 Py_ssize_t acount = 0; /* # of times A won in a row */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1485 Py_ssize_t bcount = 0; /* # of times B won in a row */
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1486
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1487 /* Do the straightforward thing until (if ever) one run
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1488 * appears to win consistently.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1489 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1490 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1491 assert(na > 1 && nb > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1492 k = ISLT(pb, pa, compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1493 if (k) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1494 if (k < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1495 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1496 dest++ = pb++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1497 ++bcount;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1498 acount = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1499 --nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1500 if (nb == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1501 goto Succeed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1502 if (bcount >= min_gallop)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1503 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1504 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1505 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1506 dest++ = pa++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1507 ++acount;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1508 bcount = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1509 --na;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1510 if (na == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1511 goto CopyB;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1512 if (acount >= min_gallop)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1513 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1514 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1515 }
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1516
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1517 /* One run is winning so consistently that galloping may
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1518 * be a huge win. So try that, and continue galloping until
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1519 * (if ever) neither run appears to be winning consistently
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1520 * anymore.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1521 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1522 ++min_gallop;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1523 do {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1524 assert(na > 1 && nb > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1525 min_gallop -= min_gallop > 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1526 ms->min_gallop = min_gallop;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1527 k = gallop_right(*pb, pa, na, 0, compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1528 acount = k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1529 if (k) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1530 if (k < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1531 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1532 memcpy(dest, pa, k * sizeof(PyObject *));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1533 dest += k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1534 pa += k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1535 na -= k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1536 if (na == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1537 goto CopyB;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1538 /* na==0 is impossible now if the comparison
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1539 * function is consistent, but we can't assume
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1540 * that it is.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1541 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1542 if (na == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1543 goto Succeed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1544 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1545 dest++ = pb++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1546 --nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1547 if (nb == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1548 goto Succeed;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1549
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1550 k = gallop_left(*pa, pb, nb, 0, compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1551 bcount = k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1552 if (k) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1553 if (k < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1554 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1555 memmove(dest, pb, k * sizeof(PyObject *));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1556 dest += k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1557 pb += k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1558 nb -= k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1559 if (nb == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1560 goto Succeed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1561 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1562 dest++ = pa++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1563 --na;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1564 if (na == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1565 goto CopyB;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1566 } while (acount >= MIN_GALLOP \|\| bcount >= MIN_GALLOP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1567 ++min_gallop; /* penalize it for leaving galloping mode */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1568 ms->min_gallop = min_gallop;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1569 }
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1570 Succeed:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1571 result = 0;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1572 Fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1573 if (na)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1574 memcpy(dest, pa, na * sizeof(PyObject*));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1575 return result;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1576 CopyB:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1577 assert(na == 1 && nb > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1578 /* The last element of pa belongs at the end of the merge. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1579 memmove(dest, pb, nb * sizeof(PyObject *));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1580 dest[nb] = *pa;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1581 return 0;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1582 }
6814 0fe3dc28b92c Modified quicksort by Raymund Galvin, after studying the GNU libg++ Guido van Rossum <guido@python.org> parents: 6154 diff changeset	1583
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1584 /* Merge the na elements starting at pa with the nb elements starting at pb
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1585 * in a stable way, in-place. na and nb must be > 0, and pa + na == pb.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1586 * Must also have that pb < pa, that pa[na-1] belongs at the end of the
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1587 * merge, and should have na >= nb. See listsort.txt for more info.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1588 * Return 0 if successful, -1 if error.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1589 */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1590 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1591 merge_hi(MergeState ms, PyObject pa, Py_ssize_t na, PyObject *pb, Py_ssize_t nb)
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1592 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1593 Py_ssize_t k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1594 PyObject *compare;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1595 PyObject **dest;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1596 int result = -1; /* guilty until proved innocent */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1597 PyObject **basea;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1598 PyObject **baseb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1599 Py_ssize_t min_gallop;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1600
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1601 assert(ms && pa && pb && na > 0 && nb > 0 && pa + na == pb);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1602 if (MERGE_GETMEM(ms, nb) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1603 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1604 dest = pb + nb - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1605 memcpy(ms->a, pb, nb * sizeof(PyObject*));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1606 basea = pa;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1607 baseb = ms->a;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1608 pb = ms->a + nb - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1609 pa += na - 1;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1610
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1611 dest-- = pa--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1612 --na;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1613 if (na == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1614 goto Succeed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1615 if (nb == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1616 goto CopyA;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1617
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1618 min_gallop = ms->min_gallop;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1619 compare = ms->compare;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1620 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1621 Py_ssize_t acount = 0; /* # of times A won in a row */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1622 Py_ssize_t bcount = 0; /* # of times B won in a row */
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1623
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1624 /* Do the straightforward thing until (if ever) one run
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1625 * appears to win consistently.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1626 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1627 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1628 assert(na > 0 && nb > 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1629 k = ISLT(pb, pa, compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1630 if (k) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1631 if (k < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1632 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1633 dest-- = pa--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1634 ++acount;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1635 bcount = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1636 --na;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1637 if (na == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1638 goto Succeed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1639 if (acount >= min_gallop)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1640 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1641 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1642 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1643 dest-- = pb--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1644 ++bcount;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1645 acount = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1646 --nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1647 if (nb == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1648 goto CopyA;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1649 if (bcount >= min_gallop)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1650 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1651 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1652 }
8164 ea59bb921380 Quicksort retuned by Tim Peters. Guido van Rossum <guido@python.org> parents: 7986 diff changeset	1653
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1654 /* One run is winning so consistently that galloping may
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1655 * be a huge win. So try that, and continue galloping until
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1656 * (if ever) neither run appears to be winning consistently
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1657 * anymore.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1658 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1659 ++min_gallop;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1660 do {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1661 assert(na > 0 && nb > 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1662 min_gallop -= min_gallop > 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1663 ms->min_gallop = min_gallop;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1664 k = gallop_right(*pb, basea, na, na-1, compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1665 if (k < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1666 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1667 k = na - k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1668 acount = k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1669 if (k) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1670 dest -= k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1671 pa -= k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1672 memmove(dest+1, pa+1, k * sizeof(PyObject *));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1673 na -= k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1674 if (na == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1675 goto Succeed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1676 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1677 dest-- = pb--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1678 --nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1679 if (nb == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1680 goto CopyA;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1681
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1682 k = gallop_left(*pa, baseb, nb, nb-1, compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1683 if (k < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1684 goto Fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1685 k = nb - k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1686 bcount = k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1687 if (k) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1688 dest -= k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1689 pb -= k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1690 memcpy(dest+1, pb+1, k * sizeof(PyObject *));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1691 nb -= k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1692 if (nb == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1693 goto CopyA;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1694 /* nb==0 is impossible now if the comparison
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1695 * function is consistent, but we can't assume
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1696 * that it is.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1697 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1698 if (nb == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1699 goto Succeed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1700 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1701 dest-- = pa--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1702 --na;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1703 if (na == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1704 goto Succeed;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1705 } while (acount >= MIN_GALLOP \|\| bcount >= MIN_GALLOP);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1706 ++min_gallop; /* penalize it for leaving galloping mode */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1707 ms->min_gallop = min_gallop;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1708 }
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1709 Succeed:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1710 result = 0;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1711 Fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1712 if (nb)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1713 memcpy(dest-(nb-1), baseb, nb * sizeof(PyObject*));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1714 return result;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1715 CopyA:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1716 assert(nb == 1 && na > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1717 /* The first element of pb belongs at the front of the merge. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1718 dest -= na;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1719 pa -= na;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1720 memmove(dest+1, pa+1, na * sizeof(PyObject *));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1721 dest = pb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1722 return 0;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1723 }
6814 0fe3dc28b92c Modified quicksort by Raymund Galvin, after studying the GNU libg++ Guido van Rossum <guido@python.org> parents: 6154 diff changeset	1724
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1725 /* Merge the two runs at stack indices i and i+1.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1726 * Returns 0 on success, -1 on error.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1727 */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1728 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1729 merge_at(MergeState *ms, Py_ssize_t i)
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1730 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1731 PyObject pa, pb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1732 Py_ssize_t na, nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1733 Py_ssize_t k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1734 PyObject *compare;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1735
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1736 assert(ms != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1737 assert(ms->n >= 2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1738 assert(i >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1739 assert(i == ms->n - 2 \|\| i == ms->n - 3);
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1740
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1741 pa = ms->pending[i].base;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1742 na = ms->pending[i].len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1743 pb = ms->pending[i+1].base;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1744 nb = ms->pending[i+1].len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1745 assert(na > 0 && nb > 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1746 assert(pa + na == pb);
8322 e6ef0e39e35c Tim's quicksort on May 10. Guido van Rossum <guido@python.org> parents: 8186 diff changeset	1747
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1748 /* Record the length of the combined runs; if i is the 3rd-last
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1749 * run now, also slide over the last run (which isn't involved
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1750 * in this merge). The current run i+1 goes away in any case.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1751 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1752 ms->pending[i].len = na + nb;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1753 if (i == ms->n - 3)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1754 ms->pending[i+1] = ms->pending[i+2];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1755 --ms->n;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1756
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1757 /* Where does b start in a? Elements in a before that can be
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1758 * ignored (already in place).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1759 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1760 compare = ms->compare;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1761 k = gallop_right(*pb, pa, na, 0, compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1762 if (k < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1763 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1764 pa += k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1765 na -= k;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1766 if (na == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1767 return 0;
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1768
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1769 /* Where does a end in b? Elements in b after that can be
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1770 * ignored (already in place).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1771 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1772 nb = gallop_left(pa[na-1], pb, nb, nb-1, compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1773 if (nb <= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1774 return nb;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1775
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1776 /* Merge what remains of the runs, using a temp array with
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1777 * min(na, nb) elements.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1778 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1779 if (na <= nb)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1780 return merge_lo(ms, pa, na, pb, nb);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1781 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1782 return merge_hi(ms, pa, na, pb, nb);
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1783 }
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1784
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1785 /* Examine the stack of runs waiting to be merged, merging adjacent runs
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1786 * until the stack invariants are re-established:
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1787 *
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1788 * 1. len[-3] > len[-2] + len[-1]
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1789 * 2. len[-2] > len[-1]
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1790 *
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1791 * See listsort.txt for more info.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1792 *
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1793 * Returns 0 on success, -1 on error.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1794 */
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1795 static int
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1796 merge_collapse(MergeState *ms)
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1797 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1798 struct s_slice *p = ms->pending;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1799
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1800 assert(ms);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1801 while (ms->n > 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1802 Py_ssize_t n = ms->n - 2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1803 if (n > 0 && p[n-1].len <= p[n].len + p[n+1].len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1804 if (p[n-1].len < p[n+1].len)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1805 --n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1806 if (merge_at(ms, n) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1807 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1808 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1809 else if (p[n].len <= p[n+1].len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1810 if (merge_at(ms, n) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1811 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1812 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1813 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1814 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1815 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1816 return 0;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1817 }
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1818
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1819 /* Regardless of invariants, merge all runs on the stack until only one
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1820 * remains. This is used at the end of the mergesort.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1821 *
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1822 * Returns 0 on success, -1 on error.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1823 */
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1824 static int
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1825 merge_force_collapse(MergeState *ms)
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1826 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1827 struct s_slice *p = ms->pending;
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	1828
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1829 assert(ms);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1830 while (ms->n > 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1831 Py_ssize_t n = ms->n - 2;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1832 if (n > 0 && p[n-1].len < p[n+1].len)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1833 --n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1834 if (merge_at(ms, n) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1835 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1836 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1837 return 0;
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1838 }
8457 af48887c9717 Tim's revision of the previous patch. He also added some sparts to Guido van Rossum <guido@python.org> parents: 8440 diff changeset	1839
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1840 /* Compute a good value for the minimum run length; natural runs shorter
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1841 * than this are boosted artificially via binary insertion.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1842 *
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1843 * If n < 64, return n (it's too small to bother with fancy stuff).
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1844 * Else if n is an exact power of 2, return 32.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1845 * Else return an int k, 32 <= k <= 64, such that n/k is close to, but
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1846 * strictly less than, an exact power of 2.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1847 *
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1848 * See listsort.txt for more info.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1849 */
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1850 static Py_ssize_t
7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	1851 merge_compute_minrun(Py_ssize_t n)
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1852 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1853 Py_ssize_t r = 0; /* becomes 1 if any 1 bits are shifted off */
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	1854
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1855 assert(n >= 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1856 while (n >= 64) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1857 r \|= n & 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1858 n >>= 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1859 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1860 return n + r;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	1861 }
8457 af48887c9717 Tim's revision of the previous patch. He also added some sparts to Guido van Rossum <guido@python.org> parents: 8440 diff changeset	1862
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1863 /* Special wrapper to support stable sorting using the decorate-sort-undecorate
33448 5570fae1f01c Typo fix: 'comparisions' is not a word Andrew M. Kuchling <amk@amk.ca> parents: 33114 diff changeset	1864 pattern. Holds a key which is used for comparisons and the original record
32850 09e633c52730 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32848 diff changeset	1865 which is returned during the undecorate phase. By exposing only the key
09e633c52730 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32848 diff changeset	1866 during comparisons, the underlying sort stability characteristics are left
09e633c52730 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32848 diff changeset	1867 unchanged. Also, if a custom comparison function is used, it will only see
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1868 the key instead of a full record. */
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1869
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1870 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1871 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1872 PyObject *key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1873 PyObject *value;
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1874 } sortwrapperobject;
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1875
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1876 PyDoc_STRVAR(sortwrapper_doc, "Object wrapper with a custom sort key.");
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1877 static PyObject *
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1878 sortwrapper_richcompare(sortwrapperobject , sortwrapperobject , int);
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1879 static void
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1880 sortwrapper_dealloc(sortwrapperobject *);
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1881
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1882 static PyTypeObject sortwrapper_type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1883 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1884 "sortwrapper", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1885 sizeof(sortwrapperobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1886 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1887 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1888 (destructor)sortwrapper_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1889 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1890 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1891 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1892 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1893 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1894 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1895 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1896 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1897 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1898 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1899 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1900 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1901 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1902 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1903 Py_TPFLAGS_DEFAULT \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1904 Py_TPFLAGS_HAVE_RICHCOMPARE, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1905 sortwrapper_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1906 0, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1907 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1908 (richcmpfunc)sortwrapper_richcompare, /* tp_richcompare */
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1909 };
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1910
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1911
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1912 static PyObject *
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1913 sortwrapper_richcompare(sortwrapperobject a, sortwrapperobject b, int op)
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1914 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1915 if (!PyObject_TypeCheck(b, &sortwrapper_type)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1916 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1917 "expected a sortwrapperobject");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1918 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1919 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1920 return PyObject_RichCompare(a->key, b->key, op);
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1921 }
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1922
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1923 static void
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1924 sortwrapper_dealloc(sortwrapperobject *so)
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1925 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1926 Py_XDECREF(so->key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1927 Py_XDECREF(so->value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1928 PyObject_Del(so);
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1929 }
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	1930
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1931 /* Returns a new reference to a sortwrapper.
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1932 Consumes the references to the two underlying objects. */
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1933
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1934 static PyObject *
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1935 build_sortwrapper(PyObject key, PyObject value)
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1936 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1937 sortwrapperobject *so;
32850 09e633c52730 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32848 diff changeset	1938
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1939 so = PyObject_New(sortwrapperobject, &sortwrapper_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1940 if (so == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1941 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1942 so->key = key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1943 so->value = value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1944 return (PyObject *)so;
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1945 }
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1946
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1947 /* Returns a new reference to the value underlying the wrapper. */
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1948 static PyObject *
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1949 sortwrapper_getvalue(PyObject *so)
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1950 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1951 PyObject *value;
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1952
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1953 if (!PyObject_TypeCheck(so, &sortwrapper_type)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1954 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1955 "expected a sortwrapperobject");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1956 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1957 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1958 value = ((sortwrapperobject *)so)->value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1959 Py_INCREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1960 return value;
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1961 }
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1962
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1963 /* Wrapper for user specified cmp functions in combination with a
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1964 specified key function. Makes sure the cmp function is presented
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1965 with the actual key instead of the sortwrapper */
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1966
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1967 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1968 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1969 PyObject *func;
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1970 } cmpwrapperobject;
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1971
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1972 static void
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1973 cmpwrapper_dealloc(cmpwrapperobject *co)
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1974 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1975 Py_XDECREF(co->func);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1976 PyObject_Del(co);
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1977 }
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1978
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1979 static PyObject *
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1980 cmpwrapper_call(cmpwrapperobject co, PyObject args, PyObject *kwds)
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1981 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1982 PyObject x, y, xx, yy;
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1983
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1984 if (!PyArg_UnpackTuple(args, "", 2, 2, &x, &y))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1985 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1986 if (!PyObject_TypeCheck(x, &sortwrapper_type) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1987 !PyObject_TypeCheck(y, &sortwrapper_type)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1988 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1989 "expected a sortwrapperobject");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1990 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1991 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1992 xx = ((sortwrapperobject *)x)->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1993 yy = ((sortwrapperobject *)y)->key;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	1994 return PyObject_CallFunctionObjArgs(co->func, xx, yy, NULL);
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1995 }
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1996
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1997 PyDoc_STRVAR(cmpwrapper_doc, "cmp() wrapper for sort with custom keys.");
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1998
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	1999 static PyTypeObject cmpwrapper_type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2000 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2001 "cmpwrapper", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2002 sizeof(cmpwrapperobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2003 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2004 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2005 (destructor)cmpwrapper_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2006 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2007 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2008 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2009 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2010 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2011 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2012 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2013 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2014 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2015 (ternaryfunc)cmpwrapper_call, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2016 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2017 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2018 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2019 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2020 Py_TPFLAGS_DEFAULT, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2021 cmpwrapper_doc, /* tp_doc */
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2022 };
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2023
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2024 static PyObject *
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2025 build_cmpwrapper(PyObject *cmpfunc)
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2026 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2027 cmpwrapperobject *co;
32850 09e633c52730 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32848 diff changeset	2028
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2029 co = PyObject_New(cmpwrapperobject, &cmpwrapper_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2030 if (co == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2031 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2032 Py_INCREF(cmpfunc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2033 co->func = cmpfunc;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2034 return (PyObject *)co;
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2035 }
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2036
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	2037 /* An adaptive, stable, natural mergesort. See listsort.txt.
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	2038 * Returns Py_None on success, NULL on error. Even in case of error, the
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	2039 * list will be some permutation of its input state (nothing is lost or
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	2040 * duplicated).
d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	2041 */
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2042 static PyObject *
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2043 listsort(PyListObject self, PyObject args, PyObject *kwds)
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2044 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2045 MergeState ms;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2046 PyObject lo, hi;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2047 Py_ssize_t nremaining;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2048 Py_ssize_t minrun;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2049 Py_ssize_t saved_ob_size, saved_allocated;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2050 PyObject **saved_ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2051 PyObject **final_ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2052 PyObject *compare = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2053 PyObject result = NULL; / guilty until proved innocent */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2054 int reverse = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2055 PyObject *keyfunc = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2056 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2057 PyObject key, value, *kvpair;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2058 static char *kwlist[] = {"cmp", "key", "reverse", 0};
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	2059
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2060 assert(self != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2061 assert (PyList_Check(self));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2062 if (args != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2063 if (!PyArg_ParseTupleAndKeywords(args, kwds, "\|OOi:sort",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2064 kwlist, &compare, &keyfunc, &reverse))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2065 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2066 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2067 if (compare == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2068 compare = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2069 if (compare != NULL &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2070 PyErr_WarnPy3k("the cmp argument is not supported in 3.x", 1) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2071 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2072 if (keyfunc == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2073 keyfunc = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2074 if (compare != NULL && keyfunc != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2075 compare = build_cmpwrapper(compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2076 if (compare == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2077 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2078 } else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2079 Py_XINCREF(compare);
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2080
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2081 /* The list is temporarily made empty, so that mutations performed
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2082 * by comparison functions can't affect the slice of memory we're
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2083 * sorting (allowing mutations during sorting is a core-dump
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2084 * factory, since ob_item may change).
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2085 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2086 saved_ob_size = Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2087 saved_ob_item = self->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2088 saved_allocated = self->allocated;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2089 Py_SIZE(self) = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2090 self->ob_item = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2091 self->allocated = -1; /* any operation will reset it to >= 0 */
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	2092
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2093 if (keyfunc != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2094 for (i=0 ; i < saved_ob_size ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2095 value = saved_ob_item[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2096 key = PyObject_CallFunctionObjArgs(keyfunc, value,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2097 NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2098 if (key == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2099 for (i=i-1 ; i>=0 ; i--) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2100 kvpair = saved_ob_item[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2101 value = sortwrapper_getvalue(kvpair);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2102 saved_ob_item[i] = value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2103 Py_DECREF(kvpair);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2104 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2105 goto dsu_fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2106 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2107 kvpair = build_sortwrapper(key, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2108 if (kvpair == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2109 goto dsu_fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2110 saved_ob_item[i] = kvpair;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2111 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2112 }
31093 f2e7646f7763 Fixes and tests for various "holding pointers when arbitrary Python code Michael W. Hudson <mwh@python.net> parents: 31041 diff changeset	2113
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2114 /* Reverse sort stability achieved by initially reversing the list,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2115 applying a stable forward sort, then reversing the final result. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2116 if (reverse && saved_ob_size > 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2117 reverse_slice(saved_ob_item, saved_ob_item + saved_ob_size);
31093 f2e7646f7763 Fixes and tests for various "holding pointers when arbitrary Python code Michael W. Hudson <mwh@python.net> parents: 31041 diff changeset	2118
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2119 merge_init(&ms, compare);
31093 f2e7646f7763 Fixes and tests for various "holding pointers when arbitrary Python code Michael W. Hudson <mwh@python.net> parents: 31041 diff changeset	2120
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2121 nremaining = saved_ob_size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2122 if (nremaining < 2)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2123 goto succeed;
24316 dd38291b89fb More sort cleanup: Moved the special cases from samplesortslice into Tim Peters <tim.peters@gmail.com> parents: 24313 diff changeset	2124
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2125 /* March over the array once, left to right, finding natural runs,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2126 * and extending short natural runs to minrun elements.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2127 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2128 lo = saved_ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2129 hi = lo + nremaining;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2130 minrun = merge_compute_minrun(nremaining);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2131 do {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2132 int descending;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2133 Py_ssize_t n;
24316 dd38291b89fb More sort cleanup: Moved the special cases from samplesortslice into Tim Peters <tim.peters@gmail.com> parents: 24313 diff changeset	2134
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2135 /* Identify next run. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2136 n = count_run(lo, hi, compare, &descending);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2137 if (n < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2138 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2139 if (descending)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2140 reverse_slice(lo, lo + n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2141 /* If short, extend to min(minrun, nremaining). */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2142 if (n < minrun) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2143 const Py_ssize_t force = nremaining <= minrun ?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2144 nremaining : minrun;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2145 if (binarysort(lo, lo + force, lo + n, compare) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2146 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2147 n = force;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2148 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2149 /* Push run onto pending-runs stack, and maybe merge. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2150 assert(ms.n < MAX_MERGE_PENDING);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2151 ms.pending[ms.n].base = lo;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2152 ms.pending[ms.n].len = n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2153 ++ms.n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2154 if (merge_collapse(&ms) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2155 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2156 /* Advance to find next run. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2157 lo += n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2158 nremaining -= n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2159 } while (nremaining);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2160 assert(lo == hi);
24316 dd38291b89fb More sort cleanup: Moved the special cases from samplesortslice into Tim Peters <tim.peters@gmail.com> parents: 24313 diff changeset	2161
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2162 if (merge_force_collapse(&ms) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2163 goto fail;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2164 assert(ms.n == 1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2165 assert(ms.pending[0].base == saved_ob_item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2166 assert(ms.pending[0].len == saved_ob_size);
24316 dd38291b89fb More sort cleanup: Moved the special cases from samplesortslice into Tim Peters <tim.peters@gmail.com> parents: 24313 diff changeset	2167
24456 d216e67ac221 Replaced samplesort with a stable, adaptive mergesort. Tim Peters <tim.peters@gmail.com> parents: 24424 diff changeset	2168 succeed:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2169 result = Py_None;
24316 dd38291b89fb More sort cleanup: Moved the special cases from samplesortslice into Tim Peters <tim.peters@gmail.com> parents: 24313 diff changeset	2170 fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2171 if (keyfunc != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2172 for (i=0 ; i < saved_ob_size ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2173 kvpair = saved_ob_item[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2174 value = sortwrapper_getvalue(kvpair);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2175 saved_ob_item[i] = value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2176 Py_DECREF(kvpair);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2177 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2178 }
31093 f2e7646f7763 Fixes and tests for various "holding pointers when arbitrary Python code Michael W. Hudson <mwh@python.net> parents: 31041 diff changeset	2179
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2180 if (self->allocated != -1 && result != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2181 /* The user mucked with the list during the sort,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2182 * and we don't already have another error to report.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2183 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2184 PyErr_SetString(PyExc_ValueError, "list modified during sort");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2185 result = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2186 }
31093 f2e7646f7763 Fixes and tests for various "holding pointers when arbitrary Python code Michael W. Hudson <mwh@python.net> parents: 31041 diff changeset	2187
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2188 if (reverse && saved_ob_size > 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2189 reverse_slice(saved_ob_item, saved_ob_item + saved_ob_size);
31093 f2e7646f7763 Fixes and tests for various "holding pointers when arbitrary Python code Michael W. Hudson <mwh@python.net> parents: 31041 diff changeset	2190
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2191 merge_freemem(&ms);
31093 f2e7646f7763 Fixes and tests for various "holding pointers when arbitrary Python code Michael W. Hudson <mwh@python.net> parents: 31041 diff changeset	2192
f2e7646f7763 Fixes and tests for various "holding pointers when arbitrary Python code Michael W. Hudson <mwh@python.net> parents: 31041 diff changeset	2193 dsu_fail:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2194 final_ob_item = self->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2195 i = Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2196 Py_SIZE(self) = saved_ob_size;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2197 self->ob_item = saved_ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2198 self->allocated = saved_allocated;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2199 if (final_ob_item != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2200 /* we cannot use list_clear() for this because it does not
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2201 guarantee that the list is really empty when it returns */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2202 while (--i >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2203 Py_XDECREF(final_ob_item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2204 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2205 PyMem_FREE(final_ob_item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2206 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2207 Py_XDECREF(compare);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2208 Py_XINCREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2209 return result;
4673 a3cdc8164990 Added new quicksort implementation, tailored to sorting arrays of Guido van Rossum <guido@python.org> parents: 4503 diff changeset	2210 }
24316 dd38291b89fb More sort cleanup: Moved the special cases from samplesortslice into Tim Peters <tim.peters@gmail.com> parents: 24313 diff changeset	2211 #undef IFLT
24540 614358e3c4f6 Sped the usual case for sorting by calling PyObject_RichCompareBool Tim Peters <tim.peters@gmail.com> parents: 24515 diff changeset	2212 #undef ISLT
24316 dd38291b89fb More sort cleanup: Moved the special cases from samplesortslice into Tim Peters <tim.peters@gmail.com> parents: 24313 diff changeset	2213
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	2214 int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	2215 PyList_Sort(PyObject *v)
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	2216 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2217 if (v == NULL \|\| !PyList_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2218 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2219 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2220 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2221 v = listsort((PyListObject )v, (PyObject )NULL, (PyObject *)NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2222 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2223 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2224 Py_DECREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2225 return 0;
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	2226 }
69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	2227
16581 c0cdf82599e0 Fix core dump whenever PyList_Reverse() was called. Guido van Rossum <guido@python.org> parents: 15969 diff changeset	2228 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2229 listreverse(PyListObject *self)
16581 c0cdf82599e0 Fix core dump whenever PyList_Reverse() was called. Guido van Rossum <guido@python.org> parents: 15969 diff changeset	2230 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2231 if (Py_SIZE(self) > 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2232 reverse_slice(self->ob_item, self->ob_item + Py_SIZE(self));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2233 Py_RETURN_NONE;
155 896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	2234 }
896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	2235
47 05057e3660f8 Added external interface to sort a list. Guido van Rossum <guido@python.org> parents: 27 diff changeset	2236 int
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	2237 PyList_Reverse(PyObject *v)
2159 a619a61aad1e added reverselist; free recycling bin on error exit Guido van Rossum <guido@python.org> parents: 2143 diff changeset	2238 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2239 PyListObject self = (PyListObject )v;
24657 955914b0a4d6 PyList_Reverse(): This was leaking a reference to Py_None on every call. Tim Peters <tim.peters@gmail.com> parents: 24540 diff changeset	2240
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2241 if (v == NULL \|\| !PyList_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2242 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2243 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2244 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2245 if (Py_SIZE(self) > 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2246 reverse_slice(self->ob_item, self->ob_item + Py_SIZE(self));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2247 return 0;
2159 a619a61aad1e added reverselist; free recycling bin on error exit Guido van Rossum <guido@python.org> parents: 2143 diff changeset	2248 }
a619a61aad1e added reverselist; free recycling bin on error exit Guido van Rossum <guido@python.org> parents: 2143 diff changeset	2249
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2250 PyObject *
13472 dbe83fd23393 ANSI-fication of the sources. Fred Drake <fdrake@acm.org> parents: 13265 diff changeset	2251 PyList_AsTuple(PyObject *v)
1836 1203f0629527 Correct problems found by THINK C 6.0 Guido van Rossum <guido@python.org> parents: 1405 diff changeset	2252 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2253 PyObject *w;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2254 PyObject p, q;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2255 Py_ssize_t n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2256 if (v == NULL \|\| !PyList_Check(v)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2257 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2258 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2259 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2260 n = Py_SIZE(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2261 w = PyTuple_New(n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2262 if (w == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2263 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2264 p = ((PyTupleObject *)w)->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2265 q = ((PyListObject *)v)->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2266 while (--n >= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2267 Py_INCREF(*q);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2268 p = q;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2269 p++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2270 q++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2271 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2272 return w;
1836 1203f0629527 Correct problems found by THINK C 6.0 Guido van Rossum <guido@python.org> parents: 1405 diff changeset	2273 }
1203f0629527 Correct problems found by THINK C 6.0 Guido van Rossum <guido@python.org> parents: 1405 diff changeset	2274
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2275 static PyObject *
29510 01e925371d7c SF #754014: list.index() should accept optional start, end arguments Raymond Hettinger <python@rcn.com> parents: 29198 diff changeset	2276 listindex(PyListObject self, PyObject args)
155 896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	2277 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2278 Py_ssize_t i, start=0, stop=Py_SIZE(self);
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2279 PyObject v, format_tuple, *err_string;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2280 static PyObject *err_format = NULL;
11846 8b70eaaadf4b Made all list methods use PyArg_ParseTuple(), for more accurate Guido van Rossum <guido@python.org> parents: 11673 diff changeset	2281
73407 19ffa12ffdd4 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73389 diff changeset	2282 if (!PyArg_ParseTuple(args, "O\|O&O&:index", &v,
19ffa12ffdd4 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73389 diff changeset	2283 _PyEval_SliceIndex, &start,
19ffa12ffdd4 Revert "Accept None as start and stop parameters for list.index() and tuple.index()" Petri Lehtinen <petri@digip.org> parents: 73389 diff changeset	2284 _PyEval_SliceIndex, &stop))
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2285 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2286 if (start < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2287 start += Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2288 if (start < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2289 start = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2290 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2291 if (stop < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2292 stop += Py_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2293 if (stop < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2294 stop = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2295 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2296 for (i = start; i < stop && i < Py_SIZE(self); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2297 int cmp = PyObject_RichCompareBool(self->ob_item[i], v, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2298 if (cmp > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2299 return PyInt_FromSsize_t(i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2300 else if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2301 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2302 }
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2303 if (err_format == NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2304 err_format = PyString_FromString("%r is not in list");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2305 if (err_format == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2306 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2307 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2308 format_tuple = PyTuple_Pack(1, v);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2309 if (format_tuple == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2310 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2311 err_string = PyString_Format(err_format, format_tuple);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2312 Py_DECREF(format_tuple);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2313 if (err_string == NULL)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2314 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2315 PyErr_SetObject(PyExc_ValueError, err_string);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 59205 diff changeset	2316 Py_DECREF(err_string);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2317 return NULL;
155 896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	2318 }
896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	2319
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2320 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2321 listcount(PyListObject self, PyObject v)
394 8154385248d8 Added count() method. Guido van Rossum <guido@python.org> parents: 284 diff changeset	2322 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2323 Py_ssize_t count = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2324 Py_ssize_t i;
11846 8b70eaaadf4b Made all list methods use PyArg_ParseTuple(), for more accurate Guido van Rossum <guido@python.org> parents: 11673 diff changeset	2325
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2326 for (i = 0; i < Py_SIZE(self); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2327 int cmp = PyObject_RichCompareBool(self->ob_item[i], v, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2328 if (cmp > 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2329 count++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2330 else if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2331 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2332 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2333 return PyInt_FromSsize_t(count);
394 8154385248d8 Added count() method. Guido van Rossum <guido@python.org> parents: 284 diff changeset	2334 }
8154385248d8 Added count() method. Guido van Rossum <guido@python.org> parents: 284 diff changeset	2335
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2336 static PyObject *
19301 b9701538f827 Patch #427190: Implement and use METH_NOARGS and METH_O. Martin v. Löwis <martin@v.loewis.de> parents: 18933 diff changeset	2337 listremove(PyListObject self, PyObject v)
155 896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	2338 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2339 Py_ssize_t i;
11846 8b70eaaadf4b Made all list methods use PyArg_ParseTuple(), for more accurate Guido van Rossum <guido@python.org> parents: 11673 diff changeset	2340
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2341 for (i = 0; i < Py_SIZE(self); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2342 int cmp = PyObject_RichCompareBool(self->ob_item[i], v, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2343 if (cmp > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2344 if (list_ass_slice(self, i, i+1,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2345 (PyObject *)NULL) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2346 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2347 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2348 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2349 else if (cmp < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2350 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2351 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2352 PyErr_SetString(PyExc_ValueError, "list.remove(x): x not in list");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2353 return NULL;
155 896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	2354 }
896c825f2f71 Added repeat (for listinteget). Guido van Rossum <guido@python.org>* parents: 145 diff changeset	2355
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12952 diff changeset	2356 static int
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12952 diff changeset	2357 list_traverse(PyListObject o, visitproc visit, void arg)
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12952 diff changeset	2358 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2359 Py_ssize_t i;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12952 diff changeset	2360
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2361 for (i = Py_SIZE(o); --i >= 0; )
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2362 Py_VISIT(o->ob_item[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2363 return 0;
12990 e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12952 diff changeset	2364 }
e615596c5c47 Round 1 of Neil Schemenauer's GC patches: Jeremy Hylton <jeremy@alum.mit.edu> parents: 12952 diff changeset	2365
15969 e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2366 static PyObject *
e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2367 list_richcompare(PyObject v, PyObject w, int op)
e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2368 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2369 PyListObject vl, wl;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2370 Py_ssize_t i;
15969 e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2371
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2372 if (!PyList_Check(v) \|\| !PyList_Check(w)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2373 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2374 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2375 }
15969 e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2376
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2377 vl = (PyListObject *)v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2378 wl = (PyListObject *)w;
15969 e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2379
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2380 if (Py_SIZE(vl) != Py_SIZE(wl) && (op == Py_EQ \|\| op == Py_NE)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2381 /* Shortcut: if the lengths differ, the lists differ */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2382 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2383 if (op == Py_EQ)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2384 res = Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2385 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2386 res = Py_True;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2387 Py_INCREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2388 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2389 }
15969 e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2390
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2391 /* Search for the first index where items are different */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2392 for (i = 0; i < Py_SIZE(vl) && i < Py_SIZE(wl); i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2393 int k = PyObject_RichCompareBool(vl->ob_item[i],
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2394 wl->ob_item[i], Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2395 if (k < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2396 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2397 if (!k)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2398 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2399 }
15969 e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2400
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2401 if (i >= Py_SIZE(vl) \|\| i >= Py_SIZE(wl)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2402 /* No more items to compare -- compare sizes */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2403 Py_ssize_t vs = Py_SIZE(vl);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2404 Py_ssize_t ws = Py_SIZE(wl);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2405 int cmp;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2406 PyObject *res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2407 switch (op) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2408 case Py_LT: cmp = vs < ws; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2409 case Py_LE: cmp = vs <= ws; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2410 case Py_EQ: cmp = vs == ws; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2411 case Py_NE: cmp = vs != ws; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2412 case Py_GT: cmp = vs > ws; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2413 case Py_GE: cmp = vs >= ws; break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2414 default: return NULL; /* cannot happen */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2415 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2416 if (cmp)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2417 res = Py_True;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2418 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2419 res = Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2420 Py_INCREF(res);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2421 return res;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2422 }
15969 e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2423
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2424 /* We have an item that differs -- shortcuts for EQ/NE */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2425 if (op == Py_EQ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2426 Py_INCREF(Py_False);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2427 return Py_False;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2428 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2429 if (op == Py_NE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2430 Py_INCREF(Py_True);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2431 return Py_True;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2432 }
15969 e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2433
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2434 /* Compare the final item again using the proper operator */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2435 return PyObject_RichCompare(vl->ob_item[i], wl->ob_item[i], op);
15969 e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2436 }
e21da84d0c65 Convert to rich comparisons: Guido van Rossum <guido@python.org> parents: 15707 diff changeset	2437
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18409 diff changeset	2438 static int
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18409 diff changeset	2439 list_init(PyListObject self, PyObject args, PyObject *kw)
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18409 diff changeset	2440 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2441 PyObject *arg = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2442 static char *kwlist[] = {"sequence", 0};
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18409 diff changeset	2443
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2444 if (!PyArg_ParseTupleAndKeywords(args, kw, "\|O:list", kwlist, &arg))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2445 return -1;
32859 45f3222b84ee * Simplify and speed-up list_resize(). Relying on the newly documented Raymond Hettinger <python@rcn.com> parents: 32858 diff changeset	2446
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2447 /* Verify list invariants established by PyType_GenericAlloc() */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2448 assert(0 <= Py_SIZE(self));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2449 assert(Py_SIZE(self) <= self->allocated \|\| self->allocated == -1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2450 assert(self->ob_item != NULL \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2451 self->allocated == 0 \|\| self->allocated == -1);
32859 45f3222b84ee * Simplify and speed-up list_resize(). Relying on the newly documented Raymond Hettinger <python@rcn.com> parents: 32858 diff changeset	2452
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2453 /* Empty previous contents */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2454 if (self->ob_item != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2455 (void)list_clear(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2456 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2457 if (arg != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2458 PyObject *rv = listextend(self, arg);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2459 if (rv == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2460 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2461 Py_DECREF(rv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2462 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2463 return 0;
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18409 diff changeset	2464 }
09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18409 diff changeset	2465
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47294 diff changeset	2466 static PyObject *
88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47294 diff changeset	2467 list_sizeof(PyListObject *self)
21155 bca53a37a8a5 Fix of SF bug #475877 (Mutable subtype instances are hashable). Guido van Rossum <guido@python.org> parents: 20277 diff changeset	2468 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2469 Py_ssize_t res;
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47294 diff changeset	2470
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2471 res = sizeof(PyListObject) + self->allocated * sizeof(void*);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2472 return PyInt_FromSsize_t(res);
21155 bca53a37a8a5 Fix of SF bug #475877 (Mutable subtype instances are hashable). Guido van Rossum <guido@python.org> parents: 20277 diff changeset	2473 }
bca53a37a8a5 Fix of SF bug #475877 (Mutable subtype instances are hashable). Guido van Rossum <guido@python.org> parents: 20277 diff changeset	2474
30874 682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2475 static PyObject list_iter(PyObject seq);
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2476 static PyObject list_reversed(PyListObject seq, PyObject* unused);
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2477
31172 e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31164 diff changeset	2478 PyDoc_STRVAR(getitem_doc,
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31164 diff changeset	2479 "x.__getitem__(y) <==> x[y]");
30874 682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2480 PyDoc_STRVAR(reversed_doc,
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2481 "L.__reversed__() -- return a reverse iterator over the list");
47419 88bd07c0a847 Issue #2898: Added sys.getsizeof() to retrieve size of objects in bytes. Robert Schuppenies <okkotonushi@googlemail.com> parents: 47294 diff changeset	2482 PyDoc_STRVAR(sizeof_doc,
47421 a65f095b27f3 Some style nits. Also clarify in the docstrings what __sizeof__ does. Georg Brandl <georg@python.org> parents: 47419 diff changeset	2483 "L.__sizeof__() -- size of L in memory, in bytes");
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2484 PyDoc_STRVAR(append_doc,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2485 "L.append(object) -- append object to end");
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2486 PyDoc_STRVAR(extend_doc,
26816 6932794817c2 SF Bug 645777: list.extend() works with any iterable and is no longer Raymond Hettinger <python@rcn.com> parents: 26543 diff changeset	2487 "L.extend(iterable) -- extend list by appending elements from the iterable");
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2488 PyDoc_STRVAR(insert_doc,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2489 "L.insert(index, object) -- insert object before index");
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2490 PyDoc_STRVAR(pop_doc,
49431 2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47961 diff changeset	2491 "L.pop([index]) -> item -- remove and return item at index (default last).\n"
2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47961 diff changeset	2492 "Raises IndexError if list is empty or index is out of range.");
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2493 PyDoc_STRVAR(remove_doc,
49431 2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47961 diff changeset	2494 "L.remove(value) -- remove first occurrence of value.\n"
2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47961 diff changeset	2495 "Raises ValueError if the value is not present.");
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2496 PyDoc_STRVAR(index_doc,
49431 2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47961 diff changeset	2497 "L.index(value, [start, [stop]]) -> integer -- return first index of value.\n"
2e794757bdc8 Merged revisions 66766-66767,66771-66772,66774,66776,66783-66787,66790,66793,66797 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 47961 diff changeset	2498 "Raises ValueError if the value is not present.");
23832 ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2499 PyDoc_STRVAR(count_doc,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2500 "L.count(value) -> integer -- return number of occurrences of value");
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2501 PyDoc_STRVAR(reverse_doc,
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2502 "L.reverse() -- reverse IN PLACE");
ed1ba37a46b7 Patch #568124: Add doc string macros. Martin v. Löwis <martin@v.loewis.de> parents: 23779 diff changeset	2503 PyDoc_STRVAR(sort_doc,
30697 1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2504 "L.sort(cmp=None, key=None, reverse=False) -- stable sort IN PLACE;\n\
1345c23a0591 * list.sort() now supports three keyword arguments: cmp, key, and reverse. Raymond Hettinger <python@rcn.com> parents: 30156 diff changeset	2505 cmp(x, y) -> -1, 0, 1");
8595 635c3d94a948 Added doc strings for methods and a new pop() method. Guido van Rossum <guido@python.org> parents: 8515 diff changeset	2506
31172 e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31164 diff changeset	2507 static PyObject list_subscript(PyListObject, PyObject*);
e4fb6164158c * Added a new method flag, METH_COEXIST. Raymond Hettinger <python@rcn.com> parents: 31164 diff changeset	2508
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2509 static PyMethodDef list_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2510 {"__getitem__", (PyCFunction)list_subscript, METH_O\|METH_COEXIST, getitem_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2511 {"__reversed__",(PyCFunction)list_reversed, METH_NOARGS, reversed_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2512 {"__sizeof__", (PyCFunction)list_sizeof, METH_NOARGS, sizeof_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2513 {"append", (PyCFunction)listappend, METH_O, append_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2514 {"insert", (PyCFunction)listinsert, METH_VARARGS, insert_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2515 {"extend", (PyCFunction)listextend, METH_O, extend_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2516 {"pop", (PyCFunction)listpop, METH_VARARGS, pop_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2517 {"remove", (PyCFunction)listremove, METH_O, remove_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2518 {"index", (PyCFunction)listindex, METH_VARARGS, index_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2519 {"count", (PyCFunction)listcount, METH_O, count_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2520 {"reverse", (PyCFunction)listreverse, METH_NOARGS, reverse_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2521 {"sort", (PyCFunction)listsort, METH_VARARGS \| METH_KEYWORDS, sort_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2522 {NULL, NULL} /* sentinel */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2523 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2524
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2525 static PySequenceMethods list_as_sequence = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2526 (lenfunc)list_length, /* sq_length */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2527 (binaryfunc)list_concat, /* sq_concat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2528 (ssizeargfunc)list_repeat, /* sq_repeat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2529 (ssizeargfunc)list_item, /* sq_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2530 (ssizessizeargfunc)list_slice, /* sq_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2531 (ssizeobjargproc)list_ass_item, /* sq_ass_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2532 (ssizessizeobjargproc)list_ass_slice, /* sq_ass_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2533 (objobjproc)list_contains, /* sq_contains */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2534 (binaryfunc)list_inplace_concat, /* sq_inplace_concat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2535 (ssizeargfunc)list_inplace_repeat, /* sq_inplace_repeat */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2536 };
fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2537
23855 2b071337205c Missed one use of new PyDoc_STRVAR macro Neal Norwitz <nnorwitz@gmail.com> parents: 23834 diff changeset	2538 PyDoc_STRVAR(list_doc,
59223 0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58903 diff changeset	2539 "list() -> new empty list\n"
0265cdc8d5bb Merged revisions 78515-78516,78522 via svnmerge from Ezio Melotti <ezio.melotti@gmail.com> parents: 58903 diff changeset	2540 "list(iterable) -> new list initialized from iterable's items");
18933 09df3254b49d Merge of descr-branch back into trunk. Tim Peters <tim.peters@gmail.com> parents: 18409 diff changeset	2541
36882 6a9c7165b17b Checking in the code for PEP 357. Guido van Rossum <guido@python.org> parents: 36675 diff changeset	2542
24230 2860be244263 Don't declare a function with staticforward. Jeremy Hylton <jeremy@alum.mit.edu> parents: 24207 diff changeset	2543 static PyObject *
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2544 list_subscript(PyListObject* self, PyObject* item)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2545 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2546 if (PyIndex_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2547 Py_ssize_t i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2548 i = PyNumber_AsSsize_t(item, PyExc_IndexError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2549 if (i == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2550 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2551 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2552 i += PyList_GET_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2553 return list_item(self, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2554 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2555 else if (PySlice_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2556 Py_ssize_t start, stop, step, slicelength, cur, i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2557 PyObject* result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2558 PyObject* it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2559 PyObject src, dest;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2560
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2561 if (PySlice_GetIndicesEx((PySliceObject*)item, Py_SIZE(self),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2562 &start, &stop, &step, &slicelength) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2563 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2564 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2565
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2566 if (slicelength <= 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2567 return PyList_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2568 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2569 else if (step == 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2570 return list_slice(self, start, stop);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2571 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2572 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2573 result = PyList_New(slicelength);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2574 if (!result) return NULL;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2575
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2576 src = self->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2577 dest = ((PyListObject *)result)->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2578 for (cur = start, i = 0; i < slicelength;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2579 cur += step, i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2580 it = src[cur];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2581 Py_INCREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2582 dest[i] = it;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2583 }
24310 5ede9bcc651e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 24309 diff changeset	2584
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2585 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2586 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2587 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2588 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2589 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2590 "list indices must be integers, not %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2591 item->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2592 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2593 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2594 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2595
24310 5ede9bcc651e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 24309 diff changeset	2596 static int
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2597 list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value)
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2598 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2599 if (PyIndex_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2600 Py_ssize_t i = PyNumber_AsSsize_t(item, PyExc_IndexError);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2601 if (i == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2602 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2603 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2604 i += PyList_GET_SIZE(self);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2605 return list_ass_item(self, i, value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2606 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2607 else if (PySlice_Check(item)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2608 Py_ssize_t start, stop, step, slicelength;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2609
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2610 if (PySlice_GetIndicesEx((PySliceObject*)item, Py_SIZE(self),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2611 &start, &stop, &step, &slicelength) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2612 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2613 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2614
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2615 if (step == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2616 return list_ass_slice(self, start, stop, value);
23929 26ba17b758b9 Fix the bug described in Michael W. Hudson <mwh@python.net> parents: 23855 diff changeset	2617
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2618 /* Make sure s[5:2] = [..] inserts at the right place:
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2619 before 5, not before 2. */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2620 if ((step < 0 && start < stop) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2621 (step > 0 && start > stop))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2622 stop = start;
24310 5ede9bcc651e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 24309 diff changeset	2623
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2624 if (value == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2625 /* delete slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2626 PyObject **garbage;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2627 size_t cur;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2628 Py_ssize_t i;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2629
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2630 if (slicelength <= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2631 return 0;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2632
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2633 if (step < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2634 stop = start + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2635 start = stop + step*(slicelength - 1) - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2636 step = -step;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2637 }
24310 5ede9bcc651e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 24309 diff changeset	2638
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2639 assert((size_t)slicelength <=
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2640 PY_SIZE_MAX / sizeof(PyObject*));
24424 f4cd78b3b774 Fix for Michael W. Hudson <mwh@python.net> parents: 24414 diff changeset	2641
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2642 garbage = (PyObject**)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2643 PyMem_MALLOC(slicelengthsizeof(PyObject));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2644 if (!garbage) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2645 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2646 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2647 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2648
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2649 /* drawing pictures might help understand these for
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2650 loops. Basically, we memmove the parts of the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2651 list that are not part of the slice: step-1
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2652 items for each item that is part of the slice,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2653 and then tail end of the list that was not
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2654 covered by the slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2655 for (cur = start, i = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2656 cur < (size_t)stop;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2657 cur += step, i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2658 Py_ssize_t lim = step - 1;
24424 f4cd78b3b774 Fix for Michael W. Hudson <mwh@python.net> parents: 24414 diff changeset	2659
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2660 garbage[i] = PyList_GET_ITEM(self, cur);
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31632 diff changeset	2661
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2662 if (cur + step >= (size_t)Py_SIZE(self)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2663 lim = Py_SIZE(self) - cur - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2664 }
31633 5bd455638c7a Optimize inner loops for subscript, repeat, and concat. Raymond Hettinger <python@rcn.com> parents: 31632 diff changeset	2665
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2666 memmove(self->ob_item + cur - i,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2667 self->ob_item + cur + 1,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2668 lim * sizeof(PyObject *));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2669 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2670 cur = start + slicelength*step;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2671 if (cur < (size_t)Py_SIZE(self)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2672 memmove(self->ob_item + cur - slicelength,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2673 self->ob_item + cur,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2674 (Py_SIZE(self) - cur) *
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2675 sizeof(PyObject *));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2676 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2677
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2678 Py_SIZE(self) -= slicelength;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2679 list_resize(self, Py_SIZE(self));
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2680
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2681 for (i = 0; i < slicelength; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2682 Py_DECREF(garbage[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2683 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2684 PyMem_FREE(garbage);
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2685
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2686 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2687 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2688 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2689 /* assign slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2690 PyObject ins, seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2691 PyObject garbage, seqitems, **selfitems;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2692 Py_ssize_t cur, i;
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2693
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2694 /* protect against a[::-1] = a */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2695 if (self == (PyListObject*)value) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2696 seq = list_slice((PyListObject*)value, 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2697 PyList_GET_SIZE(value));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2698 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2699 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2700 seq = PySequence_Fast(value,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2701 "must assign iterable "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2702 "to extended slice");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2703 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2704 if (!seq)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2705 return -1;
26543 975482d5eb5c The final tweaks before closing Michael W. Hudson <mwh@python.net> parents: 26161 diff changeset	2706
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2707 if (PySequence_Fast_GET_SIZE(seq) != slicelength) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2708 PyErr_Format(PyExc_ValueError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2709 "attempt to assign sequence of "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2710 "size %zd to extended slice of "
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2711 "size %zd",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2712 PySequence_Fast_GET_SIZE(seq),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2713 slicelength);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2714 Py_DECREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2715 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2716 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2717
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2718 if (!slicelength) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2719 Py_DECREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2720 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2721 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2722
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2723 garbage = (PyObject**)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2724 PyMem_MALLOC(slicelengthsizeof(PyObject));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2725 if (!garbage) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2726 Py_DECREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2727 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2728 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2729 }
24310 5ede9bcc651e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 24309 diff changeset	2730
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2731 selfitems = self->ob_item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2732 seqitems = PySequence_Fast_ITEMS(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2733 for (cur = start, i = 0; i < slicelength;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2734 cur += step, i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2735 garbage[i] = selfitems[cur];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2736 ins = seqitems[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2737 Py_INCREF(ins);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2738 selfitems[cur] = ins;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2739 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2740
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2741 for (i = 0; i < slicelength; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2742 Py_DECREF(garbage[i]);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2743 }
24310 5ede9bcc651e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 24309 diff changeset	2744
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2745 PyMem_FREE(garbage);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2746 Py_DECREF(seq);
24310 5ede9bcc651e Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 24309 diff changeset	2747
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2748 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2749 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2750 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2751 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2752 PyErr_Format(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2753 "list indices must be integers, not %.200s",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2754 item->ob_type->tp_name);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2755 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2756 }
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2757 }
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2758
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2759 static PyMappingMethods list_as_mapping = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2760 (lenfunc)list_length,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2761 (binaryfunc)list_subscript,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2762 (objobjargproc)list_ass_subscript
23778 245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2763 };
245224d1b8c9 This is my nearly two year old patch Michael W. Hudson <mwh@python.net> parents: 23615 diff changeset	2764
5396 d1447950fa04 Quickly renamed the last directory. Guido van Rossum <guido@python.org> parents: 5288 diff changeset	2765 PyTypeObject PyList_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2766 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2767 "list",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2768 sizeof(PyListObject),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2769 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2770 (destructor)list_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2771 (printfunc)list_print, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2772 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2773 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2774 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2775 (reprfunc)list_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2776 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2777 &list_as_sequence, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2778 &list_as_mapping, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2779 (hashfunc)PyObject_HashNotImplemented, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2780 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2781 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2782 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2783 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2784 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2785 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2786 Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_LIST_SUBCLASS, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2787 list_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2788 (traverseproc)list_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2789 (inquiry)list_clear, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2790 list_richcompare, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2791 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2792 list_iter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2793 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2794 list_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2795 0, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2796 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2797 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2798 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2799 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2800 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2801 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2802 (initproc)list_init, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2803 PyType_GenericAlloc, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2804 PyType_GenericNew, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2805 PyObject_GC_Del, /* tp_free */
6 fc6fcd7df4f7 Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2806 };
8511 69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	2807
69662f16a838 Tim's latest, with some of my changes (also a TP suggestion) added: Guido van Rossum <guido@python.org> parents: 8457 diff changeset	2808
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2809 /********************* List Iterator ************************/
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2810
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2811 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2812 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2813 long it_index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2814 PyListObject it_seq; / Set to NULL when iterator is exhausted */
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2815 } listiterobject;
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2816
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2817 static PyObject list_iter(PyObject );
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2818 static void listiter_dealloc(listiterobject *);
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2819 static int listiter_traverse(listiterobject , visitproc, void );
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2820 static PyObject listiter_next(listiterobject );
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2821 static PyObject listiter_len(listiterobject );
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2822
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2823 PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2824
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2825 static PyMethodDef listiter_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2826 {"__length_hint__", (PyCFunction)listiter_len, METH_NOARGS, length_hint_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2827 {NULL, NULL} /* sentinel */
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2828 };
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2829
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2830 PyTypeObject PyListIter_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2831 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2832 "listiterator", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2833 sizeof(listiterobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2834 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2835 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2836 (destructor)listiter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2837 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2838 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2839 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2840 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2841 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2842 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2843 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2844 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2845 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2846 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2847 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2848 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2849 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2850 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2851 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2852 0, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2853 (traverseproc)listiter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2854 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2855 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2856 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2857 PyObject_SelfIter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2858 (iternextfunc)listiter_next, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2859 listiter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2860 0, /* tp_members */
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2861 };
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2862
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2863
24247 5d3ec28e9a7a Make list_iter() really static. Guido van Rossum <guido@python.org> parents: 24236 diff changeset	2864 static PyObject *
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2865 list_iter(PyObject *seq)
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2866 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2867 listiterobject *it;
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2868
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2869 if (!PyList_Check(seq)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2870 PyErr_BadInternalCall();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2871 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2872 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2873 it = PyObject_GC_New(listiterobject, &PyListIter_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2874 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2875 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2876 it->it_index = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2877 Py_INCREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2878 it->it_seq = (PyListObject *)seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2879 _PyObject_GC_TRACK(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2880 return (PyObject *)it;
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2881 }
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2882
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2883 static void
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2884 listiter_dealloc(listiterobject *it)
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2885 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2886 _PyObject_GC_UNTRACK(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2887 Py_XDECREF(it->it_seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2888 PyObject_GC_Del(it);
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2889 }
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2890
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2891 static int
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2892 listiter_traverse(listiterobject it, visitproc visit, void arg)
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2893 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2894 Py_VISIT(it->it_seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2895 return 0;
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2896 }
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2897
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2898 static PyObject *
23615 a6715ad416e5 A bogus assert in the new listiter code prevented starting Python in a Tim Peters <tim.peters@gmail.com> parents: 23606 diff changeset	2899 listiter_next(listiterobject *it)
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2900 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2901 PyListObject *seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2902 PyObject *item;
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2903
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2904 assert(it != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2905 seq = it->it_seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2906 if (seq == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2907 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2908 assert(PyList_Check(seq));
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2909
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2910 if (it->it_index < PyList_GET_SIZE(seq)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2911 item = PyList_GET_ITEM(seq, it->it_index);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2912 ++it->it_index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2913 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2914 return item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2915 }
24255 41c54b37e030 Make StopIteration a sink state. This is done by clearing out the Guido van Rossum <guido@python.org> parents: 24247 diff changeset	2916
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2917 Py_DECREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2918 it->it_seq = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2919 return NULL;
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2920 }
5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2921
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35365 diff changeset	2922 static PyObject *
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31665 diff changeset	2923 listiter_len(listiterobject *it)
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31665 diff changeset	2924 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2925 Py_ssize_t len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2926 if (it->it_seq) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2927 len = PyList_GET_SIZE(it->it_seq) - it->it_index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2928 if (len >= 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2929 return PyInt_FromSsize_t(len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2930 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2931 return PyInt_FromLong(0);
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31665 diff changeset	2932 }
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2933 /********************* List Reverse Iterator ************************/
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31665 diff changeset	2934
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2935 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2936 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2937 Py_ssize_t it_index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2938 PyListObject it_seq; / Set to NULL when iterator is exhausted */
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2939 } listreviterobject;
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35365 diff changeset	2940
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2941 static PyObject list_reversed(PyListObject , PyObject *);
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2942 static void listreviter_dealloc(listreviterobject *);
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2943 static int listreviter_traverse(listreviterobject , visitproc, void );
aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2944 static PyObject listreviter_next(listreviterobject );
50008 11bf59fe10b9 Merged revisions 67326,67498,67531-67532,67538,67553-67554,67556-67557 via svnmerge from Georg Brandl <georg@python.org> parents: 49431 diff changeset	2945 static PyObject listreviter_len(listreviterobject );
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2946
50008 11bf59fe10b9 Merged revisions 67326,67498,67531-67532,67538,67553-67554,67556-67557 via svnmerge from Georg Brandl <georg@python.org> parents: 49431 diff changeset	2947 static PyMethodDef listreviter_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2948 {"__length_hint__", (PyCFunction)listreviter_len, METH_NOARGS, length_hint_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2949 {NULL, NULL} /* sentinel */
31686 823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31665 diff changeset	2950 };
823279ae43eb Make iterators length transparent where possible. Raymond Hettinger <python@rcn.com> parents: 31665 diff changeset	2951
37589 aeee85b6a5dd More C++-compliance. Note especially listobject.c - to get C++ to accept the Anthony Baxter <anthonybaxter@gmail.com> parents: 36882 diff changeset	2952 PyTypeObject PyListRevIter_Type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2953 PyVarObject_HEAD_INIT(&PyType_Type, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2954 "listreverseiterator", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2955 sizeof(listreviterobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2956 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2957 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2958 (destructor)listreviter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2959 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2960 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2961 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2962 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2963 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2964 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2965 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2966 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2967 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2968 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2969 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2970 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2971 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2972 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2973 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2974 0, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2975 (traverseproc)listreviter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2976 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2977 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2978 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2979 PyObject_SelfIter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2980 (iternextfunc)listreviter_next, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2981 listreviter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2982 0,
23606 5edea752a421 SF 560736. Optimize list iteration by filling the tp_iter slot. Raymond Hettinger <python@rcn.com> parents: 23517 diff changeset	2983 };
30874 682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2984
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2985 static PyObject *
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2986 list_reversed(PyListObject seq, PyObject unused)
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2987 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2988 listreviterobject *it;
30874 682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2989
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2990 it = PyObject_GC_New(listreviterobject, &PyListRevIter_Type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2991 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2992 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2993 assert(PyList_Check(seq));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2994 it->it_index = PyList_GET_SIZE(seq) - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2995 Py_INCREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2996 it->it_seq = seq;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2997 PyObject_GC_Track(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	2998 return (PyObject *)it;
30874 682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	2999 }
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3000
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3001 static void
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3002 listreviter_dealloc(listreviterobject *it)
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3003 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3004 PyObject_GC_UnTrack(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3005 Py_XDECREF(it->it_seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3006 PyObject_GC_Del(it);
30874 682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3007 }
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3008
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3009 static int
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3010 listreviter_traverse(listreviterobject it, visitproc visit, void arg)
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3011 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3012 Py_VISIT(it->it_seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3013 return 0;
30874 682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3014 }
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3015
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3016 static PyObject *
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3017 listreviter_next(listreviterobject *it)
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3018 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3019 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3020 Py_ssize_t index = it->it_index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3021 PyListObject *seq = it->it_seq;
30874 682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3022
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3023 if (index>=0 && index < PyList_GET_SIZE(seq)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3024 item = PyList_GET_ITEM(seq, index);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3025 it->it_index--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3026 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3027 return item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3028 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3029 it->it_index = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3030 if (seq != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3031 it->it_seq = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3032 Py_DECREF(seq);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3033 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3034 return NULL;
30874 682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3035 }
682d1b67c7b5 Optimize reversed(list) using a custom iterator. Raymond Hettinger <python@rcn.com> parents: 30849 diff changeset	3036
50008 11bf59fe10b9 Merged revisions 67326,67498,67531-67532,67538,67553-67554,67556-67557 via svnmerge from Georg Brandl <georg@python.org> parents: 49431 diff changeset	3037 static PyObject *
31635 04eb2ebb46e2 Tidied up the implementations of reversed (including the custom ones Raymond Hettinger <python@rcn.com> parents: 31633 diff changeset	3038 listreviter_len(listreviterobject *it)
04eb2ebb46e2 Tidied up the implementations of reversed (including the custom ones Raymond Hettinger <python@rcn.com> parents: 31633 diff changeset	3039 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3040 Py_ssize_t len = it->it_index + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3041 if (it->it_seq == NULL \|\| PyList_GET_SIZE(it->it_seq) < len)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3042 len = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 59223 diff changeset	3043 return PyLong_FromSsize_t(len);
31635 04eb2ebb46e2 Tidied up the implementations of reversed (including the custom ones Raymond Hettinger <python@rcn.com> parents: 31633 diff changeset	3044 }

Mercurial > cpython-lru_cache-weakref

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