2007-10-17 Wojciech Polak <polak@gnu.org>

[bison.git] / src / print-xml.c

diff --git a/src/print-xml.c b/src/print-xml.c
index d1535a33e8b006ce20f12ee0cffc40b4b5e0f1bc..73a18af5f74c8de54dc37a2f33b3edf6dedc3450 100644 (file)
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -122,7 +122,8 @@ print_core (FILE *out, int level, state *s)
       sp = rules[r].rhs;
 
       /* Display the lookahead tokens?  */
-      if (report_flag & report_lookahead_tokens)
+      if (report_flag & report_lookahead_tokens
+          && item_number_is_rule_number (*sp1))
        {
          reductions *reds = s->reductions;
          int red = state_reduction_find (s, &rules[r]);
@@ -428,7 +429,7 @@ print_grammar (FILE *out, int level)
        item_number *rhsp;
 
        xml_printf (out, level + 2,
-                   "<terminal type=\"%d\" symbol=\"%s\">",
+                   "<terminal number=\"%d\" name=\"%s\">",
                    i, xml_escape (tag));
 
        for (r = 0; r < nrules; r++)
@@ -464,7 +465,7 @@ print_grammar (FILE *out, int level)
        }
 
       xml_printf (out, level + 2,
-                 "<nonterminal type=\"%d\" symbol=\"%s\">",
+                 "<nonterminal number=\"%d\" name=\"%s\">",
                  i, xml_escape (tag));
 
       if (left_count > 0)