Fix.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 0cec1a03ede3ce861a2017355a81ab2f10333276..7bc9a767dcd98903c6ac86b728983d8e8f2126d0 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,6 +1,7 @@
-/* Parse command line arguments for bison.
-   Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+/* Parse command line arguments for Bison.
+
+   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006 Free Software Foundation, Inc.

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


@@ -16,32 +17,117 @@
 
    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
 
    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.  */
+   Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 

+#include <config.h>

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

-#include "getopt.h"
-#include "argmatch.h"
+
+#include <argmatch.h>
+#include <error.h>
+
+/* Hack to get <getopt.h> to declare getopt with a prototype.  */
+#if lint && ! defined __GNU_LIBRARY__
+# define __GNU_LIBRARY__
+# define HACK_FOR___GNU_LIBRARY___PROTOTYPE 1
+#endif
+
+#include <getopt.h>
+
+#ifdef HACK_FOR___GNU_LIBRARY___PROTOTYPE
+# undef __GNU_LIBRARY__
+# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
+#endif
+

 #include "complain.h"
 #include "complain.h"

-#include "getargs.h"

 #include "files.h"
 #include "files.h"

-
-int debug_flag = 0;
-int defines_flag = 0;
-int locations_flag = 0;
-int no_lines_flag = 0;
-int no_parser_flag = 0;
-int report_flag = 0;
-int token_table_flag = 0;
-int yacc_flag = 0;     /* for -y */
-int graph_flag = 0;
-int trace_flag = 0;
+#include "getargs.h"
+#include "uniqstr.h"
+
+bool debug_flag;
+bool defines_flag;
+bool locations_flag;
+bool no_lines_flag;
+bool no_parser_flag;
+int report_flag = report_none;
+bool token_table_flag;
+bool yacc_flag;        /* for -y */
+bool graph_flag;
+int trace_flag = trace_none;
+
+bool nondeterministic_parser = false;
+bool glr_parser = false;
+bool pure_parser = false;

 
 const char *skeleton = NULL;
 const char *include = NULL;
 
 extern char *program_name;
 
 
 const char *skeleton = NULL;
 const char *include = NULL;
 
 extern char *program_name;
 

+
+/*---------------------.
+| --trace's handling.  |
+`---------------------*/
+
+static const char * const trace_args[] =
+{
+  /* In a series of synonyms, present the most meaningful first, so
+     that argmatch_valid be more readable.  */
+  "none       - no report",
+  "scan       - grammar scanner traces",
+  "parse      - grammar parser traces",
+  "automaton  - contruction of the automaton",
+  "bitsets    - use of bitsets",
+  "grammar    - reading, reducing of the grammar",
+  "resource   - memory consumption (where available)",
+  "sets       - grammar sets: firsts, nullable etc.",
+  "tools      - m4 invocation and preserve the temporary file",
+  "skeleton   - skeleton postprocessing",
+  "time       - time consumption",
+  "all        - all of the above",
+  0
+};
+
+static const int trace_types[] =
+{
+  trace_none,
+  trace_scan,
+  trace_parse,
+  trace_automaton,
+  trace_bitsets,
+  trace_grammar,
+  trace_resource,
+  trace_sets,
+  trace_tools,
+  trace_skeleton,
+  trace_time,
+  trace_all
+};
+
+ARGMATCH_VERIFY (trace_args, trace_types);
+
+static void
+trace_argmatch (char *args)
+{
+  if (args)
+    {
+      args = strtok (args, ",");
+      do
+       {
+         int trace = XARGMATCH ("--trace", args,
+                                trace_args, trace_types);
+         if (trace == trace_none)
+           trace_flag = trace_none;
+         else
+           trace_flag |= trace;
+       }
+      while ((args = strtok (NULL, ",")));
+    }
+  else
+    trace_flag = trace_all;
+}
+
+

 /*----------------------.
 | --report's handling.  |
 `----------------------*/
 /*----------------------.
 | --report's handling.  |
 `----------------------*/


@@ -53,7 +139,7 @@ static const char * const report_args[] =
   "none",
   "state", "states",
   "itemset", "itemsets",
   "none",
   "state", "states",
   "itemset", "itemsets",

