Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 21:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make xml2dot.xsl and --graph produce the same output.

Browse Source 
* data/xslt/xml2dot.xsl (xsl:template match="rule"): Use a `
'
instead of a `\n'.  That is, don't add escapes yet or they'll be doubly
escaped later.
(xsl:template name="output-node"): Use the new escape template instead
of the string-replace template directly.
(xsl:template name="output-edge"): Likewise.
(xsl:template name="escape"): New, escapes backslashes and newlines in
addition to quotation marks.
* src/graphviz.c (start_graph, output_node, output_edge): Add
whitespace to output for legibility.

Make xml2text.xsl and --report produce the same output, and remove the
XML "conflicts" element since a conflict summary is easily extracted
from the automaton.
* data/xslt/bison.xsl: New.
(xsl:template match="state" mode="bison:count-conflicts): New.
* data/xslt/xml2text.xsl: Import bison.xsl.
(xsl:template match="bison-xml-report"): Instead of styling the
"conflicts" element, style the "automaton" element with mode
"conflicts".  Unlike the former, the latter lists S/R and R/R
conflicts for a state on the same line.
(xsl:template match="conflicts"): Remove.
(xsl:template match="conflict"): Remove.
(xsl:template match="terminal"): Line-wrap the list of rules in which
the terminal is used.
(xsl:template match="nonterminal"): Likewise for nonterminals.
(xsl:template match="automaton" mode="conflicts"): New.
(xsl:template match="state" mode="conflicts"): New.
(xsl:template name="line-wrap"): New.
(xsl:template name="ws-search"): New.
* data/xslt/xml2xhtml.xsl: Import bison.xsl.
(xsl:template match="bison-xml-report"): Instead of styling the
"conflicts" element, style the "automaton" element with mode
"conflicts."
(xsl:template match="conflicts"): Remove.
(xsl:template match="conflict"): Remove.
(xsl:template match="automaton" mode="conflicts"): New.
(xsl:template match="state" mode="conflicts): New.
* src/conflicts.c (conflicts_output_xml): Remove.
* src/conflicts.h (conflicts_output_xml): Remove prototype.
* src/print-xml.c (print_xml): Don't invoke conflicts_output_xml.
* src/print.c (print_grammar): Consistently wrap at the 66th column so
the corresponding XSLT is easier.  Also, never wrap between a word and
the comma that follows it.
This commit is contained in:
Joel E. Denny
2007-10-09 08:48:43 +00:00
parent 793fbca50a
commit 21f1b063d8
10 changed files with 324 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/conflicts.c
View File

@@ -522,47 +522,6 @@ conflicts_output (FILE *out)
fputs ("\n\n", out);
}
void
conflicts_output_xml (FILE *out, int level)
{
bool printed_sth = false;
state_number i;
int src_num;
int rrc_num;
for (i = 0; i < nstates; i++)
{
state *s = states[i];
if (conflicts[i])
{
if (!printed_sth) {
fputc ('\n', out);
xml_puts (out, level, "<conflicts>");
}
src_num = count_sr_conflicts (s);
rrc_num = count_rr_conflicts (s, true);
if (src_num)
xml_printf (out, level + 1,
"<conflict state=\"%d\" num=\"%d\""
" type=\"shift/reduce\"/>",
i, src_num);
if (rrc_num)
xml_printf (out, level + 1,
"<conflict state=\"%d\" num=\"%d\""
" type=\"reduce/reduce\"/>",
i, rrc_num);
printed_sth = true;
}
}
if (printed_sth)
xml_puts (out, level, "</conflicts>");
else
xml_puts (out, level, "<conflicts/>");
}
/*--------------------------------------------------------.
| Total the number of S/R and R/R conflicts. Unlike the |
| code in conflicts_output, however, count EACH pair of |