Java: Fix syntax error handling without error token.

[bison.git] / src / tables.c

diff --git a/src/tables.c b/src/tables.c
index 5f2d7096c31860175444480bd966dac3d0557029..eb827b769ca825458d73de7468b3d78c7fb30286 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -1,7 +1,7 @@
 /* Output the generated parsing program for Bison.
 
 /* Output the generated parsing program for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2006, 2009-2012 Free
+   Software Foundation, Inc.

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


@@ -22,7 +22,6 @@
 #include "system.h"
 
 #include <bitsetv.h>
 #include "system.h"
 
 #include <bitsetv.h>

-#include <quotearg.h>

 
 #include "complain.h"
 #include "conflicts.h"
 
 #include "complain.h"
 #include "conflicts.h"


@@ -30,7 +29,7 @@
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"

-#include "muscle_tab.h"
+#include "muscle-tab.h"

 #include "reader.h"
 #include "symtab.h"
 #include "tables.h"
 #include "reader.h"
 #include "symtab.h"
 #include "tables.h"


@@ -310,7 +309,7 @@ action_row (state *s)
   {
     char *default_reductions =
       muscle_percent_define_get ("lr.default-reductions");
   {
     char *default_reductions =
       muscle_percent_define_get ("lr.default-reductions");

-    if (0 != strcmp (default_reductions, "all") && !s->consistent)
+    if (0 != strcmp (default_reductions, "most") && !s->consistent)

       nodefault = true;
     free (default_reductions);
   }
       nodefault = true;
     free (default_reductions);
   }