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

Tighten-up code by eliminating an unnecessary variable.

This commit is contained in:
Raymond Hettinger 2015-05-15 21:01:13 -07:00
parent 183a941bc1
commit c784c6db60
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Modules/_heapqmodule.c
View File

@ -50,7 +50,7 @@ siftdown(PyListObject *heap, Py_ssize_t startpos, Py_ssize_t pos)
static int static int
siftup(PyListObject *heap, Py_ssize_t pos) siftup(PyListObject *heap, Py_ssize_t pos)
{ {
Py_ssize_t startpos, endpos, childpos, rightpos, limit; Py_ssize_t startpos, endpos, childpos, limit;
PyObject *tmp1, *tmp2; PyObject *tmp1, *tmp2;
int cmp; int cmp;
@ -67,16 +67,15 @@ siftup(PyListObject *heap, Py_ssize_t pos)
while (pos < limit) { while (pos < limit) {
/* Set childpos to index of smaller child. */ /* Set childpos to index of smaller child. */
childpos = 2*pos + 1; /* leftmost child position */ childpos = 2*pos + 1; /* leftmost child position */
rightpos = childpos + 1; if (childpos + 1 < endpos) {
if (rightpos < endpos) {
cmp = PyObject_RichCompareBool( cmp = PyObject_RichCompareBool(
PyList_GET_ITEM(heap, childpos), PyList_GET_ITEM(heap, childpos),
PyList_GET_ITEM(heap, rightpos), PyList_GET_ITEM(heap, childpos + 1),
Py_LT); Py_LT);
if (cmp == -1) if (cmp == -1)
return -1; return -1;
if (cmp == 0) if (cmp == 0)
childpos = rightpos; childpos++; /* rightmost child is smallest */
if (endpos != PyList_GET_SIZE(heap)) { if (endpos != PyList_GET_SIZE(heap)) {
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"list changed size during iteration"); "list changed size during iteration");
@ -402,7 +401,7 @@ siftdown_max(PyListObject *heap, Py_ssize_t startpos, Py_ssize_t pos)
static int static int
siftup_max(PyListObject *heap, Py_ssize_t pos) siftup_max(PyListObject *heap, Py_ssize_t pos)
{ {
Py_ssize_t startpos, endpos, childpos, rightpos, limit; Py_ssize_t startpos, endpos, childpos, limit;
PyObject *tmp1, *tmp2; PyObject *tmp1, *tmp2;
int cmp; int cmp;
@ -419,16 +418,15 @@ siftup_max(PyListObject *heap, Py_ssize_t pos)
while (pos < limit) { while (pos < limit) {
/* Set childpos to index of smaller child. */ /* Set childpos to index of smaller child. */
childpos = 2*pos + 1; /* leftmost child position */ childpos = 2*pos + 1; /* leftmost child position */
rightpos = childpos + 1; if (childpos + 1 < endpos) {
if (rightpos < endpos) {
cmp = PyObject_RichCompareBool( cmp = PyObject_RichCompareBool(
PyList_GET_ITEM(heap, rightpos), PyList_GET_ITEM(heap, childpos + 1),
PyList_GET_ITEM(heap, childpos), PyList_GET_ITEM(heap, childpos),
Py_LT); Py_LT);
if (cmp == -1) if (cmp == -1)
return -1; return -1;
if (cmp == 0) if (cmp == 0)
childpos = rightpos; childpos++; /* rightmost child is smallest */
if (endpos != PyList_GET_SIZE(heap)) { if (endpos != PyList_GET_SIZE(heap)) {
PyErr_SetString(PyExc_RuntimeError, PyErr_SetString(PyExc_RuntimeError,
"list changed size during iteration"); "list changed size during iteration");