* src/conflicts.c (print_reductions): Pessimize, but clarify.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index ce24fa58334946f7be58dfc5b17bab4f9b5a5de4..9ac1feb3b34c5e8bf365a46262696d3a9bd33357 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -48,40 +48,32 @@ static void
 print_core (FILE *out, int state)
 {
   int i;
-  int k;
-  int rule;
-  core *statep;
-  short *sp;
-  short *sp1;
-
-  statep = state_table[state];
-  k = statep->nitems;
+  core *statep = state_table[state].state;
 
-  if (k == 0)
+  if (!statep->nitems)
     return;
 
-  for (i = 0; i < k; i++)
+  for (i = 0; i < statep->nitems; i++)
     {
+      short *sp;
+      short *sp1;
+      int rule;
+
       sp1 = sp = ritem + statep->items[i];
 
       while (*sp > 0)
        sp++;
 
       rule = -(*sp);
-      fprintf (out, "    %s  ->  ", tags[rlhs[rule]]);
+      fprintf (out, "    %s  ->  ", tags[rule_table[rule].lhs]);
 
-      for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
-       {
-         fprintf (out, "%s ", tags[*sp]);
-       }
+      for (sp = ritem + rule_table[rule].rhs; sp < sp1; sp++)
+       fprintf (out, "%s ", tags[*sp]);
 
       fputc ('.', out);
 
-      while (*sp > 0)
-       {
-         fprintf (out, " %s", tags[*sp]);
-         sp++;
-       }
+      for (/* Nothing */; *sp > 0; ++sp)
+       fprintf (out, " %s", tags[*sp]);
 
       fprintf (out, _("   (rule %d)"), rule);
       fputc ('\n', out);
@@ -95,16 +87,10 @@ print_actions (FILE *out, int state)
 {
   int i;
   int k;
-  int state1;
-  int symbol;
-  shifts *shiftp;
-  errs *errp;
-  reductions *redp;
-  int rule;
 
-  shiftp = shift_table[state];
-  redp = reduction_table[state];
-  errp = err_table[state];
+  shifts   *shiftp = state_table[state].shift_table;
+  reductions *redp = state_table[state].reduction_table;
+  errs       *errp = err_table[state];
 
   if (!shiftp && !redp)
     {
@@ -121,10 +107,11 @@ print_actions (FILE *out, int state)
 
       for (i = 0; i < k; i++)
        {
-         if (!shiftp->shifts[i])
+         int symbol;
+         int state1 = shiftp->shifts[i];
+         if (!state1)
            continue;
-         state1 = shiftp->shifts[i];
-         symbol = accessing_symbol[state1];
+         symbol = state_table[state1].accessing_symbol;
          /* The following line used to be turned off.  */
          if (ISVAR (symbol))
            break;
@@ -148,15 +135,12 @@ print_actions (FILE *out, int state)
 
   if (errp)
     {
-      int j, nerrs;
-
-      nerrs = errp->nerrs;
-
-      for (j = 0; j < nerrs; j++)
+      int j;
+      for (j = 0; j < errp->nerrs; j++)
        {
-         if (!errp->errs[j])
+         int symbol = errp->errs[j];
+         if (!symbol)
            continue;
-         symbol = errp->errs[j];
          fprintf (out, _("    %-4s\terror (nonassociative)\n"),
                   tags[symbol]);
        }
@@ -165,10 +149,10 @@ print_actions (FILE *out, int state)
        fputc ('\n', out);
     }
 
-  if (consistent[state] && redp)
+  if (state_table[state].consistent && redp)
     {
-      rule = redp->rules[0];
-      symbol = rlhs[rule];
+      int rule = redp->rules[0];
+      int symbol = rule_table[rule].lhs;
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
               rule, tags[symbol]);
     }
@@ -181,10 +165,11 @@ print_actions (FILE *out, int state)
     {
       for (; i < k; i++)
        {
-         if (!shiftp->shifts[i])
+         int symbol;
+         int state1 = shiftp->shifts[i];
+         if (!state1)
            continue;
-         state1 = shiftp->shifts[i];
-         symbol = accessing_symbol[state1];
+         symbol = state_table[state1].accessing_symbol;
          fprintf (out, _("    %-4s\tgo to state %d\n"),
                   tags[symbol], state1);
        }
@@ -196,11 +181,11 @@ print_actions (FILE *out, int state)
 static void
 print_state (FILE *out, int state)
 {
-  fputs ("\n\n", out);
   fprintf (out, _("state %d"), state);
   fputs ("\n\n", out);
   print_core (out, state);
   print_actions (out, state);
+  fputs ("\n\n", out);
 }
 \f
 /*-----------------------------------------.
@@ -227,23 +212,27 @@ print_grammar (FILE *out)
   int column = 0;
 
   /* rule # : LHS -> RHS */
-  fprintf (out, "\n%s\n\n", _("Grammar"));
+  fprintf (out, "%s\n\n", _("Grammar"));
+  fprintf (out, "  %s\n", _("Number, Line, Rule"));
   for (i = 1; i <= nrules; i++)
     /* Don't print rules disabled in reduce_grammar_tables.  */
-    if (rlhs[i] >= 0)
+    if (rule_table[i].useful)
       {
-       fprintf (out, _("rule %-4d %s ->"), i, tags[rlhs[i]]);
-       rule = &ritem[rrhs[i]];
+       fprintf (out, _("  %3d %3d %s ->"),
+                i, rule_table[i].line, tags[rule_table[i].lhs]);
+       rule = &ritem[rule_table[i].rhs];
        if (*rule > 0)
          while (*rule > 0)
            fprintf (out, " %s", tags[*rule++]);
        else
-         fprintf (out, "               /* %s */", _("empty"));
+         fprintf (out, " /* %s */", _("empty"));
        fputc ('\n', out);
       }
+  fputs ("\n\n", out);
+
 
   /* TERMINAL (type #) : rule #s terminal is on RHS */
-  fprintf (out, "\n%s\n\n", _("Terminals, with rules where they appear"));
+  fprintf (out, "%s\n\n", _("Terminals, with rules where they appear"));
   fprintf (out, "%s (-1)\n", tags[0]);
 
   for (i = 0; i <= max_user_token_number; i++)
@@ -256,7 +245,7 @@ print_grammar (FILE *out)
        sprintf (buffer, " (%d)", i);
 
        for (j = 1; j <= nrules; j++)
-         for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+         for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
            if (*rule == token_translations[i])
              {
                END_TEST (65);
@@ -265,18 +254,19 @@ print_grammar (FILE *out)
              }
        fprintf (out, "%s\n", buffer);
       }
+  fputs ("\n\n", out);
 
-  fprintf (out, "\n%s\n\n",
-          _("Nonterminals, with rules where they appear"));
+
+  fprintf (out, "%s\n\n", _("Nonterminals, with rules where they appear"));
   for (i = ntokens; i <= nsyms - 1; i++)
     {
       int left_count = 0, right_count = 0;
 
       for (j = 1; j <= nrules; j++)
        {
-         if (rlhs[j] == i)
+         if (rule_table[j].lhs == i)
            left_count++;
-         for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+         for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
            if (*rule == i)
              {
                right_count++;
@@ -298,7 +288,7 @@ print_grammar (FILE *out)
          for (j = 1; j <= nrules; j++)
            {
              END_TEST (65);
-             if (rlhs[j] == i)
+             if (rule_table[j].lhs == i)
                sprintf (buffer + strlen (buffer), " %d", j);
            }
        }
@@ -311,7 +301,7 @@ print_grammar (FILE *out)
          sprintf (buffer + strlen (buffer), _(" on right:"));
          for (j = 1; j <= nrules; j++)
            {
-             for (rule = &ritem[rrhs[j]]; *rule > 0; rule++)
+             for (rule = &ritem[rule_table[j].rhs]; *rule > 0; rule++)
                if (*rule == i)
                  {
                    END_TEST (65);
@@ -322,6 +312,7 @@ print_grammar (FILE *out)
        }
       fprintf (out, "%s\n", buffer);
     }
+  fputs ("\n\n", out);
 }
 \f
 void
@@ -337,6 +328,8 @@ print_results (void)
 
       size_t size = obstack_object_size (&output_obstack);
       fwrite (obstack_finish (&output_obstack), 1, size, out);
+      if (size)
+       fputs ("\n\n", out);
 
       reduce_output (out);
       conflicts_output (out);