/* Parse command line arguments for Bison.
- Copyright (C) 1984, 1986, 1989, 1992, 2000-2012 Free Software
+ Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software
Foundation, Inc.
This file is part of Bison, the GNU Compiler Compiler.
bool nondeterministic_parser = false;
bool glr_parser = false;
+int feature_flag = feature_caret;
int report_flag = report_none;
int trace_flag = trace_none;
struct bison_language const *language = &valid_languages[0];
const char *include = NULL;
-
-/** Decode an option's set of keys.
+/** Decode an option's key.
*
* \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 comma separated list of effective subarguments to decode.
- * If 0, then activate all the flags.
+ * \param arg the subarguments to decode.
+ * If null, then activate all the flags.
+ * \param no length of the potential "no-" prefix.
+ * Can be 0 or 3. If 3, negate the action of the subargument.
*
* 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
+flag_argmatch (const char *option,
+ const char * const keys[], const int values[],
+ int all, int *flags, char *arg, size_t no)
+{
+ int value = 0;
+ value = XARGMATCH (option, arg + no, keys, values);
+
+ if (value)
+ {
+ if (no)
+ *flags &= ~value;
+ else
+ *flags |= value;
+ }
+ else
+ {
+ if (no)
+ *flags |= all;
+ else
+ *flags &= ~all;
+ }
+}
+
+/** 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 comma separated list of effective subarguments to decode.
+ * If 0, then activate all the flags.
+ */
+static void
flags_argmatch (const char *option,
const char * const keys[], const int values[],
int all, int *flags, char *args)
{
if (args)
- {
- args = strtok (args, ",");
-
- /* Not sure whether we should keep this : -Werror=no-bar */
- int no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
- args += no;
- int value = 0;
-
- while (args)
- {
- int err = STRPREFIX_LIT ("error", args);
- if (err)
- args += (args[5] == '=') ? 6 : 5;
-
- if (!err || args[-1] == '=')
- value = XARGMATCH (option, args, keys, values);
- if (value == 0)
+ for (args = strtok (args, ","); args; args = strtok (NULL, ","))
{
- if (no)
- {
- if (err)
- /* Using &= ~all activates complaint, silent and fatal */
- errors_flag = Wnone;
- else
- *flags |= all;
- }
- else
- {
- if (err)
- errors_flag |= all;
- else
- *flags &= ~all;
- }
- }
- else
- {
- if (no)
- {
- if (err)
- errors_flag &= ~value;
- else
- *flags &= ~value;
- }
- else
- {
- if (err)
- {
- errors_flag |= value;
- warnings_flag |= value;
- }
- else
- *flags |= value;
- }
+ size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
+ flag_argmatch (option, keys,
+ values, all, flags, args, no);
}
- args = strtok (NULL, ",");
- }
- }
+ else
+ *flags |= all;
}
+
/** Decode a set of sub arguments.
*
* \param FlagName the flag familly to update.
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 traces",
"scan - grammar scanner traces",
"parse - grammar parser traces",
| --warnings's handling. |
`------------------------*/
-static const char * const warnings_args[] =
+/** Decode a single argument from -W.
+ *
+ * \param flags the flags to update
+ * \param arg the subarguments to decode.
+ * If null, then activate all the flags.
+ * \param no length of the potential "no-" prefix.
+ * Can be 0 or 3. If 3, negate the action of the subargument.
+ * \param err length of a potential "error=".
+ * Can be 0 or 5. If 5, treat the subargument as a CATEGORY.
+ *
+ * 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
+warning_argmatch (int *flags, char *arg, size_t no, size_t err)
{
- /* In a series of synonyms, present the most meaningful first, so
- that argmatch_valid be more readable. */
- "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",
- "deprecated - obsolete constructs",
- "other - all other warnings",
- "all - all of the above",
- "error - warnings are errors",
+ int value = 0;
+ if (!err || arg[no + err++] != '\0')
+ value = XARGMATCH ("--warning", arg + no + err,
+ warnings_args, warnings_types);
+
+ if (value)
+ {
+ if (no)
+ *flags &= ~value;
+ else
+ {
+ if (err)
+ warnings_flag |= value;
+ *flags |= value;
+ }
+ }
+ else
+ {
+ /* With a simpler 'if (no)' version, -Werror means -Werror=all
+ (or rather, -Werror=no-none, but that syntax is invalid).
+ The difference is:
+ - Werror activates all errors, but not the warnings
+ - Werror=all activates errors, and all warnings */
+ if (no ? !err : err)
+ *flags |= Wall;
+ else
+ *flags &= ~Wall;
+ }
+}
+
+/** Decode a comma-separated list of arguments from -W.
+ *
+ * \param args comma separated list of effective subarguments to decode.
+ * If 0, then activate all the flags.
+ */
+static void
+warnings_argmatch (char *args)
+{
+ if (args)
+ for (args = strtok (args, ","); args; args = strtok (NULL, ","))
+ {
+ size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
+ size_t err = STRPREFIX_LIT ("error", args + no) ? 5 : 0;
+
+ warning_argmatch (err ? &errors_flag : &warnings_flag,
+ args, no, err);
+ }
+ else
+ warnings_flag |= Wall;
+}
+
+const char * const warnings_args[] =
+{
+ "none",
+ "midrule-values",
+ "yacc",
+ "conflicts-sr",
+ "conflicts-rr",
+ "deprecated",
+ "precedence",
+ "other",
+ "all",
+ "error",
0
};
-static const int warnings_types[] =
+const int warnings_types[] =
{
Wnone,
Wmidrule_values,
Wconflicts_sr,
Wconflicts_rr,
Wdeprecated,
+ Wprecedence,
Wother,
Wall,
Werror
ARGMATCH_VERIFY (warnings_args, warnings_types);
+/*-----------------------.
+| --feature's handling. |
+`-----------------------*/
+
+static const char * const feature_args[] =
+{
+ "none",
+ "caret", "diagnostics-show-caret",
+ "all",
+ 0
+};
+
+static const int feature_types[] =
+{
+ feature_none,
+ feature_caret, feature_caret,
+ feature_all
+};
+
+ARGMATCH_VERIFY (feature_args, feature_types);
+
/*-------------------------------------------.
| Display the help message and exit STATUS. |
`-------------------------------------------*/
--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\
+ -f, --feature[=FEATURE] activate miscellaneous features\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 tracing\n\
same as `-Dparse.trace'\n\
deprecated by '-Dapi.prefix=PREFIX'\n\
-l, --no-lines don't generate '#line' directives\n\
-k, --token-table include a table of token names\n\
-\n\
"), stdout);
+ putc ('\n', stdout);
/* Keep -d and --defines separate so that ../build-aux/cross-options.pl
* won't assume that -d also takes an argument. */
-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);
+ putc ('\n', stdout);
fputs (_("\
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\
- `error' treat warnings as errors\n\
-\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\
+ `deprecated' obsolete constructs\n\
+ `precedence' useless precedence and associativity\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\
+ `error[=CATEGORY]' treat warnings as errors\n\
"), stdout);
+ putc ('\n', stdout);
fputs (_("\
THINGS is a list of comma separated words that can include:\n\
`all' include all the above information\n\
`none' disable the report\n\
"), stdout);
+ putc ('\n', stdout);
+
+ fputs (_("\
+FEATURE is a list of comma separated words that can include:\n\
+ `caret' show errors with carets\n\
+ `all' all of the above\n\
+ `none' disable all of the above\n\
+ "), stdout);
putc ('\n', stdout);
printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
skeleton = arg;
}
else if (prio == skeleton_prio)
- complain_at (loc, complaint,
- _("multiple skeleton declarations are invalid"));
+ complain (&loc, complaint,
+ _("multiple skeleton declarations are invalid"));
}
void
else
return;
- complain_at (loc, complaint, msg, quotearg_colon (arg));
+ complain (&loc, complaint, msg, quotearg_colon (arg));
}
/*----------------------.
"W::"
"b:"
"d"
+ "f::"
"e"
"g::"
"h"
/* Output. */
{ "defines", optional_argument, 0, 'd' },
+ { "feature", optional_argument, 0, 'f' },
/* Operation modes. */
{ "fixed-output-files", no_argument, 0, 'y' },
{
location res;
/* "<command line>" is used in GCC's messages about -D. */
- boundary_set (&res.start, uniqstr_new ("<command line>"), optind, -1);
+ boundary_set (&res.start, uniqstr_new ("<command line>"), optind - 1, -1);
res.end = res.start;
return res;
}
version ();
exit (EXIT_SUCCESS);
+ case 'f':
+ FLAGS_ARGMATCH (feature, optarg, feature_all);
+ break;
+
case 'W':
- FLAGS_ARGMATCH (warnings, optarg, Wall);
+ warnings_argmatch (optarg);
break;
case 'b':
break;
case 'y':
+ warnings_flag |= Wyacc;
+ errors_flag |= Wyacc;
yacc_flag = true;
break;
projects / bison.git / blobdiff