[Python-checkins] cpython: Minor beautification. Move struct definitions to the top. Fix-up a comment.

raymond.hettinger python-checkins at python.org
Tue Mar 3 07:31:54 CET 2015


https://hg.python.org/cpython/rev/e972cc540f33
changeset:   94839:e972cc540f33
user:        Raymond Hettinger <python at rcn.com>
date:        Mon Mar 02 22:31:35 2015 -0800
summary:
  Minor beautification.  Move struct definitions to the top.  Fix-up a comment.

files:
  Modules/_collectionsmodule.c |  30 ++++++++++++------------
  1 files changed, 15 insertions(+), 15 deletions(-)


diff --git a/Modules/_collectionsmodule.c b/Modules/_collectionsmodule.c
--- a/Modules/_collectionsmodule.c
+++ b/Modules/_collectionsmodule.c
@@ -15,9 +15,9 @@
 
 /* The block length may be set to any number over 1.  Larger numbers
  * reduce the number of calls to the memory allocator, give faster
- * indexing and rotation, and reduce the link::data overhead ratio.
+ * indexing and rotation, and reduce the link to data overhead ratio.
  * Making the block length a power of two speeds-up the modulo
- * calculation in deque_item().
+ * and division calculations in deque_item() and deque_ass_item().
  */
 
 #define BLOCKLEN 64
@@ -56,6 +56,19 @@
     struct BLOCK *rightlink;
 } block;
 
+typedef struct {
+    PyObject_VAR_HEAD
+    block *leftblock;
+    block *rightblock;
+    Py_ssize_t leftindex;       /* in range(BLOCKLEN) */
+    Py_ssize_t rightindex;      /* in range(BLOCKLEN) */
+    long state;                 /* incremented whenever the indices move */
+    Py_ssize_t maxlen;
+    PyObject *weakreflist; /* List of weak references */
+} dequeobject;
+
+static PyTypeObject deque_type;
+
 /* For debug builds, add error checking to track the endpoints
  * in the chain of links.  The goal is to make sure that link
  * assignments only take place at endpoints so that links already
@@ -119,19 +132,6 @@
     }
 }
 
-typedef struct {
-    PyObject_VAR_HEAD
-    block *leftblock;
-    block *rightblock;
-    Py_ssize_t leftindex;       /* in range(BLOCKLEN) */
-    Py_ssize_t rightindex;      /* in range(BLOCKLEN) */
-    long state;                 /* incremented whenever the indices move */
-    Py_ssize_t maxlen;
-    PyObject *weakreflist; /* List of weak references */
-} dequeobject;
-
-static PyTypeObject deque_type;
-
 /* XXX Todo:
    If aligned memory allocations become available, make the
    deque object 64 byte aligned so that all of the fields

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list