Merge branch 'maint'

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index c80ed870891e61c093895e401e6438d6c6b80a6c..093e9cb26674aeb0502b16e892f2c2906ae97e43 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 /* Top level entry point of Bison.
 
 /* Top level entry point of Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000, 2001, 2002, 2004,
-   2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+   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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -24,10 +24,12 @@
 #include <bitset_stats.h>
 #include <bitset.h>
 #include <configmake.h>
 #include <bitset_stats.h>
 #include <bitset.h>
 #include <configmake.h>

+#include <progname.h>

 #include <quotearg.h>
 #include <timevar.h>
 
 #include "LR0.h"
 #include <quotearg.h>
 #include <timevar.h>
 
 #include "LR0.h"

+#include "closeout.h"

 #include "complain.h"
 #include "conflicts.h"
 #include "derives.h"
 #include "complain.h"
 #include "conflicts.h"
 #include "derives.h"


@@ -36,12 +38,13 @@
 #include "gram.h"
 #include "lalr.h"
 #include "ielr.h"
 #include "gram.h"
 #include "lalr.h"
 #include "ielr.h"

-#include "muscle_tab.h"
+#include "muscle-tab.h"

 #include "nullable.h"
 #include "output.h"
 #include "print.h"
 #include "print_graph.h"
 #include "print-xml.h"
 #include "nullable.h"
 #include "output.h"
 #include "print.h"
 #include "print_graph.h"
 #include "print-xml.h"

+#include <quote.h>

 #include "reader.h"
 #include "reduce.h"
 #include "scan-code.h"
 #include "reader.h"
 #include "reduce.h"
 #include "scan-code.h"


@@ -52,16 +55,25 @@
 #include "uniqstr.h"
 
 
 #include "uniqstr.h"
 
 

-

 int
 main (int argc, char *argv[])
 {
 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);
 
   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 (&quote_quoting_options, "'", "'");
+    else
+      set_quoting_style (&quote_quoting_options, locale_quoting_style);
+  }
+
+  atexit (close_stdout);
+

   uniqstrs_new ();
   muscle_init ();
 
   uniqstrs_new ();
   muscle_init ();
 


@@ -97,15 +109,14 @@ main (int argc, char *argv[])
   nullable_compute ();
   timevar_pop (TV_SETS);
 
   nullable_compute ();
   timevar_pop (TV_SETS);
 

-  /* Convert to nondeterministic finite state machine.  In file LR0.
-     See state.h for more info.  */
+  /* Compute LR(0) parser states.  See state.h for more info.  */

   timevar_push (TV_LR0);
   generate_states ();
   timevar_pop (TV_LR0);
 
   timevar_push (TV_LR0);
   generate_states ();
   timevar_pop (TV_LR0);
 

-  /* 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.  */
+  /* Add lookahead sets to parser states.  Except when LALR(1) is
+     requested, split states to eliminate LR(1)-relative
+     inadequacies.  */

   ielr ();
 
   /* Find and record any conflicts: places where one token of
   ielr ();
 
   /* Find and record any conflicts: places where one token of


@@ -131,8 +142,7 @@ main (int argc, char *argv[])
   tables_generate ();
   timevar_pop (TV_ACTIONS);
 
   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 ();
 
   /* Output file names. */
   compute_output_file_names ();