Update TODO.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 58939d92942fc8ad3a3619fc87a5fdabcd720dfa..8070446683212b4a47598e89431979d34588d70f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,6 @@
 /* Top level entry point of bison,
 /* Top level entry point of bison,

-   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 1992, 1995, 2000, 2001
+   Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -19,48 +20,28 @@
    Boston, MA 02111-1307, USA.  */
 
 
    Boston, MA 02111-1307, USA.  */
 
 

-#include <stdio.h>

 #include "system.h"
 #include "system.h"

-#include "machine.h"   /* for MAXSHORT */
-
-extern int lineno;
-extern int verboseflag;
-extern char *infile;
-
-/* Nonzero means failure has been detected; don't write a parser file.  */
-int failure;
+#include "getargs.h"
+#include "files.h"
+#include "complain.h"
+#include "derives.h"
+#include "output.h"
+#include "reader.h"
+#include "lalr.h"
+#include "reduce.h"
+#include "nullable.h"
+#include "print.h"
+#include "LR0.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;
 

-char *printable_version PARAMS((int));
-char *int_to_string PARAMS((int));
-void fatal PARAMS((char *));
-void fatals PARAMS((char *, char *));
-void warn PARAMS((char *));
-void warni PARAMS((char *, int));
-void warns PARAMS((char *, char *));
-void warnss PARAMS((char *, char *, char *));
-void warnsss PARAMS((char *, char *, char *, char *));
-void toomany PARAMS((char *));
-void berror PARAMS((char *));
-
-extern void getargs PARAMS((int, char *[]));
-extern void openfiles PARAMS((void));
-extern void reader PARAMS((void));
-extern void reduce_grammar PARAMS((void));
-extern void set_derives PARAMS((void));
-extern void set_nullable PARAMS((void));
-extern void generate_states PARAMS((void));
-extern void lalr PARAMS((void));
-extern void initialize_conflicts PARAMS((void));
-extern void verbose PARAMS((void));
-extern void terse PARAMS((void));
-extern void output PARAMS((void));
-extern void done PARAMS((int));
-
-
-/* VMS complained about using `int'.  */
+extern void berror PARAMS((const char *));

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


@@ -70,201 +51,88 @@ main (int argc, char *argv[])
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
 

-  failure = 0;

   lineno = 0;
   lineno = 0;

-  getargs(argc, argv);
-  openfiles();
+  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 the grammar; see gram.h.  */
-  reader();
-  if (failure)
-       done(failure);
+  /* 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.  */
+  reader ();
+  if (complain_message_count)
+    exit (1);

 
 

-  /* find useless nonterminals and productions and reduce the grammar.  In
-     file reduce.c */
-  reduce_grammar();
+  /* Find useless nonterminals and productions and reduce the grammar.
+     In file reduce.c.  */
+  reduce_grammar ();

 
 

-  /* record other info about the grammar.  In files derives and nullable.  */
-  set_derives();
-  set_nullable();
+  /* Record other info about the grammar.  In files derives and
+     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.  */
      See state.h for more info.  */

-  generate_states();
+  generate_states ();

 
   /* make it deterministic.  In file lalr.  */
 
   /* make it deterministic.  In file lalr.  */

-  lalr();
+  lalr ();

 
 

-  /* Find and record any conflicts: places where one token of lookahead is not
-     enough to disambiguate the parsing.  In file conflicts.
-     Also resolve s/r conflicts based on precedence declarations.  */
-  initialize_conflicts();
+  /* Find and record any conflicts: places where one token of
+     lookahead is not enough to disambiguate the parsing.  In file
+     conflicts.  Also resolve s/r conflicts based on precedence
+     declarations.  */
+  solve_conflicts ();
+  conflicts_print ();

 
 

-  /* print information about results, if requested.  In file print. */
-  if (verboseflag)
-    verbose();
-  else
-    terse();
+  /* Output file names. */
+  compute_output_file_names ();

 
 

