Fix the previous test.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 890179ec5b5c3f5a72ad95c2330bc43cbb3fad8b..3a74ea1dc74405310d2993b5596d67a241495be3 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -22,51 +22,26 @@
 #include "getopt.h"
 #include "system.h"
 #include "files.h"
+#include "complain.h"
 #include "getargs.h"
+#include "xalloc.h"
+#include "options.h"
 
 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 token_table_flag = 0;
 int verbose_flag = 0;
-int statistics_flag = 0;
 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;
-const char *shortopts = "yvdhrltknVo:b:p:S:";
-static struct option longopts[] =
-{
-  /* 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}
-};
 
 /*---------------------------.
 | Display the help message.  |
@@ -106,7 +81,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\
-  -r, --raw                  number the tokens from 3\n\
   -k, --token-table          include a table of token names\n\
 "), stream);
   putc ('\n', stream);
@@ -116,7 +90,9 @@ Output:\n\
   -d, --defines              also produce a header file\n\
   -v, --verbose              also produce an explanation of the automaton\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 (_("\
@@ -154,11 +130,20 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 | 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;
 
+  struct option *longopts = long_option_table_new ();
   while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != EOF)
     switch (c)
       {
@@ -178,16 +163,29 @@ getargs (int argc, char *argv[])
        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':
        verbose_flag = 1;
        break;
 
       case 'S':
-       skeleton = optarg;
+       skeleton = AS_FILE_NAME (optarg);
+       break;
+
+      case 'I':
+       include = AS_FILE_NAME (optarg);
        break;
 
       case 'd':
+       /* Here, the -d and --defines options are differentiated.  */
        defines_flag = 1;
+       if (optarg)
+         spec_defines_file = AS_FILE_NAME (optarg);
        break;
 
       case 'l':
@@ -199,7 +197,7 @@ getargs (int argc, char *argv[])
        break;
 
       case 'r':
-       raw_flag = 1;
+       fatal (_("`%s' is no longer supported"), "--raw");
        break;
 
       case 'n':
@@ -211,11 +209,11 @@ getargs (int argc, char *argv[])
        break;
 
       case 'o':
-       spec_outfile = optarg;
+       spec_outfile = AS_FILE_NAME (optarg);
        break;
 
       case 'b':
-       spec_file_prefix = optarg;
+       spec_file_prefix = AS_FILE_NAME (optarg);
        break;
 
       case 'p':
@@ -228,6 +226,8 @@ getargs (int argc, char *argv[])
        exit (1);
       }
 
+  free (longopts);
+
   if (optind == argc)
     {
       fprintf (stderr, _("%s: no grammar file given\n"), program_name);