Re: <reductions>

[Joel E. Denny]

On Sun, 30 Sep 2007, Joel E. Denny wrote:

> In grammar/rules, instead of:
> 
>       <rule number="0">
>         <lhs>$accept</lhs>
>         <rhs>
>           <symbol class="nonterminal">exp</symbol>
>           <symbol class="terminal">$end</symbol>
>         </rhs>
>       </rule>
> 
> we could have:
> 
>       <rule number="0">
>         <lhs>
>           <symbol-ref number="9" />
>         </lhs>
>         <rhs>
>           <symbol-ref number="10" />
>           <symbol-ref number="0" />
>         </rhs>
>       </rule>
> 
> Or is this going too far?  I think it's cleaner.

Perhaps referencing symbols by name rather than number really is the best 
way, but the class attribute is redundant.  Here's a patch, not yet 
committed.  It also adds prec/assoc information to the XML.

Index: ChangeLog
===================================================================
RCS file: /sources/bison/bison/ChangeLog,v
retrieving revision 1.1761
diff -p -u -r1.1761 ChangeLog
--- ChangeLog   8 Dec 2007 16:05:37 -0000       1.1761
+++ ChangeLog   8 Dec 2007 22:17:43 -0000
@@ -1,5 +1,27 @@
 2007-12-08  Joel E. Denny  <address@hidden>
 
+       In XML output, remove redundant class attribute on symbol element.
+       * data/xslt/bison.xsl (xsl:key name="bison:symbolByName"): New.
+       * data/xslt/xml2xhtml.xsl (xsl:template match="symbol"): Use it to
+       look up a symbol to determine whether it's a nonterminal or terminal.
+       * src/gram.c (rule_rhs_print_xml): Remove class attribute.
+       * src/state.c (state_rule_lookahead_tokens_print_xml): Likewise.
+
+       Add prec/assoc information to XML output.
+       * src/gram.c (grammar_rules_print_xml): For each rule that has a
+       %prec, add a percent_prec attribute.
+       * src/print-xml.c (print_grammar): For each terminal that has a
+       precedence or associativity, add a prec or assoc attribute.
+       (xml_indent): New.
+       (xml_puts): Use xml_indent.
+       (xml_printf): Use xml_indent.
+       * src/print-xml.h (xml_indent): Prototype.
+
+       * tests/existing.at (GNU pic Grammar): Fix a rule miscopied from
+       <http://lists.gnu.org/archive/html/bug-bison/2003-04/msg00026.html>.
+
+2007-12-08  Joel E. Denny  <address@hidden>
+
        * data/xslt/bison.xsl (bison:ruleNumber): Rename to...
        (bison:ruleByNumber): ... this for clarity.
        * data/xslt/xml2dot.xsl (xsl:template match="item"): Update.
@@ -300,7 +322,7 @@
 
        * data/xslt/xml2dot.xsl (xsl:template match="automaton/state"): After
        2007-10-11 change, the child elements here are items not rules.
-       (<xsl:template match="item"): New.
+       (xsl:template match="item"): New.
        (xsl:template match="rule"): Update for new reduced itemset.
        (xsl:template match="point"): Remove.
        (xsl:template match="empty"): For consistency with --graph, don't
Index: data/xslt/bison.xsl
===================================================================
RCS file: /sources/bison/bison/data/xslt/bison.xsl,v
retrieving revision 1.3
diff -p -u -r1.3 bison.xsl
--- data/xslt/bison.xsl 8 Dec 2007 16:05:38 -0000       1.3
+++ data/xslt/bison.xsl 8 Dec 2007 22:17:43 -0000
@@ -27,6 +27,16 @@
   xmlns:bison="http://www.gnu.org/software/bison/";>
 
 <xsl:key
+  name="bison:symbolByName"
+  match="/bison-xml-report/grammar/nonterminals/nonterminal"
+  use="@name"
+/>
+<xsl:key
+  name="bison:symbolByName"
+  match="/bison-xml-report/grammar/terminals/terminal"
+  use="@name"
+/>
+<xsl:key
   name="bison:ruleByNumber"
   match="/bison-xml-report/grammar/rules/rule"
   use="@number"
Index: data/xslt/xml2xhtml.xsl
===================================================================
RCS file: /sources/bison/bison/data/xslt/xml2xhtml.xsl,v
retrieving revision 1.8
diff -p -u -r1.8 xml2xhtml.xsl
--- data/xslt/xml2xhtml.xsl     8 Dec 2007 16:05:38 -0000       1.8
+++ data/xslt/xml2xhtml.xsl     8 Dec 2007 22:17:43 -0000
@@ -552,7 +552,7 @@
 <xsl:template match="symbol">
   <xsl:text> </xsl:text>
   <xsl:choose>
