X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4663cb4d0c9b0ad8d5809a8911b9581db4d11126..026816664ff8283a55f91915843a8ff0ac5cf86c:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 06e6e972..1fd9cfa5 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. @@ -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" @@ -59,10 +46,9 @@ 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; -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,69 +61,83 @@ int skeleton_prio = default_prio; const char *skeleton = NULL; int language_prio = default_prio; struct bison_language const *language = &valid_languages[0]; -const char *include = NULL; - -/** 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. * * 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) +{ + int value = XARGMATCH (option, arg + no, keys, values); + + /* -rnone == -rno-all, and -rno-none == -rall. */ + if (!value) + { + value = all; + no = !no; + } + + if (no) + *flags &= ~value; + else + *flags |= value; +} + +/** 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) - { - args = strtok (args, ","); - while (args) - { - int no = STRPREFIX_LIT ("no-", args) ? 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, ","); - } - } + for (args = strtok (args, ","); args; args = strtok (NULL, ",")) + { + size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0; + flag_argmatch (option, keys, + values, all, flags, args, no); + } 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_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) /*----------------------. @@ -178,8 +178,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", @@ -220,39 +218,26 @@ static const int trace_types[] = ARGMATCH_VERIFY (trace_args, trace_types); -/*------------------------. -| --warnings's handling. | -`------------------------*/ +/*-----------------------. +| --feature's handling. | +`-----------------------*/ -static const char * const warnings_args[] = +static const char * const feature_args[] = { - /* 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", - "other - all other warnings", - "all - all of the above", - "error - warnings are errors", + "none", + "caret", "diagnostics-show-caret", + "all", 0 }; -static const int warnings_types[] = +static const int feature_types[] = { - warnings_none, - warnings_midrule_values, - warnings_yacc, - warnings_conflicts_sr, - warnings_conflicts_rr, - warnings_other, - warnings_all, - warnings_error + feature_none, + feature_caret, feature_caret, + feature_all }; -ARGMATCH_VERIFY (warnings_args, warnings_types); - +ARGMATCH_VERIFY (feature_args, feature_types); /*-------------------------------------------. | Display the help message and exit STATUS. | @@ -264,7 +249,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 { @@ -297,24 +282,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 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\ + -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. */ @@ -324,40 +310,69 @@ 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\ -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\ - `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\ + '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); - 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); @@ -403,7 +418,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 @@ -428,7 +444,7 @@ language_argmatch (char const *arg, int prio, location loc) else return; - complain_at (loc, msg, quotearg_colon (arg)); + complain (&loc, complaint, msg, quotearg_colon (arg)); } /*----------------------. @@ -447,12 +463,11 @@ static char const short_options[] = "W::" "b:" "d" - "e" + "f::" "g::" "h" "k" "l" - "n" "o:" "p:" "r:" @@ -482,7 +497,6 @@ static struct option const long_options[] = /* Parser. */ { "name-prefix", required_argument, 0, 'p' }, - { "include", required_argument, 0, 'I' }, /* Output. */ { "file-prefix", required_argument, 0, 'b' }, @@ -499,6 +513,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' }, @@ -510,7 +525,6 @@ static struct option const long_options[] = { "force-define", required_argument, 0, 'F' }, { "locations", no_argument, 0, LOCATIONS_OPTION }, { "no-lines", no_argument, 0, 'l' }, - { "raw", no_argument, 0, 0 }, { "skeleton", required_argument, 0, 'S' }, { "language", required_argument, 0, 'L' }, { "token-table", no_argument, 0, 'k' }, @@ -519,7 +533,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 @@ -533,7 +547,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; } @@ -555,24 +569,36 @@ getargs (int argc, char *argv[]) /* Certain long options cause getopt_long to return 0. */ break; - case 'D': /* -DNAME[=VALUE]. */ - case 'F': /* -FNAME[=VALUE]. */ + case 'D': /* -DNAME[=(VALUE|"VALUE"|{VALUE})]. */ + case 'F': /* -FNAME[=(VALUE|"VALUE"|{VALUE})]. */ { - char* name = optarg; - char* value = mbschr (optarg, '='); + char *name = optarg; + char *value = strchr (optarg, '='); + muscle_kind kind = muscle_keyword; if (value) - *value++ = 0; + { + char *end = value + strlen (value) - 1; + *value++ = 0; + if (*value == '{' && *end == '}') + { + kind = muscle_code; + ++value; + *end = 0; + } + else if (*value == '"' && *end == '"') + { + kind = muscle_string; + ++value; + *end = 0; + } + } muscle_percent_define_insert (name, command_line_location (), - value ? value : "", + kind, value ? value : "", c == 'D' ? MUSCLE_PERCENT_DEFINE_D : MUSCLE_PERCENT_DEFINE_F); } break; - case 'I': - include = AS_FILE_NAME (optarg); - break; - case 'L': language_argmatch (optarg, command_line_prio, command_line_location ()); @@ -584,15 +610,19 @@ getargs (int argc, char *argv[]) break; case 'T': - FLAGS_ARGMATCH (trace, optarg); + FLAGS_ARGMATCH (trace, optarg, trace_all); break; case 'V': version (); exit (EXIT_SUCCESS); + case 'f': + FLAGS_ARGMATCH (feature, optarg, feature_all); + break; + case 'W': - FLAGS_ARGMATCH (warnings, optarg); + warnings_argmatch (optarg); break; case 'b': @@ -603,13 +633,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,12 +668,13 @@ getargs (int argc, char *argv[]) break; case 'r': - FLAGS_ARGMATCH (report, optarg); + FLAGS_ARGMATCH (report, optarg, report_all); break; case 't': muscle_percent_define_insert ("parse.trace", - command_line_location (), "", + command_line_location (), + muscle_keyword, "", MUSCLE_PERCENT_DEFINE_D); break; @@ -648,10 +685,14 @@ 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': + warning_argmatch ("error=yacc", 0, 6); yacc_flag = true; break; @@ -665,10 +706,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;