X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c02634922181a18cd6f2d430901a7747ea17b12b..aca4ddc75daaf5a9d9ce8f52e15e1f9c0ebab741:/src/conflicts.c diff --git a/src/conflicts.c b/src/conflicts.c index 2cf6ce28..9af53a67 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -1,48 +1,53 @@ -/* Find and resolve or report look-ahead conflicts for bison, - Copyright (C) 1984, 1989, 1992, 2000, 2001, 2002 - Free Software Foundation, Inc. +/* Find and resolve or report lookahead conflicts for bison, + + Copyright (C) 1984, 1989, 1992, 2000-2007, 2009-2012 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 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. + 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. - Bison 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. + 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., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + along with this program. If not, see . */ +#include #include "system.h" -#include "bitset.h" + +#include + +#include "LR0.h" #include "complain.h" -#include "getargs.h" -#include "symtab.h" +#include "conflicts.h" #include "files.h" +#include "getargs.h" #include "gram.h" -#include "state.h" #include "lalr.h" -#include "conflicts.h" +#include "print-xml.h" #include "reader.h" -#include "LR0.h" +#include "state.h" +#include "symtab.h" /* -1 stands for not specified. */ -int expected_conflicts = -1; -static char *conflicts = NULL; -struct obstack solved_conflicts_obstack; +int expected_sr_conflicts = -1; +int expected_rr_conflicts = -1; +static char *conflicts; +static struct obstack solved_conflicts_obstack; +static struct obstack solved_conflicts_xml_obstack; -static bitset shiftset; -static bitset lookaheadset; +static bitset shift_set; +static bitset lookahead_set; -enum conflict_resolution_e +enum conflict_resolution { shift_resolution, reduce_resolution, @@ -52,9 +57,14 @@ enum conflict_resolution_e }; +/*----------------------------------------------------------------. +| Explain how an SR conflict between TOKEN and RULE was resolved: | +| RESOLUTION. | +`----------------------------------------------------------------*/ + static inline void -log_resolution (int lookahead, int token, - enum conflict_resolution_e resolution) +log_resolution (rule *r, symbol_number token, + enum conflict_resolution resolution) { if (report_flag & report_solved_conflicts) { @@ -62,26 +72,28 @@ log_resolution (int lookahead, int token, switch (resolution) { case shift_resolution: - case left_resolution: + case right_resolution: obstack_fgrow2 (&solved_conflicts_obstack, - _("\ - Conflict between rule %d and token %s resolved as shift"), - LArule[lookahead]->number, + _(" Conflict between rule %d and token %s" + " resolved as shift"), + r->number, symbols[token]->tag); break; + case reduce_resolution: - case right_resolution: + case left_resolution: obstack_fgrow2 (&solved_conflicts_obstack, - _("\ - Conflict between rule %d and token %s resolved as reduce"), - LArule[lookahead]->number, + _(" Conflict between rule %d and token %s" + " resolved as reduce"), + r->number, symbols[token]->tag); break; + case nonassoc_resolution: obstack_fgrow2 (&solved_conflicts_obstack, - _("\ - Conflict between rule %d and token %s resolved as an error"), - LArule[lookahead]->number, + _(" Conflict between rule %d and token %s" + " resolved as an error"), + r->number, symbols[token]->tag); break; } @@ -92,7 +104,7 @@ log_resolution (int lookahead, int token, case shift_resolution: obstack_fgrow2 (&solved_conflicts_obstack, " (%s < %s)", - LArule[lookahead]->prec->tag, + r->prec->tag, symbols[token]->tag); break; @@ -100,7 +112,7 @@ log_resolution (int lookahead, int token, obstack_fgrow2 (&solved_conflicts_obstack, " (%s < %s)", symbols[token]->tag, - LArule[lookahead]->prec->tag); + r->prec->tag); break; case left_resolution: @@ -114,46 +126,121 @@ log_resolution (int lookahead, int token, " (%%right %s)", symbols[token]->tag); break; + case nonassoc_resolution: obstack_fgrow1 (&solved_conflicts_obstack, " (%%nonassoc %s)", symbols[token]->tag); break; } + obstack_sgrow (&solved_conflicts_obstack, ".\n"); } + + /* XML report */ + if (xml_flag) + { + /* The description of the resolution. */ + switch (resolution) + { + case shift_resolution: + case right_resolution: + obstack_fgrow2 (&solved_conflicts_xml_obstack, + " ", + r->number, + xml_escape (symbols[token]->tag)); + break; + + case reduce_resolution: + case left_resolution: + obstack_fgrow2 (&solved_conflicts_xml_obstack, + " ", + r->number, + xml_escape (symbols[token]->tag)); + break; + + case nonassoc_resolution: + obstack_fgrow2 (&solved_conflicts_xml_obstack, + " ", + r->number, + xml_escape (symbols[token]->tag)); + break; + } + + /* The reason. */ + switch (resolution) + { + case shift_resolution: + obstack_fgrow2 (&solved_conflicts_xml_obstack, + "%s < %s", + xml_escape_n (0, r->prec->tag), + xml_escape_n (1, symbols[token]->tag)); + break; + + case reduce_resolution: + obstack_fgrow2 (&solved_conflicts_xml_obstack, + "%s < %s", + xml_escape_n (0, symbols[token]->tag), + xml_escape_n (1, r->prec->tag)); + break; + + case left_resolution: + obstack_fgrow1 (&solved_conflicts_xml_obstack, + "%%left %s", + xml_escape (symbols[token]->tag)); + break; + + case right_resolution: + obstack_fgrow1 (&solved_conflicts_xml_obstack, + "%%right %s", + xml_escape (symbols[token]->tag)); + break; + + case nonassoc_resolution: + obstack_fgrow1 (&solved_conflicts_xml_obstack, + "%%nonassoc %s", + xml_escape (symbols[token]->tag)); + break; + } + + obstack_sgrow (&solved_conflicts_xml_obstack, "\n"); + } } /*------------------------------------------------------------------. | Turn off the shift recorded for the specified token in the | | specified state. Used when we resolve a shift-reduce conflict in | -| favor of the reduction. | +| favor of the reduction or as an error (%nonassoc). | `------------------------------------------------------------------*/ static void -flush_shift (state_t *state, int token) +flush_shift (state *s, int token) { - shifts *shiftp = state->shifts; + transitions *trans = s->transitions; int i; - bitset_reset (lookaheadset, token); - for (i = 0; i < shiftp->nshifts; i++) - if (!SHIFT_IS_DISABLED (shiftp, i) && SHIFT_SYMBOL (shiftp, i) == token) - SHIFT_DISABLE (shiftp, i); + bitset_reset (lookahead_set, token); + for (i = 0; i < trans->num; i++) + if (!TRANSITION_IS_DISABLED (trans, i) + && TRANSITION_SYMBOL (trans, i) == token) + TRANSITION_DISABLE (trans, i); } -/*-------------------------------------------------------------------. -| Turn off the reduce recorded for the specified token for the | -| specified lookahead. Used when we resolve a shift-reduce conflict | -| in favor of the shift. | -`-------------------------------------------------------------------*/ +/*--------------------------------------------------------------------. +| Turn off the reduce recorded for the specified token in the | +| specified lookahead set. Used when we resolve a shift-reduce | +| conflict in favor of the shift or as an error (%nonassoc). | +`--------------------------------------------------------------------*/ static void -flush_reduce (int lookahead, int token) +flush_reduce (bitset lookahead_tokens, int token) { - bitset_reset (LA[lookahead], token); + bitset_reset (lookahead_tokens, token); } @@ -162,20 +249,26 @@ flush_reduce (int lookahead, int token) | precedence declarations. It has already been checked that the | | rule has a precedence. A conflict is resolved by modifying the | | shift or reduce tables so that there is no longer a conflict. | +| | +| RULENO is the number of the lookahead bitset to consider. | +| | +| ERRORS and NERRS can be used to store discovered explicit | +| errors. | `------------------------------------------------------------------*/ static void -resolve_sr_conflict (state_t *state, int lookahead) +resolve_sr_conflict (state *s, int ruleno, symbol **errors, int *nerrs) { - int i; - /* find the rule to reduce by to get precedence of reduction */ - int redprec = LArule[lookahead]->prec->prec; - errs *errp = errs_new (ntokens + 1); - errp->nerrs = 0; + symbol_number i; + reductions *reds = s->reductions; + /* Find the rule to reduce by to get precedence of reduction. */ + rule *redrule = reds->rules[ruleno]; + int redprec = redrule->prec->prec; + bitset lookahead_tokens = reds->lookahead_tokens[ruleno]; for (i = 0; i < ntokens; i++) - if (bitset_test (LA[lookahead], i) - && bitset_test (lookaheadset, i) + if (bitset_test (lookahead_tokens, i) + && bitset_test (lookahead_set, i) && symbols[i]->prec) { /* Shift-reduce conflict occurs for token number i @@ -183,13 +276,13 @@ resolve_sr_conflict (state_t *state, int lookahead) The precedence of shifting is that of token i. */ if (symbols[i]->prec < redprec) { - log_resolution (lookahead, i, reduce_resolution); - flush_shift (state, i); + log_resolution (redrule, i, reduce_resolution); + flush_shift (s, i); } else if (symbols[i]->prec > redprec) { - log_resolution (lookahead, i, shift_resolution); - flush_reduce (lookahead, i); + log_resolution (redrule, i, shift_resolution); + flush_reduce (lookahead_tokens, i); } else /* Matching precedence levels. @@ -199,94 +292,130 @@ resolve_sr_conflict (state_t *state, int lookahead) switch (symbols[i]->assoc) { + default: + abort (); + case right_assoc: - log_resolution (lookahead, i, right_resolution); - flush_reduce (lookahead, i); + log_resolution (redrule, i, right_resolution); + flush_reduce (lookahead_tokens, i); break; case left_assoc: - log_resolution (lookahead, i, left_resolution); - flush_shift (state, i); + log_resolution (redrule, i, left_resolution); + flush_shift (s, i); break; case non_assoc: - log_resolution (lookahead, i, nonassoc_resolution); - flush_shift (state, i); - flush_reduce (lookahead, i); + log_resolution (redrule, i, nonassoc_resolution); + flush_shift (s, i); + flush_reduce (lookahead_tokens, i); /* Record an explicit error for this token. */ - errp->errs[errp->nerrs++] = i; - break; - - case undef_assoc: - assert (symbols[i]->assoc != undef_assoc); + errors[(*nerrs)++] = symbols[i]; break; } } - - /* Some tokens have been explicitly made errors. Allocate a - permanent errs structure for this state, to record them. */ - state->errs = errs_dup (errp); - free (errp); - - if (obstack_object_size (&solved_conflicts_obstack)) - { - obstack_1grow (&solved_conflicts_obstack, '\0'); - state->solved_conflicts = obstack_finish (&solved_conflicts_obstack); - } } +/*-------------------------------------------------------------------. +| Solve the S/R conflicts of state S using the | +| precedence/associativity, and flag it inconsistent if it still has | +| conflicts. ERRORS can be used as storage to compute the list of | +| lookahead tokens on which S raises a syntax error (%nonassoc). | +`-------------------------------------------------------------------*/ + static void -set_conflicts (state_t *state) +set_conflicts (state *s, symbol **errors) { int i; - shifts *shiftp; + transitions *trans = s->transitions; + reductions *reds = s->reductions; + int nerrs = 0; - if (state->consistent) + if (s->consistent) return; - bitset_zero (lookaheadset); + bitset_zero (lookahead_set); - shiftp = state->shifts; - for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++) - if (!SHIFT_IS_DISABLED (shiftp, i)) - bitset_set (lookaheadset, SHIFT_SYMBOL (shiftp, i)); + FOR_EACH_SHIFT (trans, i) + bitset_set (lookahead_set, TRANSITION_SYMBOL (trans, i)); /* Loop over all rules which require lookahead in this state. First check for shift-reduce conflict, and try to resolve using - precedence */ - for (i = 0; i < state->nlookaheads; ++i) - if (state->lookaheads_rule[i]->prec - && state->lookaheads_rule[i]->prec->prec - && !bitset_disjoint_p (state->lookaheads[i], lookaheadset)) - { - resolve_sr_conflict (state, (state->lookaheads - LA) + i); - break; - } + precedence. */ + for (i = 0; i < reds->num; ++i) + if (reds->rules[i]->prec && reds->rules[i]->prec->prec + && !bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set)) + resolve_sr_conflict (s, i, errors, &nerrs); + + if (nerrs) + { + /* Some tokens have been explicitly made errors. Allocate a + permanent errs structure for this state, to record them. */ + state_errs_set (s, nerrs, errors); + } + if (obstack_object_size (&solved_conflicts_obstack)) + { + obstack_1grow (&solved_conflicts_obstack, '\0'); + s->solved_conflicts = obstack_finish (&solved_conflicts_obstack); + } + if (obstack_object_size (&solved_conflicts_xml_obstack)) + { + obstack_1grow (&solved_conflicts_xml_obstack, '\0'); + s->solved_conflicts_xml = obstack_finish (&solved_conflicts_xml_obstack); + } /* Loop over all rules which require lookahead in this state. Check for conflicts not resolved above. */ - for (i = 0; i < state->nlookaheads; ++i) + for (i = 0; i < reds->num; ++i) { - if (!bitset_disjoint_p (state->lookaheads[i], lookaheadset)) - conflicts[state->number] = 1; - - bitset_or (lookaheadset, lookaheadset, state->lookaheads[i]); + if (!bitset_disjoint_p (reds->lookahead_tokens[i], lookahead_set)) + conflicts[s->number] = 1; + bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]); } } + +/*----------------------------------------------------------------. +| Solve all the S/R conflicts using the precedence/associativity, | +| and flag as inconsistent the states that still have conflicts. | +`----------------------------------------------------------------*/ + void conflicts_solve (void) { - size_t i; + state_number i; + /* List of lookahead tokens on which we explicitly raise a syntax error. */ + symbol **errors = xnmalloc (ntokens + 1, sizeof *errors); - conflicts = XCALLOC (char, nstates); - shiftset = bitset_create (ntokens, BITSET_FIXED); - lookaheadset = bitset_create (ntokens, BITSET_FIXED); + conflicts = xcalloc (nstates, sizeof *conflicts); + shift_set = bitset_create (ntokens, BITSET_FIXED); + lookahead_set = bitset_create (ntokens, BITSET_FIXED); obstack_init (&solved_conflicts_obstack); + obstack_init (&solved_conflicts_xml_obstack); for (i = 0; i < nstates; i++) - set_conflicts (states[i]); + { + set_conflicts (states[i], errors); + + /* For uniformity of the code, make sure all the states have a valid + `errs' member. */ + if (!states[i]->errs) + states[i]->errs = errs_new (0, 0); + } + + free (errors); +} + + +void +conflicts_update_state_numbers (state_number old_to_new[], + state_number nstates_old) +{ + state_number i; + for (i = 0; i < nstates_old; ++i) + if (old_to_new[i] != nstates_old) + conflicts[old_to_new[i]] = conflicts[i]; } @@ -295,97 +424,77 @@ conflicts_solve (void) `---------------------------------------------*/ static int -count_sr_conflicts (state_t *state) +count_sr_conflicts (state *s) { int i; int src_count = 0; - shifts *shiftp = state->shifts; + transitions *trans = s->transitions; + reductions *reds = s->reductions; - if (!shiftp) + if (!trans) return 0; - bitset_zero (lookaheadset); - bitset_zero (shiftset); + bitset_zero (lookahead_set); + bitset_zero (shift_set); - for (i = 0; i < shiftp->nshifts && SHIFT_IS_SHIFT (shiftp, i); i++) - if (!SHIFT_IS_DISABLED (shiftp, i)) - bitset_set (shiftset, SHIFT_SYMBOL (shiftp, i)); + FOR_EACH_SHIFT (trans, i) + bitset_set (shift_set, TRANSITION_SYMBOL (trans, i)); - for (i = 0; i < state->nlookaheads; ++i) - bitset_or (lookaheadset, lookaheadset, state->lookaheads[i]); + for (i = 0; i < reds->num; ++i) + bitset_or (lookahead_set, lookahead_set, reds->lookahead_tokens[i]); - bitset_and (lookaheadset, lookaheadset, shiftset); + bitset_and (lookahead_set, lookahead_set, shift_set); - src_count = bitset_count (lookaheadset); + src_count = bitset_count (lookahead_set); return src_count; } -/*----------------------------------------------. -| Count the number of reduce/reduce conflicts. | -`----------------------------------------------*/ +/*----------------------------------------------------------------. +| Count the number of reduce/reduce conflicts. If ONE_PER_TOKEN, | +| count one conflict for each token that has any reduce/reduce | +| conflicts. Otherwise, count one conflict for each pair of | +| conflicting reductions. | ++`----------------------------------------------------------------*/ static int -count_rr_conflicts (state_t *state) +count_rr_conflicts (state *s, bool one_per_token) { int i; + reductions *reds = s->reductions; int rrc_count = 0; - if (state->nlookaheads < 2) - return 0; - for (i = 0; i < ntokens; i++) { int count = 0; int j; - for (j = 0; j < state->nlookaheads; ++j) - if (bitset_test (state->lookaheads[j], i)) + for (j = 0; j < reds->num; ++j) + if (bitset_test (reds->lookahead_tokens[j], i)) count++; if (count >= 2) - rrc_count++; + rrc_count += one_per_token ? 1 : count-1; } return rrc_count; } -/*--------------------------------------------------------------. -| Return a human readable string which reports shift/reduce and | -| reduce/reduce conflict numbers (SRC_NUM, RRC_NUM). | -`--------------------------------------------------------------*/ - -static const char * -conflict_report (int src_num, int rrc_num) -{ - static char res[4096]; - char *cp = res; - - if (src_num >= 1) - { - sprintf (cp, ngettext ("%d shift/reduce conflict", - "%d shift/reduce conflicts", src_num), src_num); - cp += strlen (cp); - } - - if (src_num > 0 && rrc_num > 0) - { - sprintf (cp, " %s ", _("and")); - cp += strlen (cp); - } - if (rrc_num >= 1) - { - sprintf (cp, ngettext ("%d reduce/reduce conflict", - "%d reduce/reduce conflicts", rrc_num), rrc_num); - cp += strlen (cp); - } +/*--------------------------------------------------------. +| Report the number of conflicts, using the Yacc format. | +`--------------------------------------------------------*/ - *cp++ = '.'; - *cp++ = '\n'; - *cp++ = '\0'; - - return res; +static void +conflict_report (FILE *out, int src_num, int rrc_num) +{ + if (src_num && rrc_num) + fprintf (out, _("conflicts: %d shift/reduce, %d reduce/reduce\n"), + src_num, rrc_num); + else if (src_num) + fprintf (out, _("conflicts: %d shift/reduce\n"), src_num); + else if (rrc_num) + fprintf (out, _("conflicts: %d reduce/reduce\n"), rrc_num); } @@ -396,18 +505,45 @@ conflict_report (int src_num, int rrc_num) void conflicts_output (FILE *out) { - bool printed_sth = FALSE; - size_t i; + bool printed_sth = false; + state_number i; + for (i = 0; i < nstates; i++) + { + state *s = states[i]; + if (conflicts[i]) + { + fprintf (out, _("State %d "), i); + conflict_report (out, count_sr_conflicts (s), + count_rr_conflicts (s, true)); + printed_sth = true; + } + } + if (printed_sth) + fputs ("\n\n", out); +} + +/*--------------------------------------------------------. +| Total the number of S/R and R/R conflicts. Unlike the | +| code in conflicts_output, however, count EACH pair of | +| reductions for the same state and lookahead as one | +| conflict. | +`--------------------------------------------------------*/ + +int +conflicts_total_count (void) +{ + state_number i; + int count; + + /* Conflicts by state. */ + count = 0; for (i = 0; i < nstates; i++) if (conflicts[i]) { - fprintf (out, _("State %d contains "), i); - fputs (conflict_report (count_sr_conflicts (states[i]), - count_rr_conflicts (states[i])), out); - printed_sth = TRUE; + count += count_sr_conflicts (states[i]); + count += count_rr_conflicts (states[i], false); } - if (printed_sth) - fputs ("\n\n", out); + return count; } @@ -418,58 +554,74 @@ conflicts_output (FILE *out) void conflicts_print (void) { - size_t i; - /* Is the number of SR conflicts OK? Either EXPECTED_CONFLICTS is not set, and then we want 0 SR, or else it is specified, in which case we want equality. */ - int src_ok = 0; + bool src_ok; + bool rrc_ok; int src_total = 0; int rrc_total = 0; + int src_expected; + int rrc_expected; /* Conflicts by state. */ - for (i = 0; i < nstates; i++) - if (conflicts[i]) - { - src_total += count_sr_conflicts (states[i]); - rrc_total += count_rr_conflicts (states[i]); - } + { + state_number i; + + for (i = 0; i < nstates; i++) + if (conflicts[i]) + { + src_total += count_sr_conflicts (states[i]); + rrc_total += count_rr_conflicts (states[i], true); + } + } + + if (! glr_parser && rrc_total > 0 && expected_rr_conflicts != -1) + { + warn (_("%%expect-rr applies only to GLR parsers")); + expected_rr_conflicts = -1; + } - src_ok = src_total == (expected_conflicts == -1 ? 0 : expected_conflicts); + src_expected = expected_sr_conflicts == -1 ? 0 : expected_sr_conflicts; + rrc_expected = expected_rr_conflicts == -1 ? 0 : expected_rr_conflicts; + src_ok = src_total == src_expected; + rrc_ok = rrc_total == rrc_expected; - /* If there are no RR conflicts, and as many SR conflicts as + /* If there are as many RR conflicts and SR conflicts as expected, then there is nothing to report. */ - if (!rrc_total && src_ok) + if (rrc_ok & src_ok) return; /* Report the total number of conflicts on STDERR. */ - if (yacc_flag) + if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1) { - /* If invoked with `--yacc', use the output format specified by - POSIX. */ - fprintf (stderr, _("conflicts: ")); - if (src_total > 0) - fprintf (stderr, _(" %d shift/reduce"), src_total); - if (src_total > 0 && rrc_total > 0) - fprintf (stderr, ","); - if (rrc_total > 0) - fprintf (stderr, _(" %d reduce/reduce"), rrc_total); - putc ('\n', stderr); + if (!(warnings_flag & warnings_conflicts_sr)) + src_total = 0; + if (!(warnings_flag & warnings_conflicts_rr)) + rrc_total = 0; } - else + if (src_total | rrc_total) { - fprintf (stderr, _("%s contains "), infile); - fputs (conflict_report (src_total, rrc_total), stderr); + if (expected_sr_conflicts == -1 && expected_rr_conflicts == -1) + set_warning_issued (); + if (! yacc_flag) + fprintf (stderr, "%s: ", current_file); + conflict_report (stderr, src_total, rrc_total); } - if (expected_conflicts != -1 && !src_ok) + if (expected_sr_conflicts != -1 || expected_rr_conflicts != -1) { - complain_message_count++; - fprintf (stderr, ngettext ("expected %d shift/reduce conflict\n", - "expected %d shift/reduce conflicts\n", - expected_conflicts), - expected_conflicts); + if (! src_ok) + complain (ngettext ("expected %d shift/reduce conflict", + "expected %d shift/reduce conflicts", + src_expected), + src_expected); + if (! rrc_ok) + complain (ngettext ("expected %d reduce/reduce conflict", + "expected %d reduce/reduce conflicts", + rrc_expected), + rrc_expected); } } @@ -477,8 +629,9 @@ conflicts_print (void) void conflicts_free (void) { - XFREE (conflicts); - bitset_free (shiftset); - bitset_free (lookaheadset); + free (conflicts); + bitset_free (shift_set); + bitset_free (lookahead_set); obstack_free (&solved_conflicts_obstack, NULL); + obstack_free (&solved_conflicts_xml_obstack, NULL); }