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

annotate Objects/listobject.c @ 51749:1408feec0084 3.0

Merged revisions 69798 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r69798 | benjamin.peterson | 2009-02-19 22:02:38 -0600 (Thu, 19 Feb 2009) | 13 lines Merged revisions 69769,69776 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r69769 | georg.brandl | 2009-02-19 02:30:06 -0600 (Thu, 19 Feb 2009) | 1 line #5310, #3558: fix operator precedence table. ........ r69776 | georg.brandl | 2009-02-19 10:34:51 -0600 (Thu, 19 Feb 2009) | 2 lines #5317: update IronPython URL. ........ ................

author	Benjamin Peterson <benjamin@python.org>
date	Fri, 20 Feb 2009 04:05:32 +0000
parents	74438fc11d05
children	a0951f11be3d

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

Mercurial > cpython-lru_cache-weakref

annotate Objects/listobject.c @ 51749:1408feec0084 3.0