mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 16:43:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Minor tweak. Make the maxlen comparisons a little more clear and consistent.

Browse source
This commit is contained in:
Raymond Hettinger 2015-10-10 23:56:02 -04:00
parent 10dcff7a04
commit a7f63009d6
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Modules/_collectionsmodule.c
View file

@ -281,7 +281,7 @@ PyDoc_STRVAR(popleft_doc, "Remove and return the leftmost element.");
static void static void
deque_trim_right(dequeobject *deque) deque_trim_right(dequeobject *deque)
{ {
if (deque->maxlen != -1 && Py_SIZE(deque) > deque->maxlen) { if (deque->maxlen >= 0 && Py_SIZE(deque) > deque->maxlen) {
PyObject *rv = deque_pop(deque, NULL); PyObject *rv = deque_pop(deque, NULL);
assert(rv != NULL); assert(rv != NULL);
assert(Py_SIZE(deque) <= deque->maxlen); assert(Py_SIZE(deque) <= deque->maxlen);
@ -292,7 +292,7 @@ deque_trim_right(dequeobject *deque)
static void static void
deque_trim_left(dequeobject *deque) deque_trim_left(dequeobject *deque)
{ {
if (deque->maxlen != -1 && Py_SIZE(deque) > deque->maxlen) { if (deque->maxlen >= 0 && Py_SIZE(deque) > deque->maxlen) {
PyObject *rv = deque_popleft(deque, NULL); PyObject *rv = deque_popleft(deque, NULL);
assert(rv != NULL); assert(rv != NULL);
assert(Py_SIZE(deque) <= deque->maxlen); assert(Py_SIZE(deque) <= deque->maxlen);
@ -385,7 +385,7 @@ deque_extend(dequeobject *deque, PyObject *iterable)
{ {
PyObject *it, *item; PyObject *it, *item;
PyObject *(*iternext)(PyObject *); PyObject *(*iternext)(PyObject *);
int trim = (deque->maxlen != -1); int trim = (deque->maxlen >= 0);
/* Handle case where id(deque) == id(iterable) */ /* Handle case where id(deque) == id(iterable) */
if ((PyObject *)deque == iterable) { if ((PyObject *)deque == iterable) {
@ -447,7 +447,7 @@ deque_extendleft(dequeobject *deque, PyObject *iterable)
{ {
PyObject *it, *item; PyObject *it, *item;
PyObject *(*iternext)(PyObject *); PyObject *(*iternext)(PyObject *);
int trim = (deque->maxlen != -1); int trim = (deque->maxlen >= 0);
/* Handle case where id(deque) == id(iterable) */ /* Handle case where id(deque) == id(iterable) */
if ((PyObject *)deque == iterable) { if ((PyObject *)deque == iterable) {
@ -686,7 +686,7 @@ deque_inplace_repeat(dequeobject *deque, Py_ssize_t n)
/* common case, repeating a single element */ /* common case, repeating a single element */
PyObject *item = deque->leftblock->data[deque->leftindex]; PyObject *item = deque->leftblock->data[deque->leftindex];
if (deque->maxlen != -1 && n > deque->maxlen) if (deque->maxlen >= 0 && n > deque->maxlen)
n = deque->maxlen; n = deque->maxlen;
if (n > MAX_DEQUE_LEN) if (n > MAX_DEQUE_LEN)
@ -1355,7 +1355,7 @@ deque_repr(PyObject *deque)
Py_ReprLeave(deque); Py_ReprLeave(deque);
return NULL; return NULL;
} }
if (((dequeobject *)deque)->maxlen != -1) if (((dequeobject *)deque)->maxlen >= 0)
result = PyUnicode_FromFormat("deque(%R, maxlen=%zd)", result = PyUnicode_FromFormat("deque(%R, maxlen=%zd)",
aslist, ((dequeobject *)deque)->maxlen); aslist, ((dequeobject *)deque)->maxlen);
else else