-/* Parse command line arguments for bison.
+/* Parse command line arguments for Bison.
+
Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
Free Software Foundation, Inc.
02111-1307, USA. */
#include "system.h"
-#include "getopt.h"
-#include "argmatch.h"
-#include "error.h"
+
+#include <argmatch.h>
+#include <error.h>
+#include <getopt.h>
+
#include "complain.h"
-#include "struniq.h"
-#include "getargs.h"
#include "files.h"
+#include "getargs.h"
+#include "uniqstr.h"
int debug_flag = 0;
int defines_flag = 0;
/* In a series of synonyms, present the most meaningful first, so
that argmatch_valid be more readable. */
"none - no report",
- "scan - scanner traces",
- "parse - parser traces",
+ "scan - grammar scanner traces",
+ "parse - grammar parser traces",
"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",
+ "skeleton - skeleton postprocessing",
+ "time - time consumption",
"all - all of the above",
0
};
trace_grammar,
trace_resource,
trace_sets,
- trace_time,
trace_tools,
+ trace_skeleton,
+ trace_time,
trace_all
};
static void
trace_argmatch (char *args)
{
- ARGMATCH_ASSERT (trace_args, trace_types);
+ verify (trace_constraint, ARGMATCH_CONSTRAINT (trace_args, trace_types));
if (args)
{
args = strtok (args, ",");
static void
report_argmatch (char *args)
{
- ARGMATCH_ASSERT (report_args, report_types);
+ verify (report_constraint, ARGMATCH_CONSTRAINT (report_args, report_types));
args = strtok (args, ",");
do
{
{
int c;
- while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) != EOF)
+ while ((c = getopt_long (argc, argv, short_options, long_options, NULL))
+ != -1)
switch (c)
{
case 0:
usage (EXIT_FAILURE);
}
- current_file = grammar_file = struniq_new (argv[optind]);
+ current_file = grammar_file = uniqstr_new (argv[optind]);
}