Update.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 1227765b2f010454a2e51e40b12b847895345338..6fbe2c9a1ac31934ed24e6e3df63a445935d4d23 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -244,25 +244,25 @@ state_default_rule (state_t *state)
        bitset_set (shiftset, errp->symbols[i]->number);
   }
 
        bitset_set (shiftset, errp->symbols[i]->number);
   }
 

-  for (i = 0; i < state->nlookaheads; ++i)
+  for (i = 0; i < redp->num; ++i)

     {
       int count = 0;
 
       /* How many non-masked lookaheads are there for this reduction?
         */
     {
       int count = 0;
 
       /* How many non-masked lookaheads are there for this reduction?
         */

-      bitset_andn (lookaheadset, state->lookaheads[i], shiftset);
+      bitset_andn (lookaheadset, redp->lookaheads[i], shiftset);

       count = bitset_count (lookaheadset);
 
       if (count > cmax)
        {
          cmax = count;
       count = bitset_count (lookaheadset);
 
       if (count > cmax)
        {
          cmax = count;

-         default_rule = state->lookaheads_rule[i];
+         default_rule = redp->rules[i];

        }
 
       /* 3. And finally, each reduction is possibly masked by previous
         reductions (in R/R conflicts, we keep the first reductions).
         */
        }
 
       /* 3. And finally, each reduction is possibly masked by previous
         reductions (in R/R conflicts, we keep the first reductions).
         */

-      bitset_or (shiftset, shiftset, state->lookaheads[i]);
+      bitset_or (shiftset, shiftset, redp->lookaheads[i]);

     }
 
   return default_rule;
     }
 
   return default_rule;


@@ -286,8 +286,11 @@ print_reduction (FILE *out, size_t width,
     fputc (' ', out);
   if (!enabled)
     fputc ('[', out);
     fputc (' ', out);
   if (!enabled)
     fputc ('[', out);

-  fprintf (out, _("reduce using rule %d (%s)"),
-          rule->number, rule->lhs->tag);
+  if (rule->number)
+    fprintf (out, _("reduce using rule %d (%s)"),
+            rule->number, rule->lhs->tag);
+  else
+    fprintf (out, _("accept"));

   if (!enabled)
     fputc (']', out);
   fputc ('\n', out);
   if (!enabled)
     fputc (']', out);
   fputc ('\n', out);


@@ -319,25 +322,27 @@ print_reductions (FILE *out, state_t *state)
   /* Compute the width of the lookaheads column.  */
   if (default_rule)
     width = strlen (_("$default"));
   /* Compute the width of the lookaheads column.  */
   if (default_rule)
     width = strlen (_("$default"));

-  for (i = 0; i < ntokens; i++)
-    {
-      int count = bitset_test (shiftset, i);

 
 

-      for (j = 0; j < state->nlookaheads; ++j)
-       if (bitset_test (state->lookaheads[j], i))
-         {
-           if (count == 0)
-             {
-               if (state->lookaheads_rule[j] != default_rule)
+  if (redp->lookaheads)
+    for (i = 0; i < ntokens; i++)
+      {
+       int count = bitset_test (shiftset, i);
+
+       for (j = 0; j < redp->num; ++j)
+         if (bitset_test (redp->lookaheads[j], i))
+           {
+             if (count == 0)
+               {
+                 if (redp->rules[j] != default_rule)
+                   max_length (&width, symbols[i]->tag);
+                 count++;
+               }
+             else
+               {

                  max_length (&width, symbols[i]->tag);
                  max_length (&width, symbols[i]->tag);

-               count++;
-             }
-           else
-             {
-               max_length (&width, symbols[i]->tag);
-             }
-         }
-    }
+               }
+           }
+      }

 
   /* Nothing to report. */
   if (!width)
 
   /* Nothing to report. */
   if (!width)


@@ -347,37 +352,38 @@ print_reductions (FILE *out, state_t *state)
   width += 2;
 
   /* Report lookaheads (or $default) and reductions.  */
   width += 2;
 
   /* Report lookaheads (or $default) and reductions.  */

-  for (i = 0; i < ntokens; i++)
-    {
-      int defaulted = 0;
-      int count = bitset_test (shiftset, i);
+  if (redp->lookaheads)
+    for (i = 0; i < ntokens; i++)
+      {
+       int defaulted = 0;
+       int count = bitset_test (shiftset, i);

 
 

-      for (j = 0; j < state->nlookaheads; ++j)
-       if (bitset_test (state->lookaheads[j], i))
-         {
-           if (count == 0)
-             {
-               if (state->lookaheads_rule[j] != default_rule)
-                 print_reduction (out, width,
-                                  symbols[i]->tag,
-                                  state->lookaheads_rule[j], TRUE);
-               else
-                 defaulted = 1;
-               count++;
-             }
-           else
-             {
-               if (defaulted)
+       for (j = 0; j < redp->num; ++j)
+         if (bitset_test (redp->lookaheads[j], i))
+           {
+             if (count == 0)
+               {
+                 if (redp->rules[j] != default_rule)
+                   print_reduction (out, width,
+                                    symbols[i]->tag,
+                                    redp->rules[j], TRUE);
+                 else
+                   defaulted = 1;
+                 count++;
+               }
+             else
+               {
+                 if (defaulted)
+                   print_reduction (out, width,
+                                    symbols[i]->tag,
+                                    default_rule, TRUE);
+                 defaulted = 0;

                  print_reduction (out, width,
                                   symbols[i]->tag,
                  print_reduction (out, width,
                                   symbols[i]->tag,

-                                  default_rule, TRUE);
-               defaulted = 0;
-               print_reduction (out, width,
-                                symbols[i]->tag,
-                                state->lookaheads_rule[j], FALSE);
-             }
-         }
-    }
+                                  redp->rules[j], FALSE);
+               }
+           }
+      }

 
   if (default_rule)
     print_reduction (out, width,
 
   if (default_rule)
     print_reduction (out, width,


@@ -393,19 +399,6 @@ print_reductions (FILE *out, state_t *state)
 static void
 print_actions (FILE *out, state_t *state)
 {
 static void
 print_actions (FILE *out, state_t *state)
 {

-  reductions_t *redp = state->reductions;
-  transitions_t *transitions = state->transitions;
-
-  if (transitions->num == 0 && redp->num == 0)
-    {
-      fputc ('\n', out);
-      if (state->number == final_state->number)
-       fprintf (out, _("    $default\taccept\n"));
-      else
-       fprintf (out, _("    NO ACTIONS\n"));
-      return;
-    }
-

   /* Print shifts.  */
   print_transitions (state, out, TRUE);
   print_errs (out, state);
   /* Print shifts.  */
   print_transitions (state, out, TRUE);
   print_errs (out, state);


@@ -555,6 +548,8 @@ print_results (void)
   FILE *out = xfopen (spec_verbose_file, "w");
 
   reduce_output (out);
   FILE *out = xfopen (spec_verbose_file, "w");
 
   reduce_output (out);

+  grammar_rules_partial_print (out,
+                              _("Rules never reduced"), rule_never_reduced_p);

   conflicts_output (out);
 
   print_grammar (out);
   conflicts_output (out);
 
   print_grammar (out);