Skip to content

Heapq: Code clean-up. Remove unnecessary pre-increment before the loop starts. #3312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhettinger merged 1 commit into from
Sep 4, 2017
Merged

Heapq: Code clean-up. Remove unnecessary pre-increment before the loop starts. #3312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Code clean-up. Remove unnecessary pre-increment before the loop starts.
  • Loading branch information
@rhettinger
rhettinger committed Sep 4, 2017
commit de4d9a360294e844fb4f21a0991133e62bb8abd2
27 changes: 10 additions & 17 deletions Modules/_collectionsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,8 +938,7 @@ deque_reverse(dequeobject *deque, PyObject *unused)
Py_ssize_t n = Py_SIZE(deque) >> 1;
PyObject *tmp;

n++;
while (--n) {
while (--n >= 0) {
/* Validate that pointers haven't met in the middle */
assert(leftblock != rightblock || leftindex < rightindex);
CHECK_NOT_END(leftblock);
Expand Down Expand Up @@ -981,8 +980,7 @@ deque_count(dequeobject *deque, PyObject *v)
PyObject *item;
int cmp;

n++;
while (--n) {
while (--n >= 0) {
CHECK_NOT_END(b);
item = b->data[index];
cmp = PyObject_RichCompareBool(item, v, Py_EQ);
Expand Down Expand Up @@ -1019,8 +1017,7 @@ deque_contains(dequeobject *deque, PyObject *v)
PyObject *item;
int cmp;

n++;
while (--n) {
while (--n >= 0) {
CHECK_NOT_END(b);
item = b->data[index];
cmp = PyObject_RichCompareBool(item, v, Py_EQ);
Expand Down Expand Up @@ -1088,13 +1085,13 @@ deque_index(dequeobject *deque, PyObject **args, Py_ssize_t nargs)
}
}

n = stop - i + 1;
while (--n) {
n = stop - i;
while (--n >= 0) {
CHECK_NOT_END(b);
item = b->data[index];
cmp = PyObject_RichCompareBool(item, v, Py_EQ);
if (cmp > 0)
return PyLong_FromSsize_t(stop - n);
return PyLong_FromSsize_t(stop - n - 1);
if (cmp < 0)
return NULL;
if (start_state != deque->state) {
Expand Down Expand Up @@ -1228,16 +1225,14 @@ deque_item(dequeobject *deque, Py_ssize_t i)
i = (Py_ssize_t)((size_t) i % BLOCKLEN);
if (index < (Py_SIZE(deque) >> 1)) {
b = deque->leftblock;
n++;
while (--n)
while (--n >= 0)
b = b->rightlink;
} else {
n = (Py_ssize_t)(
((size_t)(deque->leftindex + Py_SIZE(deque) - 1))
/ BLOCKLEN - n);
b = deque->rightblock;
n++;
while (--n)
while (--n >= 0)
b = b->leftlink;
}
}
Expand Down Expand Up @@ -1281,16 +1276,14 @@ deque_ass_item(dequeobject *deque, Py_ssize_t i, PyObject *v)
i = (Py_ssize_t)((size_t) i % BLOCKLEN);
if (index <= halflen) {
b = deque->leftblock;
n++;
while (--n)
while (--n >= 0)
b = b->rightlink;
} else {
n = (Py_ssize_t)(
((size_t)(deque->leftindex + Py_SIZE(deque) - 1))
/ BLOCKLEN - n);
b = deque->rightblock;
n++;
while (--n)
while (--n >= 0)
b = b->leftlink;
}
Py_INCREF(v);
Expand Down