X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/51c7ca01e2c9cfb5c7a274bed0e14899adbd005c..f3ead217b8636f623399e66bd937b1c51774d4af:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 8f7e668f..0d43186f 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -1,7 +1,7 @@ /* Parse command line arguments for Bison. - Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000-2012 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -26,44 +26,29 @@ #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 debug_flag; bool defines_flag; bool graph_flag; bool xml_flag; -bool locations_flag; bool no_lines_flag; bool token_table_flag; -bool yacc_flag; /* for -y */ - -bool error_verbose = false; +bool yacc_flag; /* for -y */ bool nondeterministic_parser = false; bool glr_parser = false; +int feature_flag = feature_none; int report_flag = report_none; int trace_flag = trace_none; -int warnings_flag = warnings_none; static struct bison_language const valid_languages[] = { { "c", "c-skel.m4", ".c", ".h", true }, @@ -78,54 +63,99 @@ int language_prio = default_prio; struct bison_language const *language = &valid_languages[0]; const char *include = NULL; -char *program_name; - +/** 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 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 +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 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 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 colon separated list of effective subarguments to decode. + * \param args comma separated list of effective subarguments to decode. * If 0, then activate all the flags. - * - * The special value 0 resets the flags to 0. */ static void flags_argmatch (const char *option, - const char * const keys[], const int values[], - int *flags, char *args) + const char * const keys[], const int values[], + int all, int *flags, char *args) { if (args) - { - args = strtok (args, ","); - while (args) - { - int value = XARGMATCH (option, args, keys, values); - if (value == 0) - *flags = 0; - else - *flags |= value; - args = strtok (NULL, ","); - } - } + 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 = ~0; + *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 FLAGS_ARGMATCH(FlagName, Args) \ +#define FLAGS_ARGMATCH(FlagName, Args, All) \ flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \ - &FlagName ## _flag, Args) + All, &FlagName ## _flag, Args) /*----------------------. @@ -219,6 +249,10 @@ static const char * const warnings_args[] = "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", 0 @@ -226,15 +260,39 @@ static const char * const warnings_args[] = static const int warnings_types[] = { - warnings_none, - warnings_midrule_values, - warnings_yacc, - warnings_all, - warnings_error + Wnone, + Wmidrule_values, + Wyacc, + Wconflicts_sr, + Wconflicts_rr, + Wdeprecated, + 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. | @@ -247,18 +305,19 @@ usage (int status) { if (status != 0) fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + program_name); else { /* For ../build-aux/cross-options.pl to work, use the format: - ^ -S, --long[=ARGS] (whitespace) - A --long option is required. - Otherwise, add exceptions to ../build-aux/cross-options.pl. */ + ^ -S, --long[=ARGS] (whitespace) + A --long option is required. + Otherwise, add exceptions to ../build-aux/cross-options.pl. */ printf (_("Usage: %s [OPTION]... FILE\n"), program_name); fputs (_("\ Generate a deterministic LR or generalized LR (GLR) parser employing\n\ -LALR(1), IELR(1), or canonical LR(1) parser tables.\n\ +LALR(1), IELR(1), or canonical LR(1) parser tables. IELR(1) and\n\ +canonical LR(1) support is experimental.\n\ \n\ "), stdout); @@ -278,23 +337,25 @@ 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 debugging\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); + putc ('\n', stdout); /* Keep -d and --defines separate so that ../build-aux/cross-options.pl * won't assume that -d also takes an argument. */ @@ -310,19 +371,23 @@ 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\ - `midrule-values' unset or unused midrule values\n\ - `yacc' incompatibilities with POSIX Yacc\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\ @@ -333,8 +398,34 @@ 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); - printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); + 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); + 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); @@ -356,14 +447,14 @@ version (void) putc ('\n', stdout); fprintf (stdout, - _("Copyright (C) %d Free Software Foundation, Inc.\n"), - PACKAGE_COPYRIGHT_YEAR); + _("Copyright (C) %d Free Software Foundation, Inc.\n"), + PACKAGE_COPYRIGHT_YEAR); fputs (_("\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ "), - stdout); + stdout); } @@ -380,7 +471,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 @@ -392,20 +484,20 @@ language_argmatch (char const *arg, int prio, location loc) { int i; for (i = 0; valid_languages[i].language[0]; i++) - if (c_strcasecmp (arg, valid_languages[i].language) == 0) - { - language_prio = prio; - language = &valid_languages[i]; - return; - } - msg = _("invalid language `%s'"); + if (c_strcasecmp (arg, valid_languages[i].language) == 0) + { + language_prio = prio; + language = &valid_languages[i]; + return; + } + 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)); } /*----------------------. @@ -424,6 +516,7 @@ static char const short_options[] = "W::" "b:" "d" + "f::" "e" "g::" "h" @@ -451,41 +544,42 @@ enum static struct option const long_options[] = { /* Operation modes. */ - { "help", no_argument, 0, 'h' }, - { "version", no_argument, 0, 'V' }, - { "print-localedir", no_argument, 0, PRINT_LOCALEDIR_OPTION }, - { "print-datadir", no_argument, 0, PRINT_DATADIR_OPTION }, + { "help", no_argument, 0, 'h' }, + { "version", no_argument, 0, 'V' }, + { "print-localedir", no_argument, 0, PRINT_LOCALEDIR_OPTION }, + { "print-datadir", no_argument, 0, PRINT_DATADIR_OPTION }, { "warnings", optional_argument, 0, 'W' }, /* Parser. */ - { "name-prefix", required_argument, 0, 'p' }, + { "name-prefix", required_argument, 0, 'p' }, { "include", required_argument, 0, 'I' }, /* Output. */ - { "file-prefix", required_argument, 0, 'b' }, - { "output", required_argument, 0, 'o' }, - { "output-file", required_argument, 0, 'o' }, - { "graph", optional_argument, 0, 'g' }, + { "file-prefix", required_argument, 0, 'b' }, + { "output", required_argument, 0, 'o' }, + { "output-file", required_argument, 0, 'o' }, + { "graph", optional_argument, 0, 'g' }, { "xml", optional_argument, 0, 'x' }, - { "report", required_argument, 0, 'r' }, + { "report", required_argument, 0, 'r' }, { "report-file", required_argument, 0, REPORT_FILE_OPTION }, - { "verbose", no_argument, 0, 'v' }, + { "verbose", no_argument, 0, 'v' }, /* Hidden. */ { "trace", optional_argument, 0, 'T' }, /* Output. */ { "defines", optional_argument, 0, 'd' }, + { "feature", optional_argument, 0, 'f' }, /* Operation modes. */ { "fixed-output-files", no_argument, 0, 'y' }, - { "yacc", no_argument, 0, 'y' }, + { "yacc", no_argument, 0, 'y' }, /* Parser. */ - { "debug", no_argument, 0, 't' }, - { "define", required_argument, 0, 'D' }, + { "debug", no_argument, 0, 't' }, + { "define", required_argument, 0, 'D' }, { "force-define", required_argument, 0, 'F' }, - { "locations", no_argument, 0, LOCATIONS_OPTION }, + { "locations", no_argument, 0, LOCATIONS_OPTION }, { "no-lines", no_argument, 0, 'l' }, { "raw", no_argument, 0, 0 }, { "skeleton", required_argument, 0, 'S' }, @@ -510,7 +604,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; } @@ -522,15 +616,15 @@ getargs (int argc, char *argv[]) int c; while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) - != -1) + != -1) switch (c) { /* ASCII Sorting for short options (i.e., upper case then lower case), and then long-only options. */ case 0: - /* Certain long options cause getopt_long to return 0. */ - break; + /* Certain long options cause getopt_long to return 0. */ + break; case 'D': /* -DNAME[=VALUE]. */ case 'F': /* -FNAME[=VALUE]. */ @@ -544,121 +638,137 @@ getargs (int argc, char *argv[]) c == 'D' ? MUSCLE_PERCENT_DEFINE_D : MUSCLE_PERCENT_DEFINE_F); } - break; + break; case 'I': - include = AS_FILE_NAME (optarg); - break; + include = AS_FILE_NAME (optarg); + break; case 'L': - language_argmatch (optarg, command_line_prio, - command_line_location ()); - break; + language_argmatch (optarg, command_line_prio, + command_line_location ()); + break; case 'S': - skeleton_arg (AS_FILE_NAME (optarg), command_line_prio, - command_line_location ()); - break; + skeleton_arg (AS_FILE_NAME (optarg), command_line_prio, + command_line_location ()); + break; case 'T': - FLAGS_ARGMATCH (trace, optarg); - break; + FLAGS_ARGMATCH (trace, optarg, trace_all); + break; case 'V': - version (); - exit (EXIT_SUCCESS); + version (); + exit (EXIT_SUCCESS); + + case 'f': + FLAGS_ARGMATCH (feature, optarg, feature_all); + break; case 'W': - if (optarg) - FLAGS_ARGMATCH (warnings, optarg); - else - warnings_flag |= warnings_all; - break; + FLAGS_ARGMATCH (warnings, optarg, Wall); + break; case 'b': - spec_file_prefix = AS_FILE_NAME (optarg); - break; + spec_file_prefix = AS_FILE_NAME (optarg); + break; case 'd': /* 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)); - break; + graph_flag = true; + if (optarg) + { + free (spec_graph_file); + spec_graph_file = xstrdup (AS_FILE_NAME (optarg)); + } + break; case 'h': - usage (EXIT_SUCCESS); + usage (EXIT_SUCCESS); case 'k': - token_table_flag = true; - break; + token_table_flag = true; + break; case 'l': - no_lines_flag = true; - break; + no_lines_flag = true; + break; case 'o': - spec_outfile = AS_FILE_NAME (optarg); - break; + spec_outfile = AS_FILE_NAME (optarg); + break; case 'p': - spec_name_prefix = optarg; - break; + spec_name_prefix = optarg; + break; case 'r': - FLAGS_ARGMATCH (report, optarg); - break; + FLAGS_ARGMATCH (report, optarg, report_all); + break; case 't': - debug_flag = true; - break; + muscle_percent_define_insert ("parse.trace", + command_line_location (), "", + MUSCLE_PERCENT_DEFINE_D); + break; case 'v': - report_flag |= report_states; - break; + report_flag |= report_states; + break; case 'x': - xml_flag = true; - if (optarg) - spec_xml_file = xstrdup (AS_FILE_NAME (optarg)); - break; + xml_flag = true; + if (optarg) + { + free (spec_xml_file); + spec_xml_file = xstrdup (AS_FILE_NAME (optarg)); + } + break; case 'y': - yacc_flag = true; - break; + warnings_flag |= Wyacc; + errors_flag |= Wyacc; + yacc_flag = true; + break; case LOCATIONS_OPTION: - locations_flag = true; - break; + muscle_percent_define_ensure ("locations", + command_line_location (), true); + break; case PRINT_LOCALEDIR_OPTION: - printf ("%s\n", LOCALEDIR); - exit (EXIT_SUCCESS); + printf ("%s\n", LOCALEDIR); + exit (EXIT_SUCCESS); case PRINT_DATADIR_OPTION: - printf ("%s\n", compute_pkgdatadir ()); - exit (EXIT_SUCCESS); + printf ("%s\n", pkgdatadir ()); + exit (EXIT_SUCCESS); case REPORT_FILE_OPTION: - spec_verbose_file = xstrdup (AS_FILE_NAME (optarg)); - break; + free (spec_verbose_file); + spec_verbose_file = xstrdup (AS_FILE_NAME (optarg)); + break; default: - usage (EXIT_FAILURE); + usage (EXIT_FAILURE); } 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); }