do not ignore errors like ENOSPC,EIO when writing to stdout

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 2b30829846e7d9394e3f1090bae51d94e423ca3c..3dbac3a9a92928861f267461c8b369d29a67c1f5 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 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.
 


@@ -28,6 +28,7 @@
 #include <timevar.h>
 
 #include "LR0.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"


@@ -35,7 +36,8 @@
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"
 #include "getargs.h"
 #include "gram.h"
 #include "lalr.h"

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

 #include "nullable.h"
 #include "output.h"
 #include "print.h"
 #include "nullable.h"
 #include "output.h"
 #include "print.h"


@@ -61,7 +63,10 @@ main (int argc, char *argv[])
   (void) bindtextdomain ("bison-runtime", LOCALEDIR);
   (void) textdomain (PACKAGE);
 
   (void) bindtextdomain ("bison-runtime", LOCALEDIR);
   (void) textdomain (PACKAGE);
 

+  atexit (close_stdout);
+

   uniqstrs_new ();
   uniqstrs_new ();

+  muscle_init ();

 
   getargs (argc, argv);
 
 
   getargs (argc, argv);
 


@@ -72,8 +77,6 @@ main (int argc, char *argv[])
   if (trace_flag & trace_bitsets)
     bitset_stats_enable ();
 
   if (trace_flag & trace_bitsets)
     bitset_stats_enable ();
 

-  muscle_init ();
-

   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
      and FATTRS.  In file reader.c.  The other parts are recorded in
      the grammar; see gram.h.  */
   /* Read the input.  Copy some parts of it to FGUARD, FACTION, FTABLE
      and FATTRS.  In file reader.c.  The other parts are recorded in
      the grammar; see gram.h.  */


@@ -97,16 +100,15 @@ 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.  In file lalr.  */
-  timevar_push (TV_LALR);
-  lalr ();
-  timevar_pop (TV_LALR);
+  /* 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
      lookahead is not enough to disambiguate the parsing.  In file
 
   /* Find and record any conflicts: places where one token of
      lookahead is not enough to disambiguate the parsing.  In file


@@ -114,8 +116,7 @@ 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"))
+  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;
     {
       state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new);
       state_number nstates_old = nstates;


@@ -132,8 +133,8 @@ main (int argc, char *argv[])
   tables_generate ();
   timevar_pop (TV_ACTIONS);
 
   tables_generate ();
   timevar_pop (TV_ACTIONS);
 

-  grammar_rules_never_reduced_report
-    (_("rule never reduced because of 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 ();