* doc/yacc.1.in: New.

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

diff --git a/src/print-xml.c b/src/print-xml.c
index 2a57848833adb97fdfbf488ea5549b34cf505fe0..f7cae3f0c4c006ee82e5783f579e3708c3b3f25c 100644 (file)
--- 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/>");
 }
 
 /*--------------------------------.
@@ -108,6 +108,7 @@ print_core (FILE *out, int level, state *s)
 
   for (i = 0; i < snritems; i++)
     {
+      bool printed = false;
       item_number *sp;
       item_number *sp1;
       rule_number r;
@@ -118,30 +119,34 @@ print_core (FILE *out, int level, state *s)
        sp++;
 
       r = item_number_as_rule_number (*sp);
-
-      xml_printf (out, level + 1, "<rule number=\"%d\">",
-                 rules[r].number);
-
-      rule_lhs_print_xml (&rules[r], out, level + 2);
-
-      xml_puts (out, level + 2, "<rhs>");
-      for (sp = rules[r].rhs; sp < sp1; sp++)
-       xml_printf (out, level + 3, "<symbol class=\"%s\">%s</symbol>",
-                   symbol_class_get_string (symbols[*sp]),
-                   xml_escape (symbols[*sp]->tag));
-      xml_puts (out, level + 3, "<point/>");
-      for (/* Nothing */; *sp >= 0; ++sp)
-       xml_printf (out, level + 3, "<symbol class=\"%s\">%s</symbol>",
-                   symbol_class_get_string (symbols[*sp]),
-                   xml_escape (symbols[*sp]->tag));
-
-      xml_puts (out, level + 2, "</rhs>");
+      sp = rules[r].rhs;
 
       /* Display the lookahead tokens?  */
-      if (report_flag & report_lookahead_tokens)
-       state_rule_lookahead_tokens_print_xml (s, &rules[r], out, level + 2);
+      if (report_flag & report_lookahead_tokens
+          && item_number_is_rule_number (*sp1))
+       {
+         reductions *reds = s->reductions;
+         int red = state_reduction_find (s, &rules[r]);
+         /* Print item with lookaheads if there are. */
+         if (reds->lookahead_tokens && red != -1)
+           {
+             xml_printf (out, level + 1,
+                         "<item rule-number=\"%d\" point=\"%d\">",
+                         rules[r].number, sp1 - sp);
+             state_rule_lookahead_tokens_print_xml (s, &rules[r],
+                                                    out, level + 2);
+             xml_puts (out, level + 1, "</item>");
+             printed = true;
+           }
+       }
 
-      xml_puts (out, level + 1, "</rule>");
+      if (!printed)
+       {
+         xml_printf (out, level + 1,
+                     "<item rule-number=\"%d\" point=\"%d\"/>",
+                     rules[r].number,
+                     sp1 - sp);
+       }
     }
   xml_puts (out, level, "</itemset>");
 }
@@ -424,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++)
@@ -460,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)
@@ -581,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);