X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/25f6da67d3bcacc570804c76b9312f74699c22fe..a005a9c4dc5588fc017a1cb1d19c1560e0e68943:/src/print-xml.c

diff --git a/src/print-xml.c b/src/print-xml.c
index d1535a33..f7cae3f0 100644
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -51,19 +51,19 @@ struct escape_buf
 static struct escape_buf escape_bufs[2];
 
 
-/*----------------------------.
-| Print rules never reduced.  |
-`-----------------------------*/
+/*--------------------------------.
+| Print rules useless in parser.  |
+`--------------------------------*/
 
 static void
-print_rules_never_reduced (FILE *out, int level)
+print_rules_useless_in_parser (FILE *out, int level)
 {
   rule_number r;
   bool count = false;
 
   for (r = 0; r < nrules + nuseless_productions; r++)
     {
-      if (rule_never_reduced_p (&rules[r]))
+      if (rule_useless_in_parser_p (&rules[r]))
 	{
 	  count = true;
 	  break;
@@ -71,13 +71,13 @@ print_rules_never_reduced (FILE *out, int level)
     }
 
   if (count) {
-    xml_puts (out, level, "<rules-never-reduced>");
+    xml_puts (out, level, "<rules-useless-in-parser>");
     grammar_rules_partial_print_xml (out, level - 1,
-				     false, rule_never_reduced_p);
-    xml_puts (out, level, "</rules-never-reduced>");
+				     false, rule_useless_in_parser_p);
+    xml_puts (out, level, "</rules-useless-in-parser>");
   }
   else
-    xml_puts (out, level, "<rules-never-reduced/>");
+    xml_puts (out, level, "<rules-useless-in-parser/>");
 }
 
 /*--------------------------------.
@@ -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,8 +429,9 @@ print_grammar (FILE *out, int level)
 	item_number *rhsp;
 
 	xml_printf (out, level + 2,
-		    "<terminal type=\"%d\" symbol=\"%s\">",
-		    i, xml_escape (tag));
+		    "<terminal symbol-number=\"%d\" token-number=\"%d\""
+                    " name=\"%s\">",
+		    token_translations[i], i, xml_escape (tag));
 
 	for (r = 0; r < nrules; r++)
 	  for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
@@ -464,7 +466,7 @@ print_grammar (FILE *out, int level)
 	}
 
       xml_printf (out, level + 2,
-		  "<nonterminal type=\"%d\" symbol=\"%s\">",
+		  "<nonterminal symbol-number=\"%d\" name=\"%s\">",
 		  i, xml_escape (tag));
 
       if (left_count > 0)
@@ -585,8 +587,8 @@ print_xml (void)
   /* print reductions */
   reduce_xml (out, level + 1);
 
-  /* print rules never reduced */
-  print_rules_never_reduced (out, level + 1);
+  /* print rules useless in parser */
+  print_rules_useless_in_parser (out, level + 1);
 
   /* print grammar */
   print_grammar (out, level + 1);