/* Parse command line arguments for Bison.
- Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1986, 1989, 1992, 2000-2012 Free Software
+ Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
#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__
# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
#endif
+#include <progname.h>
+
#include "complain.h"
#include "files.h"
#include "getargs.h"
-#include "muscle_tab.h"
+#include "muscle-tab.h"
+#include "quote.h"
#include "uniqstr.h"
bool debug_flag;
int report_flag = report_none;
int trace_flag = trace_none;
-int warnings_flag = warnings_none;
+int warnings_flag = warnings_conflicts_sr | warnings_conflicts_rr
+ | warnings_other;
static struct bison_language const valid_languages[] = {
{ "c", "c-skel.m4", ".c", ".h", true },
struct bison_language const *language = &valid_languages[0];
const char *include = NULL;
-char *program_name;
-
/** Decode an option's set of keys.
*
* \param option option being decoded.
* \param keys array of valid subarguments.
* \param values array of corresponding (int) values.
+ * \param all the all value.
* \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 from \c all and no-KEY sets all
+ * flags from \c all. Thus no-none = all and no-all = none.
*/
static void
flags_argmatch (const char *option,
const char * const keys[], const int values[],
- int *flags, char *args)
+ int all, int *flags, char *args)
{
if (args)
{
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 |= all;
+ else
+ *flags &= ~all;
+ }
else
- *flags |= value;
+ {
+ if (no)
+ *flags &= ~value;
+ else
+ *flags |= value;
+ }
args = strtok (NULL, ",");
}
}
else
- *flags = ~0;
+ *flags |= all;
}
/** Decode a set of sub arguments.
*
* \arg FlagName_args the list of keys.
* \arg FlagName_types the list of values.
+ * \arg FlagName_all the all value.
* \arg FlagName_flag the flag to update.
*/
#define FLAGS_ARGMATCH(FlagName, Args) \
flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \
- &FlagName ## _flag, Args)
+ FlagName ## _all, &FlagName ## _flag, Args)
/*----------------------.
"none - no warnings",
"midrule-values - unset or unused midrule values",
"yacc - incompatibilities with POSIX Yacc",
+ "conflicts-sr - S/R conflicts",
+ "conflicts-rr - R/R conflicts",
+ "other - all other warnings",
"all - all of the above",
"error - warnings are errors",
0
warnings_none,
warnings_midrule_values,
warnings_yacc,
+ warnings_conflicts_sr,
+ warnings_conflicts_rr,
+ warnings_other,
warnings_all,
warnings_error
};
printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
fputs (_("\
-Generate a deterministic or GLR parser employing LALR(1), IELR(1), or\n\
-canonical LR(1) parser tables.\n\
+Generate a deterministic LR or generalized LR (GLR) parser employing\n\
+LALR(1), IELR(1), or canonical LR(1) parser tables. IELR(1) and\n\
+canonical LR(1) support is experimental.\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 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\
+ -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 location support\n\
+ -D, --define=NAME[=VALUE] similar to `%define NAME \"VALUE\"'\n\
+ -F, --force-define=NAME[=VALUE] override `%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);
Warning categories include:\n\
`midrule-values' unset or unused midrule values\n\
`yacc' incompatibilities with POSIX Yacc\n\
+ `conflicts-sr' S/R conflicts (enabled by default)\n\
+ `conflicts-rr' R/R conflicts (enabled by default)\n\
+ `other' all other warnings (enabled by default)\n\
`all' all the warnings\n\
`no-CATEGORY' turn off warnings in CATEGORY\n\
`none' turn off all the warnings\n\
skeleton = arg;
}
else if (prio == skeleton_prio)
- {
- char const *msg =
- _("multiple skeleton declarations are invalid");
- complain_at (loc, msg);
- }
+ complain_at (loc, _("multiple skeleton declarations are invalid"));
}
void
{
int i;
for (i = 0; valid_languages[i].language[0]; i++)
- if (c_strcasecmp (arg, valid_languages[i].language) == 0)
- {
- language_prio = prio;
- language = &valid_languages[i];
- return;
- }
- msg = _("invalid language `%s'");
+ if (c_strcasecmp (arg, valid_languages[i].language) == 0)
+ {
+ language_prio = prio;
+ language = &valid_languages[i];
+ return;
+ }
+ msg = _("%s: invalid language");
}
else if (language_prio == prio)
msg = _("multiple language declarations are invalid");
else
return;
- complain_at (loc, msg, arg);
+ complain_at (loc, msg, quotearg_colon (arg));
}
/*----------------------.
Should be computed from long_options. */
static char const short_options[] =
"D:"
+ "F:"
"L:"
"S:"
"T::"
/* Parser. */
{ "debug", no_argument, 0, 't' },
{ "define", required_argument, 0, 'D' },
+ { "force-define", required_argument, 0, 'F' },
{ "locations", no_argument, 0, LOCATIONS_OPTION },
{ "no-lines", no_argument, 0, 'l' },
{ "raw", no_argument, 0, 0 },
break;
case 'D': /* -DNAME[=VALUE]. */
+ case 'F': /* -FNAME[=VALUE]. */
{
char* name = optarg;
- char* value = strchr (optarg, '=');
+ char* value = mbschr (optarg, '=');
if (value)
*value++ = 0;
muscle_percent_define_insert (name, command_line_location (),
- value ? value : "");
+ value ? value : "",
+ c == 'D' ? MUSCLE_PERCENT_DEFINE_D
+ : MUSCLE_PERCENT_DEFINE_F);
}
break;
exit (EXIT_SUCCESS);
case 'W':
- if (optarg)
- FLAGS_ARGMATCH (warnings, optarg);
- else
- warnings_flag |= warnings_all;
+ FLAGS_ARGMATCH (warnings, optarg);
break;
case 'b':
/* Here, the -d and --defines options are differentiated. */
defines_flag = true;
if (optarg)
- spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+ {
+ free (spec_defines_file);
+ spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+ }
break;
case 'g':
graph_flag = true;
if (optarg)
- spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+ {
+ free (spec_graph_file);
+ spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+ }
break;
case 'h':
case 'x':
xml_flag = true;
if (optarg)
- spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
+ {
+ free (spec_xml_file);
+ spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
+ }
break;
case 'y':
exit (EXIT_SUCCESS);
case REPORT_FILE_OPTION:
+ free (spec_verbose_file);
spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
break;
if (argc - optind != 1)
{
if (argc - optind < 1)
- error (0, 0, _("missing operand after `%s'"), argv[argc - 1]);
+ error (0, 0, _("%s: missing operand"), quotearg_colon (argv[argc - 1]));
else
- error (0, 0, _("extra operand `%s'"), argv[optind + 1]);
+ error (0, 0, _("extra operand %s"), quote (argv[optind + 1]));
usage (EXIT_FAILURE);
}
projects / bison.git / blobdiff