Implement %define lr.default_rules.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index b0d4e0fbe52e9cf186cfaa45c5318e06abf43f73..413896c29d57d0d63ec56207e636a3d67110d068 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,7 +1,7 @@
 /* Print information on generated parser, for bison,
 
-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005, 2007
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005,
+   2007, 2009 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -31,6 +31,7 @@
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
+#include "muscle_tab.h"
 #include "print.h"
 #include "reader.h"
 #include "reduce.h"
@@ -110,7 +111,8 @@ print_core (FILE *out, state *s)
        fprintf (out, " %s", symbols[*sp]->tag);
 
       /* Display the lookahead tokens?  */
-      if (report_flag & report_lookahead_tokens)
+      if (report_flag & report_lookahead_tokens
+          && item_number_is_rule_number (*sp1))
        state_rule_lookahead_tokens_print (s, &rules[r], out);
 
       fputc ('\n', out);
@@ -243,6 +245,7 @@ print_reductions (FILE *out, state *s)
   rule *default_rule = NULL;
   size_t width = 0;
   int i, j;
+  bool non_default_action = false;
 
   if (reds->num == 0)
     return;
@@ -295,6 +298,8 @@ print_reductions (FILE *out, state *s)
       {
        bool defaulted = false;
        bool count = bitset_test (no_reduce_set, i);
+        if (count)
+          non_default_action = true;
 
        for (j = 0; j < reds->num; ++j)
          if (bitset_test (reds->lookahead_tokens[j], i))
@@ -302,15 +307,19 @@ print_reductions (FILE *out, state *s)
              if (! count)
                {
                  if (reds->rules[j] != default_rule)
-                   print_reduction (out, width,
-                                    symbols[i]->tag,
-                                    reds->rules[j], true);
+                    {
+                      non_default_action = true;
+                      print_reduction (out, width,
+                                       symbols[i]->tag,
+                                       reds->rules[j], true);
+                    }
                  else
                    defaulted = true;
                  count = true;
                }
              else
                {
+                  non_default_action = true;
                  if (defaulted)
                    print_reduction (out, width,
                                     symbols[i]->tag,
@@ -324,8 +333,15 @@ print_reductions (FILE *out, state *s)
       }
 
   if (default_rule)
-    print_reduction (out, width,
-                    _("$default"), default_rule, true);
+    {
+      char *default_rules = muscle_percent_define_get ("lr.default_rules");
+      print_reduction (out, width, _("$default"), default_rule, true);
+      aver (0 == strcmp (default_rules, "all")
+            || (0 == strcmp (default_rules, "consistent")
+                && !non_default_action)
+            || (reds->num == 1 && reds->rules[0]->number == 0));
+      free (default_rules);
+    }
 }
 
 
@@ -401,7 +417,7 @@ print_grammar (FILE *out)
        buffer[0] = 0;
        column = strlen (tag);
        fputs (tag, out);
-       END_TEST (50);
+       END_TEST (65);
        sprintf (buffer, " (%d)", i);
 
        for (r = 0; r < nrules; r++)
@@ -445,14 +461,16 @@ print_grammar (FILE *out)
 
       if (left_count > 0)
        {
-         END_TEST (50);
+         END_TEST (65);
          sprintf (buffer + strlen (buffer), _(" on left:"));
 
          for (r = 0; r < nrules; r++)
            {
-             END_TEST (65);
              if (rules[r].lhs->number == i)
-               sprintf (buffer + strlen (buffer), " %d", r);
+               {
+                 END_TEST (65);
+                 sprintf (buffer + strlen (buffer), " %d", r);
+               }
            }
        }
 
@@ -460,7 +478,7 @@ print_grammar (FILE *out)
        {
          if (left_count > 0)
            sprintf (buffer + strlen (buffer), ",");
-         END_TEST (50);
+         END_TEST (65);
          sprintf (buffer + strlen (buffer), _(" on right:"));
          for (r = 0; r < nrules; r++)
            {
@@ -489,7 +507,8 @@ print_results (void)
 
   reduce_output (out);
   grammar_rules_partial_print (out,
-                              _("Rules never reduced"), rule_never_reduced_p);
+                              _("Rules useless in parser due to conflicts"),
+                                 rule_useless_in_parser_p);
   conflicts_output (out);
 
   print_grammar (out);