X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e9690142325711b320ef444768fdd40a087d02f7..e52ddf820b9c9c123e4f3c3799fc1fb9b0a54c09:/src/print.c?ds=sidebyside diff --git a/src/print.c b/src/print.c index 918be391..824bb4ae 100644 --- a/src/print.c +++ b/src/print.c @@ -1,6 +1,6 @@ /* Print information on generated parser, for bison, - Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2011 Free + Copyright (C) 1984, 1986, 1989, 2000-2005, 2007, 2009-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -22,7 +22,6 @@ #include "system.h" #include -#include #include "LR0.h" #include "closure.h" @@ -207,7 +206,7 @@ print_errs (FILE *out, state *s) /*-------------------------------------------------------------------------. -| 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). | `-------------------------------------------------------------------------*/ @@ -335,10 +334,10 @@ print_reductions (FILE *out, state *s) if (default_reduction) { char *default_reductions = - muscle_percent_define_get ("lr.default-reductions"); + muscle_percent_define_get ("lr.default-reduction"); print_reduction (out, width, _("$default"), default_reduction, true); - aver (0 == strcmp (default_reductions, "most") - || (0 == strcmp (default_reductions, "consistent") + aver (STREQ (default_reductions, "most") + || (STREQ (default_reductions, "consistent") && default_reduction_only) || (reds->num == 1 && reds->rules[0]->number == 0)); free (default_reductions); @@ -371,7 +370,7 @@ static void print_state (FILE *out, state *s) { fputs ("\n\n", out); - fprintf (out, _("state %d"), s->number); + fprintf (out, _("State %d"), s->number); fputc ('\n', out); print_core (out, s); print_actions (out, s); @@ -515,7 +514,7 @@ print_results (void) print_grammar (out); /* If the whole state item sets, not only the kernels, are wanted, - `closure' will be run, which needs memory allocation/deallocation. */ + 'closure' will be run, which needs memory allocation/deallocation. */ if (report_flag & report_itemsets) new_closure (nritems); /* Storage for print_reductions. */