X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c85541913b99f841de090aacf626bb8f52f7f727..75ae8299840bbd854fa2474d38402bbb933c6511:/src/lalr.c diff --git a/src/lalr.c b/src/lalr.c index 1ceda002..d99f960f 100644 --- a/src/lalr.c +++ b/src/lalr.c @@ -1,6 +1,6 @@ /* Compute lookahead criteria for Bison. - Copyright (C) 1984, 1986, 1989, 2000-2012 Free Software Foundation, + Copyright (C) 1984, 1986, 1989, 2000-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -342,7 +342,7 @@ state_lookahead_tokens_count (state *s, bool default_reduction_only_for_accept) /* We need a lookahead either to distinguish different reductions (i.e., there are two or more), or to distinguish a reduction from a shift. Otherwise, it is straightforward, and the state is - `consistent'. However, do not treat a state with any reductions as + 'consistent'. However, do not treat a state with any reductions as consistent unless it is the accepting state (because there is never a lookahead token that makes sense there, and so no lookahead token should be read) if the user has otherwise disabled default @@ -371,7 +371,7 @@ initialize_LA (void) bool default_reduction_only_for_accept; { char *default_reductions = - muscle_percent_define_get ("lr.default-reductions"); + muscle_percent_define_get ("lr.default-reduction"); default_reduction_only_for_accept = STREQ (default_reductions, "accepting"); free (default_reductions); }