-    <xsl:when test="@class = 'nonterminal'">
+    <xsl:when test="name(key('bison:symbolByName', .)) = 'nonterminal'">
       <span class="i"><xsl:value-of select="."/></span>
     </xsl:when>
     <xsl:otherwise>
Index: src/gram.c
===================================================================
RCS file: /sources/bison/bison/src/gram.c,v
retrieving revision 1.64
diff -p -u -r1.64 gram.c
--- src/gram.c  24 Nov 2007 19:41:24 -0000      1.64
+++ src/gram.c  8 Dec 2007 22:17:47 -0000
@@ -121,8 +121,7 @@ rule_rhs_print_xml (rule *r, FILE *out, 
       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 
           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);
Index: src/print-xml.c
===================================================================
RCS file: /sources/bison/bison/src/print-xml.c,v
retrieving revision 1.13
diff -p -u -r1.13 print-xml.c
--- src/print-xml.c     8 Dec 2007 16:05:38 -0000       1.13
+++ src/print-xml.c     8 Dec 2007 22:17:47 -0000
@@ -392,12 +392,20 @@ print_grammar (FILE *out, int level)
     if (token_translations[i] != undeftoken->number)
       {
        char const *tag = symbols[token_translations[i]]->tag;
-       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");
+        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>");
 
@@ -418,11 +426,17 @@ print_grammar (FILE *out, int level)
 }
 
 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);
+}
+
+void
+xml_puts (FILE *out, int level, char const *s)
+{
+  xml_indent (out, level);
   fputs (s, out);
   fputc ('\n', out);
 }
@@ -430,11 +444,9 @@ xml_puts (FILE *out, int level, char con
 void
 xml_printf (FILE *out, int level, char const *fmt, ...)
 {
-  int i;
   va_list arglist;
 
-  for (i = 0; i < level; i++)
-    fputs ("  ", out);
+  xml_indent (out, level);
 
   va_start (arglist, fmt);
   vfprintf (out, fmt, arglist);
Index: src/print-xml.h
===================================================================
RCS file: /sources/bison/bison/src/print-xml.h,v
retrieving revision 1.2
diff -p -u -r1.2 print-xml.h
--- src/print-xml.h     24 Sep 2007 01:41:35 -0000      1.2
+++ src/print-xml.h     8 Dec 2007 22:17:47 -0000
@@ -22,6 +22,7 @@
 #ifndef PRINT_XML_H_
 # define PRINT_XML_H_
 
+void xml_indent (FILE *out, int level);
 void xml_puts (FILE *, int, char const *);
 void xml_printf (FILE *, int, char const *, ...);
 char const *xml_escape_n (int n, char const *str);
Index: src/state.c
===================================================================
RCS file: /sources/bison/bison/src/state.c,v
retrieving revision 1.48
diff -p -u -r1.48 state.c
--- src/state.c 24 Sep 2007 01:41:35 -0000      1.48
+++ src/state.c 8 Dec 2007 22:17:47 -0000
@@ -262,8 +262,7 @@ state_rule_lookahead_tokens_print_xml (s
       xml_puts (out, level, "<lookaheads>");
       BITSET_FOR_EACH (biter, reds->lookahead_tokens[red], k, 0)
        {
-         xml_printf (out, level + 1, "<symbol class=\"%s\">%s</symbol>",
-                     symbol_class_get_string (symbols[k]),
+         xml_printf (out, level + 1, "<symbol>%s</symbol>",
                      xml_escape (symbols[k]->tag));
        }
       xml_puts (out, level, "</lookaheads>");
Index: tests/existing.at
===================================================================
RCS file: /sources/bison/bison/tests/existing.at,v
retrieving revision 1.14
diff -p -u -r1.14 existing.at
--- tests/existing.at   10 Nov 2007 03:42:37 -0000      1.14
+++ tests/existing.at   8 Dec 2007 22:17:47 -0000
@@ -1266,7 +1266,7 @@ element:
        | LABEL ':' optional_separator element
        | LABEL ':' optional_separator position_not_place
        | LABEL ':' optional_separator place
-       | '{}'
+       | '{' {} element_list '}'
                {}
          optional_element
        | placeless_element