X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0619caf0b1e1f05b710bac41bcefa6d12206f285..d8cf039f973a00144c03aec8860e822bffd569e1:/src/conflicts.c diff --git a/src/conflicts.c b/src/conflicts.c index 2ade63da..02b843b3 100644 --- a/src/conflicts.c +++ b/src/conflicts.c @@ -1,5 +1,5 @@ /* Find and resolve or report look-ahead conflicts for bison, - Copyright (C) 1984, 1989, 1992, 2000 Free Software Foundation, Inc. + Copyright 1984, 1989, 1992, 2000, 2001 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -19,38 +19,32 @@ 02111-1307, USA. */ #include "system.h" +#include "complain.h" #include "getargs.h" -#include "alloc.h" #include "files.h" #include "gram.h" #include "state.h" #include "lalr.h" #include "conflicts.h" +#include "reader.h" +#include "LR0.h" -extern char **tags; -extern int fixed_outfiles; +errs **err_table = NULL; +/* -1 stands for not specified. */ +int expected_conflicts = -1; +static char *conflicts = NULL; -int any_conflicts = 0; -errs **err_table; -int expected_conflicts; -static char *conflicts; - -static unsigned *shiftset; -static unsigned *lookaheadset; -static int src_total; -static int rrc_total; -static int src_count; -static int rrc_count; +static unsigned *shiftset = NULL; +static unsigned *lookaheadset = NULL; static inline void log_resolution (int state, int LAno, int token, char *resolution) { - if (verboseflag) - fprintf (foutput, - _("\ + obstack_fgrow4 (&output_obstack, + _("\ Conflict in state %d between rule %d and token %s resolved as %s.\n"), - state, LAruleno[LAno], tags[token], resolution); + state, LAruleno[LAno], tags[token], resolution); } @@ -66,7 +60,7 @@ flush_shift (int state, int token) shifts *shiftp; int k, i; - shiftp = shift_table[state]; + shiftp = state_table[state].shift_table; if (shiftp) { @@ -74,7 +68,7 @@ flush_shift (int state, int token) for (i = 0; i < k; i++) { if (shiftp->shifts[i] - && token == accessing_symbol[shiftp->shifts[i]]) + && token == state_table[shiftp->shifts[i]].accessing_symbol) (shiftp->shifts[i]) = 0; } } @@ -96,14 +90,14 @@ resolve_sr_conflict (int state, int lookaheadnum) unsigned *fp1; unsigned *fp2; int redprec; - errs *errp = (errs *) xmalloc (sizeof (errs) + ntokens * sizeof (short)); + errs *errp = ERRS_ALLOC (ntokens + 1); short *errtokens = errp->errs; /* find the rule to reduce by to get precedence of reduction */ - redprec = rprec[LAruleno[lookaheadnum]]; + redprec = rule_table[LAruleno[lookaheadnum]].prec; mask = 1; - fp1 = LA + lookaheadnum * tokensetsize; + fp1 = LA (lookaheadnum); fp2 = lookaheadset; for (i = 0; i < ntokens; i++) { @@ -132,29 +126,29 @@ resolve_sr_conflict (int state, int lookaheadnum) switch (sassoc[i]) { - case RIGHT_ASSOC: + case right_assoc: log_resolution (state, lookaheadnum, i, _("shift")); break; - case LEFT_ASSOC: + case left_assoc: log_resolution (state, lookaheadnum, i, _("reduce")); break; - case NON_ASSOC: + case non_assoc: log_resolution (state, lookaheadnum, i, _("an error")); break; } - if (sassoc[i] != RIGHT_ASSOC) + if (sassoc[i] != right_assoc) { *fp2 &= ~mask; /* flush the shift for this token */ flush_shift (state, i); } - if (sassoc[i] != LEFT_ASSOC) + if (sassoc[i] != left_assoc) { *fp1 &= ~mask; /* flush the reduce for this token */ } - if (sassoc[i] == NON_ASSOC) + if (sassoc[i] == non_assoc) { /* Record an explicit error for this token. */ *errtokens++ = i; @@ -176,7 +170,7 @@ resolve_sr_conflict (int state, int lookaheadnum) /* Some tokens have been explicitly made errors. Allocate a permanent errs structure for this state, to record them. */ i = (char *) errtokens - (char *) errp; - err_table[state] = (errs *) xmalloc ((unsigned int) i); + err_table[state] = ERRS_ALLOC (i + 1); bcopy (errp, err_table[state], i); } else @@ -188,95 +182,66 @@ resolve_sr_conflict (int state, int lookaheadnum) static void set_conflicts (int state) { - int i; - int k; + int i, j; shifts *shiftp; - unsigned *fp2; - unsigned *fp3; - unsigned *fp4; - unsigned *fp1; int symbol; - if (consistent[state]) + if (state_table[state].consistent) return; for (i = 0; i < tokensetsize; i++) lookaheadset[i] = 0; - shiftp = shift_table[state]; + shiftp = state_table[state].shift_table; if (shiftp) - { - k = shiftp->nshifts; - for (i = 0; i < k; i++) - { - symbol = accessing_symbol[shiftp->shifts[i]]; - if (ISVAR (symbol)) - break; - SETBIT (lookaheadset, symbol); - } - } - - k = lookaheads[state + 1]; - fp4 = lookaheadset + tokensetsize; + for (i = 0; i < shiftp->nshifts; i++) + { + symbol = state_table[shiftp->shifts[i]].accessing_symbol; + if (ISVAR (symbol)) + break; + SETBIT (lookaheadset, symbol); + } /* Loop over all rules which require lookahead in this state. First check for shift-reduce conflict, and try to resolve using precedence */ - for (i = lookaheads[state]; i < k; i++) - if (rprec[LAruleno[i]]) - { - fp1 = LA + i * tokensetsize; - fp2 = fp1; - fp3 = lookaheadset; - - while (fp3 < fp4) + for (i = state_table[state].lookaheads; + i < state_table[state + 1].lookaheads; + ++i) + if (rule_table[LAruleno[i]].prec) + for (j = 0; j < tokensetsize; ++j) + if (LA (i)[j] & lookaheadset[j]) { - if (*fp2++ & *fp3++) - { - resolve_sr_conflict (state, i); - break; - } + resolve_sr_conflict (state, i); + break; } - } /* Loop over all rules which require lookahead in this state. Check for conflicts not resolved above. */ - for (i = lookaheads[state]; i < k; i++) + for (i = state_table[state].lookaheads; + i < state_table[state + 1].lookaheads; + ++i) { - fp1 = LA + i * tokensetsize; - fp2 = fp1; - fp3 = lookaheadset; - - while (fp3 < fp4) - { - if (*fp2++ & *fp3++) - { - conflicts[state] = 1; - any_conflicts = 1; - } - } + for (j = 0; j < tokensetsize; ++j) + if (LA (i)[j] & lookaheadset[j]) + conflicts[state] = 1; - fp2 = fp1; - fp3 = lookaheadset; - - while (fp3 < fp4) - *fp3++ |= *fp2++; + for (j = 0; j < tokensetsize; ++j) + lookaheadset[j] |= LA (i)[j]; } } void -initialize_conflicts (void) +solve_conflicts (void) { int i; - conflicts = NEW2 (nstates, char); - shiftset = NEW2 (tokensetsize, unsigned); - lookaheadset = NEW2 (tokensetsize, unsigned); + conflicts = XCALLOC (char, nstates); + shiftset = XCALLOC (unsigned, tokensetsize); + lookaheadset = XCALLOC (unsigned, tokensetsize); - err_table = NEW2 (nstates, errs *); - - any_conflicts = 0; + err_table = XCALLOC (errs *, nstates); for (i = 0; i < nstates; i++) set_conflicts (i); @@ -287,7 +252,7 @@ initialize_conflicts (void) | Count the number of shift/reduce conflicts. | `---------------------------------------------*/ -static void +static int count_sr_conflicts (int state) { int i; @@ -299,11 +264,11 @@ count_sr_conflicts (int state) unsigned *fp3; int symbol; - src_count = 0; + int src_count = 0; - shiftp = shift_table[state]; + shiftp = state_table[state].shift_table; if (!shiftp) - return; + return 0; for (i = 0; i < tokensetsize; i++) { @@ -316,18 +281,18 @@ count_sr_conflicts (int state) { if (!shiftp->shifts[i]) continue; - symbol = accessing_symbol[shiftp->shifts[i]]; + symbol = state_table[shiftp->shifts[i]].accessing_symbol; if (ISVAR (symbol)) break; SETBIT (shiftset, symbol); } - k = lookaheads[state + 1]; + k = state_table[state + 1].lookaheads; fp3 = lookaheadset + tokensetsize; - for (i = lookaheads[state]; i < k; i++) + for (i = state_table[state].lookaheads; i < k; i++) { - fp1 = LA + i * tokensetsize; + fp1 = LA (i); fp2 = lookaheadset; while (fp2 < fp3) @@ -354,6 +319,8 @@ count_sr_conflicts (int state) fp2++; } } + + return src_count; } @@ -361,33 +328,29 @@ count_sr_conflicts (int state) | Count the number of reduce/reduce conflicts. | `----------------------------------------------*/ -static void +static int count_rr_conflicts (int state) { int i; - int j; - int count; unsigned mask; unsigned *baseword; - unsigned *wordp; - int m; - int n; - rrc_count = 0; + int rrc_count = 0; - m = lookaheads[state]; - n = lookaheads[state + 1]; + int m = state_table[state].lookaheads; + int n = state_table[state + 1].lookaheads; if (n - m < 2) - return; + return 0; mask = 1; - baseword = LA + m * tokensetsize; + baseword = LA (m); for (i = 0; i < ntokens; i++) { - wordp = baseword; + unsigned *wordp = baseword; - count = 0; + int count = 0; + int j; for (j = m; j < n; j++) { if (mask & *wordp) @@ -406,89 +369,124 @@ count_rr_conflicts (int state) baseword++; } } + + return rrc_count; } -/*----------------------------------------------------------. -| Output to OUT a human readable report on shift/reduce and | -| reduce/reduce conflict numbers (SRC_NUM, RRC_NUM). | -`----------------------------------------------------------*/ +/*--------------------------------------------------------------. +| Return a human readable string which reports shift/reduce and | +| reduce/reduce conflict numbers (SRC_NUM, RRC_NUM). | +`--------------------------------------------------------------*/ -static void -conflict_report (FILE *out, int src_num, int rrc_num) +static const char * +conflict_report (int src_num, int rrc_num) { - if (src_num == 1) - fprintf (out, _(" 1 shift/reduce conflict")); - else if (src_num > 1) - fprintf (out, _(" %d shift/reduce conflicts"), src_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) - fprintf (out, _(" and")); + { + sprintf (cp, " %s ", _("and")); + cp += strlen (cp); + } - if (rrc_num == 1) - fprintf (out, _(" 1 reduce/reduce conflict")); - else if (rrc_num > 1) - fprintf (out, _(" %d reduce/reduce conflicts"), rrc_num); + if (rrc_num >= 1) + { + sprintf (cp, ngettext ("%d reduce/reduce conflict", + "%d reduce/reduce conflicts", rrc_num), rrc_num); + cp += strlen (cp); + } + + *cp++ = '.'; + *cp++ = '\n'; + *cp++ = '\0'; - putc ('.', out); - putc ('\n', out); + return res; } -/*---------------------------------------------. -| Compute and give a report on the conflicts. | -`---------------------------------------------*/ +/*-----------------------------------------------------------. +| Output the detailed description of states with conflicts. | +`-----------------------------------------------------------*/ void -print_conflicts (void) +conflicts_output (FILE *out) { int i; + for (i = 0; i < nstates; i++) + if (conflicts[i]) + { + fprintf (out, _("State %d contains "), i); + fputs (conflict_report (count_sr_conflicts (i), + count_rr_conflicts (i)), out); + } +} - src_total = 0; - rrc_total = 0; - /* Count the total number of conflicts, and if wanted, give a - detailed report in FOUTPUT. */ +/*------------------------------------------. +| Reporting the total number of conflicts. | +`------------------------------------------*/ + +void +conflicts_print (void) +{ + int i; + + int src_total = 0; + int rrc_total = 0; + + /* Conflicts by state. */ for (i = 0; i < nstates; i++) + if (conflicts[i]) + { + src_total += count_sr_conflicts (i); + rrc_total += count_rr_conflicts (i); + } + + /* Report the total number of conflicts on STDERR. */ + if (src_total || rrc_total) { - if (conflicts[i]) + if (yacc_flag) { - count_sr_conflicts (i); - count_rr_conflicts (i); - src_total += src_count; - rrc_total += rrc_count; - - if (verboseflag) - { - fprintf (foutput, _("State %d contains"), i); - conflict_report (foutput, src_count, rrc_count); - } + /* 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); + } + else + { + fprintf (stderr, _("%s contains "), infile); + fputs (conflict_report (src_total, rrc_total), stderr); } } - /* Report the total number of conflicts on STDERR. */ - if (fixed_outfiles) - { - /* 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); - } - else + if (expected_conflicts != -1 + && src_total != expected_conflicts) { - fprintf (stderr, _("%s contains"), infile); - conflict_report (stderr, src_total, rrc_total); + complain_message_count++; + fprintf (stderr, ngettext ("expected %d shift/reduce conflict", + "expected %d shift/reduce conflicts", + expected_conflicts), + expected_conflicts); } } void -print_reductions (int state) +print_reductions (FILE *out, int state) { int i; int j; @@ -513,7 +511,7 @@ print_reductions (int state) for (i = 0; i < tokensetsize; i++) shiftset[i] = 0; - shiftp = shift_table[state]; + shiftp = state_table[state].shift_table; if (shiftp) { k = shiftp->nshifts; @@ -521,7 +519,7 @@ print_reductions (int state) { if (!shiftp->shifts[i]) continue; - symbol = accessing_symbol[shiftp->shifts[i]]; + symbol = state_table[shiftp->shifts[i]].accessing_symbol; if (ISVAR (symbol)) break; /* if this state has a shift for the error token, @@ -545,14 +543,14 @@ print_reductions (int state) } } - m = lookaheads[state]; - n = lookaheads[state + 1]; + m = state_table[state].lookaheads; + n = state_table[state + 1].lookaheads; if (n - m == 1 && !nodefault) { default_rule = LAruleno[m]; - fp1 = LA + m * tokensetsize; + fp1 = LA (m); fp2 = shiftset; fp3 = lookaheadset; fp4 = lookaheadset + tokensetsize; @@ -566,8 +564,9 @@ print_reductions (int state) for (i = 0; i < ntokens; i++) { if (mask & *fp3) - fprintf (foutput, _(" %-4s\t[reduce using rule %d (%s)]\n"), - tags[i], default_rule, tags[rlhs[default_rule]]); + fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"), + tags[i], default_rule, + tags[rule_table[default_rule].lhs]); mask <<= 1; if (mask == 0) @@ -577,8 +576,8 @@ print_reductions (int state) } } - fprintf (foutput, _(" $default\treduce using rule %d (%s)\n\n"), - default_rule, tags[rlhs[default_rule]]); + fprintf (out, _(" $default\treduce using rule %d (%s)\n\n"), + default_rule, tags[rule_table[default_rule].lhs]); } else if (n - m >= 1) { @@ -589,7 +588,7 @@ print_reductions (int state) if (!nodefault) for (i = m; i < n; i++) { - fp1 = LA + i * tokensetsize; + fp1 = LA (i); fp2 = shiftset; fp3 = lookaheadset; @@ -636,7 +635,7 @@ print_reductions (int state) { if (!shiftp->shifts[i]) continue; - symbol = accessing_symbol[shiftp->shifts[i]]; + symbol = state_table[shiftp->shifts[i]].accessing_symbol; if (ISVAR (symbol)) break; SETBIT (shiftset, symbol); @@ -644,7 +643,7 @@ print_reductions (int state) } mask = 1; - fp1 = LA + m * tokensetsize; + fp1 = LA (m); fp2 = shiftset; for (i = 0; i < ntokens; i++) { @@ -665,9 +664,9 @@ print_reductions (int state) if (j != default_LA) { rule = LAruleno[j]; - fprintf (foutput, + fprintf (out, _(" %-4s\treduce using rule %d (%s)\n"), - tags[i], rule, tags[rlhs[rule]]); + tags[i], rule, tags[rule_table[rule].lhs]); } else defaulted = 1; @@ -679,15 +678,15 @@ print_reductions (int state) if (defaulted) { rule = LAruleno[default_LA]; - fprintf (foutput, + fprintf (out, _(" %-4s\treduce using rule %d (%s)\n"), - tags[i], rule, tags[rlhs[rule]]); + tags[i], rule, tags[rule_table[rule].lhs]); defaulted = 0; } rule = LAruleno[j]; - fprintf (foutput, + fprintf (out, _(" %-4s\t[reduce using rule %d (%s)]\n"), - tags[i], rule, tags[rlhs[rule]]); + tags[i], rule, tags[rule_table[rule].lhs]); } } @@ -706,20 +705,16 @@ print_reductions (int state) } if (default_LA >= 0) - { - fprintf (foutput, _(" $default\treduce using rule %d (%s)\n"), - default_rule, tags[rlhs[default_rule]]); - } - - putc ('\n', foutput); + fprintf (out, _(" $default\treduce using rule %d (%s)\n"), + default_rule, tags[rule_table[default_rule].lhs]); } } void -finalize_conflicts (void) +free_conflicts (void) { - FREE (conflicts); - FREE (shiftset); - FREE (lookaheadset); + XFREE (conflicts); + XFREE (shiftset); + XFREE (lookaheadset); }