cpython-lru_cache-weakref: Modules/_collectionsmodule.c annotate

annotate Modules/_collectionsmodule.c @ 84007:dbfbdf2b5c19 3.3

Fix #17967: For ftp urls CWD to target instead of hopping to each directory towards target. This fixes a bug where target is accessible, but parent directories are restricted.

author	Senthil Kumaran <senthil@uthcode.com>
date	Sat, 01 Jun 2013 08:27:06 -0700
parents	5a410900e2b6
children	6aef095fdb30 bd6a2fcc7711

rev	line source
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1 #include "Python.h"
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	2 #include "structmember.h"
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	3
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	4 /* collections module implementation of a deque() datatype
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	5 Written and maintained by Raymond D. Hettinger <python@rcn.com>
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	6 Copyright (c) 2004 Python Software Foundation.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	7 All rights reserved.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	8 */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	9
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	10 /* The block length may be set to any number over 1. Larger numbers
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	11 * reduce the number of calls to the memory allocator but take more
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	12 * memory. Ideally, BLOCKLEN should be set with an eye to the
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	13 * length of a cache line.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	14 */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	15
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	16 #define BLOCKLEN 62
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	17 #define CENTER ((BLOCKLEN - 1) / 2)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	18
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	19 /* A `dequeobject` is composed of a doubly-linked list of `block` nodes.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	20 * This list is not circular (the leftmost block has leftlink==NULL,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	21 * and the rightmost block has rightlink==NULL). A deque d's first
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	22 * element is at d.leftblock[leftindex] and its last element is at
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	23 * d.rightblock[rightindex]; note that, unlike as for Python slice
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	24 * indices, these indices are inclusive on both ends. By being inclusive
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	25 * on both ends, algorithms for left and right operations become
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	26 * symmetrical which simplifies the design.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	27 *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	28 * The list of blocks is never empty, so d.leftblock and d.rightblock
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	29 * are never equal to NULL.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	30 *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	31 * The indices, d.leftindex and d.rightindex are always in the range
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	32 * 0 <= index < BLOCKLEN.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	33 * Their exact relationship is:
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	34 * (d.leftindex + d.len - 1) % BLOCKLEN == d.rightindex.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	35 *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	36 * Empty deques have d.len == 0; d.leftblock==d.rightblock;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	37 * d.leftindex == CENTER+1; and d.rightindex == CENTER.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	38 * Checking for d.len == 0 is the intended way to see whether d is empty.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	39 *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	40 * Whenever d.leftblock == d.rightblock,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	41 * d.leftindex + d.len - 1 == d.rightindex.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	42 *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	43 * However, when d.leftblock != d.rightblock, d.leftindex and d.rightindex
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	44 * become indices into distinct blocks and either may be larger than the
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	45 * other.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	46 */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	47
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	48 typedef struct BLOCK {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	49 struct BLOCK *leftlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	50 struct BLOCK *rightlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	51 PyObject *data[BLOCKLEN];
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	52 } block;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	53
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43734 diff changeset	54 #define MAXFREEBLOCKS 10
48594 35b1a20470db Merged revisions 65209-65216,65225-65226,65233,65239,65246-65247,65255-65256 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48475 diff changeset	55 static Py_ssize_t numfreeblocks = 0;
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43734 diff changeset	56 static block *freeblocks[MAXFREEBLOCKS];
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43734 diff changeset	57
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	58 static block *
48594 35b1a20470db Merged revisions 65209-65216,65225-65226,65233,65239,65246-65247,65255-65256 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48475 diff changeset	59 newblock(block leftlink, block rightlink, Py_ssize_t len) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	60 block *b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	61 /* To prevent len from overflowing PY_SSIZE_T_MAX on 64-bit machines, we
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	62 * refuse to allocate new blocks if the current len is dangerously
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	63 * close. There is some extra margin to prevent spurious arithmetic
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	64 * overflows at various places. The following check ensures that
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	65 * the blocks allocated to the deque, in the worst case, can only
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	66 * have PY_SSIZE_T_MAX-2 entries in total.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	67 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	68 if (len >= PY_SSIZE_T_MAX - 2*BLOCKLEN) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	69 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	70 "cannot add more blocks to the deque");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	71 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	72 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	73 if (numfreeblocks) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	74 numfreeblocks -= 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	75 b = freeblocks[numfreeblocks];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	76 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	77 b = PyMem_Malloc(sizeof(block));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	78 if (b == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	79 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	80 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	81 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	82 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	83 b->leftlink = leftlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	84 b->rightlink = rightlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	85 return b;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	86 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	87
47680 b5e02775fffc Merged revisions 64226 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47580 diff changeset	88 static void
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43734 diff changeset	89 freeblock(block *b)
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43734 diff changeset	90 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	91 if (numfreeblocks < MAXFREEBLOCKS) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	92 freeblocks[numfreeblocks] = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	93 numfreeblocks++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	94 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	95 PyMem_Free(b);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	96 }
43815 85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43734 diff changeset	97 }
85cf334b32c3 Merged revisions 58886-58929 via svnmerge from Guido van Rossum <guido@python.org> parents: 43734 diff changeset	98
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	99 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	100 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	101 block *leftblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	102 block *rightblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	103 Py_ssize_t leftindex; /* in range(BLOCKLEN) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	104 Py_ssize_t rightindex; /* in range(BLOCKLEN) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	105 Py_ssize_t len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	106 Py_ssize_t maxlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	107 long state; /* incremented whenever the indices move */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	108 PyObject weakreflist; / List of weak references */
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	109 } dequeobject;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	110
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	111 /* The deque's size limit is d.maxlen. The limit can be zero or positive.
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	112 * If there is no limit, then d.maxlen == -1.
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	113 *
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	114 * After an item is added to a deque, we check to see if the size has grown past
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	115 * the limit. If it has, we get the size back down to the limit by popping an
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	116 * item off of the opposite end. The methods that can trigger this are append(),
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	117 * appendleft(), extend(), and extendleft().
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	118 */
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	119
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	120 #define TRIM(d, popfunction) \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	121 if (d->maxlen != -1 && d->len > d->maxlen) { \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	122 PyObject *rv = popfunction(d, NULL); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	123 assert(rv != NULL && d->len <= d->maxlen); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	124 Py_DECREF(rv); \
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	125 }
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	126
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	127 static PyTypeObject deque_type;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	128
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	129 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	130 deque_new(PyTypeObject type, PyObject args, PyObject *kwds)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	131 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	132 dequeobject *deque;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	133 block *b;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	134
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	135 /* create dequeobject structure */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	136 deque = (dequeobject *)type->tp_alloc(type, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	137 if (deque == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	138 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	139
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	140 b = newblock(NULL, NULL, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	141 if (b == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	142 Py_DECREF(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	143 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	144 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	145
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	146 assert(BLOCKLEN >= 2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	147 deque->leftblock = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	148 deque->rightblock = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	149 deque->leftindex = CENTER + 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	150 deque->rightindex = CENTER;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	151 deque->len = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	152 deque->state = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	153 deque->weakreflist = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	154 deque->maxlen = -1;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	155
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	156 return (PyObject *)deque;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	157 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	158
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	159 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	160 deque_pop(dequeobject deque, PyObject unused)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	161 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	162 PyObject *item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	163 block *prevblock;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	164
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	165 if (deque->len == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	166 PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	167 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	168 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	169 item = deque->rightblock->data[deque->rightindex];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	170 deque->rightindex--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	171 deque->len--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	172 deque->state++;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	173
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	174 if (deque->rightindex == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	175 if (deque->len == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	176 assert(deque->leftblock == deque->rightblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	177 assert(deque->leftindex == deque->rightindex+1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	178 /* re-center instead of freeing a block */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	179 deque->leftindex = CENTER + 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	180 deque->rightindex = CENTER;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	181 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	182 prevblock = deque->rightblock->leftlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	183 assert(deque->leftblock != deque->rightblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	184 freeblock(deque->rightblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	185 prevblock->rightlink = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	186 deque->rightblock = prevblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	187 deque->rightindex = BLOCKLEN - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	188 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	189 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	190 return item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	191 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	192
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	193 PyDoc_STRVAR(pop_doc, "Remove and return the rightmost element.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	194
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	195 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	196 deque_popleft(dequeobject deque, PyObject unused)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	197 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	198 PyObject *item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	199 block *prevblock;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	200
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	201 if (deque->len == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	202 PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	203 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	204 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	205 assert(deque->leftblock != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	206 item = deque->leftblock->data[deque->leftindex];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	207 deque->leftindex++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	208 deque->len--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	209 deque->state++;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	210
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	211 if (deque->leftindex == BLOCKLEN) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	212 if (deque->len == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	213 assert(deque->leftblock == deque->rightblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	214 assert(deque->leftindex == deque->rightindex+1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	215 /* re-center instead of freeing a block */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	216 deque->leftindex = CENTER + 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	217 deque->rightindex = CENTER;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	218 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	219 assert(deque->leftblock != deque->rightblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	220 prevblock = deque->leftblock->rightlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	221 freeblock(deque->leftblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	222 assert(prevblock != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	223 prevblock->leftlink = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	224 deque->leftblock = prevblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	225 deque->leftindex = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	226 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	227 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	228 return item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	229 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	230
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	231 PyDoc_STRVAR(popleft_doc, "Remove and return the leftmost element.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	232
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	233 static PyObject *
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	234 deque_append(dequeobject deque, PyObject item)
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	235 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	236 deque->state++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	237 if (deque->rightindex == BLOCKLEN-1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	238 block *b = newblock(deque->rightblock, NULL, deque->len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	239 if (b == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	240 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	241 assert(deque->rightblock->rightlink == NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	242 deque->rightblock->rightlink = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	243 deque->rightblock = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	244 deque->rightindex = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	245 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	246 Py_INCREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	247 deque->len++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	248 deque->rightindex++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	249 deque->rightblock->data[deque->rightindex] = item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	250 TRIM(deque, deque_popleft);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	251 Py_RETURN_NONE;
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	252 }
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	253
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	254 PyDoc_STRVAR(append_doc, "Add an element to the right side of the deque.");
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	255
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	256 static PyObject *
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	257 deque_appendleft(dequeobject deque, PyObject item)
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	258 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	259 deque->state++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	260 if (deque->leftindex == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	261 block *b = newblock(NULL, deque->leftblock, deque->len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	262 if (b == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	263 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	264 assert(deque->leftblock->leftlink == NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	265 deque->leftblock->leftlink = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	266 deque->leftblock = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	267 deque->leftindex = BLOCKLEN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	268 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	269 Py_INCREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	270 deque->len++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	271 deque->leftindex--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	272 deque->leftblock->data[deque->leftindex] = item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	273 TRIM(deque, deque_pop);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	274 Py_RETURN_NONE;
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	275 }
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	276
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	277 PyDoc_STRVAR(appendleft_doc, "Add an element to the left side of the deque.");
3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	278
52118 c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	279
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	280 /* Run an iterator to exhaustion. Shortcut for
52118 c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	281 the extend/extendleft methods when maxlen == 0. */
c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	282 static PyObject*
c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	283 consume_iterator(PyObject *it)
c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	284 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	285 PyObject *item;
52118 c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	286
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	287 while ((item = PyIter_Next(it)) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	288 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	289 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	290 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	291 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	292 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	293 Py_RETURN_NONE;
52118 c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	294 }
c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	295
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	296 static PyObject *
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	297 deque_extend(dequeobject deque, PyObject iterable)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	298 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	299 PyObject it, item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	300
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	301 /* Handle case where id(deque) == id(iterable) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	302 if ((PyObject *)deque == iterable) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	303 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	304 PyObject *s = PySequence_List(iterable);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	305 if (s == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	306 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	307 result = deque_extend(deque, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	308 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	309 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	310 }
57632 bc716d8f4345 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	311
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	312 it = PyObject_GetIter(iterable);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	313 if (it == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	314 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	315
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	316 if (deque->maxlen == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	317 return consume_iterator(it);
52118 c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	318
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	319 while ((item = PyIter_Next(it)) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	320 deque->state++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	321 if (deque->rightindex == BLOCKLEN-1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	322 block *b = newblock(deque->rightblock, NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	323 deque->len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	324 if (b == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	325 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	326 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	327 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	328 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	329 assert(deque->rightblock->rightlink == NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	330 deque->rightblock->rightlink = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	331 deque->rightblock = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	332 deque->rightindex = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	333 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	334 deque->len++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	335 deque->rightindex++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	336 deque->rightblock->data[deque->rightindex] = item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	337 TRIM(deque, deque_popleft);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	338 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	339 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	340 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	341 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	342 Py_RETURN_NONE;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	343 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	344
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	345 PyDoc_STRVAR(extend_doc,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	346 "Extend the right side of the deque with elements from the iterable");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	347
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	348 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	349 deque_extendleft(dequeobject deque, PyObject iterable)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	350 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	351 PyObject it, item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	352
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	353 /* Handle case where id(deque) == id(iterable) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	354 if ((PyObject *)deque == iterable) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	355 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	356 PyObject *s = PySequence_List(iterable);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	357 if (s == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	358 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	359 result = deque_extendleft(deque, s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	360 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	361 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	362 }
57632 bc716d8f4345 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	363
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	364 it = PyObject_GetIter(iterable);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	365 if (it == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	366 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	367
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	368 if (deque->maxlen == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	369 return consume_iterator(it);
52118 c5e23b9cedcc Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 51271 diff changeset	370
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	371 while ((item = PyIter_Next(it)) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	372 deque->state++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	373 if (deque->leftindex == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	374 block *b = newblock(NULL, deque->leftblock,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	375 deque->len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	376 if (b == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	377 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	378 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	379 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	380 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	381 assert(deque->leftblock->leftlink == NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	382 deque->leftblock->leftlink = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	383 deque->leftblock = b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	384 deque->leftindex = BLOCKLEN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	385 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	386 deque->len++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	387 deque->leftindex--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	388 deque->leftblock->data[deque->leftindex] = item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	389 TRIM(deque, deque_pop);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	390 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	391 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	392 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	393 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	394 Py_RETURN_NONE;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	395 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	396
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	397 PyDoc_STRVAR(extendleft_doc,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	398 "Extend the left side of the deque with elements from the iterable");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	399
57632 bc716d8f4345 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	400 static PyObject *
bc716d8f4345 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	401 deque_inplace_concat(dequeobject deque, PyObject other)
bc716d8f4345 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	402 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	403 PyObject *result;
57632 bc716d8f4345 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	404
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	405 result = deque_extend(deque, other);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	406 if (result == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	407 return result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	408 Py_DECREF(result);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	409 Py_INCREF(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	410 return (PyObject *)deque;
57632 bc716d8f4345 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	411 }
bc716d8f4345 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	412
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	413 static int
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	414 _deque_rotate(dequeobject *deque, Py_ssize_t n)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	415 {
82115 5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	416 Py_ssize_t m, len=deque->len, halflen=len>>1;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	417
82115 5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	418 if (len <= 1)
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	419 return 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	420 if (n > halflen \|\| n < -halflen) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	421 n %= len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	422 if (n > halflen)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	423 n -= len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	424 else if (n < -halflen)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	425 n += len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	426 }
82115 5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	427 assert(len > 1);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	428 assert(-halflen <= n && n <= halflen);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	429
82115 5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	430 deque->state++;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	431 while (n > 0) {
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	432 if (deque->leftindex == 0) {
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	433 block *b = newblock(NULL, deque->leftblock, len);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	434 if (b == NULL)
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	435 return -1;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	436 assert(deque->leftblock->leftlink == NULL);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	437 deque->leftblock->leftlink = b;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	438 deque->leftblock = b;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	439 deque->leftindex = BLOCKLEN;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	440 }
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	441 assert(deque->leftindex > 0);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	442
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	443 m = n;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	444 if (m > deque->rightindex + 1)
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	445 m = deque->rightindex + 1;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	446 if (m > deque->leftindex)
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	447 m = deque->leftindex;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	448 assert (m > 0 && m <= len);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	449 memcpy(&deque->leftblock->data[deque->leftindex - m],
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	450 &deque->rightblock->data[deque->rightindex + 1 - m],
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	451 m * sizeof(PyObject *));
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	452 deque->rightindex -= m;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	453 deque->leftindex -= m;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	454 n -= m;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	455
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	456 if (deque->rightindex == -1) {
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	457 block *prevblock = deque->rightblock->leftlink;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	458 assert(deque->rightblock != NULL);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	459 assert(deque->leftblock != deque->rightblock);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	460 freeblock(deque->rightblock);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	461 prevblock->rightlink = NULL;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	462 deque->rightblock = prevblock;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	463 deque->rightindex = BLOCKLEN - 1;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	464 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	465 }
82115 5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	466 while (n < 0) {
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	467 if (deque->rightindex == BLOCKLEN - 1) {
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	468 block *b = newblock(deque->rightblock, NULL, len);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	469 if (b == NULL)
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	470 return -1;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	471 assert(deque->rightblock->rightlink == NULL);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	472 deque->rightblock->rightlink = b;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	473 deque->rightblock = b;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	474 deque->rightindex = -1;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	475 }
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	476 assert (deque->rightindex < BLOCKLEN - 1);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	477
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	478 m = -n;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	479 if (m > BLOCKLEN - deque->leftindex)
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	480 m = BLOCKLEN - deque->leftindex;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	481 if (m > BLOCKLEN - 1 - deque->rightindex)
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	482 m = BLOCKLEN - 1 - deque->rightindex;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	483 assert (m > 0 && m <= len);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	484 memcpy(&deque->rightblock->data[deque->rightindex + 1],
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	485 &deque->leftblock->data[deque->leftindex],
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	486 m * sizeof(PyObject *));
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	487 deque->leftindex += m;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	488 deque->rightindex += m;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	489 n += m;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	490
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	491 if (deque->leftindex == BLOCKLEN) {
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	492 block *nextblock = deque->leftblock->rightlink;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	493 assert(deque->leftblock != deque->rightblock);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	494 freeblock(deque->leftblock);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	495 assert(nextblock != NULL);
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	496 nextblock->leftlink = NULL;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	497 deque->leftblock = nextblock;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	498 deque->leftindex = 0;
5a410900e2b6 Backport deque.rotate() improvements. Raymond Hettinger <python@rcn.com> parents: 81470 diff changeset	499 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	500 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	501 return 0;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	502 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	503
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	504 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	505 deque_rotate(dequeobject deque, PyObject args)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	506 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	507 Py_ssize_t n=1;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	508
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	509 if (!PyArg_ParseTuple(args, "\|n:rotate", &n))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	510 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	511 if (_deque_rotate(deque, n) == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	512 Py_RETURN_NONE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	513 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	514 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	515
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	516 PyDoc_STRVAR(rotate_doc,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	517 "Rotate the deque n steps to the right (default n=1). If n is negative, rotates left.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	518
57627 816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	519 static PyObject *
816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	520 deque_reverse(dequeobject deque, PyObject unused)
816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	521 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	522 block *leftblock = deque->leftblock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	523 block *rightblock = deque->rightblock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	524 Py_ssize_t leftindex = deque->leftindex;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	525 Py_ssize_t rightindex = deque->rightindex;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	526 Py_ssize_t n = (deque->len)/2;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	527 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	528 PyObject *tmp;
57627 816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	529
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	530 for (i=0 ; i<n ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	531 /* Validate that pointers haven't met in the middle */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	532 assert(leftblock != rightblock \|\| leftindex < rightindex);
57627 816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	533
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	534 /* Swap */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	535 tmp = leftblock->data[leftindex];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	536 leftblock->data[leftindex] = rightblock->data[rightindex];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	537 rightblock->data[rightindex] = tmp;
57627 816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	538
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	539 /* Advance left block/index pair */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	540 leftindex++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	541 if (leftindex == BLOCKLEN) {
67764 776c3c294bb7 Issue #11004: Repair edge case in deque.count(). Raymond Hettinger <python@rcn.com> parents: 67287 diff changeset	542 if (leftblock->rightlink == NULL)
776c3c294bb7 Issue #11004: Repair edge case in deque.count(). Raymond Hettinger <python@rcn.com> parents: 67287 diff changeset	543 break;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	544 leftblock = leftblock->rightlink;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	545 leftindex = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	546 }
57627 816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	547
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	548 /* Step backwards with the right block/index pair */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	549 rightindex--;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	550 if (rightindex == -1) {
67764 776c3c294bb7 Issue #11004: Repair edge case in deque.count(). Raymond Hettinger <python@rcn.com> parents: 67287 diff changeset	551 if (rightblock->leftlink == NULL)
776c3c294bb7 Issue #11004: Repair edge case in deque.count(). Raymond Hettinger <python@rcn.com> parents: 67287 diff changeset	552 break;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	553 rightblock = rightblock->leftlink;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	554 rightindex = BLOCKLEN - 1;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	555 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	556 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	557 Py_RETURN_NONE;
57627 816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	558 }
816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	559
816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	560 PyDoc_STRVAR(reverse_doc,
816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	561 "D.reverse() -- reverse IN PLACE");
816303a07762 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	562
60291 da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	563 static PyObject *
da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	564 deque_count(dequeobject deque, PyObject v)
da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	565 {
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	566 block *leftblock = deque->leftblock;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	567 Py_ssize_t leftindex = deque->leftindex;
67764 776c3c294bb7 Issue #11004: Repair edge case in deque.count(). Raymond Hettinger <python@rcn.com> parents: 67287 diff changeset	568 Py_ssize_t n = deque->len;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	569 Py_ssize_t i;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	570 Py_ssize_t count = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	571 PyObject *item;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	572 long start_state = deque->state;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	573 int cmp;
60291 da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	574
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	575 for (i=0 ; i<n ; i++) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	576 item = leftblock->data[leftindex];
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	577 cmp = PyObject_RichCompareBool(item, v, Py_EQ);
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	578 if (cmp > 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	579 count++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	580 else if (cmp < 0)
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	581 return NULL;
60291 da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	582
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	583 if (start_state != deque->state) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	584 PyErr_SetString(PyExc_RuntimeError,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	585 "deque mutated during iteration");
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	586 return NULL;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	587 }
60291 da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	588
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	589 /* Advance left block/index pair */
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	590 leftindex++;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	591 if (leftindex == BLOCKLEN) {
67764 776c3c294bb7 Issue #11004: Repair edge case in deque.count(). Raymond Hettinger <python@rcn.com> parents: 67287 diff changeset	592 if (leftblock->rightlink == NULL) /* can occur when i==n-1 */
776c3c294bb7 Issue #11004: Repair edge case in deque.count(). Raymond Hettinger <python@rcn.com> parents: 67287 diff changeset	593 break;
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	594 leftblock = leftblock->rightlink;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	595 leftindex = 0;
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	596 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	597 }
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	598 return PyLong_FromSsize_t(count);
60291 da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	599 }
da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	600
da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	601 PyDoc_STRVAR(count_doc,
da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	602 "D.count(value) -> integer -- return number of occurrences of value");
da939ab2bfe2 Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57630 diff changeset	603
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	604 static Py_ssize_t
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	605 deque_len(dequeobject *deque)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	606 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	607 return deque->len;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	608 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	609
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	610 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	611 deque_remove(dequeobject deque, PyObject value)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	612 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	613 Py_ssize_t i, n=deque->len;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	614
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	615 for (i=0 ; i<n ; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	616 PyObject *item = deque->leftblock->data[deque->leftindex];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	617 int cmp = PyObject_RichCompareBool(item, value, Py_EQ);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	618
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	619 if (deque->len != n) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	620 PyErr_SetString(PyExc_IndexError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	621 "deque mutated during remove().");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	622 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	623 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	624 if (cmp > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	625 PyObject *tgt = deque_popleft(deque, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	626 assert (tgt != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	627 Py_DECREF(tgt);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	628 if (_deque_rotate(deque, i) == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	629 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	630 Py_RETURN_NONE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	631 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	632 else if (cmp < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	633 _deque_rotate(deque, i);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	634 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	635 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	636 _deque_rotate(deque, -1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	637 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	638 PyErr_SetString(PyExc_ValueError, "deque.remove(x): x not in deque");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	639 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	640 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	641
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	642 PyDoc_STRVAR(remove_doc,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	643 "D.remove(value) -- remove first occurrence of value.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	644
81470 623a7de80432 make deque_clear void, since it's infallible Benjamin Peterson <benjamin@python.org> parents: 80084 diff changeset	645 static void
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	646 deque_clear(dequeobject *deque)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	647 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	648 PyObject *item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	649
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	650 while (deque->len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	651 item = deque_pop(deque, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	652 assert (item != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	653 Py_DECREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	654 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	655 assert(deque->leftblock == deque->rightblock &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	656 deque->leftindex - 1 == deque->rightindex &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	657 deque->len == 0);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	658 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	659
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	660 static PyObject *
48594 35b1a20470db Merged revisions 65209-65216,65225-65226,65233,65239,65246-65247,65255-65256 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48475 diff changeset	661 deque_item(dequeobject *deque, Py_ssize_t i)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	662 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	663 block *b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	664 PyObject *item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	665 Py_ssize_t n, index=i;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	666
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	667 if (i < 0 \|\| i >= deque->len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	668 PyErr_SetString(PyExc_IndexError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	669 "deque index out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	670 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	671 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	672
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	673 if (i == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	674 i = deque->leftindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	675 b = deque->leftblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	676 } else if (i == deque->len - 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	677 i = deque->rightindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	678 b = deque->rightblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	679 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	680 i += deque->leftindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	681 n = i / BLOCKLEN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	682 i %= BLOCKLEN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	683 if (index < (deque->len >> 1)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	684 b = deque->leftblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	685 while (n--)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	686 b = b->rightlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	687 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	688 n = (deque->leftindex + deque->len - 1) / BLOCKLEN - n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	689 b = deque->rightblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	690 while (n--)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	691 b = b->leftlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	692 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	693 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	694 item = b->data[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	695 Py_INCREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	696 return item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	697 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	698
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	699 /* delitem() implemented in terms of rotate for simplicity and reasonable
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	700 performance near the end points. If for some reason this method becomes
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	701 popular, it is not hard to re-implement this using direct data movement
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	702 (similar to code in list slice assignment) and achieve a two or threefold
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	703 performance boost.
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	704 */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	705
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	706 static int
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	707 deque_del_item(dequeobject *deque, Py_ssize_t i)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	708 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	709 PyObject *item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	710
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	711 assert (i >= 0 && i < deque->len);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	712 if (_deque_rotate(deque, -i) == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	713 return -1;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	714
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	715 item = deque_popleft(deque, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	716 assert (item != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	717 Py_DECREF(item);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	718
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	719 return _deque_rotate(deque, i);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	720 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	721
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	722 static int
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	723 deque_ass_item(dequeobject deque, Py_ssize_t i, PyObject v)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	724 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	725 PyObject *old_value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	726 block *b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	727 Py_ssize_t n, len=deque->len, halflen=(len+1)>>1, index=i;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	728
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	729 if (i < 0 \|\| i >= len) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	730 PyErr_SetString(PyExc_IndexError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	731 "deque index out of range");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	732 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	733 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	734 if (v == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	735 return deque_del_item(deque, i);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	736
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	737 i += deque->leftindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	738 n = i / BLOCKLEN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	739 i %= BLOCKLEN;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	740 if (index <= halflen) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	741 b = deque->leftblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	742 while (n--)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	743 b = b->rightlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	744 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	745 n = (deque->leftindex + len - 1) / BLOCKLEN - n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	746 b = deque->rightblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	747 while (n--)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	748 b = b->leftlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	749 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	750 Py_INCREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	751 old_value = b->data[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	752 b->data[i] = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	753 Py_DECREF(old_value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	754 return 0;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	755 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	756
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	757 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	758 deque_clearmethod(dequeobject *deque)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	759 {
81470 623a7de80432 make deque_clear void, since it's infallible Benjamin Peterson <benjamin@python.org> parents: 80084 diff changeset	760 deque_clear(deque);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	761 Py_RETURN_NONE;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	762 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	763
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	764 PyDoc_STRVAR(clear_doc, "Remove all elements from the deque.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	765
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	766 static void
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	767 deque_dealloc(dequeobject *deque)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	768 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	769 PyObject_GC_UnTrack(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	770 if (deque->weakreflist != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	771 PyObject_ClearWeakRefs((PyObject *) deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	772 if (deque->leftblock != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	773 deque_clear(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	774 assert(deque->leftblock != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	775 freeblock(deque->leftblock);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	776 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	777 deque->leftblock = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	778 deque->rightblock = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	779 Py_TYPE(deque)->tp_free(deque);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	780 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	781
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	782 static int
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	783 deque_traverse(dequeobject deque, visitproc visit, void arg)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	784 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	785 block *b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	786 PyObject *item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	787 Py_ssize_t index;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	788 Py_ssize_t indexlo = deque->leftindex;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	789
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	790 for (b = deque->leftblock; b != NULL; b = b->rightlink) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	791 const Py_ssize_t indexhi = b == deque->rightblock ?
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	792 deque->rightindex :
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	793 BLOCKLEN - 1;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	794
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	795 for (index = indexlo; index <= indexhi; ++index) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	796 item = b->data[index];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	797 Py_VISIT(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	798 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	799 indexlo = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	800 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	801 return 0;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	802 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	803
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	804 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	805 deque_copy(PyObject *deque)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	806 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	807 if (((dequeobject *)deque)->maxlen == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	808 return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "O", deque, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	809 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	810 return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "Oi",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	811 deque, ((dequeobject *)deque)->maxlen, NULL);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	812 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	813
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	814 PyDoc_STRVAR(copy_doc, "Return a shallow copy of a deque.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	815
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	816 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	817 deque_reduce(dequeobject *deque)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	818 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	819 PyObject dict, result, *aslist;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	820 _Py_IDENTIFIER(__dict__);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	821
72848 81380082d216 Use identifier API for PyObject_GetAttrString. Martin v. Löwis <martin@v.loewis.de> parents: 72835 diff changeset	822 dict = _PyObject_GetAttrId((PyObject *)deque, &PyId___dict__);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	823 if (dict == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	824 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	825 aslist = PySequence_List((PyObject *)deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	826 if (aslist == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	827 Py_XDECREF(dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	828 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	829 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	830 if (dict == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	831 if (deque->maxlen == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	832 result = Py_BuildValue("O(O)", Py_TYPE(deque), aslist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	833 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	834 result = Py_BuildValue("O(On)", Py_TYPE(deque), aslist, deque->maxlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	835 } else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	836 if (deque->maxlen == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	837 result = Py_BuildValue("O(OO)O", Py_TYPE(deque), aslist, Py_None, dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	838 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	839 result = Py_BuildValue("O(On)O", Py_TYPE(deque), aslist, deque->maxlen, dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	840 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	841 Py_XDECREF(dict);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	842 Py_DECREF(aslist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	843 return result;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	844 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	845
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	846 PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	847
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	848 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	849 deque_repr(PyObject *deque)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	850 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	851 PyObject aslist, result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	852 int i;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	853
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	854 i = Py_ReprEnter(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	855 if (i != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	856 if (i < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	857 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	858 return PyUnicode_FromString("[...]");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	859 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	860
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	861 aslist = PySequence_List(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	862 if (aslist == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	863 Py_ReprLeave(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	864 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	865 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	866 if (((dequeobject *)deque)->maxlen != -1)
48870 82f73b0b5a30 Merged revisions 65910,65977,65980,65984,65986,66000,66011-66012,66014,66017,66020 via svnmerge from Benjamin Peterson <benjamin@python.org> parents: 48594 diff changeset	867
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	868 result = PyUnicode_FromFormat("deque(%R, maxlen=%zd)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	869 aslist, ((dequeobject *)deque)->maxlen);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	870 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	871 result = PyUnicode_FromFormat("deque(%R)", aslist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	872 Py_DECREF(aslist);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	873 Py_ReprLeave(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	874 return result;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	875 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	876
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	877 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	878 deque_richcompare(PyObject v, PyObject w, int op)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	879 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	880 PyObject it1=NULL, it2=NULL, x, y;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	881 Py_ssize_t vs, ws;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	882 int b, cmp=-1;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	883
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	884 if (!PyObject_TypeCheck(v, &deque_type) \|\|
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	885 !PyObject_TypeCheck(w, &deque_type)) {
71810 d0b0fcbb40db Replace Py_NotImplemented returns with the macro form Py_RETURN_NOTIMPLEMENTED. Brian Curtin <brian@python.org> parents: 69504 diff changeset	886 Py_RETURN_NOTIMPLEMENTED;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	887 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	888
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	889 /* Shortcuts */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	890 vs = ((dequeobject *)v)->len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	891 ws = ((dequeobject *)w)->len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	892 if (op == Py_EQ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	893 if (v == w)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	894 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	895 if (vs != ws)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	896 Py_RETURN_FALSE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	897 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	898 if (op == Py_NE) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	899 if (v == w)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	900 Py_RETURN_FALSE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	901 if (vs != ws)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	902 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	903 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	904
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	905 /* Search for the first index where items are different */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	906 it1 = PyObject_GetIter(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	907 if (it1 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	908 goto done;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	909 it2 = PyObject_GetIter(w);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	910 if (it2 == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	911 goto done;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	912 for (;;) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	913 x = PyIter_Next(it1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	914 if (x == NULL && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	915 goto done;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	916 y = PyIter_Next(it2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	917 if (x == NULL \|\| y == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	918 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	919 b = PyObject_RichCompareBool(x, y, Py_EQ);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	920 if (b == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	921 cmp = PyObject_RichCompareBool(x, y, op);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	922 Py_DECREF(x);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	923 Py_DECREF(y);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	924 goto done;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	925 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	926 Py_DECREF(x);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	927 Py_DECREF(y);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	928 if (b == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	929 goto done;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	930 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	931 /* We reached the end of one deque or both */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	932 Py_XDECREF(x);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	933 Py_XDECREF(y);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	934 if (PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	935 goto done;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	936 switch (op) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	937 case Py_LT: cmp = y != NULL; break; /* if w was longer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	938 case Py_LE: cmp = x == NULL; break; /* if v was not longer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	939 case Py_EQ: cmp = x == y; break; /* if we reached the end of both */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	940 case Py_NE: cmp = x != y; break; /* if one deque continues */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	941 case Py_GT: cmp = x != NULL; break; /* if v was longer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	942 case Py_GE: cmp = y == NULL; break; /* if w was not longer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	943 }
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	944
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	945 done:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	946 Py_XDECREF(it1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	947 Py_XDECREF(it2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	948 if (cmp == 1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	949 Py_RETURN_TRUE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	950 if (cmp == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	951 Py_RETURN_FALSE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	952 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	953 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	954
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	955 static int
43734 3e5edf19d5f0 Merged revisions 58221-58741 via svnmerge from Guido van Rossum <guido@python.org> parents: 42478 diff changeset	956 deque_init(dequeobject deque, PyObject args, PyObject *kwdargs)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	957 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	958 PyObject *iterable = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	959 PyObject *maxlenobj = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	960 Py_ssize_t maxlen = -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	961 char *kwlist[] = {"iterable", "maxlen", 0};
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	962
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	963 if (!PyArg_ParseTupleAndKeywords(args, kwdargs, "\|OO:deque", kwlist, &iterable, &maxlenobj))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	964 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	965 if (maxlenobj != NULL && maxlenobj != Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	966 maxlen = PyLong_AsSsize_t(maxlenobj);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	967 if (maxlen == -1 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	968 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	969 if (maxlen < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	970 PyErr_SetString(PyExc_ValueError, "maxlen must be non-negative");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	971 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	972 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	973 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	974 deque->maxlen = maxlen;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	975 deque_clear(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	976 if (iterable != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	977 PyObject *rv = deque_extend(deque, iterable);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	978 if (rv == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	979 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	980 Py_DECREF(rv);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	981 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	982 return 0;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	983 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	984
52120 21850d6d5b4d For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52118 diff changeset	985 static PyObject *
78394 b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	986 deque_sizeof(dequeobject deque, void unused)
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	987 {
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	988 Py_ssize_t res;
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	989 Py_ssize_t blocks;
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	990
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	991 res = sizeof(dequeobject);
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	992 blocks = (deque->leftindex + deque->len + BLOCKLEN - 1) / BLOCKLEN;
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	993 assert(deque->leftindex + deque->len - 1 ==
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	994 (blocks - 1) * BLOCKLEN + deque->rightindex);
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	995 res += blocks * sizeof(block);
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	996 return PyLong_FromSsize_t(res);
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	997 }
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	998
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	999 PyDoc_STRVAR(sizeof_doc,
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	1000 "D.__sizeof__() -- size of D in memory, in bytes");
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	1001
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	1002 static PyObject *
52120 21850d6d5b4d For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52118 diff changeset	1003 deque_get_maxlen(dequeobject *deque)
21850d6d5b4d For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52118 diff changeset	1004 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1005 if (deque->maxlen == -1)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1006 Py_RETURN_NONE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1007 return PyLong_FromSsize_t(deque->maxlen);
52120 21850d6d5b4d For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52118 diff changeset	1008 }
21850d6d5b4d For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52118 diff changeset	1009
21850d6d5b4d For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52118 diff changeset	1010 static PyGetSetDef deque_getset[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1011 {"maxlen", (getter)deque_get_maxlen, (setter)NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1012 "maximum size of a deque or None if unbounded"},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1013 {0}
52120 21850d6d5b4d For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52118 diff changeset	1014 };
21850d6d5b4d For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52118 diff changeset	1015
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1016 static PySequenceMethods deque_as_sequence = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1017 (lenfunc)deque_len, /* sq_length */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1018 0, /* sq_concat */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1019 0, /* sq_repeat */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1020 (ssizeargfunc)deque_item, /* sq_item */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1021 0, /* sq_slice */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1022 (ssizeobjargproc)deque_ass_item, /* sq_ass_item */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1023 0, /* sq_ass_slice */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1024 0, /* sq_contains */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1025 (binaryfunc)deque_inplace_concat, /* sq_inplace_concat */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1026 0, /* sq_inplace_repeat */
57632 bc716d8f4345 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55536 diff changeset	1027
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1028 };
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1029
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1030 /* deque object ********************************************************/
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1031
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1032 static PyObject deque_iter(dequeobject deque);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1033 static PyObject deque_reviter(dequeobject deque);
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1034 PyDoc_STRVAR(reversed_doc,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1035 "D.__reversed__() -- return a reverse iterator over the deque");
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1036
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1037 static PyMethodDef deque_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1038 {"append", (PyCFunction)deque_append,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1039 METH_O, append_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1040 {"appendleft", (PyCFunction)deque_appendleft,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1041 METH_O, appendleft_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1042 {"clear", (PyCFunction)deque_clearmethod,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1043 METH_NOARGS, clear_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1044 {"__copy__", (PyCFunction)deque_copy,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1045 METH_NOARGS, copy_doc},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	1046 {"count", (PyCFunction)deque_count,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	1047 METH_O, count_doc},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1048 {"extend", (PyCFunction)deque_extend,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1049 METH_O, extend_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1050 {"extendleft", (PyCFunction)deque_extendleft,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1051 METH_O, extendleft_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1052 {"pop", (PyCFunction)deque_pop,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1053 METH_NOARGS, pop_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1054 {"popleft", (PyCFunction)deque_popleft,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1055 METH_NOARGS, popleft_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1056 {"__reduce__", (PyCFunction)deque_reduce,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1057 METH_NOARGS, reduce_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1058 {"remove", (PyCFunction)deque_remove,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1059 METH_O, remove_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1060 {"__reversed__", (PyCFunction)deque_reviter,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1061 METH_NOARGS, reversed_doc},
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	1062 {"reverse", (PyCFunction)deque_reverse,
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60291 diff changeset	1063 METH_NOARGS, reverse_doc},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1064 {"rotate", (PyCFunction)deque_rotate,
78394 b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	1065 METH_VARARGS, rotate_doc},
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	1066 {"__sizeof__", (PyCFunction)deque_sizeof,
b0725c1b3068 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74936 diff changeset	1067 METH_NOARGS, sizeof_doc},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1068 {NULL, NULL} /* sentinel */
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1069 };
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1070
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1071 PyDoc_STRVAR(deque_doc,
80083 9de80866f56b Fix docstring for deque ctor to mark iterable parameter optional Andrew Svetlov <andrew.svetlov@gmail.com> parents: 78394 diff changeset	1072 "deque([iterable[, maxlen]]) --> deque object\n\
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1073 \n\
69059 36344c9505b2 Issue 11713: clarify docstring for collections.deque() Raymond Hettinger <python@rcn.com> parents: 64121 diff changeset	1074 Build an ordered collection with optimized access from its endpoints.");
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1075
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1076 static PyTypeObject deque_type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1077 PyVarObject_HEAD_INIT(NULL, 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1078 "collections.deque", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1079 sizeof(dequeobject), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1080 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1081 /* methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1082 (destructor)deque_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1083 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1084 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1085 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1086 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1087 deque_repr, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1088 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1089 &deque_as_sequence, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1090 0, /* tp_as_mapping */
65513 5b069892e413 Remove more unneeded casts to hashfunc. Georg Brandl <georg@python.org> parents: 64117 diff changeset	1091 PyObject_HashNotImplemented, /* tp_hash */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1092 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1093 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1094 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1095 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1096 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1097 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
65513 5b069892e413 Remove more unneeded casts to hashfunc. Georg Brandl <georg@python.org> parents: 64117 diff changeset	1098 /* tp_flags */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1099 deque_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1100 (traverseproc)deque_traverse, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1101 (inquiry)deque_clear, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1102 (richcmpfunc)deque_richcompare, /* tp_richcompare */
65513 5b069892e413 Remove more unneeded casts to hashfunc. Georg Brandl <georg@python.org> parents: 64117 diff changeset	1103 offsetof(dequeobject, weakreflist), /* tp_weaklistoffset*/
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1104 (getiterfunc)deque_iter, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1105 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1106 deque_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1107 0, /* tp_members */
65513 5b069892e413 Remove more unneeded casts to hashfunc. Georg Brandl <georg@python.org> parents: 64117 diff changeset	1108 deque_getset, /* tp_getset */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1109 0, /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1110 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1111 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1112 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1113 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1114 (initproc)deque_init, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1115 PyType_GenericAlloc, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1116 deque_new, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1117 PyObject_GC_Del, /* tp_free */
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1118 };
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1119
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1120 /********************* Deque Iterator ************************/
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1121
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1122 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1123 PyObject_HEAD
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1124 Py_ssize_t index;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1125 block *b;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1126 dequeobject *deque;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1127 long state; /* state when the iterator is created */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1128 Py_ssize_t counter; /* number of items remaining for iteration */
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1129 } dequeiterobject;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1130
47680 b5e02775fffc Merged revisions 64226 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47580 diff changeset	1131 static PyTypeObject dequeiter_type;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1132
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1133 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1134 deque_iter(dequeobject *deque)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1135 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1136 dequeiterobject *it;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1137
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1138 it = PyObject_GC_New(dequeiterobject, &dequeiter_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1139 if (it == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1140 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1141 it->b = deque->leftblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1142 it->index = deque->leftindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1143 Py_INCREF(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1144 it->deque = deque;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1145 it->state = deque->state;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1146 it->counter = deque->len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1147 PyObject_GC_Track(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1148 return (PyObject *)it;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1149 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1150
50553 badb471dbaeb Merged revisions 68132 via svnmerge from Georg Brandl <georg@python.org> parents: 49604 diff changeset	1151 static int
badb471dbaeb Merged revisions 68132 via svnmerge from Georg Brandl <georg@python.org> parents: 49604 diff changeset	1152 dequeiter_traverse(dequeiterobject dio, visitproc visit, void arg)
badb471dbaeb Merged revisions 68132 via svnmerge from Georg Brandl <georg@python.org> parents: 49604 diff changeset	1153 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1154 Py_VISIT(dio->deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1155 return 0;
50553 badb471dbaeb Merged revisions 68132 via svnmerge from Georg Brandl <georg@python.org> parents: 49604 diff changeset	1156 }
badb471dbaeb Merged revisions 68132 via svnmerge from Georg Brandl <georg@python.org> parents: 49604 diff changeset	1157
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1158 static void
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1159 dequeiter_dealloc(dequeiterobject *dio)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1160 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1161 Py_XDECREF(dio->deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1162 PyObject_GC_Del(dio);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1163 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1164
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1165 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1166 dequeiter_next(dequeiterobject *it)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1167 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1168 PyObject *item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1169
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1170 if (it->deque->state != it->state) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1171 it->counter = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1172 PyErr_SetString(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1173 "deque mutated during iteration");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1174 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1175 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1176 if (it->counter == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1177 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1178 assert (!(it->b == it->deque->rightblock &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1179 it->index > it->deque->rightindex));
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1180
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1181 item = it->b->data[it->index];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1182 it->index++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1183 it->counter--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1184 if (it->index == BLOCKLEN && it->counter > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1185 assert (it->b->rightlink != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1186 it->b = it->b->rightlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1187 it->index = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1188 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1189 Py_INCREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1190 return item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1191 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1192
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1193 static PyObject *
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1194 dequeiter_new(PyTypeObject type, PyObject args, PyObject *kwds)
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1195 {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1196 Py_ssize_t i, index=0;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1197 PyObject *deque;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1198 dequeiterobject *it;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1199 if (!PyArg_ParseTuple(args, "O!\|n", &deque_type, &deque, &index))
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1200 return NULL;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1201 assert(type == &dequeiter_type);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1202
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1203 it = (dequeiterobject)deque_iter((dequeobject )deque);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1204 if (!it)
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1205 return NULL;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1206 /* consume items from the queue */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1207 for(i=0; i<index; i++) {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1208 PyObject *item = dequeiter_next(it);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1209 if (item) {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1210 Py_DECREF(item);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1211 } else {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1212 if (it->counter) {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1213 Py_DECREF(it);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1214 return NULL;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1215 } else
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1216 break;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1217 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1218 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1219 return (PyObject*)it;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1220 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1221
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1222 static PyObject *
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1223 dequeiter_len(dequeiterobject *it)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1224 {
64121 2a4ceebdfcfb Merged revisions 84146-84147,84150 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 61467 diff changeset	1225 return PyLong_FromSsize_t(it->counter);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1226 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1227
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1228 PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1229
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1230 static PyObject *
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1231 dequeiter_reduce(dequeiterobject *it)
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1232 {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1233 return Py_BuildValue("O(On)", Py_TYPE(it), it->deque, it->deque->len - it->counter);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1234 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1235
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1236 static PyMethodDef dequeiter_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1237 {"__length_hint__", (PyCFunction)dequeiter_len, METH_NOARGS, length_hint_doc},
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1238 {"__reduce__", (PyCFunction)dequeiter_reduce, METH_NOARGS, reduce_doc},
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1239 {NULL, NULL} /* sentinel */
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1240 };
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1241
47680 b5e02775fffc Merged revisions 64226 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47580 diff changeset	1242 static PyTypeObject dequeiter_type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1243 PyVarObject_HEAD_INIT(NULL, 0)
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1244 "_collections._deque_iterator", /* tp_name */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1245 sizeof(dequeiterobject), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1246 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1247 /* methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1248 (destructor)dequeiter_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1249 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1250 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1251 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1252 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1253 0, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1254 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1255 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1256 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1257 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1258 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1259 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1260 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1261 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1262 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1263 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1264 0, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1265 (traverseproc)dequeiter_traverse, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1266 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1267 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1268 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1269 PyObject_SelfIter, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1270 (iternextfunc)dequeiter_next, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1271 dequeiter_methods, /* tp_methods */
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1272 0, /* tp_members */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1273 0, /* tp_getset */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1274 0, /* tp_base */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1275 0, /* tp_dict */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1276 0, /* tp_descr_get */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1277 0, /* tp_descr_set */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1278 0, /* tp_dictoffset */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1279 0, /* tp_init */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1280 0, /* tp_alloc */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1281 dequeiter_new, /* tp_new */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1282 0,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1283 };
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1284
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1285 /********************* Deque Reverse Iterator ************************/
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1286
47680 b5e02775fffc Merged revisions 64226 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47580 diff changeset	1287 static PyTypeObject dequereviter_type;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1288
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1289 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1290 deque_reviter(dequeobject *deque)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1291 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1292 dequeiterobject *it;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1293
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1294 it = PyObject_GC_New(dequeiterobject, &dequereviter_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1295 if (it == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1296 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1297 it->b = deque->rightblock;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1298 it->index = deque->rightindex;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1299 Py_INCREF(deque);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1300 it->deque = deque;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1301 it->state = deque->state;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1302 it->counter = deque->len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1303 PyObject_GC_Track(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1304 return (PyObject *)it;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1305 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1306
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1307 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1308 dequereviter_next(dequeiterobject *it)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1309 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1310 PyObject *item;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1311 if (it->counter == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1312 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1313
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1314 if (it->deque->state != it->state) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1315 it->counter = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1316 PyErr_SetString(PyExc_RuntimeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1317 "deque mutated during iteration");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1318 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1319 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1320 assert (!(it->b == it->deque->leftblock &&
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1321 it->index < it->deque->leftindex));
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1322
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1323 item = it->b->data[it->index];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1324 it->index--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1325 it->counter--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1326 if (it->index == -1 && it->counter > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1327 assert (it->b->leftlink != NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1328 it->b = it->b->leftlink;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1329 it->index = BLOCKLEN - 1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1330 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1331 Py_INCREF(item);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1332 return item;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1333 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1334
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1335 static PyObject *
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1336 dequereviter_new(PyTypeObject type, PyObject args, PyObject *kwds)
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1337 {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1338 Py_ssize_t i, index=0;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1339 PyObject *deque;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1340 dequeiterobject *it;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1341 if (!PyArg_ParseTuple(args, "O!\|n", &deque_type, &deque, &index))
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1342 return NULL;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1343 assert(type == &dequereviter_type);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1344
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1345 it = (dequeiterobject)deque_reviter((dequeobject )deque);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1346 if (!it)
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1347 return NULL;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1348 /* consume items from the queue */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1349 for(i=0; i<index; i++) {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1350 PyObject *item = dequereviter_next(it);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1351 if (item) {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1352 Py_DECREF(item);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1353 } else {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1354 if (it->counter) {
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1355 Py_DECREF(it);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1356 return NULL;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1357 } else
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1358 break;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1359 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1360 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1361 return (PyObject*)it;
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1362 }
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1363
47680 b5e02775fffc Merged revisions 64226 via svnmerge from Martin v. Löwis <martin@v.loewis.de> parents: 47580 diff changeset	1364 static PyTypeObject dequereviter_type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1365 PyVarObject_HEAD_INIT(NULL, 0)
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1366 "_collections._deque_reverse_iterator", /* tp_name */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1367 sizeof(dequeiterobject), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1368 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1369 /* methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1370 (destructor)dequeiter_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1371 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1372 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1373 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1374 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1375 0, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1376 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1377 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1378 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1379 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1380 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1381 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1382 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1383 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1384 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1385 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1386 0, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1387 (traverseproc)dequeiter_traverse, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1388 0, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1389 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1390 0, /* tp_weaklistoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1391 PyObject_SelfIter, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1392 (iternextfunc)dequereviter_next, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1393 dequeiter_methods, /* tp_methods */
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1394 0, /* tp_members */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1395 0, /* tp_getset */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1396 0, /* tp_base */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1397 0, /* tp_dict */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1398 0, /* tp_descr_get */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1399 0, /* tp_descr_set */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1400 0, /* tp_dictoffset */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1401 0, /* tp_init */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1402 0, /* tp_alloc */
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1403 dequereviter_new, /* tp_new */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1404 0,
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1405 };
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1406
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1407 /* defaultdict type *********************************************************/
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1408
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1409 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1410 PyDictObject dict;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1411 PyObject *default_factory;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1412 } defdictobject;
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1413
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1414 static PyTypeObject defdict_type; /* Forward */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1415
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1416 PyDoc_STRVAR(defdict_missing_doc,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1417 "__missing__(key) # Called by __getitem__ for missing key; pseudo-code:\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1418 if self.default_factory is None: raise KeyError((key,))\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1419 self[key] = value = self.default_factory()\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1420 return value\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1421 ");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1422
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1423 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1424 defdict_missing(defdictobject dd, PyObject key)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1425 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1426 PyObject *factory = dd->default_factory;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1427 PyObject *value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1428 if (factory == NULL \|\| factory == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1429 /* XXX Call dict.__missing__(key) */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1430 PyObject *tup;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1431 tup = PyTuple_Pack(1, key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1432 if (!tup) return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1433 PyErr_SetObject(PyExc_KeyError, tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1434 Py_DECREF(tup);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1435 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1436 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1437 value = PyEval_CallObject(factory, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1438 if (value == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1439 return value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1440 if (PyObject_SetItem((PyObject *)dd, key, value) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1441 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1442 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1443 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1444 return value;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1445 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1446
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1447 PyDoc_STRVAR(defdict_copy_doc, "D.copy() -> a shallow copy of D.");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1448
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1449 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1450 defdict_copy(defdictobject *dd)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1451 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1452 /* This calls the object's class. That only works for subclasses
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1453 whose class constructor has the same signature. Subclasses that
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1454 define a different constructor signature must override copy().
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1455 */
55536 658de84381d7 Issue 6637: defaultdict.copy() failed with an empty factory. Raymond Hettinger <python@rcn.com> parents: 52120 diff changeset	1456
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1457 if (dd->default_factory == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1458 return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), Py_None, dd, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1459 return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1460 dd->default_factory, dd, NULL);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1461 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1462
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1463 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1464 defdict_reduce(defdictobject *dd)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1465 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1466 /* __reduce__ must return a 5-tuple as follows:
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1467
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1468 - factory function
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1469 - tuple of args for the factory function
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1470 - additional state (here None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1471 - sequence iterator (here None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1472 - dictionary iterator (yielding successive (key, value) pairs
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1473
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1474 This API is used by pickle.py and copy.py.
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1475
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1476 For this to be useful with pickle.py, the default_factory
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1477 must be picklable; e.g., None, a built-in, or a global
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1478 function in a module or package.
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1479
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1480 Both shallow and deep copying are supported, but for deep
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1481 copying, the default_factory must be deep-copyable; e.g. None,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1482 or a built-in (functions are not copyable at this time).
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1483
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1484 This only works for subclasses as long as their constructor
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1485 signature is compatible; the first argument must be the
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1486 optional default_factory, defaulting to None.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1487 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1488 PyObject *args;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1489 PyObject *items;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1490 PyObject *iter;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1491 PyObject *result;
72925 7109f31300fb Rename _Py_identifier to _Py_IDENTIFIER. Martin v. Löwis <martin@v.loewis.de> parents: 72848 diff changeset	1492 _Py_IDENTIFIER(items);
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 71810 diff changeset	1493
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1494 if (dd->default_factory == NULL \|\| dd->default_factory == Py_None)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1495 args = PyTuple_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1496 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1497 args = PyTuple_Pack(1, dd->default_factory);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1498 if (args == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1499 return NULL;
72835 5e33219492bc Add API for static strings, primarily good for identifiers. Martin v. Löwis <martin@v.loewis.de> parents: 71810 diff changeset	1500 items = _PyObject_CallMethodId((PyObject *)dd, &PyId_items, "()");
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1501 if (items == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1502 Py_DECREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1503 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1504 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1505 iter = PyObject_GetIter(items);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1506 if (iter == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1507 Py_DECREF(items);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1508 Py_DECREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1509 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1510 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1511 result = PyTuple_Pack(5, Py_TYPE(dd), args,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1512 Py_None, Py_None, iter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1513 Py_DECREF(iter);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1514 Py_DECREF(items);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1515 Py_DECREF(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1516 return result;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1517 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1518
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1519 static PyMethodDef defdict_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1520 {"__missing__", (PyCFunction)defdict_missing, METH_O,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1521 defdict_missing_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1522 {"copy", (PyCFunction)defdict_copy, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1523 defdict_copy_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1524 {"__copy__", (PyCFunction)defdict_copy, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1525 defdict_copy_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1526 {"__reduce__", (PyCFunction)defdict_reduce, METH_NOARGS,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1527 reduce_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1528 {NULL}
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1529 };
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1530
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1531 static PyMemberDef defdict_members[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1532 {"default_factory", T_OBJECT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1533 offsetof(defdictobject, default_factory), 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1534 PyDoc_STR("Factory for default value called by __missing__().")},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1535 {NULL}
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1536 };
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1537
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1538 static void
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1539 defdict_dealloc(defdictobject *dd)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1540 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1541 Py_CLEAR(dd->default_factory);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1542 PyDict_Type.tp_dealloc((PyObject *)dd);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1543 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1544
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1545 static PyObject *
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1546 defdict_repr(defdictobject *dd)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1547 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1548 PyObject *baserepr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1549 PyObject *defrepr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1550 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1551 baserepr = PyDict_Type.tp_repr((PyObject *)dd);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1552 if (baserepr == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1553 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1554 if (dd->default_factory == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1555 defrepr = PyUnicode_FromString("None");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1556 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1557 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1558 int status = Py_ReprEnter(dd->default_factory);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1559 if (status != 0) {
74936 86adb5c7a9d4 Issue #13015: Fix a possible reference leak in defaultdict.__repr__. Antoine Pitrou <solipsis@pitrou.net> parents: 69107 diff changeset	1560 if (status < 0) {
86adb5c7a9d4 Issue #13015: Fix a possible reference leak in defaultdict.__repr__. Antoine Pitrou <solipsis@pitrou.net> parents: 69107 diff changeset	1561 Py_DECREF(baserepr);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1562 return NULL;
74936 86adb5c7a9d4 Issue #13015: Fix a possible reference leak in defaultdict.__repr__. Antoine Pitrou <solipsis@pitrou.net> parents: 69107 diff changeset	1563 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1564 defrepr = PyUnicode_FromString("...");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1565 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1566 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1567 defrepr = PyObject_Repr(dd->default_factory);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1568 Py_ReprLeave(dd->default_factory);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1569 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1570 if (defrepr == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1571 Py_DECREF(baserepr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1572 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1573 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1574 result = PyUnicode_FromFormat("defaultdict(%U, %U)",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1575 defrepr, baserepr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1576 Py_DECREF(defrepr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1577 Py_DECREF(baserepr);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1578 return result;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1579 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1580
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1581 static int
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1582 defdict_traverse(PyObject self, visitproc visit, void arg)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1583 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1584 Py_VISIT(((defdictobject *)self)->default_factory);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1585 return PyDict_Type.tp_traverse(self, visit, arg);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1586 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1587
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1588 static int
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1589 defdict_tp_clear(defdictobject *dd)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1590 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1591 Py_CLEAR(dd->default_factory);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1592 return PyDict_Type.tp_clear((PyObject *)dd);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1593 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1594
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1595 static int
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1596 defdict_init(PyObject self, PyObject args, PyObject *kwds)
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1597 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1598 defdictobject dd = (defdictobject )self;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1599 PyObject *olddefault = dd->default_factory;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1600 PyObject *newdefault = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1601 PyObject *newargs;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1602 int result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1603 if (args == NULL \|\| !PyTuple_Check(args))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1604 newargs = PyTuple_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1605 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1606 Py_ssize_t n = PyTuple_GET_SIZE(args);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1607 if (n > 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1608 newdefault = PyTuple_GET_ITEM(args, 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1609 if (!PyCallable_Check(newdefault) && newdefault != Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1610 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1611 "first argument must be callable");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1612 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1613 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1614 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1615 newargs = PySequence_GetSlice(args, 1, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1616 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1617 if (newargs == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1618 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1619 Py_XINCREF(newdefault);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1620 dd->default_factory = newdefault;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1621 result = PyDict_Type.tp_init(self, newargs, kwds);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1622 Py_DECREF(newargs);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1623 Py_XDECREF(olddefault);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1624 return result;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1625 }
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1626
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1627 PyDoc_STRVAR(defdict_doc,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1628 "defaultdict(default_factory) --> dict with default factory\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1629 \n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1630 The default factory is called without arguments to produce\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1631 a new value when a key is not present, in __getitem__ only.\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1632 A defaultdict compares equal to a dict with the same items.\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1633 ");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1634
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1635 /* See comment in xxsubtype.c */
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1636 #define DEFERRED_ADDRESS(ADDR) 0
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1637
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1638 static PyTypeObject defdict_type = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1639 PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1640 "collections.defaultdict", /* tp_name */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1641 sizeof(defdictobject), /* tp_basicsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1642 0, /* tp_itemsize */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1643 /* methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1644 (destructor)defdict_dealloc, /* tp_dealloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1645 0, /* tp_print */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1646 0, /* tp_getattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1647 0, /* tp_setattr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1648 0, /* tp_reserved */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1649 (reprfunc)defdict_repr, /* tp_repr */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1650 0, /* tp_as_number */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1651 0, /* tp_as_sequence */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1652 0, /* tp_as_mapping */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1653 0, /* tp_hash */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1654 0, /* tp_call */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1655 0, /* tp_str */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1656 PyObject_GenericGetAttr, /* tp_getattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1657 0, /* tp_setattro */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1658 0, /* tp_as_buffer */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1659 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1660 /* tp_flags */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1661 defdict_doc, /* tp_doc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1662 defdict_traverse, /* tp_traverse */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1663 (inquiry)defdict_tp_clear, /* tp_clear */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1664 0, /* tp_richcompare */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1665 0, /* tp_weaklistoffset*/
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1666 0, /* tp_iter */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1667 0, /* tp_iternext */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1668 defdict_methods, /* tp_methods */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1669 defdict_members, /* tp_members */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1670 0, /* tp_getset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1671 DEFERRED_ADDRESS(&PyDict_Type), /* tp_base */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1672 0, /* tp_dict */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1673 0, /* tp_descr_get */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1674 0, /* tp_descr_set */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1675 0, /* tp_dictoffset */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1676 defdict_init, /* tp_init */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1677 PyType_GenericAlloc, /* tp_alloc */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1678 0, /* tp_new */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1679 PyObject_GC_Del, /* tp_free */
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1680 };
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1681
66920 40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1682 /* helper function for Counter *********************************************/
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1683
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1684 PyDoc_STRVAR(_count_elements_doc,
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1685 "_count_elements(mapping, iterable) -> None\n\
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1686 \n\
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1687 Count elements in the iterable, updating the mappping");
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1688
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1689 static PyObject *
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1690 _count_elements(PyObject self, PyObject args)
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1691 {
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1692 PyObject it, iterable, mapping, oldval;
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1693 PyObject *newval = NULL;
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1694 PyObject *key = NULL;
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1695 PyObject *one = NULL;
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1696
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1697 if (!PyArg_UnpackTuple(args, "_count_elements", 2, 2, &mapping, &iterable))
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1698 return NULL;
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1699
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1700 it = PyObject_GetIter(iterable);
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1701 if (it == NULL)
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1702 return NULL;
67287 a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1703
66920 40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1704 one = PyLong_FromLong(1);
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1705 if (one == NULL) {
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1706 Py_DECREF(it);
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1707 return NULL;
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1708 }
67287 a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1709
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1710 if (PyDict_CheckExact(mapping)) {
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1711 while (1) {
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1712 key = PyIter_Next(it);
69504 4bd68b1f8702 Simplify _count_elements() in _collections Victor Stinner <victor.stinner@haypocalc.com> parents: 69107 diff changeset	1713 if (key == NULL)
4bd68b1f8702 Simplify _count_elements() in _collections Victor Stinner <victor.stinner@haypocalc.com> parents: 69107 diff changeset	1714 break;
67287 a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1715 oldval = PyDict_GetItem(mapping, key);
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1716 if (oldval == NULL) {
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1717 if (PyDict_SetItem(mapping, key, one) == -1)
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1718 break;
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1719 } else {
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1720 newval = PyNumber_Add(oldval, one);
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1721 if (newval == NULL)
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1722 break;
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1723 if (PyDict_SetItem(mapping, key, newval) == -1)
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1724 break;
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1725 Py_CLEAR(newval);
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1726 }
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1727 Py_DECREF(key);
66920 40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1728 }
67287 a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1729 } else {
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1730 while (1) {
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1731 key = PyIter_Next(it);
69504 4bd68b1f8702 Simplify _count_elements() in _collections Victor Stinner <victor.stinner@haypocalc.com> parents: 69107 diff changeset	1732 if (key == NULL)
4bd68b1f8702 Simplify _count_elements() in _collections Victor Stinner <victor.stinner@haypocalc.com> parents: 69107 diff changeset	1733 break;
67287 a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1734 oldval = PyObject_GetItem(mapping, key);
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1735 if (oldval == NULL) {
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1736 if (!PyErr_Occurred() \|\| !PyErr_ExceptionMatches(PyExc_KeyError))
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1737 break;
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1738 PyErr_Clear();
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1739 Py_INCREF(one);
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1740 newval = one;
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1741 } else {
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1742 newval = PyNumber_Add(oldval, one);
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1743 Py_DECREF(oldval);
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1744 if (newval == NULL)
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1745 break;
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1746 }
a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1747 if (PyObject_SetItem(mapping, key, newval) == -1)
66920 40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1748 break;
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1749 Py_CLEAR(newval);
67287 a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1750 Py_DECREF(key);
66920 40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1751 }
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1752 }
67287 a048d0cf2ad1 Make C helper function more closely match the pure python version, and add tests. Raymond Hettinger <python@rcn.com> parents: 66920 diff changeset	1753
66920 40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1754 Py_DECREF(it);
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1755 Py_XDECREF(key);
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1756 Py_XDECREF(newval);
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1757 Py_DECREF(one);
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1758 if (PyErr_Occurred())
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1759 return NULL;
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1760 Py_RETURN_NONE;
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1761 }
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1762
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1763 /* module level code ********************************************************/
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1764
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1765 PyDoc_STRVAR(module_doc,
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1766 "High performance data structures.\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1767 - deque: ordered collection accessible from endpoints only\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1768 - defaultdict: dict subclass with a default value factory\n\
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1769 ");
06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1770
66920 40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1771 static struct PyMethodDef module_functions[] = {
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1772 {"_count_elements", _count_elements, METH_VARARGS, _count_elements_doc},
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1773 {NULL, NULL} /* sentinel */
40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1774 };
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45307 diff changeset	1775
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45307 diff changeset	1776 static struct PyModuleDef _collectionsmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1777 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1778 "_collections",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1779 module_doc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1780 -1,
66920 40125cddafb9 Issue 10667: Fast path for collections.Counter Raymond Hettinger <python@rcn.com> parents: 65513 diff changeset	1781 module_functions,
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1782 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1783 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1784 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1785 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45307 diff changeset	1786 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45307 diff changeset	1787
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1788 PyMODINIT_FUNC
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 45307 diff changeset	1789 PyInit__collections(void)
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1790 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1791 PyObject *m;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1792
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1793 m = PyModule_Create(&_collectionsmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1794 if (m == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1795 return NULL;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1796
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1797 if (PyType_Ready(&deque_type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1798 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1799 Py_INCREF(&deque_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1800 PyModule_AddObject(m, "deque", (PyObject *)&deque_type);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1801
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1802 defdict_type.tp_base = &PyDict_Type;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1803 if (PyType_Ready(&defdict_type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1804 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1805 Py_INCREF(&defdict_type);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1806 PyModule_AddObject(m, "defaultdict", (PyObject *)&defdict_type);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1807
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1808 if (PyType_Ready(&dequeiter_type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1809 return NULL;
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1810 Py_INCREF(&dequeiter_type);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1811 PyModule_AddObject(m, "_deque_iterator", (PyObject *)&dequeiter_type);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1812
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1813 if (PyType_Ready(&dequereviter_type) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1814 return NULL;
76091 4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1815 Py_INCREF(&dequereviter_type);
4ff234337e24 Issue #14288: Serialization support for builtin iterators. Kristján Valur Jónsson <kristjan@ccpgames.com> parents: 74937 diff changeset	1816 PyModule_AddObject(m, "_deque_reverse_iterator", (PyObject *)&dequereviter_type);
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1817
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57632 diff changeset	1818 return m;
41554 06145fbc7ab9 Merged revisions 53952-54987 via svnmerge from Guido van Rossum <guido@python.org> parents: diff changeset	1819 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_collectionsmodule.c @ 84007:dbfbdf2b5c19 3.3