tests: don't abuse AT_BISON_CHECK.

[bison.git] / src / reader.c

diff --git a/src/reader.c b/src/reader.c
index 060d4d38960d4c4af5281ca86f6b8ade08eca9b4..043fea8b1a12e2cd3244865fd9c5880296e25566 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -608,9 +608,9 @@ prepare_percent_define_front_end_variables (void)
     char *lr_type;
     /* IELR would be a better default, but LALR is historically the
        default.  */
     char *lr_type;
     /* IELR would be a better default, but LALR is historically the
        default.  */

-    muscle_percent_define_default ("lr.type", "LALR");
+    muscle_percent_define_default ("lr.type", "lalr");

     lr_type = muscle_percent_define_get ("lr.type");
     lr_type = muscle_percent_define_get ("lr.type");

-    if (0 != strcmp (lr_type, "canonical LR"))
+    if (0 != strcmp (lr_type, "canonical-lr"))

       muscle_percent_define_default ("lr.default-reductions", "all");
     else
       muscle_percent_define_default ("lr.default-reductions", "accepting");
       muscle_percent_define_default ("lr.default-reductions", "all");
     else
       muscle_percent_define_default ("lr.default-reductions", "accepting");


@@ -620,7 +620,7 @@ prepare_percent_define_front_end_variables (void)
   /* Check %define front-end variables.  */
   {
     static char const * const values[] = {
   /* Check %define front-end variables.  */
   {
     static char const * const values[] = {

-      "lr.type", "LALR", "IELR", "canonical LR", NULL,
+      "lr.type", "lalr", "ielr", "canonical-lr", NULL,

       "lr.default-reductions", "all", "consistent", "accepting", NULL,
       NULL
     };
       "lr.default-reductions", "all", "consistent", "accepting", NULL,
       NULL
     };


@@ -641,9 +641,6 @@ check_and_convert_grammar (void)
   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 
   if (nrules == 0)
     fatal (_("no rules in the input grammar"));
 

-  /* Report any undefined symbols and consider them nonterminals.  */
-  symbols_check_defined ();
-

   /* If the user did not define her ENDTOKEN, do it now. */
   if (!endtoken)
     {
   /* If the user did not define her ENDTOKEN, do it now. */
   if (!endtoken)
     {


@@ -654,6 +651,9 @@ check_and_convert_grammar (void)
       endtoken->user_token_number = 0;
     }
 
       endtoken->user_token_number = 0;
     }
 

+  /* Report any undefined symbols and consider them nonterminals.  */
+  symbols_check_defined ();
+

   /* Find the start symbol if no %start.  */
   if (!start_flag)
     {
   /* Find the start symbol if no %start.  */
   if (!start_flag)
     {