Java: Fix syntax error handling without error token.

[bison.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index f16816a02ac3e4268eea8e9982429c6c5a73861c..cb227aa513081fec25d1665b423dd02f1bc63bc6 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -1,30 +1,27 @@
 /* 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
-   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.
 

-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include <config.h>
 #include "system.h"
 
 #include <bitset.h>
 
 #include <config.h>
 #include "system.h"
 
 #include <bitset.h>

-#include <quotearg.h>

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


@@ -33,6 +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 "print.h"
 #include "reader.h"
 #include "reduce.h"
 #include "print.h"
 #include "reader.h"
 #include "reduce.h"


@@ -40,7 +38,7 @@
 #include "symtab.h"
 #include "tables.h"
 
 #include "symtab.h"
 #include "tables.h"
 

-static bitset shift_set;
+static bitset no_reduce_set;

 
 #if 0
 static void
 
 #if 0
 static void


@@ -112,7 +110,8 @@ print_core (FILE *out, state *s)
        fprintf (out, " %s", symbols[*sp]->tag);
 
       /* Display the lookahead tokens?  */
        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);
        state_rule_lookahead_tokens_print (s, &rules[r], out);
 
       fputc ('\n', out);


@@ -242,35 +241,39 @@ 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 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 (shift_set);
+  bitset_zero (no_reduce_set);

   FOR_EACH_SHIFT (trans, i)
   FOR_EACH_SHIFT (trans, i)

-    bitset_set (shift_set, TRANSITION_SYMBOL (trans, i));
+    bitset_set (no_reduce_set, TRANSITION_SYMBOL (trans, i));
+  for (i = 0; i < s->errs->num; ++i)
+    if (s->errs->symbols[i])
+      bitset_set (no_reduce_set, s->errs->symbols[i]->number);

 
   /* Compute the width of the lookahead token column.  */
 
   /* 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 (shift_set, 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)
                {
 
        for (j = 0; j < reds->num; ++j)
          if (bitset_test (reds->lookahead_tokens[j], i))
            {
              if (! count)
                {

-                 if (reds->rules[j] != default_rule)
+                 if (reds->rules[j] != default_reduction)

                    max_length (&width, symbols[i]->tag);
                  count = true;
                }
                    max_length (&width, symbols[i]->tag);
                  count = true;
                }


@@ -293,27 +296,33 @@ print_reductions (FILE *out, state *s)
     for (i = 0; i < ntokens; i++)
       {
        bool defaulted = false;
     for (i = 0; i < ntokens; i++)
       {
        bool defaulted = false;

-       bool count = bitset_test (shift_set, i);
+       bool count = bitset_test (no_reduce_set, i);
+        if (count)
+          default_reduction_only = false;

 
        for (j = 0; j < reds->num; ++j)
          if (bitset_test (reds->lookahead_tokens[j], i))
            {
              if (! count)
                {
 
        for (j = 0; j < reds->num; ++j)
          if (bitset_test (reds->lookahead_tokens[j], i))
            {
              if (! count)
                {

-                 if (reds->rules[j] != default_rule)
-                   print_reduction (out, width,
-                                    symbols[i]->tag,
-                                    reds->rules[j], true);
+                 if (reds->rules[j] != default_reduction)
+                    {
+                      default_reduction_only = false;
+                      print_reduction (out, width,
+                                       symbols[i]->tag,
+                                       reds->rules[j], true);
+                    }

                  else
                    defaulted = true;
                  count = true;
                }
              else
                {
                  else
                    defaulted = true;
                  count = true;
                }
              else
                {

+                  default_reduction_only = false;

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

-                                    default_rule, true);
+                                    default_reduction, true);

                  defaulted = false;
                  print_reduction (out, width,
                                   symbols[i]->tag,
                  defaulted = false;
                  print_reduction (out, width,
                                   symbols[i]->tag,


@@ -322,9 +331,17 @@ print_reductions (FILE *out, state *s)
            }
       }
 
            }
       }
 

-  if (default_rule)
-    print_reduction (out, width,
-                    _("$default"), default_rule, true);
+  if (default_reduction)
+    {
+      char *default_reductions =
+        muscle_percent_define_get ("lr.default-reductions");
+      print_reduction (out, width, _("$default"), default_reduction, true);
+      aver (0 == strcmp (default_reductions, "most")
+            || (0 == strcmp (default_reductions, "consistent")
+                && default_reduction_only)
+            || (reds->num == 1 && reds->rules[0]->number == 0));
+      free (default_reductions);
+    }

 }
 
 
 }
 
 


@@ -400,7 +417,7 @@ print_grammar (FILE *out)
        buffer[0] = 0;
        column = strlen (tag);
        fputs (tag, 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++)
        sprintf (buffer, " (%d)", i);
 
        for (r = 0; r < nrules; r++)


@@ -444,14 +461,16 @@ print_grammar (FILE *out)
 
       if (left_count > 0)
        {
 
       if (left_count > 0)
        {

-         END_TEST (50);
+         END_TEST (65);

          sprintf (buffer + strlen (buffer), _(" on left:"));
 
          for (r = 0; r < nrules; r++)
            {
          sprintf (buffer + strlen (buffer), _(" on left:"));
 
          for (r = 0; r < nrules; r++)
            {

-             END_TEST (65);

              if (rules[r].lhs->number == i)
              if (rules[r].lhs->number == i)

-               sprintf (buffer + strlen (buffer), " %d", r);
+               {
+                 END_TEST (65);
+                 sprintf (buffer + strlen (buffer), " %d", r);
+               }

            }
        }
 
            }
        }
 


@@ -459,7 +478,7 @@ print_grammar (FILE *out)
        {
          if (left_count > 0)
            sprintf (buffer + strlen (buffer), ",");
        {
          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++)
            {
          sprintf (buffer + strlen (buffer), _(" on right:"));
          for (r = 0; r < nrules; r++)
            {


@@ -488,7 +507,8 @@ print_results (void)
 
   reduce_output (out);
   grammar_rules_partial_print (out,
 
   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);
   conflicts_output (out);
 
   print_grammar (out);


@@ -498,10 +518,10 @@ print_results (void)
   if (report_flag & report_itemsets)
     new_closure (nritems);
   /* Storage for print_reductions.  */
   if (report_flag & report_itemsets)
     new_closure (nritems);
   /* Storage for print_reductions.  */

-  shift_set =  bitset_create (ntokens, BITSET_FIXED);
+  no_reduce_set =  bitset_create (ntokens, BITSET_FIXED);

   for (i = 0; i < nstates; i++)
     print_state (out, states[i]);
   for (i = 0; i < nstates; i++)
     print_state (out, states[i]);

-  bitset_free (shift_set);
+  bitset_free (no_reduce_set);

   if (report_flag & report_itemsets)
     free_closure ();
 
   if (report_flag & report_itemsets)
     free_closure ();