* src/parse-gram.y (rules_or_grammar_declaration): Add an error

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 674c56d5fd7634763dc33643a820a9fdfcb1115e..5a0fb45825027bec735d97dbf48495117482fe98 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /* Top level entry point of bison,
 /* Top level entry point of bison,

-   Copyright 1984, 1986, 1989, 1992, 1995, 2000, 2001
+   Copyright 1984, 1986, 1989, 1992, 1995, 2000, 2001, 2002

    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -21,7 +21,11 @@
 
 
 #include "system.h"
 
 
 #include "system.h"

+#include "bitset_stats.h"
+#include "bitset.h"

 #include "getargs.h"
 #include "getargs.h"

+#include "symtab.h"
+#include "gram.h"

 #include "files.h"
 #include "complain.h"
 #include "derives.h"
 #include "files.h"
 #include "complain.h"
 #include "derives.h"


@@ -35,14 +39,10 @@
 #include "conflicts.h"
 #include "print_graph.h"
 #include "muscle_tab.h"
 #include "conflicts.h"
 #include "print_graph.h"
 #include "muscle_tab.h"

-#include "symtab.h"
-#include "lex.h"

 
 /* The name this program was run with, for messages.  */
 char *program_name;
 
 
 /* The name this program was run with, for messages.  */
 char *program_name;
 

-extern void berror PARAMS((const char *));
-

 int
 main (int argc, char *argv[])
 {
 int
 main (int argc, char *argv[])
 {


@@ -54,8 +54,10 @@ main (int argc, char *argv[])
   lineno = 0;
   getargs (argc, argv);
 
   lineno = 0;
   getargs (argc, argv);
 

+  if (trace_flag)
+    bitset_stats_enable ();
+

   muscle_init ();
   muscle_init ();

-  open_files ();

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


@@ -64,8 +66,7 @@ main (int argc, char *argv[])
   if (complain_message_count)
     exit (1);
 
   if (complain_message_count)
     exit (1);
 

-  /* Find useless nonterminals and productions and reduce the grammar.
-     In file reduce.c.  */
+  /* Find useless nonterminals and productions and reduce the grammar. */

   reduce_grammar ();
 
   /* Record other info about the grammar.  In files derives and
   reduce_grammar ();
 
   /* Record other info about the grammar.  In files derives and


@@ -84,49 +85,47 @@ main (int argc, char *argv[])
      lookahead is not enough to disambiguate the parsing.  In file
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */
      lookahead is not enough to disambiguate the parsing.  In file
      conflicts.  Also resolve s/r conflicts based on precedence
      declarations.  */

-  solve_conflicts ();
+  conflicts_solve ();

   conflicts_print ();
 
   /* Output file names. */
   compute_output_file_names ();
 
   conflicts_print ();
 
   /* Output file names. */
   compute_output_file_names ();
 

+  /* Output the detailed report on the grammar.  */
+  if (report_flag)
+    print_results ();
+

   /* Stop if there were errors, to avoid trashing previous output
      files.  */
   if (complain_message_count)
     exit (1);
 
   /* Stop if there were errors, to avoid trashing previous output
      files.  */
   if (complain_message_count)
     exit (1);
 

-  /* Output the detailed report on the grammar.  */
-  print_results ();
-

   /* Output the VCG graph.  */
   /* Output the VCG graph.  */

-  print_graph ();
+  if (graph_flag)
+    print_graph ();

 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 
 
   /* Output the tables and the parser to ftable.  In file output.  */
   output ();
 

-  /* Close the input files. */
-  close_files ();
-
-  /* Free the symbol table data structure.  */
-  free_symtab ();
-
-  lex_free ();
-
+  states_free ();

   reduce_free ();
   reduce_free ();

-  free_conflicts ();
+  conflicts_free ();

   free_nullable ();
   free_derives ();
   free_nullable ();
   free_derives ();

-
-  output_files ();
-
-  exit (complain_message_count ? 1 : 0);
-}
-\f
-/* Abort for an internal error denoted by string S.  */
-
-void
-berror (const char *s)
-{
-  fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort ();
+  grammar_free ();
+
+  /* The scanner memory cannot be released right after parsing, as it
+     contains things such as user actions, prologue, epilogue etc.  */
+  scanner_free ();
+  muscle_free ();
+  /* If using alloca.c, flush the alloca'ed memory for the benefit of
+     people running Bison as a library in IDEs.  */
+#if C_ALLOCA
+    alloca (0);
+#endif
+
+    if (trace_flag)
+      bitset_stats_dump (stderr);
+
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }