X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/cd5bd6ac4f0ee29eec5efd5c4659a29c37527c23..f30e1ab65cd39d44e492025c1c6ba0429a013dae:/src/getargs.c?ds=sidebyside

diff --git a/src/getargs.c b/src/getargs.c
index 890179ec..dd5de7fd 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -22,6 +22,7 @@
 #include "getopt.h"
 #include "system.h"
 #include "files.h"
+#include "complain.h"
 #include "getargs.h"
 
 int debug_flag = 0;
@@ -29,15 +30,16 @@ 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;
 
 extern char *program_name;
-const char *shortopts = "yvdhrltknVo:b:p:S:";
+const char *shortopts = "yvgdhrltknVo:b:p:S:";
 static struct option longopts[] =
 {
   /* Operation modes. */
@@ -48,7 +50,7 @@ static struct option longopts[] =
 
   /* Parser. */
   {"skeleton",		required_argument,	0, 'S'},
-  {"debug",		no_argument,		0, 'd'},
+  {"debug",		no_argument,		0, 't'},
   {"locations",		no_argument, 	&locations_flag, 1},
   /* was 'a';  apparently unused -wjh */
   {"name-prefix",	required_argument, 	0, 'p'},
@@ -58,13 +60,15 @@ static struct option longopts[] =
   {"token-table",	no_argument,		0, 'k'},
 
   /* Output. */
-  {"defines",		no_argument,		0, 'd'},
+  {"defines",		optional_argument,     	0, 'd'},
   {"verbose",		no_argument,		0, 'v'},
   {"file-prefix",	required_argument, 	0, 'b'},
+  {"output",		required_argument, 	0, 'o'},
   {"output-file",	required_argument, 	0, 'o'},
+  {"graph",		optional_argument,     	0, 'g'},
 
   /* Hidden. */
-  {"statistics",	no_argument, 	&statistics_flag, 1},
+  {"trace", 		no_argument, 	&trace_flag, 1},
   {0, 0, 0, 0}
 };
 
@@ -106,7 +110,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 +119,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 (_("\
@@ -178,6 +183,12 @@ 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 = optarg;
+	break;
+
       case 'v':
 	verbose_flag = 1;
 	break;
@@ -187,7 +198,9 @@ getargs (int argc, char *argv[])
 	break;
 
       case 'd':
+	/* Here, the -d and --defines options are differentiated.  */
 	defines_flag = 1;
+	spec_defines_file = optarg;
 	break;
 
       case 'l':
@@ -199,7 +212,7 @@ getargs (int argc, char *argv[])
 	break;
 
       case 'r':
-	raw_flag = 1;
+	fatal (_("`%s' is no longer supported"), "--raw");
 	break;
 
       case 'n':