* src/getargs.c (report_argmatch): Initialize strtok().

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 890179ec5b5c3f5a72ad95c2330bc43cbb3fad8b..5789152ab32013b8034e7fc9dca0f3e1a49d093e 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,5 +1,6 @@
 /* Parse command line arguments for bison.
 /* Parse command line arguments for bison.

-   Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.
+   Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002
+   Free Software Foundation, Inc.

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


@@ -18,56 +19,75 @@
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 
    Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.  */
 

-#include <stdio.h>
-#include "getopt.h"

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

-#include "files.h"
+#include "getopt.h"
+#include "argmatch.h"
+#include "complain.h"

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

+#include "options.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 debug_flag = 0;
 int defines_flag = 0;
 int locations_flag = 0;
 int no_lines_flag = 0;
 int no_parser_flag = 0;

-int raw_flag = 0;
-char *skeleton = 0;
+int report_flag = 0;

 int token_table_flag = 0;
 int token_table_flag = 0;

-int verbose_flag = 0;
-int statistics_flag = 0;

 int yacc_flag = 0;     /* for -y */
 int yacc_flag = 0;     /* for -y */

+int graph_flag = 0;
+int trace_flag = 0;
+
+const char *skeleton = NULL;
+const char *include = NULL;

 
 extern char *program_name;
 
 extern char *program_name;

-const char *shortopts = "yvdhrltknVo:b:p:S:";
-static struct option longopts[] =
+
+/*----------------------.
+| --report's handling.  |
+`----------------------*/
+
+static const char * const report_args[] =
+{
+  /* In a series of synonyms, present the most meaningful first, so
+     that argmatch_valid be more readable.  */
+  "none",
+  "state", "states",
+  "itemset", "itemsets",
+  "lookahead", "lookaheads",
+  "solved",
+  "all",
+  0
+};
+
+static const int report_types[] =

 {
 {

-  /* Operation modes. */
-  {"help",             no_argument,    0, 'h'},
-  {"version",          no_argument,    0, 'V'},
-  {"yacc",             no_argument,    0, 'y'},
-  {"fixed-output-files",no_argument,   0, 'y'},
-
-  /* Parser. */
-  {"skeleton",         required_argument,      0, 'S'},
-  {"debug",            no_argument,            0, 'd'},
-  {"locations",                no_argument,    &locations_flag, 1},
-  /* was 'a';  apparently unused -wjh */
-  {"name-prefix",      required_argument,      0, 'p'},
-  {"no-lines",         no_argument,            0, 'l'},
-  {"no-parser",                no_argument,            0, 'n'},
-  {"raw",              no_argument,            0, 'r'},
-  {"token-table",      no_argument,            0, 'k'},
-
-  /* Output. */
-  {"defines",          no_argument,            0, 'd'},
-  {"verbose",          no_argument,            0, 'v'},
-  {"file-prefix",      required_argument,      0, 'b'},
-  {"output-file",      required_argument,      0, 'o'},
-
-  /* Hidden. */
-  {"statistics",       no_argument,    &statistics_flag, 1},
-  {0, 0, 0, 0}
+  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_solved_conflicts,
+  report_all

 };
 
 };
 

+
+static void
+report_argmatch (char *args)
+{
+  ARGMATCH_ASSERT (report_args, report_types);
+  args = strtok (args, ",");
+  do
+    {
+      int report = XARGMATCH ("--report", args,
+                             report_args, report_types);
+      if (report == report_none)
+       report_flag = report_none;
+      else
+       report_flag |= report;
+    }
+  while ((args = strtok (NULL, ",")));
+}
+

 /*---------------------------.
 | Display the help message.  |
 `---------------------------*/
 /*---------------------------.
 | Display the help message.  |
 `---------------------------*/


@@ -106,7 +126,6 @@ Parser:\n\
   -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
   -l, --no-lines             don't generate `#line' directives\n\
   -n, --no-parser            generate the tables only\n\
   -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
   -l, --no-lines             don't generate `#line' directives\n\
   -n, --no-parser            generate the tables only\n\

-  -r, --raw                  number the tokens from 3\n\

   -k, --token-table          include a table of token names\n\
 "), stream);
   putc ('\n', stream);
   -k, --token-table          include a table of token names\n\
 "), stream);
   putc ('\n', stream);


