X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/110ef36a1a93c60cc83627492de40cb95aedf9b1..026816664ff8283a55f91915843a8ff0ac5cf86c:/src/print-xml.c?ds=inline diff --git a/src/print-xml.c b/src/print-xml.c index 72e61a84..e5c25c54 100644 --- a/src/print-xml.c +++ b/src/print-xml.c @@ -1,23 +1,21 @@ /* Print an xml on generated parser, for Bison, - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. - Bison is free software; you can redistribute it and/or modify + 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 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Bison is distributed in the hope that it will be useful, + 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 Bison; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include #include "system.h" @@ -25,7 +23,6 @@ #include #include -#include #include "LR0.h" #include "closure.h" @@ -48,7 +45,8 @@ struct escape_buf char *ptr; size_t size; }; -static struct escape_buf escape_bufs[2]; +enum { num_escape_bufs = 3 }; +static struct escape_buf escape_bufs[num_escape_bufs]; /*--------------------------------. @@ -84,36 +82,36 @@ print_core (FILE *out, int level, state *s) sp1 = sp = ritem + sitems[i]; while (*sp >= 0) - sp++; + sp++; r = item_number_as_rule_number (*sp); sp = rules[r].rhs; /* Display the lookahead tokens? */ if (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, - "", - rules[r].number, sp1 - sp); - state_rule_lookahead_tokens_print_xml (s, &rules[r], - out, level + 2); - xml_puts (out, level + 1, ""); - printed = true; - } - } + { + 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, + "", + rules[r].number, sp1 - sp); + state_rule_lookahead_tokens_print_xml (s, &rules[r], + out, level + 2); + xml_puts (out, level + 1, ""); + printed = true; + } + } if (!printed) - { - xml_printf (out, level + 1, - "", - rules[r].number, - sp1 - sp); - } + { + xml_printf (out, level + 1, + "", + rules[r].number, + sp1 - sp); + } } xml_puts (out, level, ""); } @@ -134,7 +132,7 @@ print_transitions (state *s, FILE *out, int level) for (i = 0; i < trans->num; i++) if (!TRANSITION_IS_DISABLED (trans, i)) { - n++; + n++; } /* Nothing to report. */ @@ -148,28 +146,28 @@ print_transitions (state *s, FILE *out, int level) for (i = 0; i < trans->num; i++) if (!TRANSITION_IS_DISABLED (trans, i) - && TRANSITION_IS_SHIFT (trans, i)) + && TRANSITION_IS_SHIFT (trans, i)) { - symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)]; - char const *tag = sym->tag; - state *s1 = trans->states[i]; + symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)]; + char const *tag = sym->tag; + state *s1 = trans->states[i]; - xml_printf (out, level + 1, - "", - xml_escape (tag), s1->number); + xml_printf (out, level + 1, + "", + xml_escape (tag), s1->number); } for (i = 0; i < trans->num; i++) if (!TRANSITION_IS_DISABLED (trans, i) - && !TRANSITION_IS_SHIFT (trans, i)) + && !TRANSITION_IS_SHIFT (trans, i)) { - symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)]; - char const *tag = sym->tag; - state *s1 = trans->states[i]; + symbol *sym = symbols[TRANSITION_SYMBOL (trans, i)]; + char const *tag = sym->tag; + state *s1 = trans->states[i]; - xml_printf (out, level + 1, - "", - xml_escape (tag), s1->number); + xml_printf (out, level + 1, + "", + xml_escape (tag), s1->number); } xml_puts (out, level, ""); @@ -202,36 +200,36 @@ print_errs (FILE *out, int level, state *s) for (i = 0; i < errp->num; ++i) if (errp->symbols[i]) { - char const *tag = errp->symbols[i]->tag; - xml_printf (out, level + 1, - "nonassociative", - xml_escape (tag)); + char const *tag = errp->symbols[i]->tag; + xml_printf (out, level + 1, + "nonassociative", + xml_escape (tag)); } xml_puts (out, level, ""); } /*-------------------------------------------------------------------------. -| Report a reduction of RULE on LOOKAHEAD_TOKEN (which can be `default'). | +| Report a reduction of RULE on LOOKAHEAD_TOKEN (which can be 'default'). | | If not ENABLED, the rule is masked by a shift or a reduce (S/R and | | R/R conflicts). | `-------------------------------------------------------------------------*/ static void print_reduction (FILE *out, int level, char const *lookahead_token, - rule *r, bool enabled) + rule *r, bool enabled) { if (r->number) xml_printf (out, level, - "", - xml_escape (lookahead_token), - r->number, - enabled ? "true" : "false"); + "", + xml_escape (lookahead_token), + r->number, + enabled ? "true" : "false"); else xml_printf (out, level, - "", - xml_escape (lookahead_token), - enabled ? "true" : "false"); + "", + xml_escape (lookahead_token), + enabled ? "true" : "false"); } @@ -248,10 +246,11 @@ print_reductions (FILE *out, int level, state *s) int report = false; int i, j; - if (reds->num == 0) { - xml_puts (out, level, ""); - return; - } + if (reds->num == 0) + { + xml_puts (out, level, ""); + return; + } if (yydefact[s->number] != 0) default_reduction = &rules[yydefact[s->number] - 1]; @@ -269,22 +268,22 @@ print_reductions (FILE *out, int level, state *s) if (reds->lookahead_tokens) for (i = 0; i < ntokens; i++) { - bool count = bitset_test (no_reduce_set, i); - - for (j = 0; j < reds->num; ++j) - if (bitset_test (reds->lookahead_tokens[j], i)) - { - if (! count) - { - if (reds->rules[j] != default_reduction) - report = true; - count = true; - } - else - { - report = true; - } - } + bool count = bitset_test (no_reduce_set, i); + + for (j = 0; j < reds->num; ++j) + if (bitset_test (reds->lookahead_tokens[j], i)) + { + if (! count) + { + if (reds->rules[j] != default_reduction) + report = true; + count = true; + } + else + { + report = true; + } + } } /* Nothing to report. */ @@ -299,36 +298,36 @@ print_reductions (FILE *out, int level, state *s) if (reds->lookahead_tokens) for (i = 0; i < ntokens; i++) { - bool defaulted = false; - bool count = bitset_test (no_reduce_set, i); - - for (j = 0; j < reds->num; ++j) - if (bitset_test (reds->lookahead_tokens[j], i)) - { - if (! count) - { - if (reds->rules[j] != default_reduction) - print_reduction (out, level + 1, symbols[i]->tag, - reds->rules[j], true); - else - defaulted = true; - count = true; - } - else - { - if (defaulted) - print_reduction (out, level + 1, symbols[i]->tag, - default_reduction, true); - defaulted = false; - print_reduction (out, level + 1, symbols[i]->tag, - reds->rules[j], false); - } - } + bool defaulted = false; + bool count = bitset_test (no_reduce_set, i); + + for (j = 0; j < reds->num; ++j) + if (bitset_test (reds->lookahead_tokens[j], i)) + { + if (! count) + { + if (reds->rules[j] != default_reduction) + print_reduction (out, level + 1, symbols[i]->tag, + reds->rules[j], true); + else + defaulted = true; + count = true; + } + else + { + if (defaulted) + print_reduction (out, level + 1, symbols[i]->tag, + default_reduction, true); + defaulted = false; + print_reduction (out, level + 1, symbols[i]->tag, + reds->rules[j], false); + } + } } if (default_reduction) print_reduction (out, level + 1, - "$default", default_reduction, true); + "$default", default_reduction, true); xml_puts (out, level, ""); } @@ -391,7 +390,7 @@ print_grammar (FILE *out, int level) for (i = 0; i < max_user_token_number + 1; i++) if (token_translations[i] != undeftoken->number) { - char const *tag = symbols[token_translations[i]]->tag; + char const *tag = symbols[token_translations[i]]->tag; int precedence = symbols[token_translations[i]]->prec; assoc associativity = symbols[token_translations[i]]->assoc; xml_indent (out, level + 2); @@ -415,9 +414,9 @@ print_grammar (FILE *out, int level) { char const *tag = symbols[i]->tag; xml_printf (out, level + 2, - "", - i, xml_escape (tag), + i, xml_escape (tag), reduce_nonterminal_useless_in_grammar (i) ? "useless-in-grammar" : "useful"); } @@ -498,18 +497,21 @@ xml_escape (char const *str) void print_xml (void) { - state_number i; int level = 0; FILE *out = xfopen (spec_xml_file, "w"); fputs ("\n\n", out); - xml_printf (out, level, "", - xml_escape (VERSION)); + xml_printf (out, level, + "", + xml_escape_n (0, VERSION), + xml_escape_n (1, PACKAGE_BUGREPORT), + xml_escape_n (2, PACKAGE_URL)); fputc ('\n', out); xml_printf (out, level + 1, "%s", - xml_escape (grammar_file)); + xml_escape (grammar_file)); /* print grammar */ print_grammar (out, level + 1); @@ -520,8 +522,11 @@ print_xml (void) /* print automaton */ fputc ('\n', out); xml_puts (out, level + 1, ""); - for (i = 0; i < nstates; i++) - print_state (out, level + 2, states[i]); + { + state_number i; + for (i = 0; i < nstates; i++) + print_state (out, level + 2, states[i]); + } xml_puts (out, level + 1, ""); bitset_free (no_reduce_set); @@ -529,8 +534,11 @@ print_xml (void) xml_puts (out, 0, ""); - free (escape_bufs[0].ptr); - free (escape_bufs[1].ptr); + { + int i; + for (i = 0; i < num_escape_bufs; ++i) + free (escape_bufs[i].ptr); + } xfclose (out); }