mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Minor cleanups.

Browse source
This commit is contained in:
Raymond Hettinger 2013-02-09 18:55:44 -05:00
parent 15ea3ac67a
commit 6688bdbe77
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Modules/_collectionsmodule.c
View file

@ -413,8 +413,7 @@ deque_inplace_concat(dequeobject *deque, PyObject *other)
static int static int
_deque_rotate(dequeobject *deque, Py_ssize_t n) _deque_rotate(dequeobject *deque, Py_ssize_t n)
{ {
Py_ssize_t i, m, len=deque->len, halflen=(len+1)>>1; Py_ssize_t m, len=deque->len, halflen=len>>1;
block *prevblock;
if (len <= 1) if (len <= 1)
return 0; return 0;
@ -425,12 +424,13 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
else if (n < -halflen) else if (n < -halflen)
n += len; n += len;
} }
assert(len > 1);
assert(-halflen <= n && n <= halflen);
assert(deque->len > 1);
deque->state++; deque->state++;
for (i=0 ; i<n ; ) { while (n > 0) {
if (deque->leftindex == 0) { if (deque->leftindex == 0) {
block *b = newblock(NULL, deque->leftblock, deque->len); block *b = newblock(NULL, deque->leftblock, len);
if (b == NULL) if (b == NULL)
return -1; return -1;
assert(deque->leftblock->leftlink == NULL); assert(deque->leftblock->leftlink == NULL);
@ -440,22 +440,22 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
} }
assert(deque->leftindex > 0); assert(deque->leftindex > 0);
m = n - i; m = n;
if (m > deque->rightindex + 1) if (m > deque->rightindex + 1)
m = deque->rightindex + 1; m = deque->rightindex + 1;
if (m > deque->leftindex) if (m > deque->leftindex)
m = deque->leftindex; m = deque->leftindex;
assert (m > 0); assert (m > 0 && m <= len);
memcpy(&deque->leftblock->data[deque->leftindex - m], memcpy(&deque->leftblock->data[deque->leftindex - m],
&deque->rightblock->data[deque->rightindex - m + 1], &deque->rightblock->data[deque->rightindex + 1 - m],
m * sizeof(PyObject *)); m * sizeof(PyObject *));
deque->rightindex -= m; deque->rightindex -= m;
deque->leftindex -= m; deque->leftindex -= m;
i += m; n -= m;
if (deque->rightindex == -1) { if (deque->rightindex == -1) {
block *prevblock = deque->rightblock->leftlink;
assert(deque->rightblock != NULL); assert(deque->rightblock != NULL);
prevblock = deque->rightblock->leftlink;
assert(deque->leftblock != deque->rightblock); assert(deque->leftblock != deque->rightblock);
freeblock(deque->rightblock); freeblock(deque->rightblock);
prevblock->rightlink = NULL; prevblock->rightlink = NULL;
@ -463,9 +463,9 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
deque->rightindex = BLOCKLEN - 1; deque->rightindex = BLOCKLEN - 1;
} }
} }
for (i=0 ; i>n ; ) { while (n < 0) {
if (deque->rightindex == BLOCKLEN - 1) { if (deque->rightindex == BLOCKLEN - 1) {
block *b = newblock(deque->rightblock, NULL, deque->len); block *b = newblock(deque->rightblock, NULL, len);
if (b == NULL) if (b == NULL)
return -1; return -1;
assert(deque->rightblock->rightlink == NULL); assert(deque->rightblock->rightlink == NULL);
@ -475,26 +475,26 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
} }
assert (deque->rightindex < BLOCKLEN - 1); assert (deque->rightindex < BLOCKLEN - 1);
m = i - n; m = -n;
if (m > BLOCKLEN - deque->leftindex) if (m > BLOCKLEN - deque->leftindex)
m = BLOCKLEN - deque->leftindex; m = BLOCKLEN - deque->leftindex;
if (m > BLOCKLEN - 1 - deque->rightindex) if (m > BLOCKLEN - 1 - deque->rightindex)
m = BLOCKLEN - 1 - deque->rightindex; m = BLOCKLEN - 1 - deque->rightindex;
assert (m > 0); assert (m > 0 && m <= len);
memcpy(&deque->rightblock->data[deque->rightindex + 1], memcpy(&deque->rightblock->data[deque->rightindex + 1],
&deque->leftblock->data[deque->leftindex], &deque->leftblock->data[deque->leftindex],
m * sizeof(PyObject *)); m * sizeof(PyObject *));
deque->leftindex += m; deque->leftindex += m;
deque->rightindex += m; deque->rightindex += m;
i -= m; n += m;
if (deque->leftindex == BLOCKLEN) { if (deque->leftindex == BLOCKLEN) {
block *nextblock = deque->leftblock->rightlink;
assert(deque->leftblock != deque->rightblock); assert(deque->leftblock != deque->rightblock);
prevblock = deque->leftblock->rightlink;
freeblock(deque->leftblock); freeblock(deque->leftblock);
assert(prevblock != NULL); assert(nextblock != NULL);
prevblock->leftlink = NULL; nextblock->leftlink = NULL;
deque->leftblock = prevblock; deque->leftblock = nextblock;
deque->leftindex = 0; deque->leftindex = 0;
} }
} }