-  /* output the tables and the parser to ftable.  In file output. */
-  output();
-  done(failure);
-  return failure;
-}
-\f
-/* functions to report errors which prevent a parser from being generated */
+  /* 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 ();

 
 

-/* Return a string containing a printable version of C:
-   either C itself, or the corresponding \DDD code.  */
-
-char *
-printable_version (int c)
-{
-  static char buf[10];
-  if (c < ' ' || c >= '\177')
-    sprintf(buf, "\\%o", c);
-  else
-    {
-      buf[0] = c;
-      buf[1] = '\0';
-    }
-  return buf;
-}
-
-/* Generate a string from the integer I.
-   Return a ptr to internal memory containing the string.  */
-
-char *
-int_to_string (int i)
-{
-  static char buf[20];
-  sprintf(buf, "%d", i);
-  return buf;
-}
-
-/* Display filename and lino if available.  */
+  /* Output the VCG graph.  */
+  print_graph ();

 
 

-static void
-banner (void)
-{
-  if (infile == 0)
-    fprintf(stderr, "%s: ", program_name);
-  else
-    fprintf(stderr, "%s:%d: ", infile, lineno);
-}
+  /* Output the tables and the parser to ftable.  In file output.  */
+  output ();

 
 

-static void
-fatal_banner (void)
-{
-  banner ();
-  fputs (_("fatal error: "), stderr);
-}
+  /* Close the input files. */
+  close_files ();

 
 

-/* Print the message S for a fatal error.  */
+  /* Free the symbol table data structure.  */
+  free_symtab ();

 
 

-void
-fatal (char *s)
-{
-  fatal_banner ();
-  fputs (s, stderr);
-  fputc ('\n', stderr);
-  done (1);
-}
+  lex_free ();

 
 

+  reduce_free ();
+  free_conflicts ();
+  free_nullable ();
+  free_derives ();

 
 

-/* Print a message for a fatal error.  Use FMT to construct the message
-   and incorporate string X1.  */
+  output_files ();

 
 

-void
-fatals (char *fmt, char *x1)
-{
-  fatal_banner ();
-  fprintf (stderr, fmt, x1);
-  fputc ('\n', stderr);
-  done (1);
-}
+  /* 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

 
 

-static void
-warn_banner (void)
-{
-  banner ();
-  failure = 1;
+  return complain_message_count ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }

-
-/* Print a warning message S.  */
-
-void
-warn (char *s)
-{
-  warn_banner ();
-  fputs (s, stderr);
-  fputc ('\n', stderr);
-}
-
-/* Print a warning message containing the string for the integer X1.
-   The message is given by the format FMT.  */
-
-void
-warni (char *fmt, int x1)
-{
-  warn_banner ();
-  fprintf (stderr, fmt, x1);
-  fputc ('\n', stderr);
-}
-
-/* Print a warning message containing the string X1.
-   The message is given by the format FMT.  */
-
-void
-warns (char *fmt, char *x1)
-{
-  warn_banner ();
-  fprintf (stderr, fmt, x1);
-  fputc ('\n', stderr);
-}
-
-/* Print a warning message containing the two strings X1 and X2.
-       The message is given by the format FMT.  */
-
-void
-warnss (char *fmt, char *x1, char *x2)
-{
-  warn_banner ();
-  fprintf (stderr, fmt, x1, x2);
-  fputc ('\n', stderr);
-}
-
-/* Print a warning message containing the 3 strings X1, X2, X3.
-   The message is given by the format FMT.  */
-
-void
-warnsss (char *fmt, char *x1, char *x2, char *x3)
-{
-  warn_banner ();
-  fprintf (stderr, fmt, x1, x2, x3);
-  fputc ('\n', stderr);
-}
-
-/* Print a message for the fatal occurence of more than MAXSHORT
-   instances of whatever is denoted by the string S.  */
-
-void
-toomany (char *s)
-{
-  fatal_banner ();
-  fprintf (stderr, _("too many %s (max %d)"), s, MAXSHORT);
-  fputc ('\n', stderr);
-  done (1);
-}
-
+\f

 /* Abort for an internal error denoted by string S.  */
 
 void
 /* Abort for an internal error denoted by string S.  */
 
 void

-berror (char *s)
+berror (const char *s)

 {
 {

-  fprintf(stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort();
+  fprintf (stderr, _("%s: internal error: %s\n"), program_name, s);
+  abort ();

 }
 }