Set all front-end %define defaults in one place.

* src/main.c (main): Move lr.keep_unreachable_states default...
* src/reader.c (reader): ... to here.
(cherry picked from commit 1c4aa81df1fd11e2be5b2af78b4375f85bb2e59e)

diff --git a/ChangeLog b/ChangeLog
index 382cf1c4d95387f12605ddd54eeb2a321910a4a7..11d5a15cf8090729b37343ddd947234c78a758be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-04-30  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       Set all front-end %define defaults in one place.
+       * src/main.c (main): Move lr.keep_unreachable_states default...
+       * src/reader.c (reader): ... to here.
+

 2009-04-29  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Rename lr.default_reductions to lr.default-reductions.
 2009-04-29  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        Rename lr.default_reductions to lr.default-reductions.

diff --git a/src/main.c b/src/main.c
index ed0893fdf3e7ec29a95067435f10afcafc647c79..7a9a49d8211e911ccbf2f0e397191eede60063b6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -114,7 +114,6 @@ main (int argc, char *argv[])
      declarations.  */
   timevar_push (TV_CONFLICTS);
   conflicts_solve ();
      declarations.  */
   timevar_push (TV_CONFLICTS);
   conflicts_solve ();

-  muscle_percent_define_default ("lr.keep_unreachable_states", "false");

   if (!muscle_percent_define_flag_if ("lr.keep_unreachable_states"))
     {
       state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new);
   if (!muscle_percent_define_flag_if ("lr.keep_unreachable_states"))
     {
       state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new);

diff --git a/src/reader.c b/src/reader.c
index 78faa6b39f7f39fe667605d4d62e3d54f079a18b..9540a8d7b09ce25913854921227fd0aee98f0d89 100644 (file)
--- a/src/reader.c
+++ b/src/reader.c
@@ -555,9 +555,12 @@ reader (void)
   gram_scanner_initialize ();
   gram_parse ();
 
   gram_scanner_initialize ();
   gram_parse ();
 

-  /* IELR would be a better default, but LALR is historically the default.  */
+  /* Set front-end %define variable defaults.  */
+  muscle_percent_define_default ("lr.keep_unreachable_states", "false");

   {
     char *lr_type;
   {
     char *lr_type;

+    /* IELR would be a better default, but LALR is historically the
+       default.  */

     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.type", "LALR");
     lr_type = muscle_percent_define_get ("lr.type");
     if (0 != strcmp (lr_type, "canonical LR"))


@@ -567,7 +570,7 @@ reader (void)
     free (lr_type);
   }
 
     free (lr_type);
   }
 

-  /* Check front-end %define variable values.  */
+  /* Check front-end %define variables.  */

   {
     static char const * const values[] = {
       "lr.type", "LALR", "IELR", "canonical LR", NULL,
   {
     static char const * const values[] = {
       "lr.type", "LALR", "IELR", "canonical LR", NULL,