graphs: minor style changes

* src/graphviz.c (output_red): Fix C90 issues.
Reduce variable scopes.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>

diff --git a/src/graphviz.c b/src/graphviz.c
index a2baa1604da0686d31d6c98b9ec359872b2bdd25..b37a28e0cdfc317a5edd3d704f8af78b6a742459 100644 (file)
--- a/src/graphviz.c
+++ b/src/graphviz.c
@@ -107,20 +107,21 @@ print_token (struct obstack *out, bool first, char const *tok)
 void
 output_red (state const *s, reductions const *reds, FILE *fout)
 {
 void
 output_red (state const *s, reductions const *reds, FILE *fout)
 {

-  int source = s->number;
-  int i, j;

   bitset no_reduce_set;
   bitset no_reduce_set;

-  no_reduce_bitset_init (s, &no_reduce_set);
-
+  int j;
+  int source = s->number;

   struct obstack oout;
   struct obstack oout;

+
+  no_reduce_bitset_init (s, &no_reduce_set);

   obstack_init (&oout);
 
   for (j = 0; j < reds->num; ++j)
     {
   obstack_init (&oout);
 
   for (j = 0; j < reds->num; ++j)
     {

-      bool first = true;

       bool disabled = false;
       bool disabled = false;

+      bool first = true;

       int ruleno = reds->rules[j]->user_number;
       rule *default_reduction = NULL;
       int ruleno = reds->rules[j]->user_number;
       rule *default_reduction = NULL;

+

       if (yydefact[s->number] != 0)
         default_reduction = &rules[yydefact[s->number] - 1];
 
       if (yydefact[s->number] != 0)
         default_reduction = &rules[yydefact[s->number] - 1];
 


@@ -131,13 +132,16 @@ output_red (state const *s, reductions const *reds, FILE *fout)
       if (default_reduction && default_reduction == reds->rules[j])
         first = print_token (&oout, true, "$default");
       else
       if (default_reduction && default_reduction == reds->rules[j])
         first = print_token (&oout, true, "$default");
       else

-        for (i = 0; i < ntokens; i++)
+        {
+          int i;
+          for (i = 0; i < ntokens; i++)

             if (bitset_test (reds->lookahead_tokens[j], i))
               {
                 first = print_token (&oout, first, symbols[i]->tag);
                 if (bitset_test (no_reduce_set, i))
                   disabled = true;
               }
             if (bitset_test (reds->lookahead_tokens[j], i))
               {
                 first = print_token (&oout, first, symbols[i]->tag);
                 if (bitset_test (no_reduce_set, i))
                   disabled = true;
               }

+        }

       obstack_sgrow (&oout, "\" style=solid]\n");
 
       /* Then, print the reduction's representation. This most be done later
       obstack_sgrow (&oout, "\" style=solid]\n");
 
       /* Then, print the reduction's representation. This most be done later