Changeset 388 for python/vendor/current/Parser/grammar1.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/grammar1.c (modified) (2 diffs)

python/vendor/current/Parser/grammar1.c

@@ -12 +12 @@
 PyGrammar_FindDFA(grammar *g, register int type)
 {
-        register dfa *d;
+    register dfa *d;
 #if 1
-        /* Massive speed-up */
-        d = &g->g_dfa[type - NT_OFFSET];
-        assert(d->d_type == type);
-        return d;
+    /* Massive speed-up */
+    d = &g->g_dfa[type - NT_OFFSET];
+    assert(d->d_type == type);
+    return d;
 #else
-        /* Old, slow version */
-        register int i;
-        
-        for (i = g->g_ndfas, d = g->g_dfa; --i >= 0; d++) {
-                if (d->d_type == type)
-                        return d;
-        }
-        assert(0);
-        /* NOTREACHED */
+    /* Old, slow version */
+    register int i;
+
+    for (i = g->g_ndfas, d = g->g_dfa; --i >= 0; d++) {
+        if (d->d_type == type)
+            return d;
+    }
+    assert(0);
+    /* NOTREACHED */
 #endif
 }
@@ -34 +34 @@
 PyGrammar_LabelRepr(label *lb)
 {
-        static char buf[100];
-        
-        if (lb->lb_type == ENDMARKER)
-                return "EMPTY";
-        else if (ISNONTERMINAL(lb->lb_type)) {
-                if (lb->lb_str == NULL) {
-                        PyOS_snprintf(buf, sizeof(buf), "NT%d", lb->lb_type);
-                        return buf;
-                }
-                else
-                        return lb->lb_str;
-        }
-        else {
-                if (lb->lb_str == NULL)
-                        return _PyParser_TokenNames[lb->lb_type];
-                else {
-                        PyOS_snprintf(buf, sizeof(buf), "%.32s(%.32s)",
-                                _PyParser_TokenNames[lb->lb_type], lb->lb_str);
-                        return buf;
-                }
-        }
+    static char buf[100];
+
+    if (lb->lb_type == ENDMARKER)
+        return "EMPTY";
+    else if (ISNONTERMINAL(lb->lb_type)) {
+        if (lb->lb_str == NULL) {
+            PyOS_snprintf(buf, sizeof(buf), "NT%d", lb->lb_type);
+            return buf;
+        }
+        else
+            return lb->lb_str;
+    }
+    else {
+        if (lb->lb_str == NULL)
+            return _PyParser_TokenNames[lb->lb_type];
+        else {
+            PyOS_snprintf(buf, sizeof(buf), "%.32s(%.32s)",
+                _PyParser_TokenNames[lb->lb_type], lb->lb_str);
+            return buf;
+        }
+    }
 }