[Python-checkins] cpython (2.7): Minor cleanups.

Sun Feb 10 00:55:54 CET 2013

http://hg.python.org/cpython/rev/3afa4c8eee1e
changeset: 82114:3afa4c8eee1e
branch: 2.7
parent: 82106:49b1fde510a6
user: Raymond Hettinger <python at rcn.com>
date: Sat Feb 09 18:55:44 2013 -0500
summary:
 Minor cleanups.
files:
 Modules/_collectionsmodule.c | 38 ++++++++++++------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -413,8 +413,7 @@
 static int
 _deque_rotate(dequeobject *deque, Py_ssize_t n)
 {
- Py_ssize_t i, m, len=deque->len, halflen=(len+1)>>1;
- block *prevblock;
+ Py_ssize_t m, len=deque->len, halflen=len>>1;
 
 if (len <= 1)
 return 0;
@@ -425,12 +424,13 @@
 else if (n < -halflen)
 n += len;
 }
+ assert(len > 1);
+ assert(-halflen <= n && n <= halflen);
 
- assert(deque->len > 1);
 deque->state++;
- for (i=0 ; i<n ; ) {
+ while (n > 0) {
 if (deque->leftindex == 0) {
- block *b = newblock(NULL, deque->leftblock, deque->len);
+ block *b = newblock(NULL, deque->leftblock, len);
 if (b == NULL)
 return -1;
 assert(deque->leftblock->leftlink == NULL);
@@ -440,22 +440,22 @@
 }
 assert(deque->leftindex > 0);
 
- m = n - i;
+ m = n;
 if (m > deque->rightindex + 1)
 m = deque->rightindex + 1;
 if (m > deque->leftindex)
 m = deque->leftindex;
- assert (m > 0);
+ assert (m > 0 && m <= len);
 memcpy(&deque->leftblock->data[deque->leftindex - m],
- &deque->rightblock->data[deque->rightindex - m + 1],
+ &deque->rightblock->data[deque->rightindex + 1 - m],
 m * sizeof(PyObject *));
 deque->rightindex -= m;
 deque->leftindex -= m;
- i += m;
+ n -= m;
 
 if (deque->rightindex == -1) {
+ block *prevblock = deque->rightblock->leftlink;
 assert(deque->rightblock != NULL);
- prevblock = deque->rightblock->leftlink;
 assert(deque->leftblock != deque->rightblock);
 freeblock(deque->rightblock);
 prevblock->rightlink = NULL;
@@ -463,9 +463,9 @@
 deque->rightindex = BLOCKLEN - 1;
 }
 }
- for (i=0 ; i>n ; ) {
+ while (n < 0) {
 if (deque->rightindex == BLOCKLEN - 1) {
- block *b = newblock(deque->rightblock, NULL, deque->len);
+ block *b = newblock(deque->rightblock, NULL, len);
 if (b == NULL)
 return -1;
 assert(deque->rightblock->rightlink == NULL);
@@ -475,26 +475,26 @@
 }
 assert (deque->rightindex < BLOCKLEN - 1);
 
- m = i - n;
+ m = -n;
 if (m > BLOCKLEN - deque->leftindex)
 m = BLOCKLEN - deque->leftindex;
 if (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],
 &deque->leftblock->data[deque->leftindex],
 m * sizeof(PyObject *));
 deque->leftindex += m;
 deque->rightindex += m;
- i -= m;
+ n += m;
 
 if (deque->leftindex == BLOCKLEN) {
+ block *nextblock = deque->leftblock->rightlink;
 assert(deque->leftblock != deque->rightblock);
- prevblock = deque->leftblock->rightlink;
 freeblock(deque->leftblock);
- assert(prevblock != NULL);
- prevblock->leftlink = NULL;
- deque->leftblock = prevblock;
+ assert(nextblock != NULL);
+ nextblock->leftlink = NULL;
+ deque->leftblock = nextblock;
 deque->leftindex = 0;
 }
 }
-- 
Repository URL: http://hg.python.org/cpython
