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

annotate Modules/_collectionsmodule.c @ 82251:bb5a8564e186 2.7

Issue #13153: Tkinter functions now raise TclError instead of ValueError when a unicode argument contains non-BMP character.

author	Serhiy Storchaka <storchaka@gmail.com>
date	Mon, 18 Feb 2013 13:00:08 +0200
parents	3afa4c8eee1e
children	5accb0ac8bfb

rev	line source
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1 #include "Python.h"
32158 679e5c8effae Make sets and deques weak referencable. Raymond Hettinger <python@rcn.com> parents: 32119 diff changeset	2 #include "structmember.h"
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	3
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	4 /* collections module implementation of a deque() datatype
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	5 Written and maintained by Raymond D. Hettinger <python@rcn.com>
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	6 Copyright (c) 2004 Python Software Foundation.
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	7 All rights reserved.
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	8 */
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	9
33643 91634f3ba213 Restore the block length and add a comment. Raymond Hettinger <python@rcn.com> parents: 33642 diff changeset	10 /* The block length may be set to any number over 1. Larger numbers
91634f3ba213 Restore the block length and add a comment. Raymond Hettinger <python@rcn.com> parents: 33642 diff changeset	11 * reduce the number of calls to the memory allocator but take more
91634f3ba213 Restore the block length and add a comment. Raymond Hettinger <python@rcn.com> parents: 33642 diff changeset	12 * memory. Ideally, BLOCKLEN should be set with an eye to the
39232 cd8f20d400c1 defdict_reduce(): Plug leaks. Tim Peters <tim.peters@gmail.com> parents: 37748 diff changeset	13 * length of a cache line.
33643 91634f3ba213 Restore the block length and add a comment. Raymond Hettinger <python@rcn.com> parents: 33642 diff changeset	14 */
91634f3ba213 Restore the block length and add a comment. Raymond Hettinger <python@rcn.com> parents: 33642 diff changeset	15
33879 687362fa471c Bump-up block size. Raymond Hettinger <python@rcn.com> parents: 33697 diff changeset	16 #define BLOCKLEN 62
33641 cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	17 #define CENTER ((BLOCKLEN - 1) / 2)
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	18
33637 6f4bcb3bd202 Document some reverse-engineered invariants and pragmatic hints. Tim Peters <tim.peters@gmail.com> parents: 33635 diff changeset	19 /* A `dequeobject` is composed of a doubly-linked list of `block` nodes.
6f4bcb3bd202 Document some reverse-engineered invariants and pragmatic hints. Tim Peters <tim.peters@gmail.com> parents: 33635 diff changeset	20 * This list is not circular (the leftmost block has leftlink==NULL,
6f4bcb3bd202 Document some reverse-engineered invariants and pragmatic hints. Tim Peters <tim.peters@gmail.com> parents: 33635 diff changeset	21 * and the rightmost block has rightlink==NULL). A deque d's first
6f4bcb3bd202 Document some reverse-engineered invariants and pragmatic hints. Tim Peters <tim.peters@gmail.com> parents: 33635 diff changeset	22 * element is at d.leftblock[leftindex] and its last element is at
6f4bcb3bd202 Document some reverse-engineered invariants and pragmatic hints. Tim Peters <tim.peters@gmail.com> parents: 33635 diff changeset	23 * d.rightblock[rightindex]; note that, unlike as for Python slice
33641 cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	24 * indices, these indices are inclusive on both ends. By being inclusive
39232 cd8f20d400c1 defdict_reduce(): Plug leaks. Tim Peters <tim.peters@gmail.com> parents: 37748 diff changeset	25 * on both ends, algorithms for left and right operations become
33641 cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	26 * symmetrical which simplifies the design.
39232 cd8f20d400c1 defdict_reduce(): Plug leaks. Tim Peters <tim.peters@gmail.com> parents: 37748 diff changeset	27 *
33641 cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	28 * The list of blocks is never empty, so d.leftblock and d.rightblock
cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	29 * are never equal to NULL.
cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	30 *
cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	31 * The indices, d.leftindex and d.rightindex are always in the range
cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	32 * 0 <= index < BLOCKLEN.
33642 4fb8c89f66a0 Clarify the relationship between indices. Raymond Hettinger <python@rcn.com> parents: 33641 diff changeset	33 * Their exact relationship is:
4fb8c89f66a0 Clarify the relationship between indices. Raymond Hettinger <python@rcn.com> parents: 33641 diff changeset	34 * (d.leftindex + d.len - 1) % BLOCKLEN == d.rightindex.
33641 cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	35 *
cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	36 * Empty deques have d.len == 0; d.leftblock==d.rightblock;
cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	37 * d.leftindex == CENTER+1; and d.rightindex == CENTER.
cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	38 * Checking for d.len == 0 is the intended way to see whether d is empty.
cd70f1ac3c25 * Elaborate on the invariant comments and make them more precise. Raymond Hettinger <python@rcn.com> parents: 33639 diff changeset	39 *
39232 cd8f20d400c1 defdict_reduce(): Plug leaks. Tim Peters <tim.peters@gmail.com> parents: 37748 diff changeset	40 * Whenever d.leftblock == d.rightblock,
33642 4fb8c89f66a0 Clarify the relationship between indices. Raymond Hettinger <python@rcn.com> parents: 33641 diff changeset	41 * d.leftindex + d.len - 1 == d.rightindex.
39232 cd8f20d400c1 defdict_reduce(): Plug leaks. Tim Peters <tim.peters@gmail.com> parents: 37748 diff changeset	42 *
33642 4fb8c89f66a0 Clarify the relationship between indices. Raymond Hettinger <python@rcn.com> parents: 33641 diff changeset	43 * However, when d.leftblock != d.rightblock, d.leftindex and d.rightindex
39232 cd8f20d400c1 defdict_reduce(): Plug leaks. Tim Peters <tim.peters@gmail.com> parents: 37748 diff changeset	44 * become indices into distinct blocks and either may be larger than the
33642 4fb8c89f66a0 Clarify the relationship between indices. Raymond Hettinger <python@rcn.com> parents: 33641 diff changeset	45 * other.
33637 6f4bcb3bd202 Document some reverse-engineered invariants and pragmatic hints. Tim Peters <tim.peters@gmail.com> parents: 33635 diff changeset	46 */
6f4bcb3bd202 Document some reverse-engineered invariants and pragmatic hints. Tim Peters <tim.peters@gmail.com> parents: 33635 diff changeset	47
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	48 typedef struct BLOCK {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	49 struct BLOCK *leftlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	50 struct BLOCK *rightlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	51 PyObject *data[BLOCKLEN];
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	52 } block;
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	53
43812 f82a20dda465 Use a freelist to speed-up block allocation and deallocation in collections.deque(). Raymond Hettinger <python@rcn.com> parents: 43517 diff changeset	54 #define MAXFREEBLOCKS 10
48059 b68704457efe Finish-up the partial conversion from int to Py_ssize_t for deque indices and length. Raymond Hettinger <python@rcn.com> parents: 47961 diff changeset	55 static Py_ssize_t numfreeblocks = 0;
43812 f82a20dda465 Use a freelist to speed-up block allocation and deallocation in collections.deque(). Raymond Hettinger <python@rcn.com> parents: 43517 diff changeset	56 static block *freeblocks[MAXFREEBLOCKS];
f82a20dda465 Use a freelist to speed-up block allocation and deallocation in collections.deque(). Raymond Hettinger <python@rcn.com> parents: 43517 diff changeset	57
33635 836e92cc5c4f Definition consistency. Tim Peters <tim.peters@gmail.com> parents: 33634 diff changeset	58 static block *
48059 b68704457efe Finish-up the partial conversion from int to Py_ssize_t for deque indices and length. Raymond Hettinger <python@rcn.com> parents: 47961 diff changeset	59 newblock(block leftlink, block rightlink, Py_ssize_t len) {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	60 block *b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	61 /* To prevent len from overflowing PY_SSIZE_T_MAX on 64-bit machines, we
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	62 * refuse to allocate new blocks if the current len is dangerously
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	63 * close. There is some extra margin to prevent spurious arithmetic
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	64 * overflows at various places. The following check ensures that
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	65 * the blocks allocated to the deque, in the worst case, can only
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	66 * have PY_SSIZE_T_MAX-2 entries in total.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	67 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	68 if (len >= PY_SSIZE_T_MAX - 2*BLOCKLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	69 PyErr_SetString(PyExc_OverflowError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	70 "cannot add more blocks to the deque");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	71 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	72 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	73 if (numfreeblocks) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	74 numfreeblocks -= 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	75 b = freeblocks[numfreeblocks];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	76 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	77 b = PyMem_Malloc(sizeof(block));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	78 if (b == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	79 PyErr_NoMemory();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	80 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	81 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	82 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	83 b->leftlink = leftlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	84 b->rightlink = rightlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	85 return b;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	86 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	87
47678 a35da94e05fc Make more symbols static. Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	88 static void
43812 f82a20dda465 Use a freelist to speed-up block allocation and deallocation in collections.deque(). Raymond Hettinger <python@rcn.com> parents: 43517 diff changeset	89 freeblock(block *b)
f82a20dda465 Use a freelist to speed-up block allocation and deallocation in collections.deque(). Raymond Hettinger <python@rcn.com> parents: 43517 diff changeset	90 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	91 if (numfreeblocks < MAXFREEBLOCKS) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	92 freeblocks[numfreeblocks] = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	93 numfreeblocks++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	94 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	95 PyMem_Free(b);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	96 }
43812 f82a20dda465 Use a freelist to speed-up block allocation and deallocation in collections.deque(). Raymond Hettinger <python@rcn.com> parents: 43517 diff changeset	97 }
f82a20dda465 Use a freelist to speed-up block allocation and deallocation in collections.deque(). Raymond Hettinger <python@rcn.com> parents: 43517 diff changeset	98
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	99 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	100 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	101 block *leftblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	102 block *rightblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	103 Py_ssize_t leftindex; /* in range(BLOCKLEN) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	104 Py_ssize_t rightindex; /* in range(BLOCKLEN) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	105 Py_ssize_t len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	106 Py_ssize_t maxlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	107 long state; /* incremented whenever the indices move */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	108 PyObject weakreflist; / List of weak references */
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	109 } dequeobject;
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	110
43466 73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	111 /* The deque's size limit is d.maxlen. The limit can be zero or positive.
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	112 * If there is no limit, then d.maxlen == -1.
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	113 *
43466 73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	114 * After an item is added to a deque, we check to see if the size has grown past
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	115 * the limit. If it has, we get the size back down to the limit by popping an
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	116 * item off of the opposite end. The methods that can trigger this are append(),
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	117 * appendleft(), extend(), and extendleft().
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	118 */
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	119
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	120 #define TRIM(d, popfunction) \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	121 if (d->maxlen != -1 && d->len > d->maxlen) { \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	122 PyObject *rv = popfunction(d, NULL); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	123 assert(rv != NULL && d->len <= d->maxlen); \
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	124 Py_DECREF(rv); \
43466 73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	125 }
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	126
31605 2fed331de014 Make deque_type static so namespace is not polluted. Neal Norwitz <nnorwitz@gmail.com> parents: 31603 diff changeset	127 static PyTypeObject deque_type;
31603 15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	128
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	129 static PyObject *
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	130 deque_new(PyTypeObject type, PyObject args, PyObject *kwds)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	131 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	132 dequeobject *deque;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	133 block *b;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	134
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	135 /* create dequeobject structure */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	136 deque = (dequeobject *)type->tp_alloc(type, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	137 if (deque == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	138 return NULL;
33634 6bd4a1056716 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32752 diff changeset	139
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	140 b = newblock(NULL, NULL, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	141 if (b == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	142 Py_DECREF(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	143 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	144 }
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	145
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	146 assert(BLOCKLEN >= 2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	147 deque->leftblock = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	148 deque->rightblock = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	149 deque->leftindex = CENTER + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	150 deque->rightindex = CENTER;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	151 deque->len = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	152 deque->state = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	153 deque->weakreflist = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	154 deque->maxlen = -1;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	155
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	156 return (PyObject *)deque;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	157 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	158
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	159 static PyObject *
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	160 deque_pop(dequeobject deque, PyObject unused)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	161 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	162 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	163 block *prevblock;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	164
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	165 if (deque->len == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	166 PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	167 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	168 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	169 item = deque->rightblock->data[deque->rightindex];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	170 deque->rightindex--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	171 deque->len--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	172 deque->state++;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	173
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	174 if (deque->rightindex == -1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	175 if (deque->len == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	176 assert(deque->leftblock == deque->rightblock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	177 assert(deque->leftindex == deque->rightindex+1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	178 /* re-center instead of freeing a block */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	179 deque->leftindex = CENTER + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	180 deque->rightindex = CENTER;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	181 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	182 prevblock = deque->rightblock->leftlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	183 assert(deque->leftblock != deque->rightblock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	184 freeblock(deque->rightblock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	185 prevblock->rightlink = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	186 deque->rightblock = prevblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	187 deque->rightindex = BLOCKLEN - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	188 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	189 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	190 return item;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	191 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	192
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	193 PyDoc_STRVAR(pop_doc, "Remove and return the rightmost element.");
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	194
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	195 static PyObject *
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	196 deque_popleft(dequeobject deque, PyObject unused)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	197 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	198 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	199 block *prevblock;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	200
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	201 if (deque->len == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	202 PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	203 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	204 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	205 assert(deque->leftblock != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	206 item = deque->leftblock->data[deque->leftindex];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	207 deque->leftindex++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	208 deque->len--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	209 deque->state++;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	210
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	211 if (deque->leftindex == BLOCKLEN) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	212 if (deque->len == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	213 assert(deque->leftblock == deque->rightblock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	214 assert(deque->leftindex == deque->rightindex+1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	215 /* re-center instead of freeing a block */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	216 deque->leftindex = CENTER + 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	217 deque->rightindex = CENTER;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	218 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	219 assert(deque->leftblock != deque->rightblock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	220 prevblock = deque->leftblock->rightlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	221 freeblock(deque->leftblock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	222 assert(prevblock != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	223 prevblock->leftlink = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	224 deque->leftblock = prevblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	225 deque->leftindex = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	226 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	227 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	228 return item;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	229 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	230
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	231 PyDoc_STRVAR(popleft_doc, "Remove and return the leftmost element.");
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	232
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	233 static PyObject *
43466 73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	234 deque_append(dequeobject deque, PyObject item)
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	235 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	236 deque->state++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	237 if (deque->rightindex == BLOCKLEN-1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	238 block *b = newblock(deque->rightblock, NULL, deque->len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	239 if (b == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	240 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	241 assert(deque->rightblock->rightlink == NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	242 deque->rightblock->rightlink = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	243 deque->rightblock = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	244 deque->rightindex = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	245 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	246 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	247 deque->len++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	248 deque->rightindex++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	249 deque->rightblock->data[deque->rightindex] = item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	250 TRIM(deque, deque_popleft);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	251 Py_RETURN_NONE;
43466 73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	252 }
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	253
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	254 PyDoc_STRVAR(append_doc, "Add an element to the right side of the deque.");
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	255
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	256 static PyObject *
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	257 deque_appendleft(dequeobject deque, PyObject item)
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	258 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	259 deque->state++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	260 if (deque->leftindex == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	261 block *b = newblock(NULL, deque->leftblock, deque->len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	262 if (b == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	263 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	264 assert(deque->leftblock->leftlink == NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	265 deque->leftblock->leftlink = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	266 deque->leftblock = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	267 deque->leftindex = BLOCKLEN;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	268 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	269 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	270 deque->len++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	271 deque->leftindex--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	272 deque->leftblock->data[deque->leftindex] = item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	273 TRIM(deque, deque_pop);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	274 Py_RETURN_NONE;
43466 73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	275 }
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	276
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	277 PyDoc_STRVAR(appendleft_doc, "Add an element to the left side of the deque.");
73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	278
52117 ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	279
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	280 /* Run an iterator to exhaustion. Shortcut for
52117 ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	281 the extend/extendleft methods when maxlen == 0. */
ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	282 static PyObject*
ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	283 consume_iterator(PyObject *it)
ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	284 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	285 PyObject *item;
52117 ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	286
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	287 while ((item = PyIter_Next(it)) != NULL) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	288 Py_DECREF(item);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	289 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	290 Py_DECREF(it);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	291 if (PyErr_Occurred())
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	292 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	293 Py_RETURN_NONE;
52117 ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	294 }
ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	295
43466 73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	296 static PyObject *
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	297 deque_extend(dequeobject deque, PyObject iterable)
aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	298 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	299 PyObject it, item;
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	300
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	301 /* Handle case where id(deque) == id(iterable) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	302 if ((PyObject *)deque == iterable) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	303 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	304 PyObject *s = PySequence_List(iterable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	305 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	306 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	307 result = deque_extend(deque, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	308 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	309 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	310 }
57633 b5a4acbeaaa1 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55534 diff changeset	311
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	312 it = PyObject_GetIter(iterable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	313 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	314 return NULL;
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	315
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	316 if (deque->maxlen == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	317 return consume_iterator(it);
52117 ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	318
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	319 while ((item = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	320 deque->state++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	321 if (deque->rightindex == BLOCKLEN-1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	322 block *b = newblock(deque->rightblock, NULL,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	323 deque->len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	324 if (b == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	325 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	326 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	327 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	328 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	329 assert(deque->rightblock->rightlink == NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	330 deque->rightblock->rightlink = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	331 deque->rightblock = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	332 deque->rightindex = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	333 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	334 deque->len++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	335 deque->rightindex++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	336 deque->rightblock->data[deque->rightindex] = item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	337 TRIM(deque, deque_popleft);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	338 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	339 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	340 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	341 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	342 Py_RETURN_NONE;
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	343 }
aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	344
33634 6bd4a1056716 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32752 diff changeset	345 PyDoc_STRVAR(extend_doc,
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	346 "Extend the right side of the deque with elements from the iterable");
aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	347
aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	348 static PyObject *
aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	349 deque_extendleft(dequeobject deque, PyObject iterable)
aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	350 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	351 PyObject it, item;
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	352
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	353 /* Handle case where id(deque) == id(iterable) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	354 if ((PyObject *)deque == iterable) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	355 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	356 PyObject *s = PySequence_List(iterable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	357 if (s == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	358 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	359 result = deque_extendleft(deque, s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	360 Py_DECREF(s);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	361 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	362 }
57633 b5a4acbeaaa1 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55534 diff changeset	363
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	364 it = PyObject_GetIter(iterable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	365 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	366 return NULL;
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	367
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	368 if (deque->maxlen == 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	369 return consume_iterator(it);
52117 ab7a7215e463 Small optimization for corner case where maxlen==0. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	370
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	371 while ((item = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	372 deque->state++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	373 if (deque->leftindex == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	374 block *b = newblock(NULL, deque->leftblock,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	375 deque->len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	376 if (b == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	377 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	378 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	379 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	380 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	381 assert(deque->leftblock->leftlink == NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	382 deque->leftblock->leftlink = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	383 deque->leftblock = b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	384 deque->leftindex = BLOCKLEN;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	385 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	386 deque->len++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	387 deque->leftindex--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	388 deque->leftblock->data[deque->leftindex] = item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	389 TRIM(deque, deque_pop);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	390 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	391 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	392 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	393 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	394 Py_RETURN_NONE;
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	395 }
aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	396
33634 6bd4a1056716 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32752 diff changeset	397 PyDoc_STRVAR(extendleft_doc,
31464 aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	398 "Extend the left side of the deque with elements from the iterable");
aabd9b54e469 Have deques support high volume loads. Raymond Hettinger <python@rcn.com> parents: 31438 diff changeset	399
57633 b5a4acbeaaa1 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55534 diff changeset	400 static PyObject *
b5a4acbeaaa1 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55534 diff changeset	401 deque_inplace_concat(dequeobject deque, PyObject other)
b5a4acbeaaa1 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55534 diff changeset	402 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	403 PyObject *result;
57633 b5a4acbeaaa1 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55534 diff changeset	404
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	405 result = deque_extend(deque, other);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	406 if (result == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	407 return result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	408 Py_DECREF(result);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	409 Py_INCREF(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	410 return (PyObject *)deque;
57633 b5a4acbeaaa1 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55534 diff changeset	411 }
b5a4acbeaaa1 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55534 diff changeset	412
33697 aac4cc6618b5 Simplify delitem() code by calling rotate() directly instead of using Raymond Hettinger <python@rcn.com> parents: 33677 diff changeset	413 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	414 _deque_rotate(dequeobject *deque, Py_ssize_t n)
31474 3ce4ffac27ab * Incorporate Skip's suggestions for documentation (explain the word deque Raymond Hettinger <python@rcn.com> parents: 31466 diff changeset	415 {
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	416 Py_ssize_t m, len=deque->len, halflen=len>>1;
31474 3ce4ffac27ab * Incorporate Skip's suggestions for documentation (explain the word deque Raymond Hettinger <python@rcn.com> parents: 31466 diff changeset	417
81439 0d81333bde78 Issue #16398: Optimize deque.rotate() Raymond Hettinger <python@rcn.com> parents: 80082 diff changeset	418 if (len <= 1)
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	419 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	420 if (n > halflen \|\| n < -halflen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	421 n %= len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	422 if (n > halflen)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	423 n -= len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	424 else if (n < -halflen)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	425 n += len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	426 }
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	427 assert(len > 1);
3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	428 assert(-halflen <= n && n <= halflen);
31474 3ce4ffac27ab * Incorporate Skip's suggestions for documentation (explain the word deque Raymond Hettinger <python@rcn.com> parents: 31466 diff changeset	429
81439 0d81333bde78 Issue #16398: Optimize deque.rotate() Raymond Hettinger <python@rcn.com> parents: 80082 diff changeset	430 deque->state++;
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	431 while (n > 0) {
81439 0d81333bde78 Issue #16398: Optimize deque.rotate() Raymond Hettinger <python@rcn.com> parents: 80082 diff changeset	432 if (deque->leftindex == 0) {
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	433 block *b = newblock(NULL, deque->leftblock, len);
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	434 if (b == NULL)
81439 0d81333bde78 Issue #16398: Optimize deque.rotate() Raymond Hettinger <python@rcn.com> parents: 80082 diff changeset	435 return -1;
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	436 assert(deque->leftblock->leftlink == NULL);
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	437 deque->leftblock->leftlink = b;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	438 deque->leftblock = b;
81439 0d81333bde78 Issue #16398: Optimize deque.rotate() Raymond Hettinger <python@rcn.com> parents: 80082 diff changeset	439 deque->leftindex = BLOCKLEN;
0d81333bde78 Issue #16398: Optimize deque.rotate() Raymond Hettinger <python@rcn.com> parents: 80082 diff changeset	440 }
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	441 assert(deque->leftindex > 0);
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	442
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	443 m = n;
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	444 if (m > deque->rightindex + 1)
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	445 m = deque->rightindex + 1;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	446 if (m > deque->leftindex)
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	447 m = deque->leftindex;
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	448 assert (m > 0 && m <= len);
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	449 memcpy(&deque->leftblock->data[deque->leftindex - m],
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	450 &deque->rightblock->data[deque->rightindex + 1 - m],
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	451 m * sizeof(PyObject *));
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	452 deque->rightindex -= m;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	453 deque->leftindex -= m;
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	454 n -= m;
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	455
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	456 if (deque->rightindex == -1) {
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	457 block *prevblock = deque->rightblock->leftlink;
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	458 assert(deque->rightblock != NULL);
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	459 assert(deque->leftblock != deque->rightblock);
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	460 freeblock(deque->rightblock);
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	461 prevblock->rightlink = NULL;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	462 deque->rightblock = prevblock;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	463 deque->rightindex = BLOCKLEN - 1;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	464 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	465 }
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	466 while (n < 0) {
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	467 if (deque->rightindex == BLOCKLEN - 1) {
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	468 block *b = newblock(deque->rightblock, NULL, len);
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	469 if (b == NULL)
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	470 return -1;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	471 assert(deque->rightblock->rightlink == NULL);
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	472 deque->rightblock->rightlink = b;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	473 deque->rightblock = b;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	474 deque->rightindex = -1;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	475 }
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	476 assert (deque->rightindex < BLOCKLEN - 1);
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	477
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	478 m = -n;
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	479 if (m > BLOCKLEN - deque->leftindex)
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	480 m = BLOCKLEN - deque->leftindex;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	481 if (m > BLOCKLEN - 1 - deque->rightindex)
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	482 m = BLOCKLEN - 1 - deque->rightindex;
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	483 assert (m > 0 && m <= len);
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	484 memcpy(&deque->rightblock->data[deque->rightindex + 1],
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	485 &deque->leftblock->data[deque->leftindex],
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	486 m * sizeof(PyObject *));
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	487 deque->leftindex += m;
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	488 deque->rightindex += m;
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	489 n += m;
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	490
81439 0d81333bde78 Issue #16398: Optimize deque.rotate() Raymond Hettinger <python@rcn.com> parents: 80082 diff changeset	491 if (deque->leftindex == BLOCKLEN) {
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	492 block *nextblock = deque->leftblock->rightlink;
81942 cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	493 assert(deque->leftblock != deque->rightblock);
cb5cde9e5ac5 Issue 16398: Use memcpy() in deque.rotate(). Raymond Hettinger <python@rcn.com> parents: 81472 diff changeset	494 freeblock(deque->leftblock);
82114 3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	495 assert(nextblock != NULL);
3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	496 nextblock->leftlink = NULL;
3afa4c8eee1e Minor cleanups. Raymond Hettinger <python@rcn.com> parents: 81942 diff changeset	497 deque->leftblock = nextblock;
81439 0d81333bde78 Issue #16398: Optimize deque.rotate() Raymond Hettinger <python@rcn.com> parents: 80082 diff changeset	498 deque->leftindex = 0;
0d81333bde78 Issue #16398: Optimize deque.rotate() Raymond Hettinger <python@rcn.com> parents: 80082 diff changeset	499 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	500 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	501 return 0;
33697 aac4cc6618b5 Simplify delitem() code by calling rotate() directly instead of using Raymond Hettinger <python@rcn.com> parents: 33677 diff changeset	502 }
aac4cc6618b5 Simplify delitem() code by calling rotate() directly instead of using Raymond Hettinger <python@rcn.com> parents: 33677 diff changeset	503
aac4cc6618b5 Simplify delitem() code by calling rotate() directly instead of using Raymond Hettinger <python@rcn.com> parents: 33677 diff changeset	504 static PyObject *
aac4cc6618b5 Simplify delitem() code by calling rotate() directly instead of using Raymond Hettinger <python@rcn.com> parents: 33677 diff changeset	505 deque_rotate(dequeobject deque, PyObject args)
aac4cc6618b5 Simplify delitem() code by calling rotate() directly instead of using Raymond Hettinger <python@rcn.com> parents: 33677 diff changeset	506 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	507 Py_ssize_t n=1;
33697 aac4cc6618b5 Simplify delitem() code by calling rotate() directly instead of using Raymond Hettinger <python@rcn.com> parents: 33677 diff changeset	508
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	509 if (!PyArg_ParseTuple(args, "\|n:rotate", &n))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	510 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	511 if (_deque_rotate(deque, n) == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	512 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	513 return NULL;
31474 3ce4ffac27ab * Incorporate Skip's suggestions for documentation (explain the word deque Raymond Hettinger <python@rcn.com> parents: 31466 diff changeset	514 }
3ce4ffac27ab * Incorporate Skip's suggestions for documentation (explain the word deque Raymond Hettinger <python@rcn.com> parents: 31466 diff changeset	515
33634 6bd4a1056716 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32752 diff changeset	516 PyDoc_STRVAR(rotate_doc,
31476 25b30439fe22 Make deque.rotate() smarter. Beef-up related tests. Raymond Hettinger <python@rcn.com> parents: 31474 diff changeset	517 "Rotate the deque n steps to the right (default n=1). If n is negative, rotates left.");
31474 3ce4ffac27ab * Incorporate Skip's suggestions for documentation (explain the word deque Raymond Hettinger <python@rcn.com> parents: 31466 diff changeset	518
57635 8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	519 static PyObject *
8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	520 deque_reverse(dequeobject deque, PyObject unused)
8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	521 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	522 block *leftblock = deque->leftblock;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	523 block *rightblock = deque->rightblock;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	524 Py_ssize_t leftindex = deque->leftindex;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	525 Py_ssize_t rightindex = deque->rightindex;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	526 Py_ssize_t n = (deque->len)/2;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	527 Py_ssize_t i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	528 PyObject *tmp;
57635 8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	529
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	530 for (i=0 ; i<n ; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	531 /* Validate that pointers haven't met in the middle */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	532 assert(leftblock != rightblock \|\| leftindex < rightindex);
57635 8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	533
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	534 /* Swap */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	535 tmp = leftblock->data[leftindex];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	536 leftblock->data[leftindex] = rightblock->data[rightindex];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	537 rightblock->data[rightindex] = tmp;
57635 8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	538
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	539 /* Advance left block/index pair */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	540 leftindex++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	541 if (leftindex == BLOCKLEN) {
67765 f6392c4ce619 Issue 11004: Fix edge case for deque.count(). Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	542 if (leftblock->rightlink == NULL)
f6392c4ce619 Issue 11004: Fix edge case for deque.count(). Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	543 break;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	544 leftblock = leftblock->rightlink;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	545 leftindex = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	546 }
57635 8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	547
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	548 /* Step backwards with the right block/index pair */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	549 rightindex--;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	550 if (rightindex == -1) {
67765 f6392c4ce619 Issue 11004: Fix edge case for deque.count(). Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	551 if (rightblock->leftlink == NULL)
f6392c4ce619 Issue 11004: Fix edge case for deque.count(). Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	552 break;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	553 rightblock = rightblock->leftlink;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	554 rightindex = BLOCKLEN - 1;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	555 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	556 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	557 Py_RETURN_NONE;
57635 8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	558 }
8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	559
8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	560 PyDoc_STRVAR(reverse_doc,
8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	561 "D.reverse() -- reverse IN PLACE");
8276d00d3100 Add a reverse() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57634 diff changeset	562
60277 c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	563 static PyObject *
c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	564 deque_count(dequeobject deque, PyObject v)
c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	565 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	566 block *leftblock = deque->leftblock;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	567 Py_ssize_t leftindex = deque->leftindex;
67765 f6392c4ce619 Issue 11004: Fix edge case for deque.count(). Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	568 Py_ssize_t n = deque->len;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	569 Py_ssize_t i;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	570 Py_ssize_t count = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	571 PyObject *item;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	572 long start_state = deque->state;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	573 int cmp;
60277 c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	574
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	575 for (i=0 ; i<n ; i++) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	576 item = leftblock->data[leftindex];
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	577 cmp = PyObject_RichCompareBool(item, v, Py_EQ);
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	578 if (cmp > 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	579 count++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	580 else if (cmp < 0)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	581 return NULL;
60277 c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	582
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	583 if (start_state != deque->state) {
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	584 PyErr_SetString(PyExc_RuntimeError,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	585 "deque mutated during iteration");
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	586 return NULL;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	587 }
60277 c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	588
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	589 /* Advance left block/index pair */
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	590 leftindex++;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	591 if (leftindex == BLOCKLEN) {
67765 f6392c4ce619 Issue 11004: Fix edge case for deque.count(). Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	592 if (leftblock->rightlink == NULL) /* can occur when i==n-1 */
f6392c4ce619 Issue 11004: Fix edge case for deque.count(). Raymond Hettinger <python@rcn.com> parents: 61463 diff changeset	593 break;
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	594 leftblock = leftblock->rightlink;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	595 leftindex = 0;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	596 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	597 }
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	598 return PyInt_FromSsize_t(count);
60277 c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	599 }
c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	600
c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	601 PyDoc_STRVAR(count_doc,
c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	602 "D.count(value) -> integer -- return number of occurrences of value");
c73a658da6fa Add count() method to collections.deque(). Raymond Hettinger <python@rcn.com> parents: 57635 diff changeset	603
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	604 static Py_ssize_t
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	605 deque_len(dequeobject *deque)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	606 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	607 return deque->len;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	608 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	609
34771 fb39f4eeaea4 Add a remove() method to collections.deque objects. Raymond Hettinger <python@rcn.com> parents: 33949 diff changeset	610 static PyObject *
fb39f4eeaea4 Add a remove() method to collections.deque objects. Raymond Hettinger <python@rcn.com> parents: 33949 diff changeset	611 deque_remove(dequeobject deque, PyObject value)
fb39f4eeaea4 Add a remove() method to collections.deque objects. Raymond Hettinger <python@rcn.com> parents: 33949 diff changeset	612 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	613 Py_ssize_t i, n=deque->len;
34771 fb39f4eeaea4 Add a remove() method to collections.deque objects. Raymond Hettinger <python@rcn.com> parents: 33949 diff changeset	614
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	615 for (i=0 ; i<n ; i++) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	616 PyObject *item = deque->leftblock->data[deque->leftindex];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	617 int cmp = PyObject_RichCompareBool(item, value, Py_EQ);
34772 2ee575b9b60e Apply remove's mutation test after every equality test. Raymond Hettinger <python@rcn.com> parents: 34771 diff changeset	618
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	619 if (deque->len != n) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	620 PyErr_SetString(PyExc_IndexError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	621 "deque mutated during remove().");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	622 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	623 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	624 if (cmp > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	625 PyObject *tgt = deque_popleft(deque, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	626 assert (tgt != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	627 Py_DECREF(tgt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	628 if (_deque_rotate(deque, i) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	629 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	630 Py_RETURN_NONE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	631 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	632 else if (cmp < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	633 _deque_rotate(deque, i);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	634 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	635 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	636 _deque_rotate(deque, -1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	637 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	638 PyErr_SetString(PyExc_ValueError, "deque.remove(x): x not in deque");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	639 return NULL;
34771 fb39f4eeaea4 Add a remove() method to collections.deque objects. Raymond Hettinger <python@rcn.com> parents: 33949 diff changeset	640 }
fb39f4eeaea4 Add a remove() method to collections.deque objects. Raymond Hettinger <python@rcn.com> parents: 33949 diff changeset	641
fb39f4eeaea4 Add a remove() method to collections.deque objects. Raymond Hettinger <python@rcn.com> parents: 33949 diff changeset	642 PyDoc_STRVAR(remove_doc,
fb39f4eeaea4 Add a remove() method to collections.deque objects. Raymond Hettinger <python@rcn.com> parents: 33949 diff changeset	643 "D.remove(value) -- remove first occurrence of value.");
fb39f4eeaea4 Add a remove() method to collections.deque objects. Raymond Hettinger <python@rcn.com> parents: 33949 diff changeset	644
81472 ad585b439d97 make deque_clear void, since it's infallible Benjamin Peterson <benjamin@python.org> parents: 81439 diff changeset	645 static void
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	646 deque_clear(dequeobject *deque)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	647 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	648 PyObject *item;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	649
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	650 while (deque->len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	651 item = deque_pop(deque, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	652 assert (item != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	653 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	654 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	655 assert(deque->leftblock == deque->rightblock &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	656 deque->leftindex - 1 == deque->rightindex &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	657 deque->len == 0);
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	658 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	659
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	660 static PyObject *
48059 b68704457efe Finish-up the partial conversion from int to Py_ssize_t for deque indices and length. Raymond Hettinger <python@rcn.com> parents: 47961 diff changeset	661 deque_item(dequeobject *deque, Py_ssize_t i)
31607 8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	662 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	663 block *b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	664 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	665 Py_ssize_t n, index=i;
31607 8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	666
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	667 if (i < 0 \|\| i >= deque->len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	668 PyErr_SetString(PyExc_IndexError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	669 "deque index out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	670 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	671 }
31607 8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	672
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	673 if (i == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	674 i = deque->leftindex;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	675 b = deque->leftblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	676 } else if (i == deque->len - 1) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	677 i = deque->rightindex;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	678 b = deque->rightblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	679 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	680 i += deque->leftindex;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	681 n = i / BLOCKLEN;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	682 i %= BLOCKLEN;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	683 if (index < (deque->len >> 1)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	684 b = deque->leftblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	685 while (n--)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	686 b = b->rightlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	687 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	688 n = (deque->leftindex + deque->len - 1) / BLOCKLEN - n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	689 b = deque->rightblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	690 while (n--)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	691 b = b->leftlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	692 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	693 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	694 item = b->data[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	695 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	696 return item;
31607 8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	697 }
8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	698
32413 d7110bb6c13d Add a comment with implementation notes. Raymond Hettinger <python@rcn.com> parents: 32363 diff changeset	699 /* delitem() implemented in terms of rotate for simplicity and reasonable
d7110bb6c13d Add a comment with implementation notes. Raymond Hettinger <python@rcn.com> parents: 32363 diff changeset	700 performance near the end points. If for some reason this method becomes
33634 6bd4a1056716 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32752 diff changeset	701 popular, it is not hard to re-implement this using direct data movement
32413 d7110bb6c13d Add a comment with implementation notes. Raymond Hettinger <python@rcn.com> parents: 32363 diff changeset	702 (similar to code in list slice assignment) and achieve a two or threefold
d7110bb6c13d Add a comment with implementation notes. Raymond Hettinger <python@rcn.com> parents: 32363 diff changeset	703 performance boost.
d7110bb6c13d Add a comment with implementation notes. Raymond Hettinger <python@rcn.com> parents: 32363 diff changeset	704 */
d7110bb6c13d Add a comment with implementation notes. Raymond Hettinger <python@rcn.com> parents: 32363 diff changeset	705
31607 8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	706 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	707 deque_del_item(dequeobject *deque, Py_ssize_t i)
32084 245835ed8de8 Make sure "del d[n]" is properly supported. Was necessary because the Raymond Hettinger <python@rcn.com> parents: 31908 diff changeset	708 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	709 PyObject *item;
32084 245835ed8de8 Make sure "del d[n]" is properly supported. Was necessary because the Raymond Hettinger <python@rcn.com> parents: 31908 diff changeset	710
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	711 assert (i >= 0 && i < deque->len);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	712 if (_deque_rotate(deque, -i) == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	713 return -1;
32084 245835ed8de8 Make sure "del d[n]" is properly supported. Was necessary because the Raymond Hettinger <python@rcn.com> parents: 31908 diff changeset	714
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	715 item = deque_popleft(deque, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	716 assert (item != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	717 Py_DECREF(item);
32084 245835ed8de8 Make sure "del d[n]" is properly supported. Was necessary because the Raymond Hettinger <python@rcn.com> parents: 31908 diff changeset	718
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	719 return _deque_rotate(deque, i);
32084 245835ed8de8 Make sure "del d[n]" is properly supported. Was necessary because the Raymond Hettinger <python@rcn.com> parents: 31908 diff changeset	720 }
245835ed8de8 Make sure "del d[n]" is properly supported. Was necessary because the Raymond Hettinger <python@rcn.com> parents: 31908 diff changeset	721
245835ed8de8 Make sure "del d[n]" is properly supported. Was necessary because the Raymond Hettinger <python@rcn.com> parents: 31908 diff changeset	722 static int
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36484 diff changeset	723 deque_ass_item(dequeobject deque, Py_ssize_t i, PyObject v)
31607 8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	724 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	725 PyObject *old_value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	726 block *b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	727 Py_ssize_t n, len=deque->len, halflen=(len+1)>>1, index=i;
31607 8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	728
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	729 if (i < 0 \|\| i >= len) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	730 PyErr_SetString(PyExc_IndexError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	731 "deque index out of range");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	732 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	733 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	734 if (v == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	735 return deque_del_item(deque, i);
32084 245835ed8de8 Make sure "del d[n]" is properly supported. Was necessary because the Raymond Hettinger <python@rcn.com> parents: 31908 diff changeset	736
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	737 i += deque->leftindex;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	738 n = i / BLOCKLEN;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	739 i %= BLOCKLEN;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	740 if (index <= halflen) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	741 b = deque->leftblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	742 while (n--)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	743 b = b->rightlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	744 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	745 n = (deque->leftindex + len - 1) / BLOCKLEN - n;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	746 b = deque->rightblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	747 while (n--)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	748 b = b->leftlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	749 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	750 Py_INCREF(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	751 old_value = b->data[i];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	752 b->data[i] = v;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	753 Py_DECREF(old_value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	754 return 0;
31607 8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	755 }
8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	756
8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	757 static PyObject *
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	758 deque_clearmethod(dequeobject *deque)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	759 {
81472 ad585b439d97 make deque_clear void, since it's infallible Benjamin Peterson <benjamin@python.org> parents: 81439 diff changeset	760 deque_clear(deque);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	761 Py_RETURN_NONE;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	762 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	763
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	764 PyDoc_STRVAR(clear_doc, "Remove all elements from the deque.");
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	765
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	766 static void
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	767 deque_dealloc(dequeobject *deque)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	768 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	769 PyObject_GC_UnTrack(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	770 if (deque->weakreflist != NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	771 PyObject_ClearWeakRefs((PyObject *) deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	772 if (deque->leftblock != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	773 deque_clear(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	774 assert(deque->leftblock != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	775 freeblock(deque->leftblock);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	776 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	777 deque->leftblock = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	778 deque->rightblock = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	779 Py_TYPE(deque)->tp_free(deque);
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	780 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	781
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	782 static int
31607 8ecee8f47108 Replace left(), right(), and __reversed__() with the more general purpose Raymond Hettinger <python@rcn.com> parents: 31605 diff changeset	783 deque_traverse(dequeobject deque, visitproc visit, void arg)
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	784 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	785 block *b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	786 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	787 Py_ssize_t index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	788 Py_ssize_t indexlo = deque->leftindex;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	789
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	790 for (b = deque->leftblock; b != NULL; b = b->rightlink) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	791 const Py_ssize_t indexhi = b == deque->rightblock ?
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	792 deque->rightindex :
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	793 BLOCKLEN - 1;
33639 40350fbe665d deque_traverse(): If the deque had one block, and its rightindex was Tim Peters <tim.peters@gmail.com> parents: 33638 diff changeset	794
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	795 for (index = indexlo; index <= indexhi; ++index) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	796 item = b->data[index];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	797 Py_VISIT(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	798 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	799 indexlo = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	800 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	801 return 0;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	802 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	803
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	804 static PyObject *
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	805 deque_copy(PyObject *deque)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	806 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	807 if (((dequeobject *)deque)->maxlen == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	808 return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "O", deque, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	809 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	810 return PyObject_CallFunction((PyObject *)(Py_TYPE(deque)), "Oi",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	811 deque, ((dequeobject *)deque)->maxlen, NULL);
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	812 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	813
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	814 PyDoc_STRVAR(copy_doc, "Return a shallow copy of a deque.");
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	815
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	816 static PyObject *
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	817 deque_reduce(dequeobject *deque)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	818 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	819 PyObject dict, result, *aslist;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	820
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	821 dict = PyObject_GetAttrString((PyObject *)deque, "__dict__");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	822 if (dict == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	823 PyErr_Clear();
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	824 aslist = PySequence_List((PyObject *)deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	825 if (aslist == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	826 Py_XDECREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	827 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	828 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	829 if (dict == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	830 if (deque->maxlen == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	831 result = Py_BuildValue("O(O)", Py_TYPE(deque), aslist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	832 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	833 result = Py_BuildValue("O(On)", Py_TYPE(deque), aslist, deque->maxlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	834 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	835 if (deque->maxlen == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	836 result = Py_BuildValue("O(OO)O", Py_TYPE(deque), aslist, Py_None, dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	837 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	838 result = Py_BuildValue("O(On)O", Py_TYPE(deque), aslist, deque->maxlen, dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	839 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	840 Py_XDECREF(dict);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	841 Py_DECREF(aslist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	842 return result;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	843 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	844
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	845 PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	846
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	847 static PyObject *
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	848 deque_repr(PyObject *deque)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	849 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	850 PyObject aslist, result, *fmt;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	851 int i;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	852
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	853 i = Py_ReprEnter(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	854 if (i != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	855 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	856 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	857 return PyString_FromString("[...]");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	858 }
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	859
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	860 aslist = PySequence_List(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	861 if (aslist == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	862 Py_ReprLeave(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	863 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	864 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	865 if (((dequeobject *)deque)->maxlen != -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	866 fmt = PyString_FromFormat("deque(%%r, maxlen=%zd)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	867 ((dequeobject *)deque)->maxlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	868 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	869 fmt = PyString_FromString("deque(%r)");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	870 if (fmt == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	871 Py_DECREF(aslist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	872 Py_ReprLeave(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	873 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	874 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	875 result = PyString_Format(fmt, aslist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	876 Py_DECREF(fmt);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	877 Py_DECREF(aslist);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	878 Py_ReprLeave(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	879 return result;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	880 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	881
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	882 static int
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	883 deque_tp_print(PyObject deque, FILE fp, int flags)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	884 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	885 PyObject it, item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	886 char emit = ""; / No separator emitted on first pass */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	887 char *separator = ", ";
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	888 int i;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	889
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	890 i = Py_ReprEnter(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	891 if (i != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	892 if (i < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	893 return i;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	894 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	895 fputs("[...]", fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	896 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	897 return 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	898 }
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	899
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	900 it = PyObject_GetIter(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	901 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	902 return -1;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	903
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	904 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	905 fputs("deque([", fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	906 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	907 while ((item = PyIter_Next(it)) != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	908 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	909 fputs(emit, fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	910 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	911 emit = separator;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	912 if (PyObject_Print(item, fp, 0) != 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	913 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	914 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	915 Py_ReprLeave(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	916 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	917 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	918 Py_DECREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	919 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	920 Py_ReprLeave(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	921 Py_DECREF(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	922 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	923 return -1;
43466 73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	924
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	925 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	926 if (((dequeobject *)deque)->maxlen == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	927 fputs("])", fp);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	928 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	929 fprintf(fp, "], maxlen=%" PY_FORMAT_SIZE_T "d)", ((dequeobject *)deque)->maxlen);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	930 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	931 return 0;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	932 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	933
31603 15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	934 static PyObject *
15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	935 deque_richcompare(PyObject v, PyObject w, int op)
15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	936 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	937 PyObject it1=NULL, it2=NULL, x, y;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	938 Py_ssize_t vs, ws;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	939 int b, cmp=-1;
31603 15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	940
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	941 if (!PyObject_TypeCheck(v, &deque_type) \|\|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	942 !PyObject_TypeCheck(w, &deque_type)) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	943 Py_INCREF(Py_NotImplemented);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	944 return Py_NotImplemented;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	945 }
31603 15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	946
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	947 /* Shortcuts */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	948 vs = ((dequeobject *)v)->len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	949 ws = ((dequeobject *)w)->len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	950 if (op == Py_EQ) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	951 if (v == w)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	952 Py_RETURN_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	953 if (vs != ws)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	954 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	955 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	956 if (op == Py_NE) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	957 if (v == w)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	958 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	959 if (vs != ws)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	960 Py_RETURN_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	961 }
31603 15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	962
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	963 /* Search for the first index where items are different */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	964 it1 = PyObject_GetIter(v);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	965 if (it1 == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	966 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	967 it2 = PyObject_GetIter(w);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	968 if (it2 == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	969 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	970 for (;;) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	971 x = PyIter_Next(it1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	972 if (x == NULL && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	973 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	974 y = PyIter_Next(it2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	975 if (x == NULL \|\| y == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	976 break;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	977 b = PyObject_RichCompareBool(x, y, Py_EQ);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	978 if (b == 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	979 cmp = PyObject_RichCompareBool(x, y, op);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	980 Py_DECREF(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	981 Py_DECREF(y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	982 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	983 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	984 Py_DECREF(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	985 Py_DECREF(y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	986 if (b == -1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	987 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	988 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	989 /* We reached the end of one deque or both */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	990 Py_XDECREF(x);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	991 Py_XDECREF(y);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	992 if (PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	993 goto done;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	994 switch (op) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	995 case Py_LT: cmp = y != NULL; break; /* if w was longer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	996 case Py_LE: cmp = x == NULL; break; /* if v was not longer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	997 case Py_EQ: cmp = x == y; break; /* if we reached the end of both */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	998 case Py_NE: cmp = x != y; break; /* if one deque continues */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	999 case Py_GT: cmp = x != NULL; break; /* if v was longer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1000 case Py_GE: cmp = y == NULL; break; /* if w was not longer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1001 }
33634 6bd4a1056716 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32752 diff changeset	1002
31603 15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	1003 done:
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1004 Py_XDECREF(it1);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1005 Py_XDECREF(it2);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1006 if (cmp == 1)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1007 Py_RETURN_TRUE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1008 if (cmp == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1009 Py_RETURN_FALSE;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1010 return NULL;
31603 15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	1011 }
15553a1b7a17 Improvements to collections.deque(): Raymond Hettinger <python@rcn.com> parents: 31595 diff changeset	1012
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1013 static int
43466 73f49656420b Add __asdict__() to NamedTuple and refine the docs. Raymond Hettinger <python@rcn.com> parents: 43378 diff changeset	1014 deque_init(dequeobject deque, PyObject args, PyObject *kwdargs)
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1015 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1016 PyObject *iterable = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1017 PyObject *maxlenobj = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1018 Py_ssize_t maxlen = -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1019 char *kwlist[] = {"iterable", "maxlen", 0};
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1020
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1021 if (!PyArg_ParseTupleAndKeywords(args, kwdargs, "\|OO:deque", kwlist, &iterable, &maxlenobj))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1022 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1023 if (maxlenobj != NULL && maxlenobj != Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1024 maxlen = PyInt_AsSsize_t(maxlenobj);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1025 if (maxlen == -1 && PyErr_Occurred())
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1026 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1027 if (maxlen < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1028 PyErr_SetString(PyExc_ValueError, "maxlen must be non-negative");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1029 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1030 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1031 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1032 deque->maxlen = maxlen;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1033 deque_clear(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1034 if (iterable != NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1035 PyObject *rv = deque_extend(deque, iterable);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1036 if (rv == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1037 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1038 Py_DECREF(rv);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1039 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1040 return 0;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1041 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1042
52119 b0911b5a002e For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52117 diff changeset	1043 static PyObject *
78393 a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1044 deque_sizeof(dequeobject deque, void unused)
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1045 {
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1046 Py_ssize_t res;
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1047 Py_ssize_t blocks;
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1048
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1049 res = sizeof(dequeobject);
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1050 blocks = (deque->leftindex + deque->len + BLOCKLEN - 1) / BLOCKLEN;
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1051 assert(deque->leftindex + deque->len - 1 ==
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1052 (blocks - 1) * BLOCKLEN + deque->rightindex);
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1053 res += blocks * sizeof(block);
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1054 return PyLong_FromSsize_t(res);
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1055 }
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1056
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1057 PyDoc_STRVAR(sizeof_doc,
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1058 "D.__sizeof__() -- size of D in memory, in bytes");
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1059
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1060 static PyObject *
52119 b0911b5a002e For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52117 diff changeset	1061 deque_get_maxlen(dequeobject *deque)
b0911b5a002e For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52117 diff changeset	1062 {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1063 if (deque->maxlen == -1)
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1064 Py_RETURN_NONE;
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1065 return PyInt_FromSsize_t(deque->maxlen);
52119 b0911b5a002e For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52117 diff changeset	1066 }
b0911b5a002e For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52117 diff changeset	1067
b0911b5a002e For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52117 diff changeset	1068 static PyGetSetDef deque_getset[] = {
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1069 {"maxlen", (getter)deque_get_maxlen, (setter)NULL,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1070 "maximum size of a deque or None if unbounded"},
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1071 {0}
52119 b0911b5a002e For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52117 diff changeset	1072 };
b0911b5a002e For collections.deque() objects, expose the maxlen parameter as a read-only attribute. Raymond Hettinger <python@rcn.com> parents: 52117 diff changeset	1073
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1074 static PySequenceMethods deque_as_sequence = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1075 (lenfunc)deque_len, /* sq_length */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1076 0, /* sq_concat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1077 0, /* sq_repeat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1078 (ssizeargfunc)deque_item, /* sq_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1079 0, /* sq_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1080 (ssizeobjargproc)deque_ass_item, /* sq_ass_item */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1081 0, /* sq_ass_slice */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1082 0, /* sq_contains */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1083 (binaryfunc)deque_inplace_concat, /* sq_inplace_concat */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1084 0, /* sq_inplace_repeat */
57633 b5a4acbeaaa1 Fix variants of deque.extend: d.extend(d) d+=d d.extendleft(d) Raymond Hettinger <python@rcn.com> parents: 55534 diff changeset	1085
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1086 };
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1087
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1088 /* deque object ********************************************************/
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1089
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1090 static PyObject deque_iter(dequeobject deque);
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1091 static PyObject deque_reviter(dequeobject deque);
33634 6bd4a1056716 Trimmed trailing whitespace. Tim Peters <tim.peters@gmail.com> parents: 32752 diff changeset	1092 PyDoc_STRVAR(reversed_doc,
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1093 "D.__reversed__() -- return a reverse iterator over the deque");
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1094
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1095 static PyMethodDef deque_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1096 {"append", (PyCFunction)deque_append,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1097 METH_O, append_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1098 {"appendleft", (PyCFunction)deque_appendleft,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1099 METH_O, appendleft_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1100 {"clear", (PyCFunction)deque_clearmethod,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1101 METH_NOARGS, clear_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1102 {"__copy__", (PyCFunction)deque_copy,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1103 METH_NOARGS, copy_doc},
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1104 {"count", (PyCFunction)deque_count,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1105 METH_O, count_doc},
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1106 {"extend", (PyCFunction)deque_extend,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1107 METH_O, extend_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1108 {"extendleft", (PyCFunction)deque_extendleft,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1109 METH_O, extendleft_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1110 {"pop", (PyCFunction)deque_pop,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1111 METH_NOARGS, pop_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1112 {"popleft", (PyCFunction)deque_popleft,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1113 METH_NOARGS, popleft_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1114 {"__reduce__", (PyCFunction)deque_reduce,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1115 METH_NOARGS, reduce_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1116 {"remove", (PyCFunction)deque_remove,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1117 METH_O, remove_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1118 {"__reversed__", (PyCFunction)deque_reviter,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1119 METH_NOARGS, reversed_doc},
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1120 {"reverse", (PyCFunction)deque_reverse,
fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1121 METH_NOARGS, reverse_doc},
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1122 {"rotate", (PyCFunction)deque_rotate,
78393 a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1123 METH_VARARGS, rotate_doc},
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1124 {"__sizeof__", (PyCFunction)deque_sizeof,
a3d49f1de893 Closes #15469: Correct __sizeof__ support for deque Jesus Cea <jcea@jcea.es> parents: 74938 diff changeset	1125 METH_NOARGS, sizeof_doc},
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1126 {NULL, NULL} /* sentinel */
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1127 };
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1128
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1129 PyDoc_STRVAR(deque_doc,
80082 96c02b5a4e8d Fix docstring for deque ctor to mark iterable parameter optional Andrew Svetlov <andrew.svetlov@gmail.com> parents: 78393 diff changeset	1130 "deque([iterable[, maxlen]]) --> deque object\n\
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1131 \n\
69058 f4e6e18cae4b Issue 11713: clarify docstring for collections.deque() Raymond Hettinger <python@rcn.com> parents: 68256 diff changeset	1132 Build an ordered collection with optimized access from its endpoints.");
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1133
31605 2fed331de014 Make deque_type static so namespace is not polluted. Neal Norwitz <nnorwitz@gmail.com> parents: 31603 diff changeset	1134 static PyTypeObject deque_type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1135 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1136 "collections.deque", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1137 sizeof(dequeobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1138 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1139 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1140 (destructor)deque_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1141 deque_tp_print, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1142 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1143 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1144 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1145 deque_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1146 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1147 &deque_as_sequence, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1148 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1149 (hashfunc)PyObject_HashNotImplemented, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1150 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1151 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1152 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1153 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1154 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1155 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1156 Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1157 deque_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1158 (traverseproc)deque_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1159 (inquiry)deque_clear, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1160 (richcmpfunc)deque_richcompare, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1161 offsetof(dequeobject, weakreflist), /* tp_weaklistoffset*/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1162 (getiterfunc)deque_iter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1163 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1164 deque_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1165 0, /* tp_members */
61463 fd25030223b0 Untabify C files. Will watch buildbots. Antoine Pitrou <solipsis@pitrou.net> parents: 60277 diff changeset	1166 deque_getset, /* tp_getset */
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1167 0, /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1168 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1169 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1170 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1171 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1172 (initproc)deque_init, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1173 PyType_GenericAlloc, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1174 deque_new, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1175 PyObject_GC_Del, /* tp_free */
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1176 };
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1177
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1178 /********************* Deque Iterator ************************/
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1179
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1180 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1181 PyObject_HEAD
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1182 Py_ssize_t index;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1183 block *b;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1184 dequeobject *deque;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1185 long state; /* state when the iterator is created */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1186 Py_ssize_t counter; /* number of items remaining for iteration */
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1187 } dequeiterobject;
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1188
47678 a35da94e05fc Make more symbols static. Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	1189 static PyTypeObject dequeiter_type;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1190
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1191 static PyObject *
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1192 deque_iter(dequeobject *deque)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1193 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1194 dequeiterobject *it;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1195
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1196 it = PyObject_GC_New(dequeiterobject, &dequeiter_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1197 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1198 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1199 it->b = deque->leftblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1200 it->index = deque->leftindex;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1201 Py_INCREF(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1202 it->deque = deque;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1203 it->state = deque->state;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1204 it->counter = deque->len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1205 PyObject_GC_Track(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1206 return (PyObject *)it;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1207 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1208
50424 df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	1209 static int
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	1210 dequeiter_traverse(dequeiterobject dio, visitproc visit, void arg)
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	1211 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1212 Py_VISIT(dio->deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1213 return 0;
50424 df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	1214 }
df3923c36ec5 Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from Georg Brandl <georg@python.org> parents: 49138 diff changeset	1215
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1216 static void
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1217 dequeiter_dealloc(dequeiterobject *dio)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1218 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1219 Py_XDECREF(dio->deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1220 PyObject_GC_Del(dio);
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1221 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1222
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1223 static PyObject *
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1224 dequeiter_next(dequeiterobject *it)
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1225 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1226 PyObject *item;
33644 00c36e1bc50b * Bulletproof the method for detecting mutations during iteration. Raymond Hettinger <python@rcn.com> parents: 33643 diff changeset	1227
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1228 if (it->deque->state != it->state) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1229 it->counter = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1230 PyErr_SetString(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1231 "deque mutated during iteration");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1232 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1233 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1234 if (it->counter == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1235 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1236 assert (!(it->b == it->deque->rightblock &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1237 it->index > it->deque->rightindex));
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1238
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1239 item = it->b->data[it->index];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1240 it->index++;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1241 it->counter--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1242 if (it->index == BLOCKLEN && it->counter > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1243 assert (it->b->rightlink != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1244 it->b = it->b->rightlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1245 it->index = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1246 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1247 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1248 return item;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1249 }
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1250
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	1251 static PyObject *
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1252 dequeiter_len(dequeiterobject *it)
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1253 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1254 return PyInt_FromLong(it->counter);
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1255 }
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1256
36484 20f75d5e79e9 Renamed _length_cue() to __length_hint__(). See: Armin Rigo <arigo@tunes.org> parents: 36324 diff changeset	1257 PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
35636 e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	1258
e22334b1da67 Convert iterator __len__() methods to a private API. Raymond Hettinger <python@rcn.com> parents: 35449 diff changeset	1259 static PyMethodDef dequeiter_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1260 {"__length_hint__", (PyCFunction)dequeiter_len, METH_NOARGS, length_hint_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1261 {NULL, NULL} /* sentinel */
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1262 };
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1263
47678 a35da94e05fc Make more symbols static. Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	1264 static PyTypeObject dequeiter_type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1265 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1266 "deque_iterator", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1267 sizeof(dequeiterobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1268 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1269 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1270 (destructor)dequeiter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1271 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1272 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1273 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1274 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1275 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1276 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1277 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1278 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1279 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1280 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1281 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1282 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1283 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1284 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1285 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1286 0, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1287 (traverseproc)dequeiter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1288 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1289 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1290 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1291 PyObject_SelfIter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1292 (iternextfunc)dequeiter_next, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1293 dequeiter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1294 0,
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1295 };
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1296
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1297 /********************* Deque Reverse Iterator ************************/
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1298
47678 a35da94e05fc Make more symbols static. Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	1299 static PyTypeObject dequereviter_type;
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1300
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1301 static PyObject *
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1302 deque_reviter(dequeobject *deque)
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1303 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1304 dequeiterobject *it;
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1305
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1306 it = PyObject_GC_New(dequeiterobject, &dequereviter_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1307 if (it == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1308 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1309 it->b = deque->rightblock;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1310 it->index = deque->rightindex;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1311 Py_INCREF(deque);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1312 it->deque = deque;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1313 it->state = deque->state;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1314 it->counter = deque->len;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1315 PyObject_GC_Track(it);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1316 return (PyObject *)it;
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1317 }
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1318
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1319 static PyObject *
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1320 dequereviter_next(dequeiterobject *it)
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1321 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1322 PyObject *item;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1323 if (it->counter == 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1324 return NULL;
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1325
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1326 if (it->deque->state != it->state) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1327 it->counter = 0;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1328 PyErr_SetString(PyExc_RuntimeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1329 "deque mutated during iteration");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1330 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1331 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1332 assert (!(it->b == it->deque->leftblock &&
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1333 it->index < it->deque->leftindex));
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1334
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1335 item = it->b->data[it->index];
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1336 it->index--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1337 it->counter--;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1338 if (it->index == -1 && it->counter > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1339 assert (it->b->leftlink != NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1340 it->b = it->b->leftlink;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1341 it->index = BLOCKLEN - 1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1342 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1343 Py_INCREF(item);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1344 return item;
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1345 }
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1346
47678 a35da94e05fc Make more symbols static. Martin v. Löwis <martin@v.loewis.de> parents: 47527 diff changeset	1347 static PyTypeObject dequereviter_type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1348 PyVarObject_HEAD_INIT(NULL, 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1349 "deque_reverse_iterator", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1350 sizeof(dequeiterobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1351 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1352 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1353 (destructor)dequeiter_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1354 0, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1355 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1356 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1357 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1358 0, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1359 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1360 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1361 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1362 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1363 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1364 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1365 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1366 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1367 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1368 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_HAVE_GC,/* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1369 0, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1370 (traverseproc)dequeiter_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1371 0, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1372 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1373 0, /* tp_weaklistoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1374 PyObject_SelfIter, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1375 (iternextfunc)dequereviter_next, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1376 dequeiter_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1377 0,
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1378 };
aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1379
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1380 /* defaultdict type *********************************************************/
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1381
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1382 typedef struct {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1383 PyDictObject dict;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1384 PyObject *default_factory;
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1385 } defdictobject;
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1386
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1387 static PyTypeObject defdict_type; /* Forward */
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1388
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1389 PyDoc_STRVAR(defdict_missing_doc,
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1390 "__missing__(key) # Called by __getitem__ for missing key; pseudo-code:\n\
41019 b0f26a7813c9 Fix another reincarnation of bug #1576657 in defaultdict. Georg Brandl <georg@python.org> parents: 40989 diff changeset	1391 if self.default_factory is None: raise KeyError((key,))\n\
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1392 self[key] = value = self.default_factory()\n\
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1393 return value\n\
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1394 ");
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1395
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1396 static PyObject *
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1397 defdict_missing(defdictobject dd, PyObject key)
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1398 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1399 PyObject *factory = dd->default_factory;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1400 PyObject *value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1401 if (factory == NULL \|\| factory == Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1402 /* XXX Call dict.__missing__(key) */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1403 PyObject *tup;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1404 tup = PyTuple_Pack(1, key);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1405 if (!tup) return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1406 PyErr_SetObject(PyExc_KeyError, tup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1407 Py_DECREF(tup);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1408 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1409 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1410 value = PyEval_CallObject(factory, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1411 if (value == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1412 return value;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1413 if (PyObject_SetItem((PyObject *)dd, key, value) < 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1414 Py_DECREF(value);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1415 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1416 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1417 return value;
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1418 }
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1419
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1420 PyDoc_STRVAR(defdict_copy_doc, "D.copy() -> a shallow copy of D.");
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1421
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1422 static PyObject *
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1423 defdict_copy(defdictobject *dd)
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1424 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1425 /* This calls the object's class. That only works for subclasses
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1426 whose class constructor has the same signature. Subclasses that
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1427 define a different constructor signature must override copy().
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1428 */
55534 dd4da75ebc97 Issue 6637: defaultdict.copy() failed with an empty factory. Raymond Hettinger <python@rcn.com> parents: 50522 diff changeset	1429
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1430 if (dd->default_factory == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1431 return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd), Py_None, dd, NULL);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1432 return PyObject_CallFunctionObjArgs((PyObject*)Py_TYPE(dd),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1433 dd->default_factory, dd, NULL);
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1434 }
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1435
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1436 static PyObject *
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1437 defdict_reduce(defdictobject *dd)
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1438 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1439 /* __reduce__ must return a 5-tuple as follows:
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1440
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1441 - factory function
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1442 - tuple of args for the factory function
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1443 - additional state (here None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1444 - sequence iterator (here None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1445 - dictionary iterator (yielding successive (key, value) pairs
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1446
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1447 This API is used by pickle.py and copy.py.
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1448
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1449 For this to be useful with pickle.py, the default_factory
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1450 must be picklable; e.g., None, a built-in, or a global
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1451 function in a module or package.
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1452
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1453 Both shallow and deep copying are supported, but for deep
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1454 copying, the default_factory must be deep-copyable; e.g. None,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1455 or a built-in (functions are not copyable at this time).
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1456
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1457 This only works for subclasses as long as their constructor
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1458 signature is compatible; the first argument must be the
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1459 optional default_factory, defaulting to None.
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1460 */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1461 PyObject *args;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1462 PyObject *items;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1463 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1464 if (dd->default_factory == NULL \|\| dd->default_factory == Py_None)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1465 args = PyTuple_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1466 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1467 args = PyTuple_Pack(1, dd->default_factory);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1468 if (args == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1469 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1470 items = PyObject_CallMethod((PyObject *)dd, "iteritems", "()");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1471 if (items == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1472 Py_DECREF(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1473 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1474 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1475 result = PyTuple_Pack(5, Py_TYPE(dd), args,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1476 Py_None, Py_None, items);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1477 Py_DECREF(items);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1478 Py_DECREF(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1479 return result;
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1480 }
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1481
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1482 static PyMethodDef defdict_methods[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1483 {"__missing__", (PyCFunction)defdict_missing, METH_O,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1484 defdict_missing_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1485 {"copy", (PyCFunction)defdict_copy, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1486 defdict_copy_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1487 {"__copy__", (PyCFunction)defdict_copy, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1488 defdict_copy_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1489 {"__reduce__", (PyCFunction)defdict_reduce, METH_NOARGS,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1490 reduce_doc},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1491 {NULL}
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1492 };
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1493
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1494 static PyMemberDef defdict_members[] = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1495 {"default_factory", T_OBJECT,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1496 offsetof(defdictobject, default_factory), 0,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1497 PyDoc_STR("Factory for default value called by __missing__().")},
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1498 {NULL}
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1499 };
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1500
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1501 static void
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1502 defdict_dealloc(defdictobject *dd)
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1503 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1504 Py_CLEAR(dd->default_factory);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1505 PyDict_Type.tp_dealloc((PyObject *)dd);
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1506 }
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1507
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1508 static int
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1509 defdict_print(defdictobject dd, FILE fp, int flags)
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1510 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1511 int sts;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1512 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1513 fprintf(fp, "defaultdict(");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1514 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1515 if (dd->default_factory == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1516 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1517 fprintf(fp, "None");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1518 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1519 } else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1520 PyObject_Print(dd->default_factory, fp, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1521 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1522 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1523 fprintf(fp, ", ");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1524 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1525 sts = PyDict_Type.tp_print((PyObject *)dd, fp, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1526 Py_BEGIN_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1527 fprintf(fp, ")");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1528 Py_END_ALLOW_THREADS
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1529 return sts;
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1530 }
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1531
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1532 static PyObject *
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1533 defdict_repr(defdictobject *dd)
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1534 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1535 PyObject *defrepr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1536 PyObject *baserepr;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1537 PyObject *result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1538 baserepr = PyDict_Type.tp_repr((PyObject *)dd);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1539 if (baserepr == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1540 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1541 if (dd->default_factory == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1542 defrepr = PyString_FromString("None");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1543 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1544 {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1545 int status = Py_ReprEnter(dd->default_factory);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1546 if (status != 0) {
74938 7611fb3e19c6 Issue #13015: Fix a possible reference leak in defaultdict.__repr__. Antoine Pitrou <solipsis@pitrou.net> parents: 69058 diff changeset	1547 if (status < 0) {
7611fb3e19c6 Issue #13015: Fix a possible reference leak in defaultdict.__repr__. Antoine Pitrou <solipsis@pitrou.net> parents: 69058 diff changeset	1548 Py_DECREF(baserepr);
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1549 return NULL;
74938 7611fb3e19c6 Issue #13015: Fix a possible reference leak in defaultdict.__repr__. Antoine Pitrou <solipsis@pitrou.net> parents: 69058 diff changeset	1550 }
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1551 defrepr = PyString_FromString("...");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1552 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1553 else
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1554 defrepr = PyObject_Repr(dd->default_factory);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1555 Py_ReprLeave(dd->default_factory);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1556 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1557 if (defrepr == NULL) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1558 Py_DECREF(baserepr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1559 return NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1560 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1561 result = PyString_FromFormat("defaultdict(%s, %s)",
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1562 PyString_AS_STRING(defrepr),
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1563 PyString_AS_STRING(baserepr));
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1564 Py_DECREF(defrepr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1565 Py_DECREF(baserepr);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1566 return result;
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1567 }
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1568
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1569 static int
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1570 defdict_traverse(PyObject self, visitproc visit, void arg)
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1571 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1572 Py_VISIT(((defdictobject *)self)->default_factory);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1573 return PyDict_Type.tp_traverse(self, visit, arg);
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1574 }
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1575
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1576 static int
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1577 defdict_tp_clear(defdictobject *dd)
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1578 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1579 Py_CLEAR(dd->default_factory);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1580 return PyDict_Type.tp_clear((PyObject *)dd);
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1581 }
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1582
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1583 static int
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1584 defdict_init(PyObject self, PyObject args, PyObject *kwds)
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1585 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1586 defdictobject dd = (defdictobject )self;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1587 PyObject *olddefault = dd->default_factory;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1588 PyObject *newdefault = NULL;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1589 PyObject *newargs;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1590 int result;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1591 if (args == NULL \|\| !PyTuple_Check(args))
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1592 newargs = PyTuple_New(0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1593 else {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1594 Py_ssize_t n = PyTuple_GET_SIZE(args);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1595 if (n > 0) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1596 newdefault = PyTuple_GET_ITEM(args, 0);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1597 if (!PyCallable_Check(newdefault) && newdefault != Py_None) {
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1598 PyErr_SetString(PyExc_TypeError,
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1599 "first argument must be callable");
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1600 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1601 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1602 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1603 newargs = PySequence_GetSlice(args, 1, n);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1604 }
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1605 if (newargs == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1606 return -1;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1607 Py_XINCREF(newdefault);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1608 dd->default_factory = newdefault;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1609 result = PyDict_Type.tp_init(self, newargs, kwds);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1610 Py_DECREF(newargs);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1611 Py_XDECREF(olddefault);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1612 return result;
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1613 }
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1614
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1615 PyDoc_STRVAR(defdict_doc,
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1616 "defaultdict(default_factory) --> dict with default factory\n\
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1617 \n\
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1618 The default factory is called without arguments to produce\n\
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1619 a new value when a key is not present, in __getitem__ only.\n\
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1620 A defaultdict compares equal to a dict with the same items.\n\
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1621 ");
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1622
37470 9ecbce55a454 SF Bug #1448488 - make collectionsmodule build on Cygwin, using the same Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	1623 /* See comment in xxsubtype.c */
9ecbce55a454 SF Bug #1448488 - make collectionsmodule build on Cygwin, using the same Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	1624 #define DEFERRED_ADDRESS(ADDR) 0
9ecbce55a454 SF Bug #1448488 - make collectionsmodule build on Cygwin, using the same Anthony Baxter <anthonybaxter@gmail.com> parents: 37305 diff changeset	1625
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1626 static PyTypeObject defdict_type = {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1627 PyVarObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type), 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1628 "collections.defaultdict", /* tp_name */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1629 sizeof(defdictobject), /* tp_basicsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1630 0, /* tp_itemsize */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1631 /* methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1632 (destructor)defdict_dealloc, /* tp_dealloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1633 (printfunc)defdict_print, /* tp_print */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1634 0, /* tp_getattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1635 0, /* tp_setattr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1636 0, /* tp_compare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1637 (reprfunc)defdict_repr, /* tp_repr */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1638 0, /* tp_as_number */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1639 0, /* tp_as_sequence */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1640 0, /* tp_as_mapping */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1641 0, /* tp_hash */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1642 0, /* tp_call */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1643 0, /* tp_str */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1644 PyObject_GenericGetAttr, /* tp_getattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1645 0, /* tp_setattro */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1646 0, /* tp_as_buffer */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1647 Py_TPFLAGS_DEFAULT \| Py_TPFLAGS_BASETYPE \| Py_TPFLAGS_HAVE_GC \|
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1648 Py_TPFLAGS_HAVE_WEAKREFS, /* tp_flags */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1649 defdict_doc, /* tp_doc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1650 defdict_traverse, /* tp_traverse */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1651 (inquiry)defdict_tp_clear, /* tp_clear */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1652 0, /* tp_richcompare */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1653 0, /* tp_weaklistoffset*/
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1654 0, /* tp_iter */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1655 0, /* tp_iternext */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1656 defdict_methods, /* tp_methods */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1657 defdict_members, /* tp_members */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1658 0, /* tp_getset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1659 DEFERRED_ADDRESS(&PyDict_Type), /* tp_base */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1660 0, /* tp_dict */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1661 0, /* tp_descr_get */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1662 0, /* tp_descr_set */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1663 0, /* tp_dictoffset */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1664 defdict_init, /* tp_init */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1665 PyType_GenericAlloc, /* tp_alloc */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1666 0, /* tp_new */
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1667 PyObject_GC_Del, /* tp_free */
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1668 };
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1669
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1670 /* module level code ********************************************************/
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1671
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1672 PyDoc_STRVAR(module_doc,
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1673 "High performance data structures.\n\
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1674 - deque: ordered collection accessible from endpoints only\n\
92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1675 - defaultdict: dict subclass with a default value factory\n\
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1676 ");
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1677
63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1678 PyMODINIT_FUNC
40989 4087c0ec733b Prepare collections module for pure python code entries. Raymond Hettinger <python@rcn.com> parents: 40760 diff changeset	1679 init_collections(void)
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1680 {
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1681 PyObject *m;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1682
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1683 m = Py_InitModule3("_collections", NULL, module_doc);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1684 if (m == NULL)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1685 return;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1686
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1687 if (PyType_Ready(&deque_type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1688 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1689 Py_INCREF(&deque_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1690 PyModule_AddObject(m, "deque", (PyObject *)&deque_type);
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1691
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1692 defdict_type.tp_base = &PyDict_Type;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1693 if (PyType_Ready(&defdict_type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1694 return;
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1695 Py_INCREF(&defdict_type);
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1696 PyModule_AddObject(m, "defaultdict", (PyObject *)&defdict_type);
36656 92ce8bb8b12a - Patch 1433928: Guido van Rossum <guido@python.org> parents: 36518 diff changeset	1697
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1698 if (PyType_Ready(&dequeiter_type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1699 return;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1700
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1701 if (PyType_Ready(&dequereviter_type) < 0)
e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1702 return;
31685 aafe5fef58ba Improve deque iteration. Raymond Hettinger <python@rcn.com> parents: 31615 diff changeset	1703
61465 e38335d4df91 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 57633 diff changeset	1704 return;
31436 63fa60f2d61c * Move collections.deque() in from the sandbox Raymond Hettinger <python@rcn.com> parents: diff changeset	1705 }

Mercurial > cpython-lru_cache-weakref

annotate Modules/_collectionsmodule.c @ 82251:bb5a8564e186 2.7