X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/808e523db40335778897b413d446dff1d41d0e85..9a91e7f24626da71bb4b5f0bd76159f34ba2b6f6:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 844036ee..fa9e3c1c 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-2013 Free Software + Copyright (C) 1984, 1986, 1989, 1992, 2000-2015 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -61,7 +61,6 @@ 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 key. * @@ -84,23 +83,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,123 +218,6 @@ static const int trace_types[] = ARGMATCH_VERIFY (trace_args, trace_types); -/*------------------------. -| --warnings's handling. | -`------------------------*/ - -/** Decode a single argument from -W. - * - * \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 (char const *arg, size_t no, size_t err) -{ - int value = XARGMATCH ("--warning", arg + no + err, - warnings_args, warnings_types); - - /* -Wnone == -Wno-all, and -Wno-none == -Wall. */ - if (!value) - { - value = Wall; - no = !no; - } - - if (no) - { - size_t b; - for (b = 0; b < warnings_size; ++b) - if (value & 1 << b) - { - if (err) - { - /* -Wno-error=foo: if foo enabled as an error, - make it a warning. */ - if (warnings_flag[b] == severity_error) - warnings_flag[b] = severity_warning; - } - else - /* -Wno-foo. */ - warnings_flag[b] = severity_disabled; - } - } - else - { - size_t b; - for (b = 0; b < warnings_size; ++b) - if (value & 1 << b) - /* -Wfoo and -Werror=foo. */ - warnings_flag[b] = err ? severity_error : severity_warning; - } -} - -/** Decode a comma-separated list of arguments from -W. - * - * \param args comma separated list of effective subarguments to decode. - * If 0, then activate all the flags. - */ -static void -warnings_argmatch (char *args) -{ - if (args) - for (args = strtok (args, ","); args; args = strtok (NULL, ",")) - if (STREQ (args, "error")) - warnings_are_errors = true; - else if (STREQ (args, "no-error")) - { - warnings_are_errors = false; - warning_argmatch ("no-error=all", 3, 6); - } - else - { - size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0; - size_t err = STRPREFIX_LIT ("error=", args + no) ? 6 : 0; - - warning_argmatch (args, no, err); - } - else - warning_argmatch ("all", 0, 0); -} - -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. | `-----------------------*/ @@ -371,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 { @@ -413,7 +291,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\ @@ -432,7 +310,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\ @@ -443,36 +321,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); @@ -585,12 +464,10 @@ static char const short_options[] = "b:" "d" "f::" - "e" "g::" "h" "k" "l" - "n" "o:" "p:" "r:" @@ -620,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' }, @@ -649,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' }, @@ -658,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 @@ -694,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 = strchr (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 ()); @@ -786,7 +673,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; @@ -804,7 +692,7 @@ getargs (int argc, char *argv[]) break; case 'y': - warnings_flag[warning_yacc] = severity_error; + warning_argmatch ("error=yacc", 0, 6); yacc_flag = true; break;