@@ -114,9 +133,23 @@ Parser:\n\
   fputs (_("\
 Output:\n\
   -d, --defines              also produce a header file\n\
   fputs (_("\
 Output:\n\
   -d, --defines              also produce a header file\n\

-  -v, --verbose              also produce an explanation of the automaton\n\
+  -r, --report=THINGS        also produce details on the automaton\n\
+  -v, --verbose              same as `--report=state'\n\

   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\

-  -o, --output-file=FILE     leave output to FILE\n"), stream);
+  -o, --output=FILE          leave output to FILE\n\
+  -g, --graph                also produce a VCG description of the automaton\n\
+"), stream);
+  putc ('\n', stream);
+
+  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\
+  `lookahead'    explicitly associate lookaheads to items\n\
+  `solved'       describe shift/reduce conflicts solving\n\
+  `all'          include all the above information\n\
+  `none'         disable the report\n\
+"), stream);

   putc ('\n', stream);
 
   fputs (_("\
   putc ('\n', stream);
 
   fputs (_("\


@@ -133,14 +166,13 @@ version (FILE *stream)
 {
   /* 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);
+  fprintf (stream, _("bison (GNU Bison) %s"), VERSION);

   putc ('\n', stream);
   putc ('\n', stream);

+  fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stream);

   putc ('\n', stream);
 
   putc ('\n', stream);
 

-  fputs (_("\
-Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"),
-        stream);
+  fprintf (stream,
+          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2002);

 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\


@@ -154,11 +186,20 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 | Process the options.  |
 `----------------------*/
 
 | Process the options.  |
 `----------------------*/
 

+/* Under DOS, there is no difference on the case.  This can be
+   troublesome when looking for `.tab' etc.  */
+#ifdef MSDOS
+# define AS_FILE_NAME(File) (strlwr (File), (File))
+#else
+# define AS_FILE_NAME(File) (File)
+#endif
+

 void
 getargs (int argc, char *argv[])
 {
   int c;
 
 void
 getargs (int argc, char *argv[])
 {
   int c;
 

+  struct option *longopts = long_option_table_new ();

   while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != EOF)
     switch (c)
       {
   while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != EOF)
     switch (c)
       {


@@ -178,16 +219,29 @@ getargs (int argc, char *argv[])
        version (stdout);
        exit (0);
 
        version (stdout);
        exit (0);
 

+      case 'g':
+       /* Here, the -g and --graph=FILE options are differentiated.  */
+       graph_flag = 1;
+       spec_graph_file = AS_FILE_NAME (optarg);
+       break;
+

       case 'v':
       case 'v':

-       verbose_flag = 1;
+       report_flag |= report_states;

        break;
 
       case 'S':
        break;
 
       case 'S':

-       skeleton = optarg;
+       skeleton = AS_FILE_NAME (optarg);
+       break;
+
+      case 'I':
+       include = AS_FILE_NAME (optarg);

        break;
 
       case 'd':
        break;
 
       case 'd':

+       /* Here, the -d and --defines options are differentiated.  */

        defines_flag = 1;
        defines_flag = 1;

+       if (optarg)
+         spec_defines_file = AS_FILE_NAME (optarg);

        break;
 
       case 'l':
        break;
 
       case 'l':


@@ -198,10 +252,6 @@ getargs (int argc, char *argv[])
        token_table_flag = 1;
        break;
 
        token_table_flag = 1;
        break;
 

-      case 'r':
-       raw_flag = 1;
-       break;
-

       case 'n':
        no_parser_flag = 1;
        break;
       case 'n':
        no_parser_flag = 1;
        break;


@@ -211,23 +261,29 @@ getargs (int argc, char *argv[])
        break;
 
       case 'o':
        break;
 
       case 'o':

-       spec_outfile = optarg;
+       spec_outfile = AS_FILE_NAME (optarg);

        break;
 
       case 'b':
        break;
 
       case 'b':

-       spec_file_prefix = optarg;
+       spec_file_prefix = AS_FILE_NAME (optarg);

        break;
 
       case 'p':
        spec_name_prefix = optarg;
        break;
 
        break;
 
       case 'p':
        spec_name_prefix = optarg;
        break;
 

+      case 'r':
+       report_argmatch (optarg);
+       break;
+

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

+  free (longopts);
+

   if (optind == argc)
     {
       fprintf (stderr, _("%s: no grammar file given\n"), program_name);
   if (optind == argc)
     {
       fprintf (stderr, _("%s: no grammar file given\n"), program_name);