X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e42906f7904ca7516e9867a3a19ee08d963b1205..4a3c55cf1abd36bebf3058f67b130d0a17305db6:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index cf5af694..cebfd783 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -1,6 +1,6 @@ /* 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. @@ -46,6 +46,7 @@ bool yacc_flag; /* for -y */ bool nondeterministic_parser = false; bool glr_parser = false; +int feature_flag = feature_caret; int report_flag = report_none; int trace_flag = trace_none; @@ -73,8 +74,6 @@ const char *include = NULL; * 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 6. If 6, 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 @@ -83,36 +82,27 @@ const char *include = NULL; static void flag_argmatch (const char *option, const char * const keys[], const int values[], - int all, int *flags, char *arg, size_t no, size_t err) + int all, int *flags, char *arg, size_t no) { int value = 0; - if (!err || arg[no + err++] != '\0') - value = XARGMATCH (option, arg + no + err, keys, values); + value = XARGMATCH (option, arg + no, keys, values); if (value) { if (no) *flags &= ~value; else - { - if (err) - warnings_flag |= value; - *flags |= 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) + if (no) *flags |= all; else *flags &= ~all; } } + /** Decode an option's set of keys. * * \param option option being decoded. @@ -132,16 +122,14 @@ flags_argmatch (const char *option, 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; - flag_argmatch (option, keys, - values, all, err ? &errors_flag : flags, - args, no, err); + values, all, flags, args, no); } else *flags |= all; } + /** Decode a set of sub arguments. * * \param FlagName the flag familly to update. @@ -195,8 +183,6 @@ ARGMATCH_VERIFY (report_args, report_types); 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", @@ -241,23 +227,90 @@ ARGMATCH_VERIFY (trace_args, trace_types); | --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, @@ -265,6 +318,7 @@ static const int warnings_types[] = Wconflicts_sr, Wconflicts_rr, Wdeprecated, + Wprecedence, Wother, Wall, Werror @@ -272,6 +326,27 @@ static const int warnings_types[] = 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. | `-------------------------------------------*/ @@ -315,13 +390,13 @@ Operation modes:\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\ + -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\ @@ -332,8 +407,8 @@ Parser:\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. */ @@ -349,8 +424,8 @@ Output:\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); + putc ('\n', stdout); fputs (_("\ Warning categories include:\n\ @@ -359,6 +434,7 @@ Warning categories include:\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\ @@ -376,6 +452,14 @@ 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); @@ -486,6 +570,7 @@ static char const short_options[] = "W::" "b:" "d" + "f::" "e" "g::" "h" @@ -538,6 +623,7 @@ static struct option const long_options[] = /* Output. */ { "defines", optional_argument, 0, 'd' }, + { "feature", optional_argument, 0, 'f' }, /* Operation modes. */ { "fixed-output-files", no_argument, 0, 'y' }, @@ -572,7 +658,7 @@ command_line_location (void) { location res; /* "" is used in GCC's messages about -D. */ - boundary_set (&res.start, uniqstr_new (""), optind, -1); + boundary_set (&res.start, uniqstr_new (""), optind - 1, -1); res.end = res.start; return res; } @@ -630,8 +716,12 @@ getargs (int argc, char *argv[]) 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':