Merge remote-tracking branch 'origin/maint'

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 413896c29d57d0d63ec56207e636a3d67110d068..2eecae4c00f672f8bd0294682744f93a66909aa9 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,7 +1,7 @@
 /* Print information on generated parser, for bison,
 
 /* Print information on generated parser, for bison,
 

-   Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005,
-   2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2012 Free
+   Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -22,7 +22,6 @@
 #include "system.h"
 
 #include <bitset.h>
 #include "system.h"
 
 #include <bitset.h>

-#include <quotearg.h>

 
 #include "LR0.h"
 #include "closure.h"
 
 #include "LR0.h"
 #include "closure.h"


@@ -31,7 +30,7 @@
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"

-#include "muscle_tab.h"
+#include "muscle-tab.h"

 #include "print.h"
 #include "reader.h"
 #include "reduce.h"
 #include "print.h"
 #include "reader.h"
 #include "reduce.h"


@@ -97,7 +96,7 @@ print_core (FILE *out, state *s)
       sp1 = sp = ritem + sitems[i];
 
       while (*sp >= 0)
       sp1 = sp = ritem + sitems[i];
 
       while (*sp >= 0)

-       sp++;
+        sp++;

 
       r = item_number_as_rule_number (*sp);
 
 
       r = item_number_as_rule_number (*sp);
 


@@ -105,15 +104,15 @@ print_core (FILE *out, state *s)
       previous_lhs = rules[r].lhs;
 
       for (sp = rules[r].rhs; sp < sp1; sp++)
       previous_lhs = rules[r].lhs;
 
       for (sp = rules[r].rhs; sp < sp1; sp++)

-       fprintf (out, " %s", symbols[*sp]->tag);
+        fprintf (out, " %s", symbols[*sp]->tag);

       fputs (" .", out);
       for (/* Nothing */; *sp >= 0; ++sp)
       fputs (" .", out);
       for (/* Nothing */; *sp >= 0; ++sp)

-       fprintf (out, " %s", symbols[*sp]->tag);
+        fprintf (out, " %s", symbols[*sp]->tag);

 
       /* Display the lookahead tokens?  */
       if (report_flag & report_lookahead_tokens
           && item_number_is_rule_number (*sp1))
 
       /* Display the lookahead tokens?  */
       if (report_flag & report_lookahead_tokens
           && item_number_is_rule_number (*sp1))

-       state_rule_lookahead_tokens_print (s, &rules[r], out);
+        state_rule_lookahead_tokens_print (s, &rules[r], out);

 
       fputc ('\n', out);
     }
 
       fputc ('\n', out);
     }


@@ -135,10 +134,10 @@ print_transitions (state *s, FILE *out, bool display_transitions_p)
   /* Compute the width of the lookahead token column.  */
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i)
   /* Compute the width of the lookahead token column.  */
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i)

-       && TRANSITION_IS_SHIFT (trans, i) == display_transitions_p)
+        && TRANSITION_IS_SHIFT (trans, i) == display_transitions_p)

       {
       {

-       symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)];
-       max_length (&width, sym->tag);
+        symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)];
+        max_length (&width, sym->tag);

       }
 
   /* Nothing to report. */
       }
 
   /* Nothing to report. */


@@ -151,20 +150,20 @@ print_transitions (state *s, FILE *out, bool display_transitions_p)
   /* Report lookahead tokens and shifts.  */
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i)
   /* Report lookahead tokens and shifts.  */
   for (i = 0; i < trans->num; i++)
     if (!TRANSITION_IS_DISABLED (trans, i)

-       && TRANSITION_IS_SHIFT (trans, i) == display_transitions_p)
+        && TRANSITION_IS_SHIFT (trans, i) == display_transitions_p)

       {
       {

-       symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)];
-       const char *tag = sym->tag;
-       state *s1 = trans->states[i];
-       int j;
-
-       fprintf (out, "    %s", tag);
-       for (j = width - strlen (tag); j > 0; --j)
-         fputc (' ', out);
-       if (display_transitions_p)
-         fprintf (out, _("shift, and go to state %d\n"), s1->number);
-       else
-         fprintf (out, _("go to state %d\n"), s1->number);
+        symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)];
+        const char *tag = sym->tag;
+        state *s1 = trans->states[i];
+        int j;
+
+        fprintf (out, "    %s", tag);
+        for (j = width - strlen (tag); j > 0; --j)
+          fputc (' ', out);
+        if (display_transitions_p)
+          fprintf (out, _("shift, and go to state %d\n"), s1->number);
+        else
+          fprintf (out, _("go to state %d\n"), s1->number);

       }
 }
 
       }
 }
 


