From ba5c6d94b602e77be718705fdb70aed255d41e6a Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Thu, 30 Apr 2009 00:31:12 -0400 Subject: [PATCH] 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) --- ChangeLog | 6 ++++++ src/main.c | 1 - src/reader.c | 7 +++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 382cf1c4..11d5a15c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-04-30 Joel E. Denny + + 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 Rename lr.default_reductions to lr.default-reductions. diff --git a/src/main.c b/src/main.c index ed0893fd..7a9a49d8 100644 --- a/src/main.c +++ b/src/main.c @@ -114,7 +114,6 @@ main (int argc, char *argv[]) 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); diff --git a/src/reader.c b/src/reader.c index 78faa6b3..9540a8d7 100644 --- a/src/reader.c +++ b/src/reader.c @@ -555,9 +555,12 @@ reader (void) 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; + /* 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")) @@ -567,7 +570,7 @@ reader (void) 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, -- 2.45.2