* src/reduce.c (reduce_print): Use ngettext.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 2c2b84206ceb245e5e9181bd418dc20ad94a2760..6a302962301e0199b0c25036f71b2a6080873f8f 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -87,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 = state_table[state].shift_table;
-  redp = state_table[state].reduction_table;
-  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)
     {
@@ -113,9 +107,10 @@ 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 = state_table[state1].accessing_symbol;
          /* The following line used to be turned off.  */
          if (ISVAR (symbol))
@@ -140,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]);
        }
@@ -159,8 +151,8 @@ print_actions (FILE *out, int state)
 
   if (state_table[state].consistent && redp)
     {
-      rule = redp->rules[0];
-      symbol = rule_table[rule].lhs;
+      int rule = redp->rules[0];
+      int symbol = rule_table[rule].lhs;
       fprintf (out, _("    $default\treduce using rule %d (%s)\n\n"),
               rule, tags[symbol]);
     }
@@ -173,9 +165,10 @@ 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 = state_table[state1].accessing_symbol;
          fprintf (out, _("    %-4s\tgo to state %d\n"),
                   tags[symbol], state1);
@@ -220,17 +213,19 @@ print_grammar (FILE *out)
 
   /* rule # : LHS -> RHS */
   fprintf (out, "\n%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 (rule_table[i].lhs >= 0)
       {
-       fprintf (out, _("rule %-4d %s ->"), i, tags[rule_table[i].lhs]);
+       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);
       }