]> git.saurik.com Git - bison.git/blobdiff - src/conflicts.c
glr.cc: fix a clang warning
[bison.git] / src / conflicts.c
index ade54bd7b76d8034d4f4f3d5b3804232743f9271..4e05ab32ab37e48dd8191643b393eb9c70f23690 100644 (file)
@@ -1,24 +1,22 @@
 /* Find and resolve or report lookahead conflicts for bison,
 
-   Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1992, 2000-2007, 2009-2013 Free Software
+   Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
-   Bison is free software; you can redistribute it and/or modify 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.
+   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
+   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, 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.
+   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
-   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"
@@ -32,6 +30,7 @@
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
+#include "print-xml.h"
 #include "reader.h"
 #include "state.h"
 #include "symtab.h"
@@ -41,6 +40,7 @@ int expected_sr_conflicts = -1;
 int expected_rr_conflicts = -1;
 static char *conflicts;
 static struct obstack solved_conflicts_obstack;
+static struct obstack solved_conflicts_xml_obstack;
 
 static bitset shift_set;
 static bitset lookahead_set;
@@ -73,24 +73,26 @@ log_resolution (rule *r, symbol_number token,
        {
        case shift_resolution:
        case right_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
-                         _("\
-    Conflict between rule %d and token %s resolved as shift"),
+         obstack_printf (&solved_conflicts_obstack,
+                         _("    Conflict between rule %d and token %s"
+                           " resolved as shift"),
                          r->number,
                          symbols[token]->tag);
          break;
+
        case reduce_resolution:
        case left_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
-                         _("\
-    Conflict between rule %d and token %s resolved as reduce"),
+         obstack_printf (&solved_conflicts_obstack,
+                         _("    Conflict between rule %d and token %s"
+                           " resolved as reduce"),
                          r->number,
                          symbols[token]->tag);
          break;
+
        case nonassoc_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
-                         _("\
-    Conflict between rule %d and token %s resolved as an error"),
+         obstack_printf (&solved_conflicts_obstack,
+                         _("    Conflict between rule %d and token %s"
+                           " resolved as an error"),
                          r->number,
                          symbols[token]->tag);
          break;
@@ -100,38 +102,112 @@ log_resolution (rule *r, symbol_number token,
       switch (resolution)
        {
        case shift_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
+         obstack_printf (&solved_conflicts_obstack,
                          " (%s < %s)",
                          r->prec->tag,
                          symbols[token]->tag);
          break;
 
        case reduce_resolution:
-         obstack_fgrow2 (&solved_conflicts_obstack,
+         obstack_printf (&solved_conflicts_obstack,
                          " (%s < %s)",
                          symbols[token]->tag,
                          r->prec->tag);
          break;
 
        case left_resolution:
-         obstack_fgrow1 (&solved_conflicts_obstack,
+         obstack_printf (&solved_conflicts_obstack,
                          " (%%left %s)",
                          symbols[token]->tag);
          break;
 
        case right_resolution:
-         obstack_fgrow1 (&solved_conflicts_obstack,
+         obstack_printf (&solved_conflicts_obstack,
                          " (%%right %s)",
                          symbols[token]->tag);
          break;
+
        case nonassoc_resolution:
-         obstack_fgrow1 (&solved_conflicts_obstack,
+         obstack_printf (&solved_conflicts_obstack,
                          " (%%nonassoc %s)",
                          symbols[token]->tag);
          break;
        }
+
       obstack_sgrow (&solved_conflicts_obstack, ".\n");
     }
+
+  /* XML report */
+  if (xml_flag)
+    {
+      /* The description of the resolution. */
+      switch (resolution)
+        {
+        case shift_resolution:
+        case right_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "        <resolution rule=\"%d\" symbol=\"%s\""
+                          " type=\"shift\">",
+                          r->number,
+                          xml_escape (symbols[token]->tag));
+          break;
+
+        case reduce_resolution:
+        case left_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "        <resolution rule=\"%d\" symbol=\"%s\""
+                          " type=\"reduce\">",
+                          r->number,
+                          xml_escape (symbols[token]->tag));
+          break;
+
+        case nonassoc_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "        <resolution rule=\"%d\" symbol=\"%s\""
+                          " type=\"error\">",
+                          r->number,
+                          xml_escape (symbols[token]->tag));
+          break;
+        }
+
+      /* The reason. */
+      switch (resolution)
+        {
+        case shift_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "%s &lt; %s",
+                          xml_escape_n (0, r->prec->tag),
+                          xml_escape_n (1, symbols[token]->tag));
+          break;
+
+        case reduce_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "%s &lt; %s",
+                          xml_escape_n (0, symbols[token]->tag),
+                          xml_escape_n (1, r->prec->tag));
+          break;
+
+        case left_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "%%left %s",
+                          xml_escape (symbols[token]->tag));
+          break;
+
+        case right_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "%%right %s",
+                          xml_escape (symbols[token]->tag));
+          break;
+
+        case nonassoc_resolution:
+          obstack_printf (&solved_conflicts_xml_obstack,
+                          "%%nonassoc %s",
+                          xml_escape (symbols[token]->tag));
+      break;
+        }
+
+      obstack_sgrow (&solved_conflicts_xml_obstack, "</resolution>\n");
+    }
 }
 
 
@@ -283,6 +359,11 @@ set_conflicts (state *s, symbol **errors)
       obstack_1grow (&solved_conflicts_obstack, '\0');
       s->solved_conflicts = obstack_finish (&solved_conflicts_obstack);
     }
+  if (obstack_object_size (&solved_conflicts_xml_obstack))
+    {
+      obstack_1grow (&solved_conflicts_xml_obstack, '\0');
+      s->solved_conflicts_xml = obstack_finish (&solved_conflicts_xml_obstack);
+    }
 
   /* Loop over all rules which require lookahead in this state.  Check
      for conflicts not resolved above.  */
@@ -311,6 +392,7 @@ conflicts_solve (void)
   shift_set = bitset_create (ntokens, BITSET_FIXED);
   lookahead_set = bitset_create (ntokens, BITSET_FIXED);
   obstack_init (&solved_conflicts_obstack);
+  obstack_init (&solved_conflicts_xml_obstack);
 
   for (i = 0; i < nstates; i++)
     {
@@ -512,8 +594,17 @@ conflicts_print (void)
     return;
 
   /* Report the total number of conflicts on STDERR.  */
+  if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1)
+    {
+      if (!(warnings_flag & warnings_conflicts_sr))
+        src_total = 0;
+      if (!(warnings_flag & warnings_conflicts_rr))
+        rrc_total = 0;
+    }
   if (src_total | rrc_total)
     {
+      if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1)
+        set_warning_issued ();
       if (! yacc_flag)
        fprintf (stderr, "%s: ", current_file);
       conflict_report (stderr, src_total, rrc_total);
@@ -542,4 +633,5 @@ conflicts_free (void)
   bitset_free (shift_set);
   bitset_free (lookahead_set);
   obstack_free (&solved_conflicts_obstack, NULL);
+  obstack_free (&solved_conflicts_xml_obstack, NULL);
 }