Add copyright updates missed during previous cherry pick.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 68e8b44e9b4edda3e224f17ffeb39aa953bee543..17ff0f78de358533f063494d80f4a1f4bc637bce 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -555,12 +555,23 @@ reader (void)
   gram_scanner_initialize ();
   gram_parse ();
 
-  muscle_percent_define_default ("lr.default_rules", "all");
+  /* IELR would be a better default, but LALR is historically the default.  */
+  {
+    char *lr_type;
+    muscle_percent_define_default ("lr.type", "LALR");
+    lr_type = muscle_percent_define_get ("lr.type");
+    if (0 != strcmp (lr_type, "canonical LR"))
+      muscle_percent_define_default ("lr.default_reductions", "all");
+    else
+      muscle_percent_define_default ("lr.default_reductions", "accepting");
+    free (lr_type);
+  }
 
   /* Check front-end %define variable values.  */
   {
     static char const * const values[] = {
-      "lr.default_rules", "all", "consistent", "accepting", NULL,
+      "lr.type", "LALR", "IELR", "canonical LR", NULL,
+      "lr.default_reductions", "all", "consistent", "accepting", NULL,
       NULL
     };
     muscle_percent_define_check_values (values);