tests: AT_YYERROR_DEFINE: prepare for list of ints.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index fa3fdbf552ff89769bb4f108aeee9062aec5e385..d1b3804337bd55a622896ae571453fa696c77c62 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
 /* Allocate input grammar variables for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003, 2005, 2006
-   2007 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 2001-2003, 2005-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.
 


@@ -21,13 +21,13 @@
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"
 

-#include <quotearg.h>
-
+#include "complain.h"
+#include "getargs.h"

 #include "gram.h"
 #include "gram.h"

+#include "print-xml.h"

 #include "reader.h"
 #include "reduce.h"
 #include "symtab.h"
 #include "reader.h"
 #include "reduce.h"
 #include "symtab.h"

-#include "print-xml.h"

 
 /* Comments for these variables are in gram.h.  */
 
 
 /* Comments for these variables are in gram.h.  */
 


@@ -121,8 +121,7 @@ rule_rhs_print_xml (rule *r, FILE *out, int level)
       item_number *rp;
       xml_puts (out, level, "<rhs>");
       for (rp = r->rhs; *rp >= 0; rp++)
       item_number *rp;
       xml_puts (out, level, "<rhs>");
       for (rp = r->rhs; *rp >= 0; rp++)

-       xml_printf (out, level + 1, "<symbol class=\"%s\">%s</symbol>",
-                   symbol_class_get_string (symbols[*rp]),
+       xml_printf (out, level + 1, "<symbol>%s</symbol>",

                    xml_escape (symbols[*rp]->tag));
       xml_puts (out, level, "</rhs>");
     }
                    xml_escape (symbols[*rp]->tag));
       xml_puts (out, level, "</rhs>");
     }


@@ -197,45 +196,46 @@ grammar_rules_partial_print (FILE *out, const char *title,
 }
 
 void
 }
 
 void

-grammar_rules_partial_print_xml (FILE *out, int level, bool rtag,
-                                rule_filter filter)
+grammar_rules_print (FILE *out)
+{
+  grammar_rules_partial_print (out, _("Grammar"), rule_useful_in_grammar_p);
+}
+
+void
+grammar_rules_print_xml (FILE *out, int level)

 {
   rule_number r;
   bool first = true;
 
   for (r = 0; r < nrules + nuseless_productions; r++)
     {
 {
   rule_number r;
   bool first = true;
 
   for (r = 0; r < nrules + nuseless_productions; r++)
     {

-      if (filter && !filter (&rules[r]))
-       continue;
-      if (rtag && first)
+      if (first)

        xml_puts (out, level + 1, "<rules>");
       first = false;
        xml_puts (out, level + 1, "<rules>");
       first = false;

-
-      xml_printf (out, level + 2, "<rule number=\"%d\">",
-                 rules[r].number);
+      {
+        char const *usefulness;
+        if (rule_useless_in_grammar_p (&rules[r]))
+          usefulness = "useless-in-grammar";
+        else if (rule_useless_in_parser_p (&rules[r]))
+          usefulness = "useless-in-parser";
+        else
+          usefulness = "useful";
+        xml_indent (out, level + 2);
+        fprintf (out, "<rule number=\"%d\" usefulness=\"%s\"",
+                 rules[r].number, usefulness);
+        if (rules[r].precsym)
+          fprintf (out, " percent_prec=\"%s\"",
+                   xml_escape (rules[r].precsym->tag));
+        fputs (">\n", out);
+      }

       rule_lhs_print_xml (&rules[r], out, level + 3);
       rule_rhs_print_xml (&rules[r], out, level + 3);
       xml_puts (out, level + 2, "</rule>");
     }
       rule_lhs_print_xml (&rules[r], out, level + 3);
       rule_rhs_print_xml (&rules[r], out, level + 3);
       xml_puts (out, level + 2, "</rule>");
     }

-  if (rtag)
-    {
-      if (!first)
-       xml_puts (out, level + 1, "</rules>");
-      else
-       xml_puts (out, level + 1, "<rules/>");
-    }
-}
-
-void
-grammar_rules_print (FILE *out)
-{
-  grammar_rules_partial_print (out, _("Grammar"), rule_useful_in_grammar_p);
-}
-
-void
-grammar_rules_print_xml (FILE *out, int level)
-{
-  grammar_rules_partial_print_xml (out, level, true, rule_useful_in_grammar_p);
+  if (!first)
+    xml_puts (out, level + 1, "</rules>");
+  else
+   xml_puts (out, level + 1, "<rules/>");

 }
 
 void
 }
 
 void


@@ -308,9 +308,12 @@ grammar_rules_useless_report (const char *message)
   for (r = 0; r < nrules ; ++r)
     if (!rules[r].useful)
       {
   for (r = 0; r < nrules ; ++r)
     if (!rules[r].useful)
       {

-       location_print (stderr, rules[r].location);
-       fprintf (stderr, ": %s: %s: ", _("warning"), message);
-       rule_print (&rules[r], stderr);
+        warn_at (rules[r].location, "%s: ", message);
+        if (warnings_flag & warnings_other)
+          {
+            rule_print (&rules[r], stderr);
+            fflush (stderr);
+          }

       }
 }
 
       }
 }