Merge remote-tracking branch 'origin/maint'

[bison.git] / src / lalr.c

diff --git a/src/lalr.c b/src/lalr.c
index eb12ff9348712a88184f0a70d96d75689dbf4035..d99f960fbf903fdad47f62580fb79695c829ffe1 100644 (file)
--- a/src/lalr.c
+++ b/src/lalr.c
@@ -1,6 +1,6 @@
 /* Compute lookahead criteria for Bison.
 
 /* Compute lookahead criteria for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 2000-2011 Free Software Foundation,
+   Copyright (C) 1984, 1986, 1989, 2000-2013 Free Software Foundation,

    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -27,7 +27,6 @@
 
 #include <bitset.h>
 #include <bitsetv.h>
 
 #include <bitset.h>
 #include <bitsetv.h>

-#include <quotearg.h>

 
 #include "LR0.h"
 #include "complain.h"
 
 #include "LR0.h"
 #include "complain.h"


@@ -343,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
   /* 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
      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


@@ -372,9 +371,8 @@ initialize_LA (void)
   bool default_reduction_only_for_accept;
   {
     char *default_reductions =
   bool default_reduction_only_for_accept;
   {
     char *default_reductions =

-      muscle_percent_define_get ("lr.default-reductions");
-    default_reduction_only_for_accept =
-      0 == strcmp (default_reductions, "accepting");
+      muscle_percent_define_get ("lr.default-reduction");
+    default_reduction_only_for_accept = STREQ (default_reductions, "accepting");

     free (default_reductions);
   }
 
     free (default_reductions);
   }