Changeset 391 for python/trunk/Parser/listnode.c

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Parser/listnode.c (modified) (3 diffs)

python/trunk/Parser/listnode.c

@@ -13 +13 @@
 PyNode_ListTree(node *n)
 {
-        listnode(stdout, n);
+    listnode(stdout, n);
 }
 
@@ -21 +21 @@
 listnode(FILE *fp, node *n)
 {
-        level = 0;
-        atbol = 1;
-        list1node(fp, n);
+    level = 0;
+    atbol = 1;
+    list1node(fp, n);
 }
 
@@ -29 +29 @@
 list1node(FILE *fp, node *n)
 {
-        if (n == 0)
-                return;
-        if (ISNONTERMINAL(TYPE(n))) {
-                int i;
-                for (i = 0; i < NCH(n); i++)
-                        list1node(fp, CHILD(n, i));
-        }
-        else if (ISTERMINAL(TYPE(n))) {
-                switch (TYPE(n)) {
-                case INDENT:
-                        ++level;
-                        break;
-                case DEDENT:
-                        --level;
-                        break;
-                default:
-                        if (atbol) {
-                                int i;
-                                for (i = 0; i < level; ++i)
-                                        fprintf(fp, "\t");
-                                atbol = 0;
-                        }
-                        if (TYPE(n) == NEWLINE) {
-                                if (STR(n) != NULL)
-                                        fprintf(fp, "%s", STR(n));
-                                fprintf(fp, "\n");
-                                atbol = 1;
-                        }
-                        else
-                                fprintf(fp, "%s ", STR(n));
-                        break;
-                }
-        }
-        else
-                fprintf(fp, "? ");
+    if (n == 0)
+        return;
+    if (ISNONTERMINAL(TYPE(n))) {
+        int i;
+        for (i = 0; i < NCH(n); i++)
+            list1node(fp, CHILD(n, i));
+    }
+    else if (ISTERMINAL(TYPE(n))) {
+        switch (TYPE(n)) {
+        case INDENT:
+            ++level;
+            break;
+        case DEDENT:
+            --level;
+            break;
+        default:
+            if (atbol) {
+                int i;
+                for (i = 0; i < level; ++i)
+                    fprintf(fp, "\t");
+                atbol = 0;
+            }
+            if (TYPE(n) == NEWLINE) {
+                if (STR(n) != NULL)
+                    fprintf(fp, "%s", STR(n));
+                fprintf(fp, "\n");
+                atbol = 1;
+            }
+            else
+                fprintf(fp, "%s ", STR(n));
+            break;
+        }
+    }
+    else
+        fprintf(fp, "? ");
 }