Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-35696: Simplify long_compare() (GH-16146)

This commit is contained in:
HongWeipeng 2019-09-18 23:10:15 +08:00 committed by Inada Naoki
parent d299b8b47d
commit 42acb7b8d2
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Objects/longobject.c
View File

@ -3028,33 +3028,32 @@ PyLong_AsDouble(PyObject *v)
/* Methods */ /* Methods */
static int /* if a < b, return a negative number
if a == b, return 0
if a > b, return a positive number */
static Py_ssize_t
long_compare(PyLongObject *a, PyLongObject *b) long_compare(PyLongObject *a, PyLongObject *b)
{ {
Py_ssize_t sign; Py_ssize_t sign = Py_SIZE(a) - Py_SIZE(b);
if (sign == 0) {
if (Py_SIZE(a) != Py_SIZE(b)) {
sign = Py_SIZE(a) - Py_SIZE(b);
}
else {
Py_ssize_t i = Py_ABS(Py_SIZE(a)); Py_ssize_t i = Py_ABS(Py_SIZE(a));
while (--i >= 0 && a->ob_digit[i] == b->ob_digit[i]) sdigit diff = 0;
; while (--i >= 0) {
if (i < 0) diff = (sdigit) a->ob_digit[i] - (sdigit) b->ob_digit[i];
sign = 0; if (diff) {
else { break;
sign = (sdigit)a->ob_digit[i] - (sdigit)b->ob_digit[i]; }
if (Py_SIZE(a) < 0)
sign = -sign;
} }
sign = Py_SIZE(a) < 0 ? -diff : diff;
} }
return sign < 0 ? -1 : sign > 0 ? 1 : 0; return sign;
} }
static PyObject * static PyObject *
long_richcompare(PyObject *self, PyObject *other, int op) long_richcompare(PyObject *self, PyObject *other, int op)
{ {
int result; Py_ssize_t result;
CHECK_BINOP(self, other); CHECK_BINOP(self, other);
if (self == other) if (self == other)
result = 0; result = 0;
@ -5210,7 +5209,8 @@ _PyLong_DivmodNear(PyObject *a, PyObject *b)
{ {
PyLongObject *quo = NULL, *rem = NULL; PyLongObject *quo = NULL, *rem = NULL;
PyObject *twice_rem, *result, *temp; PyObject *twice_rem, *result, *temp;
int cmp, quo_is_odd, quo_is_neg; int quo_is_odd, quo_is_neg;
Py_ssize_t cmp;
/* Equivalent Python code: /* Equivalent Python code: