#include <config.h>
#include "system.h"
-#include "revision.h"
#include "output.h"
#include <argmatch.h>
#include <c-strcase.h>
#include <configmake.h>
#include <error.h>
+#include <quotearg.h>
/* Hack to get <getopt.h> to declare getopt with a prototype. */
#if lint && ! defined __GNU_LIBRARY__
#include "complain.h"
#include "files.h"
#include "getargs.h"
+#include "muscle_tab.h"
#include "uniqstr.h"
bool debug_flag;
fputs (_("\
Mandatory arguments to long options are mandatory for short options too.\n\
+"), stdout);
+ fputs (_("\
+The same is true for optional arguments.\n\
"), stdout);
fputs (_("\
--print-localedir output directory containing locale-dependent data\n\
--print-datadir output directory containing skeletons and XSLT\n\
-y, --yacc emulate POSIX Yacc\n\
- -W, --warnings=[CATEGORY] report the warnings falling in CATEGORY\n\
+ -W, --warnings[=CATEGORY] report the warnings falling in CATEGORY\n\
\n\
"), stdout);
fputs (_("\
Parser:\n\
-L, --language=LANGUAGE specify the output programming language\n\
+ (this is an experimental feature)\n\
-S, --skeleton=FILE specify the skeleton to use\n\
-t, --debug instrument the parser for debugging\n\
- --locations enable locations computation\n\
+ --locations enable location support\n\
+ -D, --define=NAME[=VALUE] same as `%define NAME \"VALUE\"'\n\
-p, --name-prefix=PREFIX prepend PREFIX to the external symbols\n\
-l, --no-lines don't generate `#line' directives\n\
-k, --token-table include a table of token names\n\
\n\
"), stdout);
+ /* Keep -d and --defines separate so that ../build-aux/cross-options.pl
+ * won't assume that -d also takes an argument. */
fputs (_("\
Output:\n\
- -d, --defines[=FILE] also produce a header file\n\
+ --defines[=FILE] also produce a header file\n\
+ -d likewise but cannot specify FILE (for POSIX Yacc)\n\
-r, --report=THINGS also produce details on the automaton\n\
--report-file=FILE write report to FILE\n\
-v, --verbose same as `--report=state'\n\
continue. */
printf (_("bison (GNU Bison) %s"), VERSION);
putc ('\n', stdout);
- printf ("%s", revision);
fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout);
putc ('\n', stdout);
`--------------------------------------*/
void
-skeleton_arg (char const *arg, int prio, location const *loc)
+skeleton_arg (char const *arg, int prio, location loc)
{
if (prio < skeleton_prio)
{
{
char const *msg =
_("multiple skeleton declarations are invalid");
- if (loc)
- complain_at (*loc, msg);
- else
- complain (msg);
+ complain_at (loc, msg);
}
}
void
-language_argmatch (char const *arg, int prio, location const *loc)
+language_argmatch (char const *arg, int prio, location loc)
{
char const *msg;
else
return;
- if (loc)
- complain_at (*loc, msg, arg);
- else
- complain (msg, arg);
+ complain_at (loc, msg, arg);
}
/*----------------------.
/* Shorts options.
Should be computed from long_options. */
static char const short_options[] =
+ "D:"
"L:"
"S:"
"T::"
"V"
- "W"
+ "W::"
"b:"
"d"
"e"
/* Parser. */
{ "debug", no_argument, 0, 't' },
+ { "define", required_argument, 0, 'D' },
{ "locations", no_argument, 0, LOCATIONS_OPTION },
{ "no-lines", no_argument, 0, 'l' },
{ "raw", no_argument, 0, 0 },
# define AS_FILE_NAME(File) (File)
#endif
+/* Build a location for the current command line argument. */
+static
+location
+command_line_location()
+{
+ location res;
+ /* "<command line>" is used in GCC's messages about -D. */
+ boundary_set (&res.start, uniqstr_new ("<command line>"), optind, -1);
+ res.end = res.start;
+ return res;
+}
+
+
void
getargs (int argc, char *argv[])
{
!= -1)
switch (c)
{
+ /* ASCII Sorting for short options (i.e., upper case then
+ lower case), and then long-only options. */
+
case 0:
/* Certain long options cause getopt_long to return 0. */
break;
- case 'b':
- spec_file_prefix = AS_FILE_NAME (optarg);
+ case 'D': /* -DNAME[=VALUE]. */
+ {
+ char* name = optarg;
+ char* value = strchr (optarg, '=');
+ if (value)
+ *value++ = 0;
+ else
+ value = "";
+ muscle_percent_define_insert (name, command_line_location (), value);
+ }
break;
- case 'g':
- /* Here, the -g and --graph=FILE options are differentiated. */
- graph_flag = true;
- if (optarg)
- spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+ case 'I':
+ include = AS_FILE_NAME (optarg);
break;
- case 'x':
- /* Here, the -x and --xml=FILE options are differentiated. */
- xml_flag = true;
- if (optarg)
- spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
+ case 'L':
+ language_argmatch (optarg, 0, command_line_location ());
break;
- case 'h':
- usage (EXIT_SUCCESS);
+ case 'S':
+ skeleton_arg (AS_FILE_NAME (optarg), 0, command_line_location ());
+ break;
- case 'L':
- language_argmatch (optarg, 0, NULL);
+ case 'T':
+ FLAGS_ARGMATCH (trace, optarg);
break;
- case 'S':
- skeleton_arg (AS_FILE_NAME (optarg), 0, NULL);
+ case 'V':
+ version ();
+ exit (EXIT_SUCCESS);
+
+ case 'W':
+ if (optarg)
+ FLAGS_ARGMATCH (warnings, optarg);
+ else
+ warnings_flag |= warnings_all;
break;
- case 'I':
- include = AS_FILE_NAME (optarg);
+ case 'b':
+ spec_file_prefix = AS_FILE_NAME (optarg);
break;
case 'd':
- /* Here, the -d and --defines options are differentiated. */
- defines_flag = true;
+ /* Here, the -d and --defines options are differentiated. */
+ defines_flag = true;
+ if (optarg)
+ spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+ break;
+
+ case 'g':
+ graph_flag = true;
if (optarg)
- spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+ spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
break;
+ case 'h':
+ usage (EXIT_SUCCESS);
+
case 'k':
token_table_flag = true;
break;
FLAGS_ARGMATCH (report, optarg);
break;
- case REPORT_FILE_OPTION:
- spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
- break;
-
- case 'T':
- FLAGS_ARGMATCH (trace, optarg);
- break;
-
case 't':
debug_flag = true;
break;
- case 'V':
- version ();
- exit (EXIT_SUCCESS);
-
case 'v':
report_flag |= report_states;
break;
- case 'y':
- yacc_flag = true;
+ case 'x':
+ xml_flag = true;
+ if (optarg)
+ spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
break;
- case 'W':
- if (optarg)
- FLAGS_ARGMATCH (warnings, optarg);
- else
- warnings_flag |= warnings_all;
+ case 'y':
+ yacc_flag = true;
break;
case LOCATIONS_OPTION:
printf ("%s\n", compute_pkgdatadir ());
exit (EXIT_SUCCESS);
+ case REPORT_FILE_OPTION:
+ spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
+ break;
+
default:
usage (EXIT_FAILURE);
}
}
current_file = grammar_file = uniqstr_new (argv[optind]);
+ MUSCLE_INSERT_C_STRING ("file_name", grammar_file);
}
projects / bison.git / blobdiff