Browse Source

Add a spacing saving heuristic to deque's extend methods

pull/224/head
Raymond Hettinger 13 years ago
parent
commit
d9c116ca40
  1. 4
      Lib/test/test_deque.py
  2. 16
      Modules/_collectionsmodule.c

4
Lib/test/test_deque.py

@ -543,8 +543,8 @@ class TestBasic(unittest.TestCase):
check = self.check_sizeof
check(deque(), basesize + blocksize)
check(deque('a'), basesize + blocksize)
check(deque('a' * (BLOCKLEN // 2)), basesize + blocksize)
check(deque('a' * (BLOCKLEN // 2 + 1)), basesize + 2 * blocksize)
check(deque('a' * (BLOCKLEN - 1)), basesize + blocksize)
check(deque('a' * BLOCKLEN), basesize + 2 * blocksize)
check(deque('a' * (42 * BLOCKLEN)), basesize + 43 * blocksize)
class TestVariousIteratorArgs(unittest.TestCase):

16
Modules/_collectionsmodule.c

@ -332,6 +332,14 @@ deque_extend(dequeobject *deque, PyObject *iterable)
return result;
}
/* Space saving heuristic. Start filling from the left */
if (Py_SIZE(deque) == 0) {
assert(deque->leftblock == deque->rightblock);
assert(deque->leftindex == deque->rightindex+1);
deque->leftindex = 1;
deque->rightindex = 0;
}
it = PyObject_GetIter(iterable);
if (it == NULL)
return NULL;
@ -385,6 +393,14 @@ deque_extendleft(dequeobject *deque, PyObject *iterable)
return result;
}
/* Space saving heuristic. Start filling from the right */
if (Py_SIZE(deque) == 0) {
assert(deque->leftblock == deque->rightblock);
assert(deque->leftindex == deque->rightindex+1);
deque->leftindex = BLOCKLEN - 1;
deque->rightindex = BLOCKLEN - 2;
}
it = PyObject_GetIter(iterable);
if (it == NULL)
return NULL;

Loading…
Cancel
Save