X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c017f88fdedf409dc63ca63bab0b045ad23d0719..75ae8299840bbd854fa2474d38402bbb933c6511:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index dbea65d5..e6f9d766 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -84,23 +84,19 @@ 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); + int value = XARGMATCH (option, arg + no, keys, values); - if (value) + /* -rnone == -rno-all, and -rno-none == -rall. */ + if (!value) { - if (no) - *flags &= ~value; - else - *flags |= value; + value = all; + no = !no; } + + if (no) + *flags &= ~value; else - { - if (no) - *flags |= all; - else - *flags &= ~all; - } + *flags |= value; } /** Decode an option's set of keys. @@ -223,136 +219,6 @@ static const int trace_types[] = ARGMATCH_VERIFY (trace_args, trace_types); -/*------------------------. -| --warnings's handling. | -`------------------------*/ - -/** Decode a single argument from -W. - * - * \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 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 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 - * flags from \c all. Thus no-none = all and no-all = none. - */ -static void -warning_argmatch (const char *option, - const char * const keys[], const int values[], - int all, int *flags, char *arg, size_t no, size_t err) -{ - int value = 0; - if (!err || arg[no + err++] != '\0') - value = XARGMATCH (option, arg + no + err, keys, values); - - 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 |= all; - else - *flags &= ~all; - } -} - -/** Decode a comma-separated list of arguments from -W. - * - * \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 -warnings_argmatch (const char *option, - const char * const keys[], const int values[], - int all, int *flags, 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 (option, keys, - values, all, err ? &errors_flag : flags, - args, no, err); - } - else - *flags |= all; -} - -/** Decode a set of sub arguments. - * - * \param FlagName the flag familly to update. - * \param Args the effective sub arguments to decode. - * \param All the "all" value. - * - * \arg FlagName_args the list of keys. - * \arg FlagName_types the list of values. - * \arg FlagName_flag the flag to update. - */ -#define WARNINGS_ARGMATCH(FlagName, Args, All) \ - warnings_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \ - All, &FlagName ## _flag, Args) - -const char * const warnings_args[] = -{ - "none", - "midrule-values", - "yacc", - "conflicts-sr", - "conflicts-rr", - "deprecated", - "precedence", - "other", - "all", - "error", - 0 -}; - -const int warnings_types[] = -{ - Wnone, - Wmidrule_values, - Wyacc, - Wconflicts_sr, - Wconflicts_rr, - Wdeprecated, - Wprecedence, - Wother, - Wall, - Werror -}; - -ARGMATCH_VERIFY (warnings_args, warnings_types); - /*-----------------------. | --feature's handling. | `-----------------------*/ @@ -384,7 +250,7 @@ static void usage (int status) { if (status != 0) - fprintf (stderr, _("Try `%s --help' for more information.\n"), + fprintf (stderr, _("Try '%s --help' for more information.\n"), program_name); else { @@ -426,7 +292,7 @@ Parser:\n\ -L, --language=LANGUAGE specify the output programming language\n\ -S, --skeleton=FILE specify the skeleton to use\n\ -t, --debug instrument the parser for tracing\n\ - same as `-Dparse.trace'\n\ + same as '-Dparse.trace'\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\ @@ -445,7 +311,7 @@ Output:\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\ + -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[=FILE] also output a graph of the automaton\n\ @@ -456,36 +322,37 @@ Output:\n\ 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\ - `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\ + '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\ + 'empty-rule' empty rules without %empty\n\ + 'precedence' useless precedence and associativity\n\ + 'other' all other warnings (enabled by default)\n\ + 'all' all the warnings except 'yacc'\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\ - `state' describe the states\n\ - `itemset' complete the core item sets with their closure\n\ - `lookahead' explicitly associate lookahead tokens to items\n\ - `solved' describe shift/reduce conflicts solving\n\ - `all' include all the above information\n\ - `none' disable the report\n\ + 'state' describe the states\n\ + 'itemset' complete the core item sets with their closure\n\ + 'lookahead' explicitly associate lookahead tokens to items\n\ + 'solved' describe shift/reduce conflicts solving\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\ + 'caret' show errors with carets\n\ + 'all' all of the above\n\ + 'none' disable all of the above\n\ "), stdout); putc ('\n', stdout); @@ -671,7 +538,7 @@ static struct option const long_options[] = }; /* Under DOS, there is no difference on the case. This can be - troublesome when looking for `.tab' etc. */ + troublesome when looking for '.tab' etc. */ #ifdef MSDOS # define AS_FILE_NAME(File) (strlwr (File), (File)) #else @@ -715,6 +582,7 @@ getargs (int argc, char *argv[]) if (value) *value++ = 0; muscle_percent_define_insert (name, command_line_location (), + muscle_string, value ? value : "", c == 'D' ? MUSCLE_PERCENT_DEFINE_D : MUSCLE_PERCENT_DEFINE_F); @@ -748,7 +616,7 @@ getargs (int argc, char *argv[]) break; case 'W': - WARNINGS_ARGMATCH (warnings, optarg, Wall); + warnings_argmatch (optarg); break; case 'b': @@ -799,7 +667,8 @@ getargs (int argc, char *argv[]) case 't': muscle_percent_define_insert ("parse.trace", - command_line_location (), "", + command_line_location (), + muscle_keyword, "", MUSCLE_PERCENT_DEFINE_D); break; @@ -817,8 +686,7 @@ getargs (int argc, char *argv[]) break; case 'y': - warnings_flag |= Wyacc; - errors_flag |= Wyacc; + warning_argmatch ("error=yacc", 0, 6); yacc_flag = true; break;