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

python/vendor/current/Parser/printgrammar.c

@@ -14 +14 @@
 printgrammar(grammar *g, FILE *fp)
 {
-        fprintf(fp, "/* Generated by Parser/pgen */\n\n");
-        fprintf(fp, "#include \"pgenheaders.h\"\n");
-        fprintf(fp, "#include \"grammar.h\"\n");
-        fprintf(fp, "PyAPI_DATA(grammar) _PyParser_Grammar;\n");
-        printdfas(g, fp);
-        printlabels(g, fp);
-        fprintf(fp, "grammar _PyParser_Grammar = {\n");
-        fprintf(fp, "\t%d,\n", g->g_ndfas);
-        fprintf(fp, "\tdfas,\n");
-        fprintf(fp, "\t{%d, labels},\n", g->g_ll.ll_nlabels);
-        fprintf(fp, "\t%d\n", g->g_start);
-        fprintf(fp, "};\n");
+    fprintf(fp, "/* Generated by Parser/pgen */\n\n");
+    fprintf(fp, "#include \"pgenheaders.h\"\n");
+    fprintf(fp, "#include \"grammar.h\"\n");
+    fprintf(fp, "PyAPI_DATA(grammar) _PyParser_Grammar;\n");
+    printdfas(g, fp);
+    printlabels(g, fp);
+    fprintf(fp, "grammar _PyParser_Grammar = {\n");
+    fprintf(fp, "    %d,\n", g->g_ndfas);
+    fprintf(fp, "    dfas,\n");
+    fprintf(fp, "    {%d, labels},\n", g->g_ll.ll_nlabels);
+    fprintf(fp, "    %d\n", g->g_start);
+    fprintf(fp, "};\n");
 }
 
@@ -31 +31 @@
 printnonterminals(grammar *g, FILE *fp)
 {
-        dfa *d;
-        int i;
-        
-        fprintf(fp, "/* Generated by Parser/pgen */\n\n");
-        
-        d = g->g_dfa;
-        for (i = g->g_ndfas; --i >= 0; d++)
-                fprintf(fp, "#define %s %d\n", d->d_name, d->d_type);
+    dfa *d;
+    int i;
+
+    fprintf(fp, "/* Generated by Parser/pgen */\n\n");
+
+    d = g->g_dfa;
+    for (i = g->g_ndfas; --i >= 0; d++)
+        fprintf(fp, "#define %s %d\n", d->d_name, d->d_type);
 }
 
@@ -44 +44 @@
 printarcs(int i, dfa *d, FILE *fp)
 {
-        arc *a;
-        state *s;
-        int j, k;
-        
-        s = d->d_state;
-        for (j = 0; j < d->d_nstates; j++, s++) {
-                fprintf(fp, "static arc arcs_%d_%d[%d] = {\n",
-                        i, j, s->s_narcs);
-                a = s->s_arc;
-                for (k = 0; k < s->s_narcs; k++, a++)
-                        fprintf(fp, "\t{%d, %d},\n", a->a_lbl, a->a_arrow);
-                fprintf(fp, "};\n");
-        }
+    arc *a;
+    state *s;
+    int j, k;
+
+    s = d->d_state;
+    for (j = 0; j < d->d_nstates; j++, s++) {
+        fprintf(fp, "static arc arcs_%d_%d[%d] = {\n",
+            i, j, s->s_narcs);
+        a = s->s_arc;
+        for (k = 0; k < s->s_narcs; k++, a++)
+            fprintf(fp, "    {%d, %d},\n", a->a_lbl, a->a_arrow);
+        fprintf(fp, "};\n");
+    }
 }
 
@@ -62 +62 @@
 printstates(grammar *g, FILE *fp)
 {
-        state *s;
-        dfa *d;
-        int i, j;
-        
-        d = g->g_dfa;
-        for (i = 0; i < g->g_ndfas; i++, d++) {
-                printarcs(i, d, fp);
-                fprintf(fp, "static state states_%d[%d] = {\n",
-                        i, d->d_nstates);
-                s = d->d_state;
-                for (j = 0; j < d->d_nstates; j++, s++)
-                        fprintf(fp, "\t{%d, arcs_%d_%d},\n",
-                                s->s_narcs, i, j);
-                fprintf(fp, "};\n");
-        }
+    state *s;
+    dfa *d;
+    int i, j;
+
+    d = g->g_dfa;
+    for (i = 0; i < g->g_ndfas; i++, d++) {
+        printarcs(i, d, fp);
+        fprintf(fp, "static state states_%d[%d] = {\n",
+            i, d->d_nstates);
+        s = d->d_state;
+        for (j = 0; j < d->d_nstates; j++, s++)
+            fprintf(fp, "    {%d, arcs_%d_%d},\n",
+                s->s_narcs, i, j);
+        fprintf(fp, "};\n");
+    }
 }
 
@@ -82 +82 @@
 printdfas(grammar *g, FILE *fp)
 {
-        dfa *d;
-        int i, j;
-        
-        printstates(g, fp);
-        fprintf(fp, "static dfa dfas[%d] = {\n", g->g_ndfas);
-        d = g->g_dfa;
-        for (i = 0; i < g->g_ndfas; i++, d++) {
-                fprintf(fp, "\t{%d, \"%s\", %d, %d, states_%d,\n",
-                        d->d_type, d->d_name, d->d_initial, d->d_nstates, i);
-                fprintf(fp, "\t \"");
-                for (j = 0; j < NBYTES(g->g_ll.ll_nlabels); j++)
-                        fprintf(fp, "\\%03o", d->d_first[j] & 0xff);
-                fprintf(fp, "\"},\n");
-        }
-        fprintf(fp, "};\n");
+    dfa *d;
+    int i, j;
+
+    printstates(g, fp);
+    fprintf(fp, "static dfa dfas[%d] = {\n", g->g_ndfas);
+    d = g->g_dfa;
+    for (i = 0; i < g->g_ndfas; i++, d++) {
+        fprintf(fp, "    {%d, \"%s\", %d, %d, states_%d,\n",
+            d->d_type, d->d_name, d->d_initial, d->d_nstates, i);
+        fprintf(fp, "     \"");
+        for (j = 0; j < NBYTES(g->g_ll.ll_nlabels); j++)
+            fprintf(fp, "\\%03o", d->d_first[j] & 0xff);
+        fprintf(fp, "\"},\n");
+    }
+    fprintf(fp, "};\n");
 }
 
@@ -102 +102 @@
 printlabels(grammar *g, FILE *fp)
 {
-        label *l;
-        int i;
-        
-        fprintf(fp, "static label labels[%d] = {\n", g->g_ll.ll_nlabels);
-        l = g->g_ll.ll_label;
-        for (i = g->g_ll.ll_nlabels; --i >= 0; l++) {
-                if (l->lb_str == NULL)
-                        fprintf(fp, "\t{%d, 0},\n", l->lb_type);
-                else
-                        fprintf(fp, "\t{%d, \"%s\"},\n",
-                                l->lb_type, l->lb_str);
-        }
-        fprintf(fp, "};\n");
+    label *l;
+    int i;
+
+    fprintf(fp, "static label labels[%d] = {\n", g->g_ll.ll_nlabels);
+    l = g->g_ll.ll_label;
+    for (i = g->g_ll.ll_nlabels; --i >= 0; l++) {
+        if (l->lb_str == NULL)
+            fprintf(fp, "    {%d, 0},\n", l->lb_type);
+        else
+            fprintf(fp, "    {%d, \"%s\"},\n",
+                l->lb_type, l->lb_str);
+    }
+    fprintf(fp, "};\n");
 }