* src/output.c (prepare): Drop the muscle `ntbase' which

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 6c74d264b63bc3a17fc6fa56659a134c189a72b1..eee6314f0aff610a62e5c0d57441b487503624b6 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -22,50 +22,26 @@
 #include "getopt.h"
 #include "system.h"
 #include "files.h"
 #include "getopt.h"
 #include "system.h"
 #include "files.h"

+#include "complain.h"

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

-char *skeleton = 0;

 int token_table_flag = 0;
 int verbose_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[] =
-{
-  /* 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.  |
 
 /*---------------------------.
 | Display the help message.  |


@@ -114,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\
   -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 (_("\
   putc ('\n', stream);
 
   fputs (_("\


@@ -157,6 +135,7 @@ getargs (int argc, char *argv[])
 {
   int c;
 
 {
   int c;
 

+  create_long_option_table ();

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


@@ -176,6 +155,12 @@ 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 = optarg;
+       break;
+

       case 'v':
        verbose_flag = 1;
        break;
       case 'v':
        verbose_flag = 1;
        break;


@@ -184,8 +169,14 @@ getargs (int argc, char *argv[])
        skeleton = optarg;
        break;
 
        skeleton = optarg;
        break;
 

+      case 'I':
+       include = optarg;
+       break;
+

       case 'd':
       case 'd':

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

        defines_flag = 1;
        defines_flag = 1;

+       spec_defines_file = optarg;

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


@@ -226,6 +217,7 @@ getargs (int argc, char *argv[])
        exit (1);
       }
 
        exit (1);
       }
 

+  XFREE (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);