Changeset 388 for python/vendor/current/Parser/node.c

Timestamp:

Mar 19, 2014, 11:11:30 AM (11 years ago)

Author:

dmik

Message:

python: Update vendor to 2.7.6.

File:

• python/vendor/current/Parser/node.c (modified) (6 diffs)

python/vendor/current/Parser/node.c

@@ -8 +8 @@
 PyNode_New(int type)
 {
-        node *n = (node *) PyObject_MALLOC(1 * sizeof(node));
-        if (n == NULL)
-                return NULL;
-        n->n_type = type;
-        n->n_str = NULL;
-        n->n_lineno = 0;
-        n->n_nchildren = 0;
-        n->n_child = NULL;
-        return n;
+    node *n = (node *) PyObject_MALLOC(1 * sizeof(node));
+    if (n == NULL)
+        return NULL;
+    n->n_type = type;
+    n->n_str = NULL;
+    n->n_lineno = 0;
+    n->n_nchildren = 0;
+    n->n_child = NULL;
+    return n;
 }
 
@@ -23 +23 @@
 fancy_roundup(int n)
 {
-        /* Round up to the closest power of 2 >= n. */
-        int result = 256;
-        assert(n > 128);
-        while (result < n) {
-                result <<= 1;
-                if (result <= 0)
-                        return -1;
-        }
-        return result;
+    /* Round up to the closest power of 2 >= n. */
+    int result = 256;
+    assert(n > 128);
+    while (result < n) {
+        result <<= 1;
+        if (result <= 0)
+            return -1;
+    }
+    return result;
 }
 
@@ -71 +71 @@
  * capacity.  The code is tricky to avoid that.
  */
-#define XXXROUNDUP(n) ((n) <= 1 ? (n) :                 \
-                       (n) <= 128 ? (((n) + 3) & ~3) :  \
-                       fancy_roundup(n))
+#define XXXROUNDUP(n) ((n) <= 1 ? (n) :                 \
+               (n) <= 128 ? (((n) + 3) & ~3) :          \
+               fancy_roundup(n))
 
 
@@ -79 +79 @@
 PyNode_AddChild(register node *n1, int type, char *str, int lineno, int col_offset)
 {
-        const int nch = n1->n_nchildren;
-        int current_capacity;
-        int required_capacity;
-        node *n;
+    const int nch = n1->n_nchildren;
+    int current_capacity;
+    int required_capacity;
+    node *n;
 
-        if (nch == INT_MAX || nch < 0)
-                return E_OVERFLOW;
+    if (nch == INT_MAX || nch < 0)
+        return E_OVERFLOW;
 
-        current_capacity = XXXROUNDUP(nch);
-        required_capacity = XXXROUNDUP(nch + 1);
-        if (current_capacity < 0 || required_capacity < 0)
-                return E_OVERFLOW;
-        if (current_capacity < required_capacity) {
-                if (required_capacity > PY_SIZE_MAX / sizeof(node)) {
-                        return E_NOMEM;
-                }
-                n = n1->n_child;
-                n = (node *) PyObject_REALLOC(n,
-                                              required_capacity * sizeof(node));
-                if (n == NULL)
-                        return E_NOMEM;
-                n1->n_child = n;
-        }
+    current_capacity = XXXROUNDUP(nch);
+    required_capacity = XXXROUNDUP(nch + 1);
+    if (current_capacity < 0 || required_capacity < 0)
+        return E_OVERFLOW;
+    if (current_capacity < required_capacity) {
+        if (required_capacity > PY_SIZE_MAX / sizeof(node)) {
+            return E_NOMEM;
+        }
+        n = n1->n_child;
+        n = (node *) PyObject_REALLOC(n,
+                                      required_capacity * sizeof(node));
+        if (n == NULL)
+            return E_NOMEM;
+        n1->n_child = n;
+    }
 
-        n = &n1->n_child[n1->n_nchildren++];
-        n->n_type = type;
-        n->n_str = str;
-        n->n_lineno = lineno;
-        n->n_col_offset = col_offset;
-        n->n_nchildren = 0;
-        n->n_child = NULL;
-        return 0;
+    n = &n1->n_child[n1->n_nchildren++];
+    n->n_type = type;
+    n->n_str = str;
+    n->n_lineno = lineno;
+    n->n_col_offset = col_offset;
+    n->n_nchildren = 0;
+    n->n_child = NULL;
+    return 0;
 }
 
 /* Forward */
 static void freechildren(node *);
+static Py_ssize_t sizeofchildren(node *n);
 
 
@@ -120 +121 @@
 PyNode_Free(node *n)
 {
-        if (n != NULL) {
-                freechildren(n);
-                PyObject_FREE(n);
-        }
+    if (n != NULL) {
+        freechildren(n);
+        PyObject_FREE(n);
+    }
+}
+
+Py_ssize_t
+_PyNode_SizeOf(node *n)
+{
+    Py_ssize_t res = 0;
+
+    if (n != NULL)
+        res = sizeof(node) + sizeofchildren(n);
+    return res;
 }
 
@@ -129 +140 @@
 freechildren(node *n)
 {
-        int i;
-        for (i = NCH(n); --i >= 0; )
-                freechildren(CHILD(n, i));
-        if (n->n_child != NULL)
-                PyObject_FREE(n->n_child);
-        if (STR(n) != NULL)
-                PyObject_FREE(STR(n));
+    int i;
+    for (i = NCH(n); --i >= 0; )
+        freechildren(CHILD(n, i));
+    if (n->n_child != NULL)
+        PyObject_FREE(n->n_child);
+    if (STR(n) != NULL)
+        PyObject_FREE(STR(n));
 }
+
+static Py_ssize_t
+sizeofchildren(node *n)
+{
+    Py_ssize_t res = 0;
+    int i;
+    for (i = NCH(n); --i >= 0; )
+        res += sizeofchildren(CHILD(n, i));
+    if (n->n_child != NULL)
+        /* allocated size of n->n_child array */
+        res += XXXROUNDUP(NCH(n)) * sizeof(node);
+    if (STR(n) != NULL)
+        res += strlen(STR(n)) + 1;
+    return res;
+}