@@ -196,12 +195,12 @@ print_errs (FILE *out, state *s)
   for (i = 0; i < errp->num; ++i)
     if (errp->symbols[i])
       {
   for (i = 0; i < errp->num; ++i)
     if (errp->symbols[i])
       {

-       const char *tag = errp->symbols[i]->tag;
-       int j;
-       fprintf (out, "    %s", tag);
-       for (j = width - strlen (tag); j > 0; --j)
-         fputc (' ', out);
-       fputs (_("error (nonassociative)\n"), out);
+        const char *tag = errp->symbols[i]->tag;
+        int j;
+        fprintf (out, "    %s", tag);
+        for (j = width - strlen (tag); j > 0; --j)
+          fputc (' ', out);
+        fputs (_("error (nonassociative)\n"), out);

       }
 }
 
       }
 }
 


@@ -214,8 +213,8 @@ print_errs (FILE *out, state *s)
 
 static void
 print_reduction (FILE *out, size_t width,
 
 static void
 print_reduction (FILE *out, size_t width,

-                const char *lookahead_token,
-                rule *r, bool enabled)
+                 const char *lookahead_token,
+                 rule *r, bool enabled)

 {
   int j;
   fprintf (out, "    %s", lookahead_token);
 {
   int j;
   fprintf (out, "    %s", lookahead_token);


@@ -242,16 +241,16 @@ print_reductions (FILE *out, state *s)
 {
   transitions *trans = s->transitions;
   reductions *reds = s->reductions;
 {
   transitions *trans = s->transitions;
   reductions *reds = s->reductions;

-  rule *default_rule = NULL;
+  rule *default_reduction = NULL;

   size_t width = 0;
   int i, j;
   size_t width = 0;
   int i, j;

-  bool non_default_action = false;
+  bool default_reduction_only = true;

 
   if (reds->num == 0)
     return;
 
   if (yydefact[s->number] != 0)
 
   if (reds->num == 0)
     return;
 
   if (yydefact[s->number] != 0)

-    default_rule = &rules[yydefact[s->number] - 1];
+    default_reduction = &rules[yydefact[s->number] - 1];

 
   bitset_zero (no_reduce_set);
   FOR_EACH_SHIFT (trans, i)
 
   bitset_zero (no_reduce_set);
   FOR_EACH_SHIFT (trans, i)


@@ -261,28 +260,28 @@ print_reductions (FILE *out, state *s)
       bitset_set (no_reduce_set, s->errs->symbols[i]->number);
 
   /* Compute the width of the lookahead token column.  */
       bitset_set (no_reduce_set, s->errs->symbols[i]->number);
 
   /* Compute the width of the lookahead token column.  */

-  if (default_rule)
+  if (default_reduction)

     width = strlen (_("$default"));
 
   if (reds->lookahead_tokens)
     for (i = 0; i < ntokens; i++)
       {
     width = strlen (_("$default"));
 
   if (reds->lookahead_tokens)
     for (i = 0; i < ntokens; i++)
       {

-       bool count = bitset_test (no_reduce_set, i);
-
-       for (j = 0; j < reds->num; ++j)
-         if (bitset_test (reds->lookahead_tokens[j], i))
-           {
-             if (! count)
-               {
-                 if (reds->rules[j] != default_rule)
-                   max_length (&width, symbols[i]->tag);
-                 count = true;
-               }
-             else
-               {
-                 max_length (&width, symbols[i]->tag);
-               }
-           }
+        bool count = bitset_test (no_reduce_set, i);
+
+        for (j = 0; j < reds->num; ++j)
+          if (bitset_test (reds->lookahead_tokens[j], i))
+            {
+              if (! count)
+                {
+                  if (reds->rules[j] != default_reduction)
+                    max_length (&width, symbols[i]->tag);
+                  count = true;
+                }
+              else
+                {
+                  max_length (&width, symbols[i]->tag);
+                }
+            }

       }
 
   /* Nothing to report. */
       }
 
   /* Nothing to report. */


@@ -296,51 +295,52 @@ print_reductions (FILE *out, state *s)
   if (reds->lookahead_tokens)
     for (i = 0; i < ntokens; i++)
       {
   if (reds->lookahead_tokens)
     for (i = 0; i < ntokens; i++)
       {

-       bool defaulted = false;
-       bool count = bitset_test (no_reduce_set, i);
+        bool defaulted = false;
+        bool count = bitset_test (no_reduce_set, i);

         if (count)
         if (count)

-          non_default_action = true;
-
-       for (j = 0; j < reds->num; ++j)
-         if (bitset_test (reds->lookahead_tokens[j], i))
-           {
-             if (! count)
-               {
-                 if (reds->rules[j] != default_rule)
+          default_reduction_only = false;
+
+        for (j = 0; j < reds->num; ++j)
+          if (bitset_test (reds->lookahead_tokens[j], i))
+            {
+              if (! count)
+                {
+                  if (reds->rules[j] != default_reduction)

                     {
                     {

-                      non_default_action = true;
+                      default_reduction_only = false;

                       print_reduction (out, width,
                                        symbols[i]->tag,
                                        reds->rules[j], 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,
-                                    default_rule, true);
-                 defaulted = false;
-                 print_reduction (out, width,
-                                  symbols[i]->tag,
-                                  reds->rules[j], false);
-               }
-           }
+                  else
+                    defaulted = true;
+                  count = true;
+                }
+              else
+                {
+                  default_reduction_only = false;
+                  if (defaulted)
+                    print_reduction (out, width,
+                                     symbols[i]->tag,
+                                     default_reduction, true);
+                  defaulted = false;
+                  print_reduction (out, width,
+                                   symbols[i]->tag,
+                                   reds->rules[j], false);
+                }
+            }

       }
 
       }
 

-  if (default_rule)
+  if (default_reduction)

     {
     {

-      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)
+      char *default_reductions =
+        muscle_percent_define_get ("lr.default-reduction");
+      print_reduction (out, width, _("$default"), default_reduction, true);
+      aver (STREQ (default_reductions, "most")
+            || (STREQ (default_reductions, "consistent")
+                && default_reduction_only)

             || (reds->num == 1 && reds->rules[0]->number == 0));
             || (reds->num == 1 && reds->rules[0]->number == 0));

-      free (default_rules);
+      free (default_reductions);

     }
 }
 
     }
 }
 


@@ -370,7 +370,7 @@ static void
 print_state (FILE *out, state *s)
 {
   fputs ("\n\n", out);
 print_state (FILE *out, state *s)
 {
   fputs ("\n\n", out);

-  fprintf (out, _("state %d"), s->number);
+  fprintf (out, _("State %d"), s->number);

   fputc ('\n', out);
   print_core (out, s);
   print_actions (out, s);
   fputc ('\n', out);
   print_core (out, s);
   print_actions (out, s);


@@ -385,15 +385,15 @@ print_state (FILE *out, state *s)
 | Print information on the whole grammar.  |
 `-----------------------------------------*/
 
 | Print information on the whole grammar.  |
 `-----------------------------------------*/
 

-#define END_TEST(End)                          \
-do {                                           \
-  if (column + strlen(buffer) > (End))         \
-    {                                          \
-      fprintf (out, "%s\n   ", buffer);                \
-      column = 3;                              \
-      buffer[0] = 0;                           \
-    }                                          \
-} while (0)
+#define END_TEST(End)                           \
+  do {                                          \
+    if (column + strlen (buffer) > (End))       \
+      {                                         \
+        fprintf (out, "%s\n   ", buffer);       \
+        column = 3;                             \
+        buffer[0] = 0;                          \
+      }                                         \
+  } while (0)

 
 
 static void
 
 
 static void


@@ -410,25 +410,25 @@ print_grammar (FILE *out)
   for (i = 0; i < max_user_token_number + 1; i++)
     if (token_translations[i] != undeftoken->number)
       {
   for (i = 0; i < max_user_token_number + 1; i++)
     if (token_translations[i] != undeftoken->number)
       {

-       const char *tag = symbols[token_translations[i]]->tag;
-       rule_number r;
-       item_number *rhsp;
-
-       buffer[0] = 0;
-       column = strlen (tag);
-       fputs (tag, out);
-       END_TEST (65);
-       sprintf (buffer, " (%d)", i);
-
-       for (r = 0; r < nrules; r++)
-         for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
-           if (item_number_as_symbol_number (*rhsp) == token_translations[i])
-             {
-               END_TEST (65);
-               sprintf (buffer + strlen (buffer), " %d", r);
-               break;
-             }
-       fprintf (out, "%s\n", buffer);
+        const char *tag = symbols[token_translations[i]]->tag;
+        rule_number r;
+        item_number *rhsp;
+
+        buffer[0] = 0;
+        column = strlen (tag);
+        fputs (tag, out);
+        END_TEST (65);
+        sprintf (buffer, " (%d)", i);
+
+        for (r = 0; r < nrules; r++)
+          for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
+            if (item_number_as_symbol_number (*rhsp) == token_translations[i])
+              {
+                END_TEST (65);
+                sprintf (buffer + strlen (buffer), " %d", r);
+                break;
+              }
+        fprintf (out, "%s\n", buffer);

       }
   fputs ("\n\n", out);
 
       }
   fputs ("\n\n", out);
 


@@ -441,17 +441,17 @@ print_grammar (FILE *out)
       const char *tag = symbols[i]->tag;
 
       for (r = 0; r < nrules; r++)
       const char *tag = symbols[i]->tag;
 
       for (r = 0; r < nrules; r++)

-       {
-         item_number *rhsp;
-         if (rules[r].lhs->number == i)
-           left_count++;
-         for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
-           if (item_number_as_symbol_number (*rhsp) == i)
-             {
-               right_count++;
-               break;
-             }
-       }
+        {
+          item_number *rhsp;
+          if (rules[r].lhs->number == i)
+            left_count++;
+          for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
+            if (item_number_as_symbol_number (*rhsp) == i)
+              {
+                right_count++;
+                break;
+              }
+        }

 
       buffer[0] = 0;
       fputs (tag, out);
 
       buffer[0] = 0;
       fputs (tag, out);


@@ -460,38 +460,38 @@ print_grammar (FILE *out)
       END_TEST (0);
 
       if (left_count > 0)
       END_TEST (0);
 
       if (left_count > 0)

-       {
-         END_TEST (65);
-         sprintf (buffer + strlen (buffer), _(" on left:"));
-
-         for (r = 0; r < nrules; r++)
-           {
-             if (rules[r].lhs->number == i)
-               {
-                 END_TEST (65);
-                 sprintf (buffer + strlen (buffer), " %d", r);
-               }
-           }
-       }
+        {
+          END_TEST (65);
+          sprintf (buffer + strlen (buffer), _(" on left:"));
+
+          for (r = 0; r < nrules; r++)
+            {
+              if (rules[r].lhs->number == i)
+                {
+                  END_TEST (65);
+                  sprintf (buffer + strlen (buffer), " %d", r);
+                }
+            }
+        }

 
       if (right_count > 0)
 
       if (right_count > 0)

-       {
-         if (left_count > 0)
-           sprintf (buffer + strlen (buffer), ",");
-         END_TEST (65);
-         sprintf (buffer + strlen (buffer), _(" on right:"));
-         for (r = 0; r < nrules; r++)
-           {
-             item_number *rhsp;
-             for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
-               if (item_number_as_symbol_number (*rhsp) == i)
-                 {
-                   END_TEST (65);
-                   sprintf (buffer + strlen (buffer), " %d", r);
-                   break;
-                 }
-           }
-       }
+        {
+          if (left_count > 0)
+            sprintf (buffer + strlen (buffer), ",");
+          END_TEST (65);
+          sprintf (buffer + strlen (buffer), _(" on right:"));
+          for (r = 0; r < nrules; r++)
+            {
+              item_number *rhsp;
+              for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
+                if (item_number_as_symbol_number (*rhsp) == i)
+                  {
+                    END_TEST (65);
+                    sprintf (buffer + strlen (buffer), " %d", r);
+                    break;
+                  }
+            }
+        }

       fprintf (out, "%s\n", buffer);
     }
 }
       fprintf (out, "%s\n", buffer);
     }
 }


@@ -507,7 +507,7 @@ print_results (void)
 
   reduce_output (out);
   grammar_rules_partial_print (out,
 
   reduce_output (out);
   grammar_rules_partial_print (out,

-                              _("Rules useless in parser due to conflicts"),
+                               _("Rules useless in parser due to conflicts"),

                                  rule_useless_in_parser_p);
   conflicts_output (out);
 
                                  rule_useless_in_parser_p);
   conflicts_output (out);