X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/728c4be290a95081c272ca917c54987135cde7e3..e0c653e7e660c353c59b054de571474450aa4c92:/src/getargs.c
diff --git a/src/getargs.c b/src/getargs.c
index 73bc35e5..cff6ff3f 100644
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,33 +1,32 @@
/* Parse command line arguments for Bison.
Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
- Bison is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- Bison is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with Bison; see the file COPYING. If not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include "system.h"
-#include "revision.h"
+#include "output.h"
#include
#include
#include
#include
+#include
/* Hack to get to declare getopt with a prototype. */
#if lint && ! defined __GNU_LIBRARY__
@@ -45,11 +44,13 @@
#include "complain.h"
#include "files.h"
#include "getargs.h"
+#include "muscle_tab.h"
#include "uniqstr.h"
bool debug_flag;
bool defines_flag;
bool graph_flag;
+bool xml_flag;
bool locations_flag;
bool no_lines_flag;
bool token_table_flag;
@@ -59,9 +60,6 @@ bool error_verbose = false;
bool nondeterministic_parser = false;
bool glr_parser = false;
-bool pull_parser = true;
-bool pure_parser = false;
-bool push_parser = false;
int report_flag = report_none;
int trace_flag = trace_none;
@@ -74,9 +72,9 @@ static struct bison_language const valid_languages[] = {
{ "", "", "", "", false }
};
-static int skeleton_prio = 2;
+int skeleton_prio = default_prio;
const char *skeleton = NULL;
-static int language_prio = 2;
+int language_prio = default_prio;
struct bison_language const *language = &valid_languages[0];
const char *include = NULL;
@@ -89,10 +87,12 @@ char *program_name;
* \param keys array of valid subarguments.
* \param values array of corresponding (int) values.
* \param flags the flags to update
- * \param args colon separated list of effective subarguments to decode.
+ * \param args comma separated list of effective subarguments to decode.
* If 0, then activate all the flags.
*
- * The special value 0 resets the flags to 0.
+ * If VALUE != 0 then KEY sets flags and no-KEY clears them.
+ * If VALUE == 0 then KEY clears all flags and no-KEY sets all flags.
+ * Thus no-none = all and no-all = none.
*/
static void
flags_argmatch (const char *option,
@@ -104,11 +104,18 @@ flags_argmatch (const char *option,
args = strtok (args, ",");
while (args)
{
- int value = XARGMATCH (option, args, keys, values);
+ int no = strncmp (args, "no-", 3) == 0 ? 3 : 0;
+ int value = XARGMATCH (option, args + no, keys, values);
if (value == 0)
- *flags = 0;
+ if (no)
+ *flags = ~0;
+ else
+ *flags = 0;
else
- *flags |= value;
+ if (no)
+ *flags &= ~value;
+ else
+ *flags |= value;
args = strtok (NULL, ",");
}
}
@@ -178,6 +185,7 @@ static const char * const trace_args[] =
"grammar - reading, reducing the grammar",
"resource - memory consumption (where available)",
"sets - grammar sets: firsts, nullable etc.",
+ "muscles - m4 definitions passed to the skeleton",
"tools - m4 invocation",
"m4 - m4 traces",
"skeleton - skeleton postprocessing",
@@ -196,6 +204,7 @@ static const int trace_types[] =
trace_grammar,
trace_resource,
trace_sets,
+ trace_muscles,
trace_tools,
trace_m4,
trace_skeleton,
@@ -248,6 +257,11 @@ usage (int status)
program_name);
else
{
+ /* For ../build-aux/cross-options.pl to work, use the format:
+ ^ -S, --long[=ARGS] (whitespace)
+ A --long option is required.
+ Otherwise, add exceptions to ../build-aux/cross-options.pl. */
+
printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
fputs (_("\
Generate LALR(1) and GLR parsers.\n\
@@ -256,6 +270,9 @@ Generate LALR(1) and GLR parsers.\n\
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 (_("\
@@ -264,29 +281,51 @@ Operation modes:\n\
-h, --help display this help and exit\n\
-V, --version output version information and exit\n\
--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\
\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 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\
-b, --file-prefix=PREFIX specify a PREFIX for output files\n\
-o, --output=FILE leave output to FILE\n\
- -g, --graph also output a graph of the automaton\n\
+ -g, --graph[=FILE] also output a graph of the automaton\n\
+ -x, --xml[=FILE] also output an XML report of the automaton\n\
+ (the XML schema is experimental)\n\
+\n\
+"), stdout);
+
+ fputs (_("\
+Warning categories include:\n\
+ `midrule-values' unset or unused midrule values\n\
+ `yacc' incompatibilities with POSIX YACC\n\
+ `all' all the warnings\n\
+ `no-CATEGORY' turn off warnings in CATEGORY\n\
+ `none' turn off all the warnings\n\
+ `error' treat warnings as errors\n\
\n\
"), stdout);
@@ -318,12 +357,12 @@ version (void)
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);
fprintf (stdout,
- _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2006);
+ _("Copyright (C) %d Free Software Foundation, Inc.\n"),
+ PACKAGE_COPYRIGHT_YEAR);
fputs (_("\
This is free software; see the source for copying conditions. There is NO\n\
@@ -338,7 +377,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
`--------------------------------------*/
void
-skeleton_arg (char const *arg, int prio, location const *loc)
+skeleton_arg (char const *arg, int prio, location loc)
{
if (prio < skeleton_prio)
{
@@ -349,15 +388,12 @@ skeleton_arg (char const *arg, int prio, location const *loc)
{
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;
@@ -378,24 +414,46 @@ language_argmatch (char const *arg, int prio, location const *loc)
else
return;
- if (loc)
- complain_at (*loc, msg, arg);
- else
- complain (msg, arg);
+ complain_at (loc, msg, arg);
}
/*----------------------.
| Process the options. |
`----------------------*/
-/* Shorts options. */
-static char const short_options[] = "yvegdhr:L:ltknVo:b:p:S:T::W";
+/* Shorts options.
+ Should be computed from long_options. */
+static char const short_options[] =
+ "D:"
+ "L:"
+ "S:"
+ "T::"
+ "V"
+ "W::"
+ "b:"
+ "d"
+ "e"
+ "g::"
+ "h"
+ "k"
+ "l"
+ "n"
+ "o:"
+ "p:"
+ "r:"
+ "t"
+ "v"
+ "x::"
+ "y"
+ ;
/* Values for long options that do not have single-letter equivalents. */
enum
{
LOCATIONS_OPTION = CHAR_MAX + 1,
- PRINT_LOCALEDIR_OPTION
+ PRINT_LOCALEDIR_OPTION,
+ PRINT_DATADIR_OPTION,
+ REPORT_FILE_OPTION
};
static struct option const long_options[] =
@@ -404,6 +462,7 @@ static struct option const long_options[] =
{ "help", no_argument, 0, 'h' },
{ "version", no_argument, 0, 'V' },
{ "print-localedir", no_argument, 0, PRINT_LOCALEDIR_OPTION },
+ { "print-datadir", no_argument, 0, PRINT_DATADIR_OPTION },
{ "warnings", optional_argument, 0, 'W' },
/* Parser. */
@@ -415,7 +474,9 @@ static struct option const long_options[] =
{ "output", required_argument, 0, 'o' },
{ "output-file", required_argument, 0, 'o' },
{ "graph", optional_argument, 0, 'g' },
+ { "xml", optional_argument, 0, 'x' },
{ "report", required_argument, 0, 'r' },
+ { "report-file", required_argument, 0, REPORT_FILE_OPTION },
{ "verbose", no_argument, 0, 'v' },
/* Hidden. */
@@ -430,6 +491,7 @@ static struct option const long_options[] =
/* 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 },
@@ -448,6 +510,19 @@ static struct option const long_options[] =
# define AS_FILE_NAME(File) (File)
#endif
+/* Build a location for the current command line argument. */
+static
+location
+command_line_location (void)
+{
+ location res;
+ /* "" is used in GCC's messages about -D. */
+ boundary_set (&res.start, uniqstr_new (""), optind, -1);
+ res.end = res.start;
+ return res;
+}
+
+
void
getargs (int argc, char *argv[])
{
@@ -457,43 +532,73 @@ 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;
+ muscle_percent_define_insert (name, command_line_location (),
+ value ? 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 'h':
- usage (EXIT_SUCCESS);
-
case 'L':
- language_argmatch (optarg, 0, NULL);
+ language_argmatch (optarg, command_line_prio,
+ command_line_location ());
break;
case 'S':
- skeleton_arg (AS_FILE_NAME (optarg), 0, NULL);
+ skeleton_arg (AS_FILE_NAME (optarg), command_line_prio,
+ command_line_location ());
break;
- case 'I':
- include = AS_FILE_NAME (optarg);
+ case 'T':
+ FLAGS_ARGMATCH (trace, optarg);
+ break;
+
+ case 'V':
+ version ();
+ exit (EXIT_SUCCESS);
+
+ case 'W':
+ if (optarg)
+ FLAGS_ARGMATCH (warnings, optarg);
+ else
+ warnings_flag |= warnings_all;
+ break;
+
+ 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;
@@ -514,31 +619,22 @@ getargs (int argc, char *argv[])
FLAGS_ARGMATCH (report, 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:
@@ -549,6 +645,14 @@ getargs (int argc, char *argv[])
printf ("%s\n", LOCALEDIR);
exit (EXIT_SUCCESS);
+ case PRINT_DATADIR_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);
}
@@ -563,4 +667,5 @@ getargs (int argc, char *argv[])
}
current_file = grammar_file = uniqstr_new (argv[optind]);
+ MUSCLE_INSERT_C_STRING ("file_name", grammar_file);
}