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

annotate Objects/listobject.c @ 70817:dd775b1561ba

Fix markup.

author	Georg Brandl <georg@python.org>
date	Tue, 14 Jun 2011 21:09:55 +0200
parents	18e43c6acfff
children	d0b0fcbb40db

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

Mercurial > cpython-lru_cache-weakref

annotate Objects/listobject.c @ 70817:dd775b1561ba