X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4663cb4d0c9b0ad8d5809a8911b9581db4d11126..1f77b2e095492ae95ae6ab33b3ad1f1bf5d758d8:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 06e6e972..d8a527d6 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -26,20 +26,7 @@ #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" @@ -61,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 }, @@ -129,15 +114,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 +218,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 +227,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 +294,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); @@ -403,7 +390,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_at (loc, complaint, + _("multiple skeleton declarations are invalid")); } void @@ -428,7 +416,7 @@ language_argmatch (char const *arg, int prio, location loc) else return; - complain_at (loc, msg, quotearg_colon (arg)); + complain_at (loc, complaint, msg, quotearg_colon (arg)); } /*----------------------. @@ -559,7 +547,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 +572,7 @@ getargs (int argc, char *argv[]) break; case 'T': - FLAGS_ARGMATCH (trace, optarg); + FLAGS_ARGMATCH (trace, optarg, trace_all); break; case 'V': @@ -592,7 +580,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 +591,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 +626,7 @@ getargs (int argc, char *argv[]) break; case 'r': - FLAGS_ARGMATCH (report, optarg); + FLAGS_ARGMATCH (report, optarg, report_all); break; case 't': @@ -648,7 +642,10 @@ 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': @@ -665,10 +662,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;