traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unnecessary branches from count() and reverse().

This commit is contained in:
Raymond Hettinger 2013-07-06 09:07:06 -10:00
parent 0075110ab2
commit 98054b4c1b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/_collectionsmodule.c
View File

@ -551,6 +551,8 @@ deque_reverse(dequeobject *deque, PyObject *unused)
for (i=0 ; i<n ; i++) { for (i=0 ; i<n ; i++) {
/* Validate that pointers haven't met in the middle */ /* Validate that pointers haven't met in the middle */
assert(leftblock != rightblock || leftindex < rightindex); assert(leftblock != rightblock || leftindex < rightindex);
assert(leftblock != NULL);
assert(rightblock != NULL);
/* Swap */ /* Swap */
tmp = leftblock->data[leftindex]; tmp = leftblock->data[leftindex];
@ -560,8 +562,6 @@ deque_reverse(dequeobject *deque, PyObject *unused)
/* Advance left block/index pair */ /* Advance left block/index pair */
leftindex++; leftindex++;
if (leftindex == BLOCKLEN) { if (leftindex == BLOCKLEN) {
if (leftblock->rightlink == NULL)
break;
leftblock = leftblock->rightlink; leftblock = leftblock->rightlink;
leftindex = 0; leftindex = 0;
} }
@ -569,8 +569,6 @@ deque_reverse(dequeobject *deque, PyObject *unused)
/* Step backwards with the right block/index pair */ /* Step backwards with the right block/index pair */
rightindex--; rightindex--;
if (rightindex == -1) { if (rightindex == -1) {
if (rightblock->leftlink == NULL)
break;
rightblock = rightblock->leftlink; rightblock = rightblock->leftlink;
rightindex = BLOCKLEN - 1; rightindex = BLOCKLEN - 1;
} }
@ -594,6 +592,7 @@ deque_count(dequeobject *deque, PyObject *v)
int cmp; int cmp;
for (i=0 ; i<n ; i++) { for (i=0 ; i<n ; i++) {
assert(leftblock != NULL);
item = leftblock->data[leftindex]; item = leftblock->data[leftindex];
cmp = PyObject_RichCompareBool(item, v, Py_EQ); cmp = PyObject_RichCompareBool(item, v, Py_EQ);
if (cmp > 0) if (cmp > 0)
@ -610,8 +609,6 @@ deque_count(dequeobject *deque, PyObject *v)
/* Advance left block/index pair */ /* Advance left block/index pair */
leftindex++; leftindex++;
if (leftindex == BLOCKLEN) { if (leftindex == BLOCKLEN) {
if (leftblock->rightlink == NULL) /* can occur when i==n-1 */
break;
leftblock = leftblock->rightlink; leftblock = leftblock->rightlink;
leftindex = 0; leftindex = 0;
} }