Rule length is unsigned.

[bison.git] / src / gram.c

diff --git a/src/gram.c b/src/gram.c
index 1f2885f07d37929b7019f5dc252e85bdc79fb818..725293bbbe847fd302095a76e3ab6afe2417713e 100644 (file)
--- a/src/gram.c
+++ b/src/gram.c
@@ -1,7 +1,7 @@
 /* Allocate input grammar variables for Bison.
 
    Copyright (C) 1984, 1986, 1989, 2001, 2002, 2003, 2005, 2006
-   2007 Free Software Foundation, Inc.
+   2007, 2008 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -87,10 +87,10 @@ rule_lhs_print_xml (rule *r, FILE *out, int level)
   xml_printf (out, level, "<lhs>%s</lhs>", r->lhs->tag);
 }
 
-int
+size_t
 rule_rhs_length (rule *r)
 {
-  int res = 0;
+  size_t res = 0;
   item_number *rhsp;
   for (rhsp = r->rhs; *rhsp >= 0; ++rhsp)
     ++res;
@@ -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++)
-       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>");
     }
@@ -221,8 +220,12 @@ grammar_rules_print_xml (FILE *out, int level)
           usefulness = "useless-in-parser";
         else
           usefulness = "useful";
-        xml_printf (out, level + 2, "<rule number=\"%d\" usefulness=\"%s\">",
-                    rules[r].number, usefulness);
+        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\"", 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);