X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/03c07b039448552b5ac6c51076b88c2f15b0307f..041308d0c03783c51ef362f888c957cd2a0e129a:/src/print.c diff --git a/src/print.c b/src/print.c index 413896c2..cb227aa5 100644 --- a/src/print.c +++ b/src/print.c @@ -1,7 +1,7 @@ /* Print information on generated parser, for bison, - Copyright (C) 1984, 1986, 1989, 2000, 2001, 2002, 2003, 2004, 2005, - 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2012 Free + Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -22,7 +22,6 @@ #include "system.h" #include <bitset.h> -#include <quotearg.h> #include "LR0.h" #include "closure.h" @@ -31,7 +30,7 @@ #include "getargs.h" #include "gram.h" #include "lalr.h" -#include "muscle_tab.h" +#include "muscle-tab.h" #include "print.h" #include "reader.h" #include "reduce.h" @@ -242,16 +241,16 @@ print_reductions (FILE *out, state *s) { transitions *trans = s->transitions; reductions *reds = s->reductions; - rule *default_rule = NULL; + rule *default_reduction = NULL; size_t width = 0; int i, j; - bool non_default_action = false; + bool default_reduction_only = true; if (reds->num == 0) return; if (yydefact[s->number] != 0) - default_rule = &rules[yydefact[s->number] - 1]; + default_reduction = &rules[yydefact[s->number] - 1]; bitset_zero (no_reduce_set); FOR_EACH_SHIFT (trans, i) @@ -261,7 +260,7 @@ print_reductions (FILE *out, state *s) bitset_set (no_reduce_set, s->errs->symbols[i]->number); /* Compute the width of the lookahead token column. */ - if (default_rule) + if (default_reduction) width = strlen (_("$default")); if (reds->lookahead_tokens) @@ -274,7 +273,7 @@ print_reductions (FILE *out, state *s) { if (! count) { - if (reds->rules[j] != default_rule) + if (reds->rules[j] != default_reduction) max_length (&width, symbols[i]->tag); count = true; } @@ -299,16 +298,16 @@ print_reductions (FILE *out, state *s) bool defaulted = false; bool count = bitset_test (no_reduce_set, i); if (count) - non_default_action = true; + default_reduction_only = false; for (j = 0; j < reds->num; ++j) if (bitset_test (reds->lookahead_tokens[j], i)) { if (! count) { - if (reds->rules[j] != default_rule) + if (reds->rules[j] != default_reduction) { - non_default_action = true; + default_reduction_only = false; print_reduction (out, width, symbols[i]->tag, reds->rules[j], true); @@ -319,11 +318,11 @@ print_reductions (FILE *out, state *s) } else { - non_default_action = true; + default_reduction_only = false; if (defaulted) print_reduction (out, width, symbols[i]->tag, - default_rule, true); + default_reduction, true); defaulted = false; print_reduction (out, width, symbols[i]->tag, @@ -332,15 +331,16 @@ print_reductions (FILE *out, state *s) } } - if (default_rule) + if (default_reduction) { - char *default_rules = muscle_percent_define_get ("lr.default_rules"); - print_reduction (out, width, _("$default"), default_rule, true); - aver (0 == strcmp (default_rules, "all") - || (0 == strcmp (default_rules, "consistent") - && !non_default_action) + char *default_reductions = + muscle_percent_define_get ("lr.default-reductions"); + print_reduction (out, width, _("$default"), default_reduction, true); + aver (0 == strcmp (default_reductions, "most") + || (0 == strcmp (default_reductions, "consistent") + && default_reduction_only) || (reds->num == 1 && reds->rules[0]->number == 0)); - free (default_rules); + free (default_reductions); } }