Commit b97cc49c authored by Raymond Hettinger's avatar Raymond Hettinger

Minor code simplification by eliminating an unnecessary temporary variable.

parent 02e8b53e
...@@ -491,7 +491,6 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n) ...@@ -491,7 +491,6 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
b = NULL; b = NULL;
} }
assert(leftindex > 0); assert(leftindex > 0);
{ {
PyObject **src, **dest; PyObject **src, **dest;
Py_ssize_t m = n; Py_ssize_t m = n;
...@@ -510,15 +509,13 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n) ...@@ -510,15 +509,13 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
*(dest--) = *(src--); *(dest--) = *(src--);
} while (--m); } while (--m);
} }
if (rightindex == -1) { if (rightindex == -1) {
block *prevblock = rightblock->leftlink;
assert(leftblock != rightblock); assert(leftblock != rightblock);
assert(b == NULL); assert(b == NULL);
b = rightblock; b = rightblock;
CHECK_NOT_END(prevblock); CHECK_NOT_END(rightblock->leftlink);
MARK_END(prevblock->rightlink); rightblock = rightblock->leftlink;
rightblock = prevblock; MARK_END(rightblock->rightlink);
rightindex = BLOCKLEN - 1; rightindex = BLOCKLEN - 1;
} }
} }
...@@ -538,7 +535,6 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n) ...@@ -538,7 +535,6 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
b = NULL; b = NULL;
} }
assert (rightindex < BLOCKLEN - 1); assert (rightindex < BLOCKLEN - 1);
{ {
PyObject **src, **dest; PyObject **src, **dest;
Py_ssize_t m = -n; Py_ssize_t m = -n;
...@@ -557,15 +553,13 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n) ...@@ -557,15 +553,13 @@ _deque_rotate(dequeobject *deque, Py_ssize_t n)
*(dest++) = *(src++); *(dest++) = *(src++);
} while (--m); } while (--m);
} }
if (leftindex == BLOCKLEN) { if (leftindex == BLOCKLEN) {
block *nextblock = leftblock->rightlink;
assert(leftblock != rightblock); assert(leftblock != rightblock);
assert(b == NULL); assert(b == NULL);
b = leftblock; b = leftblock;
CHECK_NOT_END(nextblock); CHECK_NOT_END(leftblock->rightlink);
MARK_END(nextblock->leftlink); leftblock = leftblock->rightlink;
leftblock = nextblock; MARK_END(leftblock->leftlink);
leftindex = 0; leftindex = 0;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment