Generate bison.1 using help2man.

[bison.git] / src / reduce.c

diff --git a/src/reduce.c b/src/reduce.c
index b9b6a3dde45d64ed5b985875f61a918adda359ee..2e309a44bd77081c43d1a9f4e749693603cac1bc 100644 (file)
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -1,24 +1,22 @@
 /* Grammar reduction for Bison.
 
-   Copyright (C) 1988, 1989, 2000, 2001, 2002, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1988, 1989, 2000, 2001, 2002, 2003, 2005, 2006,
+   2007 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
+   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 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
-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 /* Reduce the grammar: Find and eliminate unreachable terminals,
@@ -27,6 +25,7 @@
 /* Don't eliminate unreachable terminals: They may be used by the
    user's parser.  */
 
+#include <config.h>
 #include "system.h"
 
 #include <bitset.h>
@@ -36,6 +35,7 @@
 #include "files.h"
 #include "getargs.h"
 #include "gram.h"
+#include "print-xml.h"
 #include "reader.h"
 #include "reduce.h"
 #include "symtab.h"
@@ -247,7 +247,7 @@ reduce_grammar_tables (void)
   {
     int useful = 0;
     int useless = nrules - nuseless_productions;
-    rule *rules_sorted = MALLOC (rules_sorted, nrules);
+    rule *rules_sorted = xnmalloc (nrules, sizeof *rules_sorted);
     rule_number r;
     for (r = 0; r < nrules; ++r)
       rules_sorted[rules[r].useful ? useful++ : useless++] = rules[r];
@@ -291,7 +291,7 @@ nonterminals_reduce (void)
   /* Map the nonterminals to their new index: useful first, useless
      afterwards.  Kept for later report.  */
 
-  symbol_number *nontermmap = CALLOC (nontermmap, nvars);
+  symbol_number *nontermmap = xnmalloc (nvars, sizeof *nontermmap);
   n = ntokens;
   for (i = ntokens; i < nsyms; i++)
     if (bitset_test (V, i))
@@ -307,7 +307,7 @@ nonterminals_reduce (void)
 
   /* Shuffle elements of tables indexed by symbol number.  */
   {
-    symbol **symbols_sorted = MALLOC (symbols_sorted, nvars);
+    symbol **symbols_sorted = xnmalloc (nvars, sizeof *symbols_sorted);
 
     for (i = ntokens; i < nsyms; i++)
       symbols[i]->number = nontermmap[i - ntokens];
@@ -375,8 +375,62 @@ reduce_output (FILE *out)
 }
 \f
 
+/*--------------------------------------------------------------.
+| Output the detailed results of the reductions.  For FILE.xml. |
+`---------------------------------------------------------------*/
 
+void
+reduce_xml (FILE *out, int level)
+{
+  fputc ('\n', out);
+  xml_puts (out, level, "<reductions>");
+  xml_puts (out, level + 1, "<useless>");
 
+  if (nuseless_nonterminals > 0)
+    {
+      int i;
+      xml_puts (out, level + 2, "<nonterminals>");
+      for (i = 0; i < nuseless_nonterminals; ++i)
+       xml_printf (out, level + 3,
+                   "<nonterminal>%s</nonterminal>",
+                   symbols[nsyms + i]->tag);
+      xml_puts (out, level + 2, "</nonterminals>");
+    }
+  else
+    xml_puts (out, level + 2, "<nonterminals/>");
+
+  if (nuseless_productions > 0)
+    grammar_rules_partial_print_xml (out, level + 1, true, rule_useless_p);
+  else
+    xml_puts (out, level + 2, "<rules/>");
+
+  xml_puts (out, level + 1, "</useless>");
+  xml_puts (out, level + 1, "<unused>");
+
+  {
+    bool b = false;
+    int i;
+    for (i = 0; i < ntokens; i++)
+      if (!bitset_test (V, i) && !bitset_test (V1, i))
+       {
+         if (!b)
+           xml_puts (out, level + 2, "<terminals>");
+         b = true;
+         xml_printf (out, level + 3,
+                     "<terminal>%s</terminal>",
+                     xml_escape (symbols[i]->tag));
+       }
+    if (b)
+      xml_puts (out, level + 2, "</terminals>");
+    else
+      xml_puts (out, level + 2, "<terminals/>");
+  }
+
+  xml_puts (out, level + 1, "</unused>");
+  xml_puts (out, level, "</reductions>");
+  fputc ('\n', out);
+}
+\f
 
 /*-------------------------------.
 | Report the results to STDERR.  |
@@ -425,7 +479,7 @@ reduce_grammar (void)
   useless_nonterminals ();
   inaccessable_symbols ();
 
-  reduced = (bool) (nuseless_nonterminals + nuseless_productions > 0);
+  reduced = (nuseless_nonterminals + nuseless_productions > 0);
   if (!reduced)
     return;