mirror of
https://github.com/python/cpython.git
synced 2025-11-11 22:55:08 +00:00
svn+ssh://pythondev@svn.python.org/python/trunk ........ r53012 | walter.doerwald | 2006-12-12 22:55:31 +0100 (Tue, 12 Dec 2006) | 2 lines Fix typo. ........ r53023 | brett.cannon | 2006-12-13 23:31:37 +0100 (Wed, 13 Dec 2006) | 2 lines Remove an unneeded import of 'warnings'. ........ r53025 | brett.cannon | 2006-12-14 00:02:38 +0100 (Thu, 14 Dec 2006) | 2 lines Remove unneeded imports of 'warnings'. ........ r53026 | brett.cannon | 2006-12-14 00:09:53 +0100 (Thu, 14 Dec 2006) | 4 lines Add test.test_support.guard_warnings_filter . This function returns a context manager that protects warnings.filter from being modified once the context is exited. ........ r53029 | george.yoshida | 2006-12-14 03:22:44 +0100 (Thu, 14 Dec 2006) | 2 lines Note that guard_warnings_filter was added in 2.6 ........ r53031 | vinay.sajip | 2006-12-14 09:53:55 +0100 (Thu, 14 Dec 2006) | 1 line Added news on recent changes to logging ........ r53032 | andrew.kuchling | 2006-12-14 19:57:53 +0100 (Thu, 14 Dec 2006) | 1 line [Patch #1599256 from David Watson] check that os.fsync is available before using it ........ r53042 | kurt.kaiser | 2006-12-15 06:13:11 +0100 (Fri, 15 Dec 2006) | 6 lines 1. Avoid hang when encountering a duplicate in a completion list. Bug 1571112. 2. Duplicate some old entries from Python's NEWS to IDLE's NEWS.txt M AutoCompleteWindow.py M NEWS.txt ........ r53048 | andrew.kuchling | 2006-12-18 18:12:31 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1618083] Add missing word; make a few grammar fixes ........ r53050 | andrew.kuchling | 2006-12-18 18:16:05 +0100 (Mon, 18 Dec 2006) | 1 line Bump version ........ r53051 | andrew.kuchling | 2006-12-18 18:22:07 +0100 (Mon, 18 Dec 2006) | 1 line [Bug #1616726] Fix description of generator.close(); if you raise some random exception, the exception is raised and doesn't trigger a RuntimeError ........ r53052 | andrew.kuchling | 2006-12-18 18:38:14 +0100 (Mon, 18 Dec 2006) | 1 line Describe new methods in Queue module ........ r53053 | andrew.kuchling | 2006-12-18 20:22:24 +0100 (Mon, 18 Dec 2006) | 1 line [Patch #1615868 by Lars Gustaebel] Use Py_off_t to fix BZ2File.seek() for offsets > 2Gb ........ r53057 | andrew.kuchling | 2006-12-18 22:29:07 +0100 (Mon, 18 Dec 2006) | 1 line Fix markup ........ r53063 | thomas.wouters | 2006-12-19 09:17:50 +0100 (Tue, 19 Dec 2006) | 5 lines Make sre's SubPattern objects accept slice objects like it already accepts simple slices. ........ r53065 | andrew.kuchling | 2006-12-19 15:13:05 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1618455 by Ben Maurer] Improve speed of HMAC by using str.translate() instead of a more general XOR that has to construct a list. Slightly modified from Maurer's patch: the _strxor() function is no longer necessary at all. ........ r53066 | andrew.kuchling | 2006-12-19 15:28:23 +0100 (Tue, 19 Dec 2006) | 9 lines [Bug #1613651] Document socket.recv_into, socket.recvfrom_into Also, the text for recvfrom told you to read recv() for an explanation of the 'flags' argument, but recv() just pointed you at the man page. Copied the man-page text to recvfrom(), recvfrom_into, recv_into to avoid the pointless redirection. I don't have LaTeX on this machine; hope my markup is OK. ........ r53067 | andrew.kuchling | 2006-12-19 15:29:04 +0100 (Tue, 19 Dec 2006) | 1 line Comment typo ........ r53068 | andrew.kuchling | 2006-12-19 16:11:41 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1617413 from Dug Song] Fix HTTP Basic authentication via HTTPS ........ r53071 | andrew.kuchling | 2006-12-19 16:18:12 +0100 (Tue, 19 Dec 2006) | 1 line [Patch #1600491 from Jim Jewett] Describe how to build help files on Windows ........ r53073 | andrew.kuchling | 2006-12-19 16:43:10 +0100 (Tue, 19 Dec 2006) | 6 lines [Patch #1587139 by kxroberto] Protect lock acquisition/release with try...finally to ensure the lock is always released. This could use the 'with' statement, but the patch uses 'finally'. 2.5 backport candidate. ........ r53074 | vinay.sajip | 2006-12-19 19:29:11 +0100 (Tue, 19 Dec 2006) | 1 line Updated documentation for findCaller() to indicate that a 3-tuple is now returned, rather than a 2-tuple. ........ r53090 | georg.brandl | 2006-12-19 23:06:46 +0100 (Tue, 19 Dec 2006) | 3 lines Patch #1484695: The tarfile module now raises a HeaderError exception if a buffer given to frombuf() is invalid. ........ r53099 | raymond.hettinger | 2006-12-20 07:42:06 +0100 (Wed, 20 Dec 2006) | 5 lines Bug #1590891: random.randrange don't return correct value for big number Needs to be backported. ........ r53106 | georg.brandl | 2006-12-20 12:55:16 +0100 (Wed, 20 Dec 2006) | 3 lines Testcase for patch #1484695. ........ r53110 | andrew.kuchling | 2006-12-20 20:48:20 +0100 (Wed, 20 Dec 2006) | 17 lines [Apply length-checking.diff from bug #1599254] Add length checking to single-file mailbox formats: before doing a flush() on a mailbox, seek to the end and verify its length is unchanged, raising ExternalClashError if the file's length has changed. This fix avoids potential data loss if some other process appends to the mailbox file after the table of contents has been generated; instead of overwriting the modified file, you'll get the exception. I also noticed that the self._lookup() call in self.flush() wasn't necessary (everything that sets self._pending to True also calls self.lookup()), and replaced it by an assertion. 2.5 backport candidate. ........ r53112 | andrew.kuchling | 2006-12-20 20:57:10 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619674] Make sum() use the term iterable, not sequence ........ r53113 | andrew.kuchling | 2006-12-20 20:58:11 +0100 (Wed, 20 Dec 2006) | 1 line Two grammar fixes ........ r53115 | andrew.kuchling | 2006-12-20 21:11:12 +0100 (Wed, 20 Dec 2006) | 5 lines Some other built-in functions are described with 'sequence' arguments that should really be 'iterable'; this commit changes them. Did I miss any? Did I introduce any errors? ........ r53117 | andrew.kuchling | 2006-12-20 21:20:42 +0100 (Wed, 20 Dec 2006) | 1 line [Bug #1619680] in_dll() arguments are documented in the wrong order ........ r53120 | neal.norwitz | 2006-12-21 05:38:00 +0100 (Thu, 21 Dec 2006) | 1 line Lars asked for permission on on python-dev for work on tarfile.py ........ r53125 | andrew.kuchling | 2006-12-21 14:40:29 +0100 (Thu, 21 Dec 2006) | 1 line Mention the os.SEEK_* constants ........ r53129 | walter.doerwald | 2006-12-21 19:06:30 +0100 (Thu, 21 Dec 2006) | 2 lines Fix typo. ........ r53131 | thomas.heller | 2006-12-21 19:30:56 +0100 (Thu, 21 Dec 2006) | 3 lines Fix wrong markup of an argument in a method signature. Will backport. ........ r53137 | andrew.kuchling | 2006-12-22 01:50:56 +0100 (Fri, 22 Dec 2006) | 1 line Typo fix ........ r53139 | andrew.kuchling | 2006-12-22 14:25:02 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #737202; fix from Titus Brown] Make CGIHTTPServer work for scripts in sub-directories ........ r53141 | andrew.kuchling | 2006-12-22 16:04:45 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128] Make the mode argument of dumbdbm actually work the way it's described, and add a test for it. 2.5 bugfix candidate, maybe; arguably this patch changes the API of dumbdbm and shouldn't be added in a point-release. ........ r53142 | andrew.kuchling | 2006-12-22 16:16:58 +0100 (Fri, 22 Dec 2006) | 6 lines [Bug #802128 continued] Modify mode depending on the process umask. Is there really no other way to read the umask than to set it? Hope this works on Windows... ........ r53145 | andrew.kuchling | 2006-12-22 17:43:26 +0100 (Fri, 22 Dec 2006) | 1 line [Bug #776202] Apply Walter Doerwald's patch to use text mode for encoded files ........ r53146 | andrew.kuchling | 2006-12-22 19:41:42 +0100 (Fri, 22 Dec 2006) | 9 lines [Patch #783050 from Patrick Lynch] The emulation of forkpty() is incorrect; the master should close the slave fd. Added a test to test_pty.py that reads from the master_fd after doing a pty.fork(); without the fix it hangs forever instead of raising an exception. (<crossing fingers for the buildbots>) 2.5 backport candidate. ........ r53147 | andrew.kuchling | 2006-12-22 20:06:16 +0100 (Fri, 22 Dec 2006) | 1 line [Patch #827559 from Chris Gonnerman] Make SimpleHTTPServer redirect when a directory URL is missing the trailing slash; this lets relative links work. ........ r53149 | andrew.kuchling | 2006-12-22 20:21:27 +0100 (Fri, 22 Dec 2006) | 1 line Darn; this test works when you run test_pty.py directly, but fails when regrtest runs it (the os.read() raises os.error). I can't figure out the cause, so am commenting out the test. ........ r53150 | andrew.kuchling | 2006-12-22 22:48:19 +0100 (Fri, 22 Dec 2006) | 1 line Frak; this test also fails ........ r53153 | lars.gustaebel | 2006-12-23 17:40:13 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1230446: tarfile.py: fix ExFileObject so that read() and tell() work correctly together with readline(). Will backport to 2.5. ........ r53155 | lars.gustaebel | 2006-12-23 18:57:23 +0100 (Sat, 23 Dec 2006) | 5 lines Patch #1262036: Prevent TarFiles from being added to themselves under certain conditions. Will backport to 2.5. ........ r53159 | andrew.kuchling | 2006-12-27 04:25:31 +0100 (Wed, 27 Dec 2006) | 4 lines [Part of patch #1182394] Move the HMAC blocksize to be a class-level constant; this allows changing it in a subclass. To accommodate this, copy() now uses __class__. Also add some text to a comment. ........ r53160 | andrew.kuchling | 2006-12-27 04:31:24 +0100 (Wed, 27 Dec 2006) | 1 line [Rest of patch #1182394] Add ._current() method so that we can use the written-in-C .hexdigest() method ........ r53161 | lars.gustaebel | 2006-12-27 11:30:46 +0100 (Wed, 27 Dec 2006) | 4 lines Patch #1504073: Fix tarfile.open() for mode "r" with a fileobj argument. Will backport to 2.5. ........ r53165 | neal.norwitz | 2006-12-28 05:39:20 +0100 (Thu, 28 Dec 2006) | 1 line Remove a stray (old) macro name left around (I guess) ........ r53188 | neal.norwitz | 2006-12-29 04:01:53 +0100 (Fri, 29 Dec 2006) | 1 line SF bug #1623890, fix argument name in docstring ........ r53200 | raymond.hettinger | 2006-12-30 05:01:17 +0100 (Sat, 30 Dec 2006) | 1 line For sets with cyclical reprs, emit an ellipsis instead of infinitely recursing. ........ r53232 | brett.cannon | 2007-01-04 01:23:49 +0100 (Thu, 04 Jan 2007) | 3 lines Add EnvironmentVarGuard to test.test_support. Provides a context manager to temporarily set or unset environment variables. ........ r53235 | neal.norwitz | 2007-01-04 07:25:31 +0100 (Thu, 04 Jan 2007) | 1 line SF #1627373, fix typo in CarbonEvt. ........ r53244 | raymond.hettinger | 2007-01-04 18:53:34 +0100 (Thu, 04 Jan 2007) | 1 line Fix stability of heapq's nlargest() and nsmallest(). ........ r53249 | martin.v.loewis | 2007-01-04 22:06:12 +0100 (Thu, 04 Jan 2007) | 3 lines Bug #1566280: Explicitly invoke threading._shutdown from Py_Main, to avoid relying on atexit. Will backport to 2.5. ........ r53252 | gregory.p.smith | 2007-01-05 02:59:42 +0100 (Fri, 05 Jan 2007) | 3 lines Support linking of the bsddb module against BerkeleyDB 4.5.x (will backport to 2.5) ........ r53253 | gregory.p.smith | 2007-01-05 03:06:17 +0100 (Fri, 05 Jan 2007) | 2 lines bump module version to match supported berkeleydb version ........ r53255 | neal.norwitz | 2007-01-05 06:25:22 +0100 (Fri, 05 Jan 2007) | 6 lines Prevent crash on shutdown which can occur if we are finalizing and the module dict has been cleared already and some object raises a warning (like in a __del__). Will backport. ........ r53258 | gregory.p.smith | 2007-01-05 08:21:35 +0100 (Fri, 05 Jan 2007) | 2 lines typo fix ........ r53260 | neal.norwitz | 2007-01-05 09:06:43 +0100 (Fri, 05 Jan 2007) | 1 line Add Collin Winter for access to update PEP 3107 ........ r53262 | andrew.kuchling | 2007-01-05 15:22:17 +0100 (Fri, 05 Jan 2007) | 1 line [Bug #1622533] Make docstrings raw strings because they contain control characters (\0, \1) ........ r53264 | andrew.kuchling | 2007-01-05 16:51:24 +0100 (Fri, 05 Jan 2007) | 1 line [Patch #1520904] Fix bsddb tests to write to the temp directory instead of the Lib/bsddb/test directory ........ r53279 | brett.cannon | 2007-01-05 22:45:09 +0100 (Fri, 05 Jan 2007) | 3 lines Silence a warning from gcc 4.0.1 by specifying a function's parameter list is 'void' instead of just a set of empty parentheses. ........ r53285 | raymond.hettinger | 2007-01-06 02:14:41 +0100 (Sat, 06 Jan 2007) | 2 lines SF# 1409443: Expand comment to cover the interaction between f->f_lasti and the PREDICT macros. ........ r53286 | anthony.baxter | 2007-01-06 05:45:54 +0100 (Sat, 06 Jan 2007) | 1 line update to (c) years to include 2007 ........ r53291 | neal.norwitz | 2007-01-06 22:24:35 +0100 (Sat, 06 Jan 2007) | 1 line Add Josiah to SF for maintaining asyncore/asynchat ........ r53293 | peter.astrand | 2007-01-07 09:53:46 +0100 (Sun, 07 Jan 2007) | 1 line Re-implemented fix for #1531862 once again, in a way that works with Python 2.2. Fixes bug #1603424. ........ r53295 | peter.astrand | 2007-01-07 15:34:16 +0100 (Sun, 07 Jan 2007) | 1 line Avoid O(N**2) bottleneck in _communicate_(). Fixes #1598181. ........ r53300 | raymond.hettinger | 2007-01-08 19:09:20 +0100 (Mon, 08 Jan 2007) | 1 line Fix zero-length corner case for iterating over a mutating deque. ........ r53301 | vinay.sajip | 2007-01-08 19:50:32 +0100 (Mon, 08 Jan 2007) | 4 lines Bare except clause removed from SMTPHandler.emit(). Now, only ImportError is trapped. Bare except clause removed from SocketHandler.createSocket(). Now, only socket.error is trapped. (SF #411881) ........ r53302 | vinay.sajip | 2007-01-08 19:51:46 +0100 (Mon, 08 Jan 2007) | 2 lines Bare except clause removed from LogRecord.__init__. Now, only ValueError, TypeError and AttributeError are trapped. (SF #411881) ........ r53303 | vinay.sajip | 2007-01-08 19:52:36 +0100 (Mon, 08 Jan 2007) | 1 line Added entries about removal of some bare except clauses from logging. ........
1360 lines
32 KiB
C
1360 lines
32 KiB
C
#include "Python.h"
|
|
#include "structmember.h"
|
|
|
|
/* collections module implementation of a deque() datatype
|
|
Written and maintained by Raymond D. Hettinger <python@rcn.com>
|
|
Copyright (c) 2004 Python Software Foundation.
|
|
All rights reserved.
|
|
*/
|
|
|
|
/* The block length may be set to any number over 1. Larger numbers
|
|
* reduce the number of calls to the memory allocator but take more
|
|
* memory. Ideally, BLOCKLEN should be set with an eye to the
|
|
* length of a cache line.
|
|
*/
|
|
|
|
#define BLOCKLEN 62
|
|
#define CENTER ((BLOCKLEN - 1) / 2)
|
|
|
|
/* A `dequeobject` is composed of a doubly-linked list of `block` nodes.
|
|
* This list is not circular (the leftmost block has leftlink==NULL,
|
|
* and the rightmost block has rightlink==NULL). A deque d's first
|
|
* element is at d.leftblock[leftindex] and its last element is at
|
|
* d.rightblock[rightindex]; note that, unlike as for Python slice
|
|
* indices, these indices are inclusive on both ends. By being inclusive
|
|
* on both ends, algorithms for left and right operations become
|
|
* symmetrical which simplifies the design.
|
|
*
|
|
* The list of blocks is never empty, so d.leftblock and d.rightblock
|
|
* are never equal to NULL.
|
|
*
|
|
* The indices, d.leftindex and d.rightindex are always in the range
|
|
* 0 <= index < BLOCKLEN.
|
|
* Their exact relationship is:
|
|
* (d.leftindex + d.len - 1) % BLOCKLEN == d.rightindex.
|
|
*
|
|
* Empty deques have d.len == 0; d.leftblock==d.rightblock;
|
|
* d.leftindex == CENTER+1; and d.rightindex == CENTER.
|
|
* Checking for d.len == 0 is the intended way to see whether d is empty.
|
|
*
|
|
* Whenever d.leftblock == d.rightblock,
|
|
* d.leftindex + d.len - 1 == d.rightindex.
|
|
*
|
|
* However, when d.leftblock != d.rightblock, d.leftindex and d.rightindex
|
|
* become indices into distinct blocks and either may be larger than the
|
|
* other.
|
|
*/
|
|
|
|
typedef struct BLOCK {
|
|
struct BLOCK *leftlink;
|
|
struct BLOCK *rightlink;
|
|
PyObject *data[BLOCKLEN];
|
|
} block;
|
|
|
|
static block *
|
|
newblock(block *leftlink, block *rightlink, int len) {
|
|
block *b;
|
|
/* To prevent len from overflowing INT_MAX on 64-bit machines, we
|
|
* refuse to allocate new blocks if the current len is dangerously
|
|
* close. There is some extra margin to prevent spurious arithmetic
|
|
* overflows at various places. The following check ensures that
|
|
* the blocks allocated to the deque, in the worst case, can only
|
|
* have INT_MAX-2 entries in total.
|
|
*/
|
|
if (len >= INT_MAX - 2*BLOCKLEN) {
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"cannot add more blocks to the deque");
|
|
return NULL;
|
|
}
|
|
b = PyMem_Malloc(sizeof(block));
|
|
if (b == NULL) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
b->leftlink = leftlink;
|
|
b->rightlink = rightlink;
|
|
return b;
|
|
}
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
block *leftblock;
|
|
block *rightblock;
|
|
int leftindex; /* in range(BLOCKLEN) */
|
|
int rightindex; /* in range(BLOCKLEN) */
|
|
int len;
|
|
long state; /* incremented whenever the indices move */
|
|
PyObject *weakreflist; /* List of weak references */
|
|
} dequeobject;
|
|
|
|
static PyTypeObject deque_type;
|
|
|
|
static PyObject *
|
|
deque_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
dequeobject *deque;
|
|
block *b;
|
|
|
|
if (!_PyArg_NoKeywords("deque()", kwds))
|
|
return NULL;
|
|
|
|
/* create dequeobject structure */
|
|
deque = (dequeobject *)type->tp_alloc(type, 0);
|
|
if (deque == NULL)
|
|
return NULL;
|
|
|
|
b = newblock(NULL, NULL, 0);
|
|
if (b == NULL) {
|
|
Py_DECREF(deque);
|
|
return NULL;
|
|
}
|
|
|
|
assert(BLOCKLEN >= 2);
|
|
deque->leftblock = b;
|
|
deque->rightblock = b;
|
|
deque->leftindex = CENTER + 1;
|
|
deque->rightindex = CENTER;
|
|
deque->len = 0;
|
|
deque->state = 0;
|
|
deque->weakreflist = NULL;
|
|
|
|
return (PyObject *)deque;
|
|
}
|
|
|
|
static PyObject *
|
|
deque_append(dequeobject *deque, PyObject *item)
|
|
{
|
|
deque->state++;
|
|
if (deque->rightindex == BLOCKLEN-1) {
|
|
block *b = newblock(deque->rightblock, NULL, deque->len);
|
|
if (b == NULL)
|
|
return NULL;
|
|
assert(deque->rightblock->rightlink == NULL);
|
|
deque->rightblock->rightlink = b;
|
|
deque->rightblock = b;
|
|
deque->rightindex = -1;
|
|
}
|
|
Py_INCREF(item);
|
|
deque->len++;
|
|
deque->rightindex++;
|
|
deque->rightblock->data[deque->rightindex] = item;
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
PyDoc_STRVAR(append_doc, "Add an element to the right side of the deque.");
|
|
|
|
static PyObject *
|
|
deque_appendleft(dequeobject *deque, PyObject *item)
|
|
{
|
|
deque->state++;
|
|
if (deque->leftindex == 0) {
|
|
block *b = newblock(NULL, deque->leftblock, deque->len);
|
|
if (b == NULL)
|
|
return NULL;
|
|
assert(deque->leftblock->leftlink == NULL);
|
|
deque->leftblock->leftlink = b;
|
|
deque->leftblock = b;
|
|
deque->leftindex = BLOCKLEN;
|
|
}
|
|
Py_INCREF(item);
|
|
deque->len++;
|
|
deque->leftindex--;
|
|
deque->leftblock->data[deque->leftindex] = item;
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
PyDoc_STRVAR(appendleft_doc, "Add an element to the left side of the deque.");
|
|
|
|
static PyObject *
|
|
deque_pop(dequeobject *deque, PyObject *unused)
|
|
{
|
|
PyObject *item;
|
|
block *prevblock;
|
|
|
|
if (deque->len == 0) {
|
|
PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
|
|
return NULL;
|
|
}
|
|
item = deque->rightblock->data[deque->rightindex];
|
|
deque->rightindex--;
|
|
deque->len--;
|
|
deque->state++;
|
|
|
|
if (deque->rightindex == -1) {
|
|
if (deque->len == 0) {
|
|
assert(deque->leftblock == deque->rightblock);
|
|
assert(deque->leftindex == deque->rightindex+1);
|
|
/* re-center instead of freeing a block */
|
|
deque->leftindex = CENTER + 1;
|
|
deque->rightindex = CENTER;
|
|
} else {
|
|
prevblock = deque->rightblock->leftlink;
|
|
assert(deque->leftblock != deque->rightblock);
|
|
PyMem_Free(deque->rightblock);
|
|
prevblock->rightlink = NULL;
|
|
deque->rightblock = prevblock;
|
|
deque->rightindex = BLOCKLEN - 1;
|
|
}
|
|
}
|
|
return item;
|
|
}
|
|
|
|
PyDoc_STRVAR(pop_doc, "Remove and return the rightmost element.");
|
|
|
|
static PyObject *
|
|
deque_popleft(dequeobject *deque, PyObject *unused)
|
|
{
|
|
PyObject *item;
|
|
block *prevblock;
|
|
|
|
if (deque->len == 0) {
|
|
PyErr_SetString(PyExc_IndexError, "pop from an empty deque");
|
|
return NULL;
|
|
}
|
|
assert(deque->leftblock != NULL);
|
|
item = deque->leftblock->data[deque->leftindex];
|
|
deque->leftindex++;
|
|
deque->len--;
|
|
deque->state++;
|
|
|
|
if (deque->leftindex == BLOCKLEN) {
|
|
if (deque->len == 0) {
|
|
assert(deque->leftblock == deque->rightblock);
|
|
assert(deque->leftindex == deque->rightindex+1);
|
|
/* re-center instead of freeing a block */
|
|
deque->leftindex = CENTER + 1;
|
|
deque->rightindex = CENTER;
|
|
} else {
|
|
assert(deque->leftblock != deque->rightblock);
|
|
prevblock = deque->leftblock->rightlink;
|
|
PyMem_Free(deque->leftblock);
|
|
assert(prevblock != NULL);
|
|
prevblock->leftlink = NULL;
|
|
deque->leftblock = prevblock;
|
|
deque->leftindex = 0;
|
|
}
|
|
}
|
|
return item;
|
|
}
|
|
|
|
PyDoc_STRVAR(popleft_doc, "Remove and return the leftmost element.");
|
|
|
|
static PyObject *
|
|
deque_extend(dequeobject *deque, PyObject *iterable)
|
|
{
|
|
PyObject *it, *item;
|
|
|
|
it = PyObject_GetIter(iterable);
|
|
if (it == NULL)
|
|
return NULL;
|
|
|
|
while ((item = PyIter_Next(it)) != NULL) {
|
|
deque->state++;
|
|
if (deque->rightindex == BLOCKLEN-1) {
|
|
block *b = newblock(deque->rightblock, NULL,
|
|
deque->len);
|
|
if (b == NULL) {
|
|
Py_DECREF(item);
|
|
Py_DECREF(it);
|
|
return NULL;
|
|
}
|
|
assert(deque->rightblock->rightlink == NULL);
|
|
deque->rightblock->rightlink = b;
|
|
deque->rightblock = b;
|
|
deque->rightindex = -1;
|
|
}
|
|
deque->len++;
|
|
deque->rightindex++;
|
|
deque->rightblock->data[deque->rightindex] = item;
|
|
}
|
|
Py_DECREF(it);
|
|
if (PyErr_Occurred())
|
|
return NULL;
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
PyDoc_STRVAR(extend_doc,
|
|
"Extend the right side of the deque with elements from the iterable");
|
|
|
|
static PyObject *
|
|
deque_extendleft(dequeobject *deque, PyObject *iterable)
|
|
{
|
|
PyObject *it, *item;
|
|
|
|
it = PyObject_GetIter(iterable);
|
|
if (it == NULL)
|
|
return NULL;
|
|
|
|
while ((item = PyIter_Next(it)) != NULL) {
|
|
deque->state++;
|
|
if (deque->leftindex == 0) {
|
|
block *b = newblock(NULL, deque->leftblock,
|
|
deque->len);
|
|
if (b == NULL) {
|
|
Py_DECREF(item);
|
|
Py_DECREF(it);
|
|
return NULL;
|
|
}
|
|
assert(deque->leftblock->leftlink == NULL);
|
|
deque->leftblock->leftlink = b;
|
|
deque->leftblock = b;
|
|
deque->leftindex = BLOCKLEN;
|
|
}
|
|
deque->len++;
|
|
deque->leftindex--;
|
|
deque->leftblock->data[deque->leftindex] = item;
|
|
}
|
|
Py_DECREF(it);
|
|
if (PyErr_Occurred())
|
|
return NULL;
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
PyDoc_STRVAR(extendleft_doc,
|
|
"Extend the left side of the deque with elements from the iterable");
|
|
|
|
static int
|
|
_deque_rotate(dequeobject *deque, Py_ssize_t n)
|
|
{
|
|
int i, len=deque->len, halflen=(len+1)>>1;
|
|
PyObject *item, *rv;
|
|
|
|
if (len == 0)
|
|
return 0;
|
|
if (n > halflen || n < -halflen) {
|
|
n %= len;
|
|
if (n > halflen)
|
|
n -= len;
|
|
else if (n < -halflen)
|
|
n += len;
|
|
}
|
|
|
|
for (i=0 ; i<n ; i++) {
|
|
item = deque_pop(deque, NULL);
|
|
assert (item != NULL);
|
|
rv = deque_appendleft(deque, item);
|
|
Py_DECREF(item);
|
|
if (rv == NULL)
|
|
return -1;
|
|
Py_DECREF(rv);
|
|
}
|
|
for (i=0 ; i>n ; i--) {
|
|
item = deque_popleft(deque, NULL);
|
|
assert (item != NULL);
|
|
rv = deque_append(deque, item);
|
|
Py_DECREF(item);
|
|
if (rv == NULL)
|
|
return -1;
|
|
Py_DECREF(rv);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
deque_rotate(dequeobject *deque, PyObject *args)
|
|
{
|
|
int n=1;
|
|
|
|
if (!PyArg_ParseTuple(args, "|i:rotate", &n))
|
|
return NULL;
|
|
if (_deque_rotate(deque, n) == 0)
|
|
Py_RETURN_NONE;
|
|
return NULL;
|
|
}
|
|
|
|
PyDoc_STRVAR(rotate_doc,
|
|
"Rotate the deque n steps to the right (default n=1). If n is negative, rotates left.");
|
|
|
|
static Py_ssize_t
|
|
deque_len(dequeobject *deque)
|
|
{
|
|
return deque->len;
|
|
}
|
|
|
|
static PyObject *
|
|
deque_remove(dequeobject *deque, PyObject *value)
|
|
{
|
|
Py_ssize_t i, n=deque->len;
|
|
|
|
for (i=0 ; i<n ; i++) {
|
|
PyObject *item = deque->leftblock->data[deque->leftindex];
|
|
int cmp = PyObject_RichCompareBool(item, value, Py_EQ);
|
|
|
|
if (deque->len != n) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"deque mutated during remove().");
|
|
return NULL;
|
|
}
|
|
if (cmp > 0) {
|
|
PyObject *tgt = deque_popleft(deque, NULL);
|
|
assert (tgt != NULL);
|
|
Py_DECREF(tgt);
|
|
if (_deque_rotate(deque, i) == -1)
|
|
return NULL;
|
|
Py_RETURN_NONE;
|
|
}
|
|
else if (cmp < 0) {
|
|
_deque_rotate(deque, i);
|
|
return NULL;
|
|
}
|
|
_deque_rotate(deque, -1);
|
|
}
|
|
PyErr_SetString(PyExc_ValueError, "deque.remove(x): x not in deque");
|
|
return NULL;
|
|
}
|
|
|
|
PyDoc_STRVAR(remove_doc,
|
|
"D.remove(value) -- remove first occurrence of value.");
|
|
|
|
static int
|
|
deque_clear(dequeobject *deque)
|
|
{
|
|
PyObject *item;
|
|
|
|
while (deque->len) {
|
|
item = deque_pop(deque, NULL);
|
|
assert (item != NULL);
|
|
Py_DECREF(item);
|
|
}
|
|
assert(deque->leftblock == deque->rightblock &&
|
|
deque->leftindex - 1 == deque->rightindex &&
|
|
deque->len == 0);
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
deque_item(dequeobject *deque, int i)
|
|
{
|
|
block *b;
|
|
PyObject *item;
|
|
int n, index=i;
|
|
|
|
if (i < 0 || i >= deque->len) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"deque index out of range");
|
|
return NULL;
|
|
}
|
|
|
|
if (i == 0) {
|
|
i = deque->leftindex;
|
|
b = deque->leftblock;
|
|
} else if (i == deque->len - 1) {
|
|
i = deque->rightindex;
|
|
b = deque->rightblock;
|
|
} else {
|
|
i += deque->leftindex;
|
|
n = i / BLOCKLEN;
|
|
i %= BLOCKLEN;
|
|
if (index < (deque->len >> 1)) {
|
|
b = deque->leftblock;
|
|
while (n--)
|
|
b = b->rightlink;
|
|
} else {
|
|
n = (deque->leftindex + deque->len - 1) / BLOCKLEN - n;
|
|
b = deque->rightblock;
|
|
while (n--)
|
|
b = b->leftlink;
|
|
}
|
|
}
|
|
item = b->data[i];
|
|
Py_INCREF(item);
|
|
return item;
|
|
}
|
|
|
|
/* delitem() implemented in terms of rotate for simplicity and reasonable
|
|
performance near the end points. If for some reason this method becomes
|
|
popular, it is not hard to re-implement this using direct data movement
|
|
(similar to code in list slice assignment) and achieve a two or threefold
|
|
performance boost.
|
|
*/
|
|
|
|
static int
|
|
deque_del_item(dequeobject *deque, Py_ssize_t i)
|
|
{
|
|
PyObject *item;
|
|
|
|
assert (i >= 0 && i < deque->len);
|
|
if (_deque_rotate(deque, -i) == -1)
|
|
return -1;
|
|
|
|
item = deque_popleft(deque, NULL);
|
|
assert (item != NULL);
|
|
Py_DECREF(item);
|
|
|
|
return _deque_rotate(deque, i);
|
|
}
|
|
|
|
static int
|
|
deque_ass_item(dequeobject *deque, Py_ssize_t i, PyObject *v)
|
|
{
|
|
PyObject *old_value;
|
|
block *b;
|
|
Py_ssize_t n, len=deque->len, halflen=(len+1)>>1, index=i;
|
|
|
|
if (i < 0 || i >= len) {
|
|
PyErr_SetString(PyExc_IndexError,
|
|
"deque index out of range");
|
|
return -1;
|
|
}
|
|
if (v == NULL)
|
|
return deque_del_item(deque, i);
|
|
|
|
i += deque->leftindex;
|
|
n = i / BLOCKLEN;
|
|
i %= BLOCKLEN;
|
|
if (index <= halflen) {
|
|
b = deque->leftblock;
|
|
while (n--)
|
|
b = b->rightlink;
|
|
} else {
|
|
n = (deque->leftindex + len - 1) / BLOCKLEN - n;
|
|
b = deque->rightblock;
|
|
while (n--)
|
|
b = b->leftlink;
|
|
}
|
|
Py_INCREF(v);
|
|
old_value = b->data[i];
|
|
b->data[i] = v;
|
|
Py_DECREF(old_value);
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
deque_clearmethod(dequeobject *deque)
|
|
{
|
|
int rv;
|
|
|
|
rv = deque_clear(deque);
|
|
assert (rv != -1);
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
PyDoc_STRVAR(clear_doc, "Remove all elements from the deque.");
|
|
|
|
static void
|
|
deque_dealloc(dequeobject *deque)
|
|
{
|
|
PyObject_GC_UnTrack(deque);
|
|
if (deque->weakreflist != NULL)
|
|
PyObject_ClearWeakRefs((PyObject *) deque);
|
|
if (deque->leftblock != NULL) {
|
|
deque_clear(deque);
|
|
assert(deque->leftblock != NULL);
|
|
PyMem_Free(deque->leftblock);
|
|
}
|
|
deque->leftblock = NULL;
|
|
deque->rightblock = NULL;
|
|
deque->ob_type->tp_free(deque);
|
|
}
|
|
|
|
static int
|
|
deque_traverse(dequeobject *deque, visitproc visit, void *arg)
|
|
{
|
|
block *b;
|
|
PyObject *item;
|
|
int index;
|
|
int indexlo = deque->leftindex;
|
|
|
|
for (b = deque->leftblock; b != NULL; b = b->rightlink) {
|
|
const int indexhi = b == deque->rightblock ?
|
|
deque->rightindex :
|
|
BLOCKLEN - 1;
|
|
|
|
for (index = indexlo; index <= indexhi; ++index) {
|
|
item = b->data[index];
|
|
Py_VISIT(item);
|
|
}
|
|
indexlo = 0;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static long
|
|
deque_nohash(PyObject *self)
|
|
{
|
|
PyErr_SetString(PyExc_TypeError, "deque objects are unhashable");
|
|
return -1;
|
|
}
|
|
|
|
static PyObject *
|
|
deque_copy(PyObject *deque)
|
|
{
|
|
return PyObject_CallFunctionObjArgs((PyObject *)(deque->ob_type),
|
|
deque, NULL);
|
|
}
|
|
|
|
PyDoc_STRVAR(copy_doc, "Return a shallow copy of a deque.");
|
|
|
|
static PyObject *
|
|
deque_reduce(dequeobject *deque)
|
|
{
|
|
PyObject *dict, *result, *it;
|
|
|
|
dict = PyObject_GetAttrString((PyObject *)deque, "__dict__");
|
|
if (dict == NULL) {
|
|
PyErr_Clear();
|
|
dict = Py_None;
|
|
Py_INCREF(dict);
|
|
}
|
|
it = PyObject_GetIter((PyObject *)deque);
|
|
if (it == NULL) {
|
|
Py_DECREF(dict);
|
|
return NULL;
|
|
}
|
|
result = Py_BuildValue("O()ON", deque->ob_type, dict, it);
|
|
Py_DECREF(dict);
|
|
return result;
|
|
}
|
|
|
|
PyDoc_STRVAR(reduce_doc, "Return state information for pickling.");
|
|
|
|
static PyObject *
|
|
deque_repr(PyObject *deque)
|
|
{
|
|
PyObject *aslist, *result, *fmt;
|
|
int i;
|
|
|
|
i = Py_ReprEnter(deque);
|
|
if (i != 0) {
|
|
if (i < 0)
|
|
return NULL;
|
|
return PyString_FromString("[...]");
|
|
}
|
|
|
|
aslist = PySequence_List(deque);
|
|
if (aslist == NULL) {
|
|
Py_ReprLeave(deque);
|
|
return NULL;
|
|
}
|
|
|
|
fmt = PyString_FromString("deque(%r)");
|
|
if (fmt == NULL) {
|
|
Py_DECREF(aslist);
|
|
Py_ReprLeave(deque);
|
|
return NULL;
|
|
}
|
|
result = PyString_Format(fmt, aslist);
|
|
Py_DECREF(fmt);
|
|
Py_DECREF(aslist);
|
|
Py_ReprLeave(deque);
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
deque_tp_print(PyObject *deque, FILE *fp, int flags)
|
|
{
|
|
PyObject *it, *item;
|
|
char *emit = ""; /* No separator emitted on first pass */
|
|
char *separator = ", ";
|
|
int i;
|
|
|
|
i = Py_ReprEnter(deque);
|
|
if (i != 0) {
|
|
if (i < 0)
|
|
return i;
|
|
fputs("[...]", fp);
|
|
return 0;
|
|
}
|
|
|
|
it = PyObject_GetIter(deque);
|
|
if (it == NULL)
|
|
return -1;
|
|
|
|
fputs("deque([", fp);
|
|
while ((item = PyIter_Next(it)) != NULL) {
|
|
fputs(emit, fp);
|
|
emit = separator;
|
|
if (PyObject_Print(item, fp, 0) != 0) {
|
|
Py_DECREF(item);
|
|
Py_DECREF(it);
|
|
Py_ReprLeave(deque);
|
|
return -1;
|
|
}
|
|
Py_DECREF(item);
|
|
}
|
|
Py_ReprLeave(deque);
|
|
Py_DECREF(it);
|
|
if (PyErr_Occurred())
|
|
return -1;
|
|
fputs("])", fp);
|
|
return 0;
|
|
}
|
|
|
|
static PyObject *
|
|
deque_richcompare(PyObject *v, PyObject *w, int op)
|
|
{
|
|
PyObject *it1=NULL, *it2=NULL, *x, *y;
|
|
int b, vs, ws, cmp=-1;
|
|
|
|
if (!PyObject_TypeCheck(v, &deque_type) ||
|
|
!PyObject_TypeCheck(w, &deque_type)) {
|
|
Py_INCREF(Py_NotImplemented);
|
|
return Py_NotImplemented;
|
|
}
|
|
|
|
/* Shortcuts */
|
|
vs = ((dequeobject *)v)->len;
|
|
ws = ((dequeobject *)w)->len;
|
|
if (op == Py_EQ) {
|
|
if (v == w)
|
|
Py_RETURN_TRUE;
|
|
if (vs != ws)
|
|
Py_RETURN_FALSE;
|
|
}
|
|
if (op == Py_NE) {
|
|
if (v == w)
|
|
Py_RETURN_FALSE;
|
|
if (vs != ws)
|
|
Py_RETURN_TRUE;
|
|
}
|
|
|
|
/* Search for the first index where items are different */
|
|
it1 = PyObject_GetIter(v);
|
|
if (it1 == NULL)
|
|
goto done;
|
|
it2 = PyObject_GetIter(w);
|
|
if (it2 == NULL)
|
|
goto done;
|
|
for (;;) {
|
|
x = PyIter_Next(it1);
|
|
if (x == NULL && PyErr_Occurred())
|
|
goto done;
|
|
y = PyIter_Next(it2);
|
|
if (x == NULL || y == NULL)
|
|
break;
|
|
b = PyObject_RichCompareBool(x, y, Py_EQ);
|
|
if (b == 0) {
|
|
cmp = PyObject_RichCompareBool(x, y, op);
|
|
Py_DECREF(x);
|
|
Py_DECREF(y);
|
|
goto done;
|
|
}
|
|
Py_DECREF(x);
|
|
Py_DECREF(y);
|
|
if (b == -1)
|
|
goto done;
|
|
}
|
|
/* We reached the end of one deque or both */
|
|
Py_XDECREF(x);
|
|
Py_XDECREF(y);
|
|
if (PyErr_Occurred())
|
|
goto done;
|
|
switch (op) {
|
|
case Py_LT: cmp = y != NULL; break; /* if w was longer */
|
|
case Py_LE: cmp = x == NULL; break; /* if v was not longer */
|
|
case Py_EQ: cmp = x == y; break; /* if we reached the end of both */
|
|
case Py_NE: cmp = x != y; break; /* if one deque continues */
|
|
case Py_GT: cmp = x != NULL; break; /* if v was longer */
|
|
case Py_GE: cmp = y == NULL; break; /* if w was not longer */
|
|
}
|
|
|
|
done:
|
|
Py_XDECREF(it1);
|
|
Py_XDECREF(it2);
|
|
if (cmp == 1)
|
|
Py_RETURN_TRUE;
|
|
if (cmp == 0)
|
|
Py_RETURN_FALSE;
|
|
return NULL;
|
|
}
|
|
|
|
static int
|
|
deque_init(dequeobject *deque, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *iterable = NULL;
|
|
|
|
if (!PyArg_UnpackTuple(args, "deque", 0, 1, &iterable))
|
|
return -1;
|
|
|
|
if (iterable != NULL) {
|
|
PyObject *rv = deque_extend(deque, iterable);
|
|
if (rv == NULL)
|
|
return -1;
|
|
Py_DECREF(rv);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static PySequenceMethods deque_as_sequence = {
|
|
(lenfunc)deque_len, /* sq_length */
|
|
0, /* sq_concat */
|
|
0, /* sq_repeat */
|
|
(ssizeargfunc)deque_item, /* sq_item */
|
|
0, /* sq_slice */
|
|
(ssizeobjargproc)deque_ass_item, /* sq_ass_item */
|
|
};
|
|
|
|
/* deque object ********************************************************/
|
|
|
|
static PyObject *deque_iter(dequeobject *deque);
|
|
static PyObject *deque_reviter(dequeobject *deque);
|
|
PyDoc_STRVAR(reversed_doc,
|
|
"D.__reversed__() -- return a reverse iterator over the deque");
|
|
|
|
static PyMethodDef deque_methods[] = {
|
|
{"append", (PyCFunction)deque_append,
|
|
METH_O, append_doc},
|
|
{"appendleft", (PyCFunction)deque_appendleft,
|
|
METH_O, appendleft_doc},
|
|
{"clear", (PyCFunction)deque_clearmethod,
|
|
METH_NOARGS, clear_doc},
|
|
{"__copy__", (PyCFunction)deque_copy,
|
|
METH_NOARGS, copy_doc},
|
|
{"extend", (PyCFunction)deque_extend,
|
|
METH_O, extend_doc},
|
|
{"extendleft", (PyCFunction)deque_extendleft,
|
|
METH_O, extendleft_doc},
|
|
{"pop", (PyCFunction)deque_pop,
|
|
METH_NOARGS, pop_doc},
|
|
{"popleft", (PyCFunction)deque_popleft,
|
|
METH_NOARGS, popleft_doc},
|
|
{"__reduce__", (PyCFunction)deque_reduce,
|
|
METH_NOARGS, reduce_doc},
|
|
{"remove", (PyCFunction)deque_remove,
|
|
METH_O, remove_doc},
|
|
{"__reversed__", (PyCFunction)deque_reviter,
|
|
METH_NOARGS, reversed_doc},
|
|
{"rotate", (PyCFunction)deque_rotate,
|
|
METH_VARARGS, rotate_doc},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
PyDoc_STRVAR(deque_doc,
|
|
"deque(iterable) --> deque object\n\
|
|
\n\
|
|
Build an ordered collection accessible from endpoints only.");
|
|
|
|
static PyTypeObject deque_type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"collections.deque", /* tp_name */
|
|
sizeof(dequeobject), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
/* methods */
|
|
(destructor)deque_dealloc, /* tp_dealloc */
|
|
deque_tp_print, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
deque_repr, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
&deque_as_sequence, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
deque_nohash, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
|
|
Py_TPFLAGS_HAVE_GC, /* tp_flags */
|
|
deque_doc, /* tp_doc */
|
|
(traverseproc)deque_traverse, /* tp_traverse */
|
|
(inquiry)deque_clear, /* tp_clear */
|
|
(richcmpfunc)deque_richcompare, /* tp_richcompare */
|
|
offsetof(dequeobject, weakreflist), /* tp_weaklistoffset*/
|
|
(getiterfunc)deque_iter, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
deque_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
(initproc)deque_init, /* tp_init */
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
deque_new, /* tp_new */
|
|
PyObject_GC_Del, /* tp_free */
|
|
};
|
|
|
|
/*********************** Deque Iterator **************************/
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
int index;
|
|
block *b;
|
|
dequeobject *deque;
|
|
long state; /* state when the iterator is created */
|
|
int counter; /* number of items remaining for iteration */
|
|
} dequeiterobject;
|
|
|
|
PyTypeObject dequeiter_type;
|
|
|
|
static PyObject *
|
|
deque_iter(dequeobject *deque)
|
|
{
|
|
dequeiterobject *it;
|
|
|
|
it = PyObject_New(dequeiterobject, &dequeiter_type);
|
|
if (it == NULL)
|
|
return NULL;
|
|
it->b = deque->leftblock;
|
|
it->index = deque->leftindex;
|
|
Py_INCREF(deque);
|
|
it->deque = deque;
|
|
it->state = deque->state;
|
|
it->counter = deque->len;
|
|
return (PyObject *)it;
|
|
}
|
|
|
|
static void
|
|
dequeiter_dealloc(dequeiterobject *dio)
|
|
{
|
|
Py_XDECREF(dio->deque);
|
|
dio->ob_type->tp_free(dio);
|
|
}
|
|
|
|
static PyObject *
|
|
dequeiter_next(dequeiterobject *it)
|
|
{
|
|
PyObject *item;
|
|
|
|
if (it->deque->state != it->state) {
|
|
it->counter = 0;
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"deque mutated during iteration");
|
|
return NULL;
|
|
}
|
|
if (it->counter == 0)
|
|
return NULL;
|
|
assert (!(it->b == it->deque->rightblock &&
|
|
it->index > it->deque->rightindex));
|
|
|
|
item = it->b->data[it->index];
|
|
it->index++;
|
|
it->counter--;
|
|
if (it->index == BLOCKLEN && it->counter > 0) {
|
|
assert (it->b->rightlink != NULL);
|
|
it->b = it->b->rightlink;
|
|
it->index = 0;
|
|
}
|
|
Py_INCREF(item);
|
|
return item;
|
|
}
|
|
|
|
static PyObject *
|
|
dequeiter_len(dequeiterobject *it)
|
|
{
|
|
return PyInt_FromLong(it->counter);
|
|
}
|
|
|
|
PyDoc_STRVAR(length_hint_doc, "Private method returning an estimate of len(list(it)).");
|
|
|
|
static PyMethodDef dequeiter_methods[] = {
|
|
{"__length_hint__", (PyCFunction)dequeiter_len, METH_NOARGS, length_hint_doc},
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
PyTypeObject dequeiter_type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"deque_iterator", /* tp_name */
|
|
sizeof(dequeiterobject), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
/* methods */
|
|
(destructor)dequeiter_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
PyObject_SelfIter, /* tp_iter */
|
|
(iternextfunc)dequeiter_next, /* tp_iternext */
|
|
dequeiter_methods, /* tp_methods */
|
|
0,
|
|
};
|
|
|
|
/*********************** Deque Reverse Iterator **************************/
|
|
|
|
PyTypeObject dequereviter_type;
|
|
|
|
static PyObject *
|
|
deque_reviter(dequeobject *deque)
|
|
{
|
|
dequeiterobject *it;
|
|
|
|
it = PyObject_New(dequeiterobject, &dequereviter_type);
|
|
if (it == NULL)
|
|
return NULL;
|
|
it->b = deque->rightblock;
|
|
it->index = deque->rightindex;
|
|
Py_INCREF(deque);
|
|
it->deque = deque;
|
|
it->state = deque->state;
|
|
it->counter = deque->len;
|
|
return (PyObject *)it;
|
|
}
|
|
|
|
static PyObject *
|
|
dequereviter_next(dequeiterobject *it)
|
|
{
|
|
PyObject *item;
|
|
if (it->counter == 0)
|
|
return NULL;
|
|
|
|
if (it->deque->state != it->state) {
|
|
it->counter = 0;
|
|
PyErr_SetString(PyExc_RuntimeError,
|
|
"deque mutated during iteration");
|
|
return NULL;
|
|
}
|
|
assert (!(it->b == it->deque->leftblock &&
|
|
it->index < it->deque->leftindex));
|
|
|
|
item = it->b->data[it->index];
|
|
it->index--;
|
|
it->counter--;
|
|
if (it->index == -1 && it->counter > 0) {
|
|
assert (it->b->leftlink != NULL);
|
|
it->b = it->b->leftlink;
|
|
it->index = BLOCKLEN - 1;
|
|
}
|
|
Py_INCREF(item);
|
|
return item;
|
|
}
|
|
|
|
PyTypeObject dequereviter_type = {
|
|
PyObject_HEAD_INIT(NULL)
|
|
0, /* ob_size */
|
|
"deque_reverse_iterator", /* tp_name */
|
|
sizeof(dequeiterobject), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
/* methods */
|
|
(destructor)dequeiter_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT, /* tp_flags */
|
|
0, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
PyObject_SelfIter, /* tp_iter */
|
|
(iternextfunc)dequereviter_next, /* tp_iternext */
|
|
dequeiter_methods, /* tp_methods */
|
|
0,
|
|
};
|
|
|
|
/* defaultdict type *********************************************************/
|
|
|
|
typedef struct {
|
|
PyDictObject dict;
|
|
PyObject *default_factory;
|
|
} defdictobject;
|
|
|
|
static PyTypeObject defdict_type; /* Forward */
|
|
|
|
PyDoc_STRVAR(defdict_missing_doc,
|
|
"__missing__(key) # Called by __getitem__ for missing key; pseudo-code:\n\
|
|
if self.default_factory is None: raise KeyError(key)\n\
|
|
self[key] = value = self.default_factory()\n\
|
|
return value\n\
|
|
");
|
|
|
|
static PyObject *
|
|
defdict_missing(defdictobject *dd, PyObject *key)
|
|
{
|
|
PyObject *factory = dd->default_factory;
|
|
PyObject *value;
|
|
if (factory == NULL || factory == Py_None) {
|
|
/* XXX Call dict.__missing__(key) */
|
|
PyErr_SetObject(PyExc_KeyError, key);
|
|
return NULL;
|
|
}
|
|
value = PyEval_CallObject(factory, NULL);
|
|
if (value == NULL)
|
|
return value;
|
|
if (PyObject_SetItem((PyObject *)dd, key, value) < 0) {
|
|
Py_DECREF(value);
|
|
return NULL;
|
|
}
|
|
return value;
|
|
}
|
|
|
|
PyDoc_STRVAR(defdict_copy_doc, "D.copy() -> a shallow copy of D.");
|
|
|
|
static PyObject *
|
|
defdict_copy(defdictobject *dd)
|
|
{
|
|
/* This calls the object's class. That only works for subclasses
|
|
whose class constructor has the same signature. Subclasses that
|
|
define a different constructor signature must override copy().
|
|
*/
|
|
return PyObject_CallFunctionObjArgs((PyObject *)dd->dict.ob_type,
|
|
dd->default_factory, dd, NULL);
|
|
}
|
|
|
|
static PyObject *
|
|
defdict_reduce(defdictobject *dd)
|
|
{
|
|
/* __reduce__ must return a 5-tuple as follows:
|
|
|
|
- factory function
|
|
- tuple of args for the factory function
|
|
- additional state (here None)
|
|
- sequence iterator (here None)
|
|
- dictionary iterator (yielding successive (key, value) pairs
|
|
|
|
This API is used by pickle.py and copy.py.
|
|
|
|
For this to be useful with pickle.py, the default_factory
|
|
must be picklable; e.g., None, a built-in, or a global
|
|
function in a module or package.
|
|
|
|
Both shallow and deep copying are supported, but for deep
|
|
copying, the default_factory must be deep-copyable; e.g. None,
|
|
or a built-in (functions are not copyable at this time).
|
|
|
|
This only works for subclasses as long as their constructor
|
|
signature is compatible; the first argument must be the
|
|
optional default_factory, defaulting to None.
|
|
*/
|
|
PyObject *args;
|
|
PyObject *items;
|
|
PyObject *result;
|
|
if (dd->default_factory == NULL || dd->default_factory == Py_None)
|
|
args = PyTuple_New(0);
|
|
else
|
|
args = PyTuple_Pack(1, dd->default_factory);
|
|
if (args == NULL)
|
|
return NULL;
|
|
items = PyObject_CallMethod((PyObject *)dd, "iteritems", "()");
|
|
if (items == NULL) {
|
|
Py_DECREF(args);
|
|
return NULL;
|
|
}
|
|
result = PyTuple_Pack(5, dd->dict.ob_type, args,
|
|
Py_None, Py_None, items);
|
|
Py_DECREF(items);
|
|
Py_DECREF(args);
|
|
return result;
|
|
}
|
|
|
|
static PyMethodDef defdict_methods[] = {
|
|
{"__missing__", (PyCFunction)defdict_missing, METH_O,
|
|
defdict_missing_doc},
|
|
{"copy", (PyCFunction)defdict_copy, METH_NOARGS,
|
|
defdict_copy_doc},
|
|
{"__copy__", (PyCFunction)defdict_copy, METH_NOARGS,
|
|
defdict_copy_doc},
|
|
{"__reduce__", (PyCFunction)defdict_reduce, METH_NOARGS,
|
|
reduce_doc},
|
|
{NULL}
|
|
};
|
|
|
|
static PyMemberDef defdict_members[] = {
|
|
{"default_factory", T_OBJECT,
|
|
offsetof(defdictobject, default_factory), 0,
|
|
PyDoc_STR("Factory for default value called by __missing__().")},
|
|
{NULL}
|
|
};
|
|
|
|
static void
|
|
defdict_dealloc(defdictobject *dd)
|
|
{
|
|
Py_CLEAR(dd->default_factory);
|
|
PyDict_Type.tp_dealloc((PyObject *)dd);
|
|
}
|
|
|
|
static int
|
|
defdict_print(defdictobject *dd, FILE *fp, int flags)
|
|
{
|
|
int sts;
|
|
fprintf(fp, "defaultdict(");
|
|
if (dd->default_factory == NULL)
|
|
fprintf(fp, "None");
|
|
else {
|
|
PyObject_Print(dd->default_factory, fp, 0);
|
|
}
|
|
fprintf(fp, ", ");
|
|
sts = PyDict_Type.tp_print((PyObject *)dd, fp, 0);
|
|
fprintf(fp, ")");
|
|
return sts;
|
|
}
|
|
|
|
static PyObject *
|
|
defdict_repr(defdictobject *dd)
|
|
{
|
|
PyObject *defrepr;
|
|
PyObject *baserepr;
|
|
PyObject *result;
|
|
baserepr = PyDict_Type.tp_repr((PyObject *)dd);
|
|
if (baserepr == NULL)
|
|
return NULL;
|
|
if (dd->default_factory == NULL)
|
|
defrepr = PyString_FromString("None");
|
|
else
|
|
defrepr = PyObject_Repr(dd->default_factory);
|
|
if (defrepr == NULL) {
|
|
Py_DECREF(baserepr);
|
|
return NULL;
|
|
}
|
|
result = PyString_FromFormat("defaultdict(%s, %s)",
|
|
PyString_AS_STRING(defrepr),
|
|
PyString_AS_STRING(baserepr));
|
|
Py_DECREF(defrepr);
|
|
Py_DECREF(baserepr);
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
defdict_traverse(PyObject *self, visitproc visit, void *arg)
|
|
{
|
|
Py_VISIT(((defdictobject *)self)->default_factory);
|
|
return PyDict_Type.tp_traverse(self, visit, arg);
|
|
}
|
|
|
|
static int
|
|
defdict_tp_clear(defdictobject *dd)
|
|
{
|
|
Py_CLEAR(dd->default_factory);
|
|
return PyDict_Type.tp_clear((PyObject *)dd);
|
|
}
|
|
|
|
static int
|
|
defdict_init(PyObject *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
defdictobject *dd = (defdictobject *)self;
|
|
PyObject *olddefault = dd->default_factory;
|
|
PyObject *newdefault = NULL;
|
|
PyObject *newargs;
|
|
int result;
|
|
if (args == NULL || !PyTuple_Check(args))
|
|
newargs = PyTuple_New(0);
|
|
else {
|
|
Py_ssize_t n = PyTuple_GET_SIZE(args);
|
|
if (n > 0)
|
|
newdefault = PyTuple_GET_ITEM(args, 0);
|
|
newargs = PySequence_GetSlice(args, 1, n);
|
|
}
|
|
if (newargs == NULL)
|
|
return -1;
|
|
Py_XINCREF(newdefault);
|
|
dd->default_factory = newdefault;
|
|
result = PyDict_Type.tp_init(self, newargs, kwds);
|
|
Py_DECREF(newargs);
|
|
Py_XDECREF(olddefault);
|
|
return result;
|
|
}
|
|
|
|
PyDoc_STRVAR(defdict_doc,
|
|
"defaultdict(default_factory) --> dict with default factory\n\
|
|
\n\
|
|
The default factory is called without arguments to produce\n\
|
|
a new value when a key is not present, in __getitem__ only.\n\
|
|
A defaultdict compares equal to a dict with the same items.\n\
|
|
");
|
|
|
|
/* See comment in xxsubtype.c */
|
|
#define DEFERRED_ADDRESS(ADDR) 0
|
|
|
|
static PyTypeObject defdict_type = {
|
|
PyObject_HEAD_INIT(DEFERRED_ADDRESS(&PyType_Type))
|
|
0, /* ob_size */
|
|
"collections.defaultdict", /* tp_name */
|
|
sizeof(defdictobject), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
/* methods */
|
|
(destructor)defdict_dealloc, /* tp_dealloc */
|
|
(printfunc)defdict_print, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)defdict_repr, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE |
|
|
Py_TPFLAGS_HAVE_GC, /* tp_flags */
|
|
defdict_doc, /* tp_doc */
|
|
defdict_traverse, /* tp_traverse */
|
|
(inquiry)defdict_tp_clear, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset*/
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
defdict_methods, /* tp_methods */
|
|
defdict_members, /* tp_members */
|
|
0, /* tp_getset */
|
|
DEFERRED_ADDRESS(&PyDict_Type), /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
defdict_init, /* tp_init */
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
0, /* tp_new */
|
|
PyObject_GC_Del, /* tp_free */
|
|
};
|
|
|
|
/* module level code ********************************************************/
|
|
|
|
PyDoc_STRVAR(module_doc,
|
|
"High performance data structures.\n\
|
|
- deque: ordered collection accessible from endpoints only\n\
|
|
- defaultdict: dict subclass with a default value factory\n\
|
|
");
|
|
|
|
PyMODINIT_FUNC
|
|
initcollections(void)
|
|
{
|
|
PyObject *m;
|
|
|
|
m = Py_InitModule3("collections", NULL, module_doc);
|
|
if (m == NULL)
|
|
return;
|
|
|
|
if (PyType_Ready(&deque_type) < 0)
|
|
return;
|
|
Py_INCREF(&deque_type);
|
|
PyModule_AddObject(m, "deque", (PyObject *)&deque_type);
|
|
|
|
defdict_type.tp_base = &PyDict_Type;
|
|
if (PyType_Ready(&defdict_type) < 0)
|
|
return;
|
|
Py_INCREF(&defdict_type);
|
|
PyModule_AddObject(m, "defaultdict", (PyObject *)&defdict_type);
|
|
|
|
if (PyType_Ready(&dequeiter_type) < 0)
|
|
return;
|
|
|
|
if (PyType_Ready(&dequereviter_type) < 0)
|
|
return;
|
|
|
|
return;
|
|
}
|