(yytname): Do not assume that the user defines YYDEBUG to a properly

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index bc9812f27e6b9e9304388e0d28963dfb1c3da817..6deec48a1f2d4d1d62c570e4bce37b5d7a6cd6ef 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -41,8 +41,6 @@
 /* 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[])
 {


@@ -55,7 +53,6 @@ main (int argc, char *argv[])
   getargs (argc, argv);
 
   muscle_init ();
   getargs (argc, argv);
 
   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,15 +61,15 @@ 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 ();
 
   reduce_grammar ();
 

-  /* record other info about the grammar.  In files derives and nullable.  */
+  /* Record other info about the grammar.  In files derives and
+     nullable.  */

   set_derives ();
   set_nullable ();
 
   set_derives ();
   set_nullable ();
 

-  /* convert to nondeterministic finite state machine.  In file LR0.
+  /* Convert to nondeterministic finite state machine.  In file LR0.

      See state.h for more info.  */
   generate_states ();
 
      See state.h for more info.  */
   generate_states ();
 


@@ -95,10 +92,12 @@ main (int argc, char *argv[])
     exit (1);
 
   /* Output the detailed report on the grammar.  */
     exit (1);
 
   /* Output the detailed report on the grammar.  */

-  print_results ();
+  if (verbose_flag)
+    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 ();


@@ -106,25 +105,18 @@ main (int argc, char *argv[])
   /* Free the symbol table data structure.  */
   free_symtab ();
 
   /* Free the symbol table data structure.  */
   free_symtab ();
 

-  lex_free ();
-
-  /* Close the input files. */
-  close_files ();
-
+  reduce_free ();

   free_conflicts ();
   free_nullable ();
   free_derives ();
 
   output_files ();
 
   free_conflicts ();
   free_nullable ();
   free_derives ();
 
   output_files ();
 

-  exit (complain_message_count ? 1 : 0);
-}
-\f
-/* Abort for an internal error denoted by string S.  */
+  /* 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

 
 

-void
-berror (const char *s)
-{
-  fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort ();
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }