Kaydet (Commit) 87e69124 authored tarafından Raymond Hettinger's avatar Raymond Hettinger

Minor neatening-up. Make assignments in same order a struct fields. Line-up comments.

üst f9d9c79a
...@@ -158,14 +158,14 @@ deque_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -158,14 +158,14 @@ deque_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
MARK_END(b->rightlink); MARK_END(b->rightlink);
assert(BLOCKLEN >= 2); assert(BLOCKLEN >= 2);
Py_SIZE(deque) = 0;
deque->leftblock = b; deque->leftblock = b;
deque->rightblock = b; deque->rightblock = b;
deque->leftindex = CENTER + 1; deque->leftindex = CENTER + 1;
deque->rightindex = CENTER; deque->rightindex = CENTER;
Py_SIZE(deque) = 0;
deque->state = 0; deque->state = 0;
deque->weakreflist = NULL;
deque->maxlen = -1; deque->maxlen = -1;
deque->weakreflist = NULL;
return (PyObject *)deque; return (PyObject *)deque;
} }
...@@ -775,9 +775,9 @@ deque_clear(dequeobject *deque) ...@@ -775,9 +775,9 @@ deque_clear(dequeobject *deque)
assert (item != NULL); assert (item != NULL);
Py_DECREF(item); Py_DECREF(item);
} }
assert(deque->leftblock == deque->rightblock && assert(deque->leftblock == deque->rightblock);
deque->leftindex - 1 == deque->rightindex && assert(deque->leftindex - 1 == deque->rightindex);
Py_SIZE(deque) == 0); assert(Py_SIZE(deque) == 0);
} }
static int static int
...@@ -1152,10 +1152,10 @@ static PySequenceMethods deque_as_sequence = { ...@@ -1152,10 +1152,10 @@ static PySequenceMethods deque_as_sequence = {
0, /* sq_repeat */ 0, /* sq_repeat */
(ssizeargfunc)deque_item, /* sq_item */ (ssizeargfunc)deque_item, /* sq_item */
0, /* sq_slice */ 0, /* sq_slice */
(ssizeobjargproc)deque_ass_item, /* sq_ass_item */ (ssizeobjargproc)deque_ass_item, /* sq_ass_item */
0, /* sq_ass_slice */ 0, /* sq_ass_slice */
0, /* sq_contains */ 0, /* sq_contains */
(binaryfunc)deque_inplace_concat, /* sq_inplace_concat */ (binaryfunc)deque_inplace_concat, /* sq_inplace_concat */
0, /* sq_inplace_repeat */ 0, /* sq_inplace_repeat */
}; };
...@@ -1254,8 +1254,8 @@ static PyTypeObject deque_type = { ...@@ -1254,8 +1254,8 @@ static PyTypeObject deque_type = {
typedef struct { typedef struct {
PyObject_HEAD PyObject_HEAD
Py_ssize_t index;
block *b; block *b;
Py_ssize_t index;
dequeobject *deque; dequeobject *deque;
size_t state; /* state when the iterator is created */ size_t state; /* state when the iterator is created */
Py_ssize_t counter; /* number of items remaining for iteration */ Py_ssize_t counter; /* number of items remaining for iteration */
...@@ -1374,7 +1374,7 @@ static PyMethodDef dequeiter_methods[] = { ...@@ -1374,7 +1374,7 @@ static PyMethodDef dequeiter_methods[] = {
static PyTypeObject dequeiter_type = { static PyTypeObject dequeiter_type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_collections._deque_iterator", /* tp_name */ "_collections._deque_iterator", /* tp_name */
sizeof(dequeiterobject), /* tp_basicsize */ sizeof(dequeiterobject), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
/* methods */ /* methods */
...@@ -1393,7 +1393,7 @@ static PyTypeObject dequeiter_type = { ...@@ -1393,7 +1393,7 @@ static PyTypeObject dequeiter_type = {
PyObject_GenericGetAttr, /* tp_getattro */ PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
0, /* tp_doc */ 0, /* tp_doc */
(traverseproc)dequeiter_traverse, /* tp_traverse */ (traverseproc)dequeiter_traverse, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
...@@ -1496,7 +1496,7 @@ dequereviter_new(PyTypeObject *type, PyObject *args, PyObject *kwds) ...@@ -1496,7 +1496,7 @@ dequereviter_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
static PyTypeObject dequereviter_type = { static PyTypeObject dequereviter_type = {
PyVarObject_HEAD_INIT(NULL, 0) PyVarObject_HEAD_INIT(NULL, 0)
"_collections._deque_reverse_iterator", /* tp_name */ "_collections._deque_reverse_iterator", /* tp_name */
sizeof(dequeiterobject), /* tp_basicsize */ sizeof(dequeiterobject), /* tp_basicsize */
0, /* tp_itemsize */ 0, /* tp_itemsize */
/* methods */ /* methods */
...@@ -1515,7 +1515,7 @@ static PyTypeObject dequereviter_type = { ...@@ -1515,7 +1515,7 @@ static PyTypeObject dequereviter_type = {
PyObject_GenericGetAttr, /* tp_getattro */ PyObject_GenericGetAttr, /* tp_getattro */
0, /* tp_setattro */ 0, /* tp_setattro */
0, /* tp_as_buffer */ 0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags */
0, /* tp_doc */ 0, /* tp_doc */
(traverseproc)dequeiter_traverse, /* tp_traverse */ (traverseproc)dequeiter_traverse, /* tp_traverse */
0, /* tp_clear */ 0, /* tp_clear */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment