Finish implementing %define lr.type.

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

diff --git a/src/print-xml.c b/src/print-xml.c
index ff2bacd9b25951a2833d84d1a7c656744fe71854..cb6707dab1ac6fb6613ee27141be18e38a53dc48 100644 (file)
--- a/src/print-xml.c
+++ b/src/print-xml.c
@@ -63,12 +63,9 @@ print_core (FILE *out, int level, state *s)
   size_t snritems = s->nitems;
 
   /* Output all the items of a state, not only its kernel.  */
   size_t snritems = s->nitems;
 
   /* Output all the items of a state, not only its kernel.  */

-  if (report_flag & report_itemsets)
-    {
-      closure (sitems, snritems);
-      sitems = itemset;
-      snritems = nitemset;
-    }
+  closure (sitems, snritems);
+  sitems = itemset;
+  snritems = nitemset;

 
   if (!snritems) {
     xml_puts (out, level, "<itemset/>");
 
   if (!snritems) {
     xml_puts (out, level, "<itemset/>");


@@ -93,8 +90,7 @@ print_core (FILE *out, int level, state *s)
       sp = rules[r].rhs;
 
       /* Display the lookahead tokens?  */
       sp = rules[r].rhs;
 
       /* Display the lookahead tokens?  */

-      if (report_flag & report_lookahead_tokens
-          && item_number_is_rule_number (*sp1))
+      if (item_number_is_rule_number (*sp1))

        {
          reductions *reds = s->reductions;
          int red = state_reduction_find (s, &rules[r]);
        {
          reductions *reds = s->reductions;
          int red = state_reduction_find (s, &rules[r]);


@@ -365,7 +361,7 @@ print_state (FILE *out, int level, state *s)
   xml_printf (out, level, "<state number=\"%d\">", s->number);
   print_core (out, level + 1, s);
   print_actions (out, level + 1, s);
   xml_printf (out, level, "<state number=\"%d\">", s->number);
   print_core (out, level + 1, s);
   print_actions (out, level + 1, s);

-  if ((report_flag & report_solved_conflicts) && s->solved_conflicts_xml)
+  if (s->solved_conflicts_xml)

     {
       xml_puts (out, level + 1, "<solved-conflicts>");
       fputs (s->solved_conflicts_xml, out);
     {
       xml_puts (out, level + 1, "<solved-conflicts>");
       fputs (s->solved_conflicts_xml, out);


@@ -396,24 +392,20 @@ print_grammar (FILE *out, int level)
     if (token_translations[i] != undeftoken->number)
       {
        char const *tag = symbols[token_translations[i]]->tag;
     if (token_translations[i] != undeftoken->number)
       {
        char const *tag = symbols[token_translations[i]]->tag;

-       rule_number r;
-       item_number *rhsp;
-
-       xml_printf (out, level + 2,
-                   "<terminal symbol-number=\"%d\" token-number=\"%d\""
-                    " name=\"%s\" usefulness=\"%s\">",
-                   token_translations[i], i, xml_escape (tag),
-                    reduce_token_unused_in_grammar (token_translations[i])
-                      ? "unused-in-grammar" : "useful");
-
-       for (r = 0; r < nrules; r++)
-         for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
-           if (item_number_as_symbol_number (*rhsp) == token_translations[i])
-             {
-               xml_printf (out, level + 3, "<rule>%d</rule>", r);
-               break;
-             }
-       xml_puts (out, level + 2, "</terminal>");
+        int precedence = symbols[token_translations[i]]->prec;
+        assoc associativity = symbols[token_translations[i]]->assoc;
+        xml_indent (out, level + 2);
+        fprintf (out,
+                 "<terminal symbol-number=\"%d\" token-number=\"%d\""
+                 " name=\"%s\" usefulness=\"%s\"",
+                 token_translations[i], i, xml_escape (tag),
+                 reduce_token_unused_in_grammar (token_translations[i])
+                   ? "unused-in-grammar" : "useful");
+        if (precedence)
+          fprintf (out, " prec=\"%d\"", precedence);
+        if (associativity != undef_assoc)
+          fprintf (out, " assoc=\"%s\"", assoc_to_string (associativity) + 1);
+        fputs ("/>\n", out);

       }
   xml_puts (out, level + 1, "</terminals>");
 
       }
   xml_puts (out, level + 1, "</terminals>");
 


@@ -421,69 +413,30 @@ print_grammar (FILE *out, int level)
   xml_puts (out, level + 1, "<nonterminals>");
   for (i = ntokens; i < nsyms + nuseless_nonterminals; i++)
     {
   xml_puts (out, level + 1, "<nonterminals>");
   for (i = ntokens; i < nsyms + nuseless_nonterminals; i++)
     {

-      int left_count = 0, right_count = 0;
-      rule_number r;

       char const *tag = symbols[i]->tag;
       char const *tag = symbols[i]->tag;

-
-      for (r = 0; r < nrules; r++)
-       {
-         item_number *rhsp;
-         if (rules[r].lhs->number == i)
-           left_count++;
-         for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
-           if (item_number_as_symbol_number (*rhsp) == i)
-             {
-               right_count++;
-               break;
-             }
-       }
-

       xml_printf (out, level + 2,
                  "<nonterminal symbol-number=\"%d\" name=\"%s\""
       xml_printf (out, level + 2,
                  "<nonterminal symbol-number=\"%d\" name=\"%s\""

-                  " usefulness=\"%s\">",
+                  " usefulness=\"%s\"/>",

                  i, xml_escape (tag),
                   reduce_nonterminal_useless_in_grammar (i)
                     ? "useless-in-grammar" : "useful");
                  i, xml_escape (tag),
                   reduce_nonterminal_useless_in_grammar (i)
                     ? "useless-in-grammar" : "useful");

-
-      if (left_count > 0)
-       {
-         xml_puts (out, level + 3, "<left>");
-         for (r = 0; r < nrules; r++)
-           {
-             if (rules[r].lhs->number == i)
-               xml_printf (out, level + 4, "<rule>%d</rule>", r);
-           }
-         xml_puts (out, level + 3, "</left>");
-       }
-
-      if (right_count > 0)
-       {
-         xml_puts (out, level + 3, "<right>");
-         for (r = 0; r < nrules; r++)
-           {
-             item_number *rhsp;
-             for (rhsp = rules[r].rhs; *rhsp >= 0; rhsp++)
-               if (item_number_as_symbol_number (*rhsp) == i)
-                 {
-                   xml_printf (out, level + 4, "<rule>%d</rule>", r);
-                   break;
-                 }
-           }
-         xml_puts (out, level + 3, "</right>");
-       }
-
-      xml_puts (out, level + 2, "</nonterminal>");

     }
   xml_puts (out, level + 1, "</nonterminals>");
   xml_puts (out, level, "</grammar>");
 }
 
 void
     }
   xml_puts (out, level + 1, "</nonterminals>");
   xml_puts (out, level, "</grammar>");
 }
 
 void

-xml_puts (FILE *out, int level, char const *s)
+xml_indent (FILE *out, int level)

 {
   int i;
   for (i = 0; i < level; i++)
     fputs ("  ", out);
 {
   int i;
   for (i = 0; i < level; i++)
     fputs ("  ", out);

+}
+
+void
+xml_puts (FILE *out, int level, char const *s)
+{
+  xml_indent (out, level);

   fputs (s, out);
   fputc ('\n', out);
 }
   fputs (s, out);
   fputc ('\n', out);
 }


@@ -491,11 +444,9 @@ xml_puts (FILE *out, int level, char const *s)
 void
 xml_printf (FILE *out, int level, char const *fmt, ...)
 {
 void
 xml_printf (FILE *out, int level, char const *fmt, ...)
 {

-  int i;

   va_list arglist;
 
   va_list arglist;
 

-  for (i = 0; i < level; i++)
-    fputs ("  ", out);
+  xml_indent (out, level);

 
   va_start (arglist, fmt);
   vfprintf (out, fmt, arglist);
 
   va_start (arglist, fmt);
   vfprintf (out, fmt, arglist);


@@ -563,8 +514,7 @@ print_xml (void)
   /* print grammar */
   print_grammar (out, level + 1);
 
   /* print grammar */
   print_grammar (out, level + 1);
 

-  if (report_flag & report_itemsets)
-    new_closure (nritems);
+  new_closure (nritems);

   no_reduce_set =  bitset_create (ntokens, BITSET_FIXED);
 
   /* print automaton */
   no_reduce_set =  bitset_create (ntokens, BITSET_FIXED);
 
   /* print automaton */


@@ -575,8 +525,7 @@ print_xml (void)
   xml_puts (out, level + 1, "</automaton>");
 
   bitset_free (no_reduce_set);
   xml_puts (out, level + 1, "</automaton>");
 
   bitset_free (no_reduce_set);

-  if (report_flag & report_itemsets)
-    free_closure ();
+  free_closure ();

 
   xml_puts (out, 0, "</bison-xml-report>");
 
 
   xml_puts (out, 0, "</bison-xml-report>");