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

annotate Objects/listobject.c @ 58925:eecf1bef052d 2.6

Merged revisions 78207 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78207 | ezio.melotti | 2010-02-17 01:26:09 +0200 (Wed, 17 Feb 2010) | 1 line #7930: fix stripid ........

author	Ezio Melotti <ezio.melotti@gmail.com>
date	Tue, 16 Feb 2010 23:29:44 +0000
parents	8756c3de6d24
children	0265cdc8d5bb

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

Mercurial > cpython-lru_cache-weakref

annotate Objects/listobject.c @ 58925:eecf1bef052d 2.6