mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 12:23:04 +00:00
21f1b063d8
* 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.
46 lines
1.7 KiB
C
46 lines
1.7 KiB
C
/* Find and resolve or report lookahead conflicts for bison,
|
|
Copyright (C) 2000, 2001, 2002, 2004, 2007 Free Software Foundation, Inc.
|
|
|
|
This file is part of Bison, the GNU Compiler Compiler.
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef CONFLICTS_H_
|
|
# define CONFLICTS_H_
|
|
# include "state.h"
|
|
|
|
void conflicts_solve (void);
|
|
|
|
/**
|
|
* Update state numbers recorded in internal arrays such that:
|
|
* - \c nstates_old is the old number of states.
|
|
* - Where \c i is the old state number, <tt>old_to_new[i]</tt> is either:
|
|
* - \c nstates_old if state \c i is removed because it is unreachable.
|
|
* - The new state number.
|
|
* - The highest new state number is the number of remaining states - 1.
|
|
* - The numerical order of the remaining states has not changed.
|
|
*/
|
|
void conflicts_update_state_numbers (state_number old_to_new[],
|
|
state_number nstates_old);
|
|
|
|
void conflicts_print (void);
|
|
int conflicts_total_count (void);
|
|
void conflicts_output (FILE *out);
|
|
void conflicts_free (void);
|
|
|
|
/* Were there conflicts? */
|
|
extern int expected_sr_conflicts;
|
|
extern int expected_rr_conflicts;
|
|
#endif /* !CONFLICTS_H_ */
|