X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4aa9d1ff9ca9b838fe02a9bfe5ae4b0f935e5451..e42906f7904ca7516e9867a3a19ee08d963b1205:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 5fa3c452..cf5af694 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -26,25 +26,14 @@ #include #include #include -#include - -/* Hack to get to declare getopt with a prototype. */ -#if lint && ! defined __GNU_LIBRARY__ -# define __GNU_LIBRARY__ -# define HACK_FOR___GNU_LIBRARY___PROTOTYPE 1 -#endif - #include - -#ifdef HACK_FOR___GNU_LIBRARY___PROTOTYPE -# undef __GNU_LIBRARY__ -# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE -#endif +#include #include "complain.h" #include "files.h" #include "getargs.h" #include "muscle-tab.h" +#include "quote.h" #include "uniqstr.h" bool defines_flag; @@ -59,8 +48,6 @@ bool glr_parser = false; int report_flag = report_none; int trace_flag = trace_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 }, @@ -75,52 +62,82 @@ int language_prio = default_prio; struct bison_language const *language = &valid_languages[0]; const char *include = NULL; -char *program_name; - - -/** 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. + * \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 -flags_argmatch (const char *option, - const char * const keys[], const int values[], - int all, int *flags, char *args) +flag_argmatch (const char *option, + const char * const keys[], const int values[], + int all, int *flags, char *arg, size_t no, size_t err) { - if (args) + int value = 0; + if (!err || arg[no + err++] != '\0') + value = XARGMATCH (option, arg + no + err, keys, values); + + if (value) { - args = strtok (args, ","); - while (args) + if (no) + *flags &= ~value; + else { - int no = strncmp (args, "no-", 3) == 0 ? 3 : 0; - int value = XARGMATCH (option, args + no, keys, values); - if (value == 0) - { - if (no) - *flags |= all; - else - *flags &= ~all; - } - else - { - if (no) - *flags &= ~value; - else - *flags |= value; - } - args = strtok (NULL, ","); + 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 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) + 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); + } else *flags |= all; } @@ -129,15 +146,15 @@ flags_argmatch (const char *option, * * \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_all the all value. * \arg FlagName_flag the flag to update. */ -#define FLAGS_ARGMATCH(FlagName, Args) \ +#define FLAGS_ARGMATCH(FlagName, Args, All) \ flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \ - FlagName ## _all, &FlagName ## _flag, Args) + All, &FlagName ## _flag, Args) /*----------------------. @@ -233,6 +250,7 @@ static const char * const warnings_args[] = "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", @@ -241,19 +259,19 @@ static const char * const warnings_args[] = static const int warnings_types[] = { - warnings_none, - warnings_midrule_values, - warnings_yacc, - warnings_conflicts_sr, - warnings_conflicts_rr, - warnings_other, - warnings_all, - warnings_error + Wnone, + Wmidrule_values, + Wyacc, + Wconflicts_sr, + Wconflicts_rr, + Wdeprecated, + Wother, + Wall, + Werror }; ARGMATCH_VERIFY (warnings_args, warnings_types); - /*-------------------------------------------. | Display the help message and exit STATUS. | `-------------------------------------------*/ @@ -308,10 +326,11 @@ Parser:\n\ -t, --debug instrument the parser for tracing\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\ + -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\ + 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); @@ -335,17 +354,18 @@ 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\ - `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\ + `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\ @@ -357,7 +377,25 @@ THINGS is a list of comma separated words that can include:\n\ `none' disable the report\n\ "), stdout); - printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); + putc ('\n', stdout); + printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT); + printf (_("%s home page: <%s>.\n"), PACKAGE_NAME, PACKAGE_URL); + fputs (_("General help using GNU software: " + ".\n"), + stdout); + /* Don't output this redundant message for English locales. + Note we still output for 'C' so that it gets included in the + man page. */ + const char *lc_messages = setlocale (LC_MESSAGES, NULL); + if (lc_messages && !STREQ (lc_messages, "en_")) + /* TRANSLATORS: Replace LANG_CODE in this URL with your language + code to + form one of the URLs at http://translationproject.org/team/. + Otherwise, replace the entire URL with your translation team's + email address. */ + fputs (_("Report translation bugs to " + ".\n"), stdout); + fputs (_("For complete documentation, run: info bison.\n"), stdout); } exit (status); @@ -403,7 +441,8 @@ skeleton_arg (char const *arg, int prio, location loc) skeleton = arg; } else if (prio == skeleton_prio) - complain_at (loc, _("multiple skeleton declarations are invalid")); + complain (&loc, complaint, + _("multiple skeleton declarations are invalid")); } void @@ -421,14 +460,14 @@ language_argmatch (char const *arg, int prio, location loc) language = &valid_languages[i]; return; } - msg = _("invalid language '%s'"); + msg = _("%s: invalid language"); } else if (language_prio == prio) msg = _("multiple language declarations are invalid"); else return; - complain_at (loc, msg, arg); + complain (&loc, complaint, msg, quotearg_colon (arg)); } /*----------------------. @@ -559,7 +598,7 @@ getargs (int argc, char *argv[]) case 'F': /* -FNAME[=VALUE]. */ { char* name = optarg; - char* value = mbschr (optarg, '='); + char* value = strchr (optarg, '='); if (value) *value++ = 0; muscle_percent_define_insert (name, command_line_location (), @@ -584,7 +623,7 @@ getargs (int argc, char *argv[]) break; case 'T': - FLAGS_ARGMATCH (trace, optarg); + FLAGS_ARGMATCH (trace, optarg, trace_all); break; case 'V': @@ -592,7 +631,7 @@ getargs (int argc, char *argv[]) exit (EXIT_SUCCESS); case 'W': - FLAGS_ARGMATCH (warnings, optarg); + FLAGS_ARGMATCH (warnings, optarg, Wall); break; case 'b': @@ -603,13 +642,19 @@ getargs (int argc, char *argv[]) /* 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': @@ -632,7 +677,7 @@ getargs (int argc, char *argv[]) break; case 'r': - FLAGS_ARGMATCH (report, optarg); + FLAGS_ARGMATCH (report, optarg, report_all); break; case 't': @@ -648,10 +693,15 @@ getargs (int argc, char *argv[]) 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': + warnings_flag |= Wyacc; + errors_flag |= Wyacc; yacc_flag = true; break; @@ -665,10 +715,11 @@ getargs (int argc, char *argv[]) exit (EXIT_SUCCESS); case PRINT_DATADIR_OPTION: - printf ("%s\n", compute_pkgdatadir ()); + printf ("%s\n", pkgdatadir ()); exit (EXIT_SUCCESS); case REPORT_FILE_OPTION: + free (spec_verbose_file); spec_verbose_file = xstrdup (AS_FILE_NAME (optarg)); break; @@ -679,9 +730,9 @@ getargs (int argc, char *argv[]) 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); }