Java: Fix syntax error handling without error token.

[bison.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 58939d92942fc8ad3a3619fc87a5fdabcd720dfa..0396b0f1be425f59b08c7e62dd3b9c9b5b5e410b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,270 +1,220 @@
-/* Top level entry point of bison,
-   Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000 Free Software Foundation, Inc.
+/* Top level entry point of Bison.
+
+   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.
 

-   Bison is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify

    it under the terms of the GNU General Public License as published by
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful,
+   This program is distributed in the hope that it will be useful,

    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
-
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

-#include <stdio.h>
+#include <config.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;
-
-/* 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'.  */
+
+#include <bitset_stats.h>
+#include <bitset.h>
+#include <configmake.h>
+#include <progname.h>
+#include <quotearg.h>
+#include <timevar.h>
+
+#include "LR0.h"
+#include "closeout.h"
+#include "complain.h"
+#include "conflicts.h"
+#include "derives.h"
+#include "files.h"
+#include "getargs.h"
+#include "gram.h"
+#include "lalr.h"
+#include "ielr.h"
+#include "muscle-tab.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 "scan-gram.h"
+#include "scan-skel.h"
+#include "symtab.h"
+#include "tables.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, "");
   setlocale (LC_ALL, "");

-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  failure = 0;
-  lineno = 0;
-  getargs(argc, argv);
-  openfiles();
-
-  /* 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);
-
-  /* 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();
-
-  /* convert to nondeterministic finite state machine.  In file LR0.
-     See state.h for more info.  */
-  generate_states();
-
-  /* make it deterministic.  In file 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();
-
-  /* print information about results, if requested.  In file print. */
-  if (verboseflag)
-    verbose();
-  else
-    terse();
-
-  /* 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 */
-
-
-/* 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
+  (void) bindtextdomain (PACKAGE, LOCALEDIR);
+  (void) bindtextdomain ("bison-runtime", LOCALEDIR);
+  (void) textdomain (PACKAGE);
+
+  {
+    char const *cp = getenv ("LC_CTYPE");
+    if (cp && !strcmp (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 ();
+
+  getargs (argc, argv);
+
+  timevar_report = trace_flag & trace_time;
+  init_timevar ();
+  timevar_start (TV_TOTAL);
+
+  if (trace_flag & trace_bitsets)
+    bitset_stats_enable ();
+
+  /* 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.  */
+
+  timevar_push (TV_READER);
+  reader ();
+  timevar_pop (TV_READER);
+
+  if (complaint_issued)
+    goto finish;
+
+  /* Find useless nonterminals and productions and reduce the grammar. */
+  timevar_push (TV_REDUCE);
+  reduce_grammar ();
+  timevar_pop (TV_REDUCE);
+
+  /* Record other info about the grammar.  In files derives and
+     nullable.  */
+  timevar_push (TV_SETS);
+  derives_compute ();
+  nullable_compute ();
+  timevar_pop (TV_SETS);
+
+  /* Compute LR(0) parser states.  See state.h for more info.  */
+  timevar_push (TV_LR0);
+  generate_states ();
+  timevar_pop (TV_LR0);
+
+  /* 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
+     conflicts.  Also resolve s/r conflicts based on precedence
+     declarations.  */
+  timevar_push (TV_CONFLICTS);
+  conflicts_solve ();
+  if (!muscle_percent_define_flag_if ("lr.keep-unreachable-states"))

     {
     {

-      buf[0] = c;
-      buf[1] = '\0';
+      state_number *old_to_new = xnmalloc (nstates, sizeof *old_to_new);
+      state_number nstates_old = nstates;
+      state_remove_unreachable_states (old_to_new);
+      lalr_update_state_numbers (old_to_new, nstates_old);
+      conflicts_update_state_numbers (old_to_new, nstates_old);
+      free (old_to_new);

     }
     }

-  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.  */
+  conflicts_print ();
+  timevar_pop (TV_CONFLICTS);

 
 

-static void
-banner (void)
-{
-  if (infile == 0)
-    fprintf(stderr, "%s: ", program_name);
-  else
-    fprintf(stderr, "%s:%d: ", infile, lineno);
-}
-
-static void
-fatal_banner (void)
-{
-  banner ();
-  fputs (_("fatal error: "), stderr);
-}
-
-/* Print the message S for a fatal error.  */
+  /* Compute the parser tables.  */
+  timevar_push (TV_ACTIONS);
+  tables_generate ();
+  timevar_pop (TV_ACTIONS);

 
 

-void
-fatal (char *s)
-{
-  fatal_banner ();
-  fputs (s, stderr);
-  fputc ('\n', stderr);
-  done (1);
-}
+  grammar_rules_useless_report
+    (_("rule useless in parser due to conflicts"));

 
 

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

 
 

-/* Print a message for a fatal error.  Use FMT to construct the message
-   and incorporate string X1.  */
-
-void
-fatals (char *fmt, char *x1)
-{
-  fatal_banner ();
-  fprintf (stderr, fmt, x1);
-  fputc ('\n', stderr);
-  done (1);
-}
-
-static void
-warn_banner (void)
-{
-  banner ();
-  failure = 1;
-}
-
-/* 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.  */
+  /* Output the detailed report on the grammar.  */
+  if (report_flag)
+    {
+      timevar_push (TV_REPORT);
+      print_results ();
+      timevar_pop (TV_REPORT);
+    }

 
 

-void
-toomany (char *s)
-{
-  fatal_banner ();
-  fprintf (stderr, _("too many %s (max %d)"), s, MAXSHORT);
-  fputc ('\n', stderr);
-  done (1);
-}
+  /* Output the graph.  */
+  if (graph_flag)
+    {
+      timevar_push (TV_GRAPH);
+      print_graph ();
+      timevar_pop (TV_GRAPH);
+    }

 
 

-/* Abort for an internal error denoted by string S.  */
+  /* Output xml.  */
+  if (xml_flag)
+    {
+      timevar_push (TV_XML);
+      print_xml ();
+      timevar_pop (TV_XML);
+    }

 
 

-void
-berror (char *s)
-{
-  fprintf(stderr, _("%s: internal error: %s\n"), program_name, s);
-  abort();
+  /* Stop if there were errors, to avoid trashing previous output
+     files.  */
+  if (complaint_issued)
+    goto finish;
+
+  /* Lookahead tokens are no longer needed. */
+  timevar_push (TV_FREE);
+  lalr_free ();
+  timevar_pop (TV_FREE);
+
+  /* Output the tables and the parser to ftable.  In file output.  */
+  timevar_push (TV_PARSER);
+  output ();
+  timevar_pop (TV_PARSER);
+
+  timevar_push (TV_FREE);
+  nullable_free ();
+  derives_free ();
+  tables_free ();
+  states_free ();
+  reduce_free ();
+  conflicts_free ();
+  grammar_free ();
+  output_file_names_free ();
+
+  /* The scanner memory cannot be released right after parsing, as it
+     contains things such as user actions, prologue, epilogue etc.  */
+  gram_scanner_free ();
+  muscle_free ();
+  uniqstrs_free ();
+  code_scanner_free ();
+  skel_scanner_free ();
+  quotearg_free ();
+  timevar_pop (TV_FREE);
+
+  if (trace_flag & trace_bitsets)
+    bitset_stats_dump (stderr);
+
+ finish:
+
+  /* Stop timing and print the times.  */
+  timevar_stop (TV_TOTAL);
+  timevar_print (stderr);
+
+  return complaint_issued ? EXIT_FAILURE : EXIT_SUCCESS;

 }
 }