X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/1c4ad777cb220ea669dc934c9b600a25a824a658..06ec0105b12cdfa2994283e345154e6720354808:/src/main.c diff --git a/src/main.c b/src/main.c index 5c852ac0..39b39c7a 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ /* Top level entry point of Bison. - Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2010 Free + Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000-2002, 2004-2012 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -24,10 +24,12 @@ #include #include #include +#include #include #include #include "LR0.h" +#include "closeout.h" #include "complain.h" #include "conflicts.h" #include "derives.h" @@ -42,6 +44,7 @@ #include "print.h" #include "print_graph.h" #include "print-xml.h" +#include #include "reader.h" #include "reduce.h" #include "scan-code.h" @@ -52,16 +55,25 @@ #include "uniqstr.h" - int main (int argc, char *argv[]) { - program_name = argv[0]; + set_program_name (argv[0]); setlocale (LC_ALL, ""); (void) bindtextdomain (PACKAGE, LOCALEDIR); (void) bindtextdomain ("bison-runtime", LOCALEDIR); (void) textdomain (PACKAGE); + { + char const *cp = getenv ("LC_CTYPE"); + if (cp && STREQ (cp, "C")) + set_custom_quoting ("e_quoting_options, "'", "'"); + else + set_quoting_style ("e_quoting_options, locale_quoting_style); + } + + atexit (close_stdout); + uniqstrs_new (); muscle_init (); @@ -82,7 +94,7 @@ main (int argc, char *argv[]) reader (); timevar_pop (TV_READER); - if (complaint_issued) + if (complaint_status == status_complaint) goto finish; /* Find useless nonterminals and productions and reduce the grammar. */ @@ -113,7 +125,7 @@ main (int argc, char *argv[]) declarations. */ timevar_push (TV_CONFLICTS); conflicts_solve (); - if (!muscle_percent_define_flag_if ("lr.keep-unreachable-states")) + if (!muscle_percent_define_flag_if ("lr.keep-unreachable-state")) { state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new); state_number nstates_old = nstates; @@ -130,8 +142,7 @@ main (int argc, char *argv[]) tables_generate (); timevar_pop (TV_ACTIONS); - grammar_rules_useless_report - (_("rule useless in parser due to conflicts")); + grammar_rules_useless_report (_("rule useless in parser due to conflicts")); /* Output file names. */ compute_output_file_names (); @@ -162,7 +173,7 @@ main (int argc, char *argv[]) /* Stop if there were errors, to avoid trashing previous output files. */ - if (complaint_issued) + if (complaint_status == status_complaint) goto finish; /* Lookahead tokens are no longer needed. */ @@ -204,5 +215,5 @@ main (int argc, char *argv[]) timevar_stop (TV_TOTAL); timevar_print (stderr); - return complaint_issued ? EXIT_FAILURE : EXIT_SUCCESS; + return complaint_status ? EXIT_FAILURE : EXIT_SUCCESS; }