X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/00f5d57533cf74aeeb50bdf3dc70e344befcdfb5..ca01f454f01645533622a59ef0df335ee07679e5:/src/main.c diff --git a/src/main.c b/src/main.c index d7a7f65f..c8dc696e 100644 --- a/src/main.c +++ b/src/main.c @@ -35,6 +35,7 @@ #include "getargs.h" #include "gram.h" #include "lalr.h" +#include "ielr.h" #include "muscle-tab.h" #include "nullable.h" #include "output.h" @@ -102,10 +103,10 @@ main (int argc, char *argv[]) generate_states (); timevar_pop (TV_LR0); - /* make it deterministic. In file lalr. */ - timevar_push (TV_LALR); - lalr (); - timevar_pop (TV_LALR); + /* Make it deterministic by computing lookahead sets. Except when LALR(1) is + requested, split states to eliminate LR(1)-relative inadequacies. In file + lalr and ielr. */ + ielr (); /* Find and record any conflicts: places where one token of lookahead is not enough to disambiguate the parsing. In file @@ -113,8 +114,7 @@ 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")) + if (!muscle_percent_define_flag_if ("lr.keep-unreachable-states")) { state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new); state_number nstates_old = nstates;