-  "lookahead", "lookaheads",
+  "look-ahead", "lookahead", "lookaheads",

   "solved",
   "all",
   0
   "solved",
   "all",
   0


@@ -64,16 +150,18 @@ static const int report_types[] =
   report_none,
   report_states, report_states,
   report_states | report_itemsets, report_states | report_itemsets,
   report_none,
   report_states, report_states,
   report_states | report_itemsets, report_states | report_itemsets,

-  report_states | report_lookaheads, report_states | report_lookaheads,
+  report_states | report_look_ahead_tokens,
+  report_states | report_look_ahead_tokens,
+  report_states | report_look_ahead_tokens,

   report_states | report_solved_conflicts,
   report_all
 };
 
   report_states | report_solved_conflicts,
   report_all
 };
 

+ARGMATCH_VERIFY (report_args, report_types);

 
 static void
 report_argmatch (char *args)
 {
 
 static void
 report_argmatch (char *args)
 {

-  ARGMATCH_ASSERT (report_args, report_types);

   args = strtok (args, ",");
   do
     {
   args = strtok (args, ",");
   do
     {


@@ -87,37 +175,46 @@ report_argmatch (char *args)
   while ((args = strtok (NULL, ",")));
 }
 
   while ((args = strtok (NULL, ",")));
 }
 

-/*---------------------------.
-| Display the help message.  |
-`---------------------------*/
+
+/*-------------------------------------------.
+| Display the help message and exit STATUS.  |
+`-------------------------------------------*/
+
+static void usage (int) ATTRIBUTE_NORETURN;

 
 static void
 
 static void

-usage (FILE *stream)
+usage (int status)

 {
 {

-  /* Some efforts were made to ease the translators' task, please
-     continue.  */
-  fputs (_("\
-GNU bison generates parsers for LALR(1) grammars.\n"), stream);
-  putc ('\n', stream);
+  if (status != 0)
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
+            program_name);
+  else
+    {
+      /* Some efforts were made to ease the translators' task, please
+        continue.  */
+      fputs (_("\
+GNU bison generates parsers for LALR(1) grammars.\n"), stdout);
+      putc ('\n', stdout);

 
 

-  fprintf (stream, _("\
+      fprintf (stdout, _("\

 Usage: %s [OPTION]... FILE\n"), program_name);
 Usage: %s [OPTION]... FILE\n"), program_name);

-  putc ('\n', stream);
+      putc ('\n', stdout);

 
 

-  fputs (_("\
+      fputs (_("\

 If a long option shows an argument as mandatory, then it is mandatory\n\
 for the equivalent short option also.  Similarly for optional arguments.\n"),
 If a long option shows an argument as mandatory, then it is mandatory\n\
 for the equivalent short option also.  Similarly for optional arguments.\n"),

-        stream);
-  putc ('\n', stream);
+            stdout);
+      putc ('\n', stdout);

 
 

-  fputs (_("\
+      fputs (_("\

 Operation modes:\n\
 Operation modes:\n\

-  -h, --help      display this help and exit\n\
-  -V, --version   output version information and exit\n\
-  -y, --yacc      emulate POSIX yacc\n"), stream);
-  putc ('\n', stream);
+  -h, --help                 display this help and exit\n\
+  -V, --version              output version information and exit\n\
+      --print-localedir      output directory containing locale-dependent data\n\
+  -y, --yacc                 emulate POSIX yacc\n"), stdout);
+      putc ('\n', stdout);

 
 

-  fputs (_("\
+      fputs (_("\

 Parser:\n\
   -S, --skeleton=FILE        specify the skeleton to use\n\
   -t, --debug                instrument the parser for debugging\n\
 Parser:\n\
   -S, --skeleton=FILE        specify the skeleton to use\n\
   -t, --debug                instrument the parser for debugging\n\


@@ -126,10 +223,10 @@ Parser:\n\
   -l, --no-lines             don't generate `#line' directives\n\
   -n, --no-parser            generate the tables only\n\
   -k, --token-table          include a table of token names\n\
   -l, --no-lines             don't generate `#line' directives\n\
   -n, --no-parser            generate the tables only\n\
   -k, --token-table          include a table of token names\n\

-"), stream);
-  putc ('\n', stream);
+"), stdout);
+      putc ('\n', stdout);

 
 

-  fputs (_("\
+      fputs (_("\

 Output:\n\
   -d, --defines              also produce a header file\n\
   -r, --report=THINGS        also produce details on the automaton\n\
 Output:\n\
   -d, --defines              also produce a header file\n\
   -r, --report=THINGS        also produce details on the automaton\n\


@@ -137,22 +234,25 @@ Output:\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\
   -g, --graph                also produce a VCG description of the automaton\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\
   -g, --graph                also produce a VCG description of the automaton\n\

-"), stream);
-  putc ('\n', stream);
+"), stdout);
+      putc ('\n', stdout);

 
 

-  fputs (_("\
+      fputs (_("\

 THINGS is a list of comma separated words that can include:\n\
   `state'        describe the states\n\
   `itemset'      complete the core item sets with their closure\n\
 THINGS is a list of comma separated words that can include:\n\
   `state'        describe the states\n\
   `itemset'      complete the core item sets with their closure\n\

-  `lookahead'    explicitly associate lookaheads to items\n\
+  `look-ahead'   explicitly associate look-ahead tokens to items\n\

   `solved'       describe shift/reduce conflicts solving\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\
   `solved'       describe shift/reduce conflicts solving\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\

-"), stream);
-  putc ('\n', stream);
+"), stdout);
+      putc ('\n', stdout);

 
 

-  fputs (_("\
-Report bugs to <bug-bison@gnu.org>.\n"), stream);
+      fputs (_("\
+Report bugs to <bug-bison@gnu.org>.\n"), stdout);
+    }
+
+  exit (status);

 }
 
 
 }
 
 


@@ -161,23 +261,23 @@ Report bugs to <bug-bison@gnu.org>.\n"), stream);
 `------------------------------*/
 
 static void
 `------------------------------*/
 
 static void

-version (FILE *stream)
+version (void)

 {
   /* Some efforts were made to ease the translators' task, please
      continue.  */
 {
   /* Some efforts were made to ease the translators' task, please
      continue.  */

-  fprintf (stream, _("bison (GNU Bison) %s"), VERSION);
-  putc ('\n', stream);
-  fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stream);
-  putc ('\n', stream);
+  printf (_("bison (GNU Bison) %s"), VERSION);
+  putc ('\n', stdout);
+  fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout);
+  putc ('\n', stdout);

 
 

-  fprintf (stream,
-          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2002);
+  fprintf (stdout,
+          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2006);

 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 "),
 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 "),

-        stream);
+        stdout);

 }
 
 
 }
 
 


@@ -186,13 +286,21 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 `----------------------*/
 
 /* Shorts options.  */
 `----------------------*/
 
 /* Shorts options.  */

-const char *short_options = "yvegdhr:ltknVo:b:p:S:";
+static char const short_options[] = "yvegdhr:ltknVo:b:p:S:T::";
+
+/* Values for long options that do not have single-letter equivalents.  */
+enum
+{
+  LOCATIONS_OPTION = CHAR_MAX + 1,
+  PRINT_LOCALEDIR_OPTION
+};

 
 static struct option const long_options[] =
 {
   /* Operation modes. */
 
 static struct option const long_options[] =
 {
   /* Operation modes. */

-  { "help",          no_argument,              0,   'h' },
-  { "version",       no_argument,              0,   'V' },
+  { "help",            no_argument,    0,   'h' },
+  { "version",         no_argument,    0,   'V' },
+  { "print-localedir", no_argument,    0,   PRINT_LOCALEDIR_OPTION },

 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },
 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },


@@ -207,19 +315,7 @@ static struct option const long_options[] =
   { "verbose",    no_argument,         0,   'v' },
 
   /* Hidden. */
   { "verbose",    no_argument,         0,   'v' },
 
   /* Hidden. */

-  { "trace",         no_argument,   &trace_flag,     1 },
-
-  /* FIXME: semantic parsers will output an `include' of an
-     output file: be sure that the naem included is indeed the name of
-     the output file.  */ /* FIXME Should we activate this options ?
-     */
-  { "output",      required_argument,     0, 'o' },
-  { "file-prefix", required_argument,     0, 'b' },
-  { "name-prefix", required_argument,     0, 'p' },
-
-  /*
-   * Percent and command line declarations.
-   */
+  { "trace",         optional_argument,   0,     'T' },

 
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },
 
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },


@@ -230,7 +326,7 @@ static struct option const long_options[] =
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },

-  { "locations",      no_argument, &locations_flag,     1 },
+  { "locations",      no_argument,              0, LOCATIONS_OPTION },

   { "no-lines",       no_argument,               0,   'l' },
   { "no-parser",      no_argument,               0,   'n' },
   { "raw",            no_argument,               0,     0 },
   { "no-lines",       no_argument,               0,   'l' },
   { "no-parser",      no_argument,               0,   'n' },
   { "raw",            no_argument,               0,     0 },


@@ -253,7 +349,8 @@ getargs (int argc, char *argv[])
 {
   int c;
 
 {
   int c;
 

-  while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) != EOF)
+  while ((c = getopt_long (argc, argv, short_options, long_options, NULL))
+        != -1)

     switch (c)
       {
       case 0:
     switch (c)
       {
       case 0:


@@ -261,21 +358,25 @@ getargs (int argc, char *argv[])
        break;
 
       case 'y':
        break;
 
       case 'y':

-       yacc_flag = 1;
+       yacc_flag = true;

        break;
 
       case 'h':
        break;
 
       case 'h':

-       usage (stdout);
-       exit (0);
+       usage (EXIT_SUCCESS);

 
       case 'V':
 
       case 'V':

-       version (stdout);
-       exit (0);
+       version ();
+       exit (EXIT_SUCCESS);
+
+      case PRINT_LOCALEDIR_OPTION:
+       printf ("%s\n", LOCALEDIR);
+       exit (EXIT_SUCCESS);

 
       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */
 
       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */

-       graph_flag = 1;
-       spec_graph_file = AS_FILE_NAME (optarg);
+       graph_flag = true;
+       if (optarg)
+         spec_graph_file = AS_FILE_NAME (optarg);

        break;
 
       case 'v':
        break;
 
       case 'v':


@@ -292,25 +393,29 @@ getargs (int argc, char *argv[])
 
       case 'd':
        /* Here, the -d and --defines options are differentiated.  */
 
       case 'd':
        /* Here, the -d and --defines options are differentiated.  */

-       defines_flag = 1;
+       defines_flag = true;

        if (optarg)
          spec_defines_file = AS_FILE_NAME (optarg);
        break;
 
       case 'l':
        if (optarg)
          spec_defines_file = AS_FILE_NAME (optarg);
        break;
 
       case 'l':

-       no_lines_flag = 1;
+       no_lines_flag = true;
+       break;
+
+      case LOCATIONS_OPTION:
+       locations_flag = true;

        break;
 
       case 'k':
        break;
 
       case 'k':

-       token_table_flag = 1;
+       token_table_flag = true;

        break;
 
       case 'n':
        break;
 
       case 'n':

-       no_parser_flag = 1;
+       no_parser_flag = true;

        break;
 
       case 't':
        break;
 
       case 't':

-       debug_flag = 1;
+       debug_flag = true;

        break;
 
       case 'o':
        break;
 
       case 'o':


@@ -329,20 +434,22 @@ getargs (int argc, char *argv[])
        report_argmatch (optarg);
        break;
 
        report_argmatch (optarg);
        break;
 

+      case 'T':
+       trace_argmatch (optarg);
+       break;
+

       default:
       default:

-       fprintf (stderr, _("Try `%s --help' for more information.\n"),
-                program_name);
-       exit (1);
+       usage (EXIT_FAILURE);

       }
 
       }
 

-  if (optind == argc)
+  if (argc - optind != 1)

     {
     {

-      fprintf (stderr, _("%s: no grammar file given\n"), program_name);
-      exit (1);
+      if (argc - optind < 1)
+       error (0, 0, _("missing operand after `%s'"), argv[argc - 1]);
+      else
+       error (0, 0, _("extra operand `%s'"), argv[optind + 1]);
+      usage (EXIT_FAILURE);

     }
     }

-  if (optind < argc - 1)
-    fprintf (stderr, _("%s: extra arguments ignored after `%s'\n"),
-            program_name, argv[optind]);

 
 

-  infile = argv[optind];
+  current_file = grammar_file = uniqstr_new (argv[optind]);

 }
 }