X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9be0c25bf054b026304e6ec480c3893817625607..3f8237696f13f3db1495b14f3a7a564734821f88:/src/getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 5789152a..9f6aef4a 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -24,7 +24,6 @@
 #include "argmatch.h"
 #include "complain.h"
 #include "getargs.h"
-#include "options.h"
 #include "files.h"
 
 int debug_flag = 0;
@@ -32,17 +31,75 @@ int defines_flag = 0;
 int locations_flag = 0;
 int no_lines_flag = 0;
 int no_parser_flag = 0;
-int report_flag = 0;
+int report_flag = report_none;
 int token_table_flag = 0;
 int yacc_flag = 0;	/* for -y */
 int graph_flag = 0;
-int trace_flag = 0;
+int trace_flag = trace_none;
 
 const char *skeleton = NULL;
 const char *include = NULL;
 
 extern char *program_name;
 
+
+/*---------------------.
+| --trace's handling.  |
+`---------------------*/
+
+static const char * const trace_args[] =
+{
+  /* In a series of synonyms, present the most meaningful first, so
+     that argmatch_valid be more readable.  */
+  "none       - no report",
+  "automaton  - contruction of the automaton",
+  "bitsets    - use of bitsets",
+  "grammar    - reading, reducing of the grammar",
+  "resource   - memory consumption (where available)",
+  "sets       - grammar sets: firsts, nullable etc.",
+  "time       - time consumption",
+  "tools      - m4 invocation and preserve the temporary file",
+  "all        - all of the above",
+  0
+};
+
+static const int trace_types[] =
+{
+  trace_none,
+  trace_automaton,
+  trace_bitsets,
+  trace_grammar,
+  trace_resource,
+  trace_sets,
+  trace_time,
+  trace_tools,
+  trace_all
+};
+
+
+static void
+trace_argmatch (char *args)
+{
+  ARGMATCH_ASSERT (trace_args, trace_types);
+  if (args)
+    {
+      args = strtok (args, ",");
+      do
+	{
+	  int trace = XARGMATCH ("--trace", args,
+				 trace_args, trace_types);
+	  if (trace == trace_none)
+	    trace_flag = trace_none;
+	  else
+	    trace_flag |= trace;
+	}
+      while ((args = strtok (NULL, ",")));
+    }
+  else
+    trace_flag = trace_all;
+}
+
+
 /*----------------------.
 | --report's handling.  |
 `----------------------*/
@@ -186,6 +243,61 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 | Process the options.  |
 `----------------------*/
 
+/* Shorts options.  */
+const char *short_options = "yvegdhr:ltknVo:b:p:S:T::";
+
+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",         optional_argument,   0,     'T' },
+
+  /* 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 +311,7 @@ getargs (int argc, char *argv[])
 {
   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:
@@ -276,14 +387,16 @@ getargs (int argc, char *argv[])
 	report_argmatch (optarg);
 	break;
 
+      case 'T':
+	trace_argmatch (optarg);
+	break;
+
       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);