Remove options.[ch]

[Akim Demaille]

We no longer share between the command line processing, and parsing.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * src/options.h, src/options.c: Remove.
        * src/getargs.c (short_options, long_options): New.

Index: src/Makefile.am
===================================================================
RCS file: /cvsroot/bison/bison/src/Makefile.am,v
retrieving revision 1.46
diff -u -u -r1.46 Makefile.am
--- src/Makefile.am 17 Jun 2002 07:04:49 -0000 1.46
+++ src/Makefile.am 27 Jun 2002 12:18:08 -0000
@@ -49,7 +49,6 @@
        main.c                                    \
        muscle_tab.c muscle_tab.h                 \
        nullable.c nullable.h                     \
-       options.c options.h                       \
        output.c output.h                         \
        parse-gram.h parse-gram.y                 \
        print.c print.h                           \
Index: src/getargs.c
===================================================================
RCS file: /cvsroot/bison/bison/src/getargs.c,v
retrieving revision 1.38
diff -u -u -r1.38 getargs.c
--- src/getargs.c 25 Jun 2002 12:05:38 -0000 1.38
+++ src/getargs.c 27 Jun 2002 12:18:08 -0000
@@ -24,7 +24,6 @@
 #include "argmatch.h"
 #include "complain.h"
 #include "getargs.h"
-#include "options.h"
 #include "files.h"
 
 int debug_flag = 0;
@@ -186,6 +185,61 @@
 | Process the options.  |
 `----------------------*/
 
+/* Shorts options.  */
+const char *short_options = "yvegdhr:ltknVo:b:p:S:";
+
+static struct option const long_options[] =
+{
+  /* Operation modes. */
+  { "help",          no_argument,              0,   'h' },
+  { "version",       no_argument,              0,   'V' },
+
+  /* Parser. */
+  { "name-prefix",   required_argument,          0,   'p' },
+  { "include",       required_argument,   0,   'I' },
+
+  /* Output. */
+  { "file-prefix", required_argument,  0,   'b' },
+  { "output",     required_argument,   0,   'o' },
+  { "output-file", required_argument,  0,   'o' },
+  { "graph",      optional_argument,   0,   'g' },
+  { "report",     required_argument,   0,   'r' },
+  { "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.
+   */
+
+  /* Output.  */
+  { "defines",     optional_argument,   0,   'd' },
+
+  /* Operation modes.  */
+  { "fixed-output-files", no_argument,  0,   'y' },
+  { "yacc",              no_argument,  0,   'y' },
+
+  /* Parser.  */
+  { "debug",         no_argument,               0,   't' },
+  { "locations",      no_argument, &locations_flag,     1 },
+  { "no-lines",       no_argument,               0,   'l' },
+  { "no-parser",      no_argument,               0,   'n' },
+  { "raw",            no_argument,               0,     0 },
+  { "skeleton",       required_argument,         0,   'S' },
+  { "token-table",    no_argument,               0,   'k' },
+
+  {0, 0, 0, 0}
+};
+
 /* Under DOS, there is no difference on the case.  This can be
    troublesome when looking for `.tab' etc.  */
 #ifdef MSDOS
@@ -199,8 +253,7 @@
 {
   int c;
 
-  struct option *longopts = long_option_table_new ();
-  while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != EOF)
+  while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) != 
EOF)
     switch (c)
       {
       case 0:
@@ -281,8 +334,6 @@
                 program_name);
        exit (1);
       }
-
-  free (longopts);
 
   if (optind == argc)
     {
Index: src/reader.c
===================================================================
RCS file: /cvsroot/bison/bison/src/reader.c,v
retrieving revision 1.198
diff -u -u -r1.198 reader.c
--- src/reader.c 20 Jun 2002 11:10:56 -0000 1.198
+++ src/reader.c 27 Jun 2002 12:18:08 -0000
@@ -27,7 +27,6 @@
 #include "files.h"
 #include "symtab.h"
 #include "symlist.h"
-#include "options.h"
 #include "gram.h"
 #include "complain.h"
 #include "output.h"