X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/e14c68313b82fa4b2f2fd8df5937e3945b488b04..24bb5f8fb7f14df4050cbefd27ae60fa9cef259d:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index ae54f81c..01cf8109 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 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,7 +26,6 @@ #include #include #include -#include /* Hack to get to declare getopt with a prototype. */ #if lint && ! defined __GNU_LIBRARY__ @@ -44,7 +43,8 @@ #include "complain.h" #include "files.h" #include "getargs.h" -#include "muscle_tab.h" +#include "muscle-tab.h" +#include "quote.h" #include "uniqstr.h" bool debug_flag; @@ -63,7 +63,8 @@ bool glr_parser = false; int report_flag = report_none; int trace_flag = trace_none; -int warnings_flag = warnings_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 }, @@ -86,32 +87,46 @@ char *program_name; * \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. + * 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 *flags, char *args) + int all, int *flags, char *args) { if (args) { args = strtok (args, ","); while (args) { - int value = XARGMATCH (option, args, keys, values); + int no = strncmp (args, "no-", 3) == 0 ? 3 : 0; + int value = XARGMATCH (option, args + no, keys, values); if (value == 0) - *flags = 0; + { + if (no) + *flags |= all; + else + *flags &= ~all; + } else - *flags |= value; + { + if (no) + *flags &= ~value; + else + *flags |= value; + } args = strtok (NULL, ","); } } else - *flags = ~0; + *flags |= all; } /** Decode a set of sub arguments. @@ -121,11 +136,12 @@ flags_argmatch (const char *option, * * \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) \ flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \ - &FlagName ## _flag, Args) + FlagName ## _all, &FlagName ## _flag, Args) /*----------------------. @@ -176,10 +192,12 @@ static const char * const trace_args[] = "grammar - reading, reducing the grammar", "resource - memory consumption (where available)", "sets - grammar sets: firsts, nullable etc.", + "muscles - m4 definitions passed to the skeleton", "tools - m4 invocation", "m4 - m4 traces", "skeleton - skeleton postprocessing", "time - time consumption", + "ielr - IELR conversion", "all - all of the above", 0 }; @@ -194,10 +212,12 @@ static const int trace_types[] = trace_grammar, trace_resource, trace_sets, + trace_muscles, trace_tools, trace_m4, trace_skeleton, trace_time, + trace_ielr, trace_all }; @@ -214,7 +234,10 @@ static const char * const warnings_args[] = that argmatch_valid be more readable. */ "none - no warnings", "midrule-values - unset or unused midrule values", - "yacc - incompatibilities with POSIX YACC", + "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", 0 @@ -225,6 +248,9 @@ static const int warnings_types[] = warnings_none, warnings_midrule_values, warnings_yacc, + warnings_conflicts_sr, + warnings_conflicts_rr, + warnings_other, warnings_all, warnings_error }; @@ -246,9 +272,16 @@ usage (int status) 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. */ + printf (_("Usage: %s [OPTION]... FILE\n"), program_name); fputs (_("\ -Generate LALR(1) and GLR parsers.\n\ +Generate a deterministic LR or generalized LR (GLR) parser employing\n\ +LALR(1), IELR(1), or canonical LR(1) parser tables. IELR(1) and\n\ +canonical LR(1) support is experimental.\n\ \n\ "), stdout); @@ -273,15 +306,16 @@ Operation modes:\n\ 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\ - --locations enable location support\n\ - -D, --define=NAME[=VALUE] same as `%define NAME \"VALUE\"'\n\ - -p, --name-prefix=PREFIX prepend PREFIX to the external symbols\n\ - -l, --no-lines don't generate `#line' directives\n\ - -k, --token-table include a table of token names\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\ + --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\ + -p, --name-prefix=PREFIX prepend PREFIX to the external symbols\n\ + -l, --no-lines don't generate `#line' directives\n\ + -k, --token-table include a table of token names\n\ \n\ "), stdout); @@ -305,7 +339,10 @@ Output:\n\ fputs (_("\ Warning categories include:\n\ `midrule-values' unset or unused midrule values\n\ - `yacc' incompatibilities with POSIX YACC\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\ @@ -361,7 +398,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ `--------------------------------------*/ void -skeleton_arg (char const *arg, int prio, location const *loc) +skeleton_arg (char const *arg, int prio, location loc) { if (prio < skeleton_prio) { @@ -369,18 +406,11 @@ skeleton_arg (char const *arg, int prio, location const *loc) skeleton = arg; } else if (prio == skeleton_prio) - { - char const *msg = - _("multiple skeleton declarations are invalid"); - if (loc) - complain_at (*loc, msg); - else - complain (msg); - } + complain_at (loc, _("multiple skeleton declarations are invalid")); } void -language_argmatch (char const *arg, int prio, location const *loc) +language_argmatch (char const *arg, int prio, location loc) { char const *msg; @@ -388,23 +418,20 @@ language_argmatch (char const *arg, int prio, location const *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; - if (loc) - complain_at (*loc, msg, arg); - else - complain (msg, arg); + complain_at (loc, msg, quotearg_colon (arg)); } /*----------------------. @@ -415,6 +442,7 @@ language_argmatch (char const *arg, int prio, location const *loc) Should be computed from long_options. */ static char const short_options[] = "D:" + "F:" "L:" "S:" "T::" @@ -482,6 +510,7 @@ static struct option const long_options[] = /* Parser. */ { "debug", no_argument, 0, 't' }, { "define", required_argument, 0, 'D' }, + { "force-define", required_argument, 0, 'F' }, { "locations", no_argument, 0, LOCATIONS_OPTION }, { "no-lines", no_argument, 0, 'l' }, { "raw", no_argument, 0, 0 }, @@ -503,7 +532,7 @@ static struct option const long_options[] = /* Build a location for the current command line argument. */ static location -command_line_location() +command_line_location (void) { location res; /* "" is used in GCC's messages about -D. */ @@ -530,14 +559,16 @@ getargs (int argc, char *argv[]) break; case 'D': /* -DNAME[=VALUE]. */ + case 'F': /* -FNAME[=VALUE]. */ { char* name = optarg; - char* value = strchr (optarg, '='); + char* value = mbschr (optarg, '='); if (value) *value++ = 0; - else - value = ""; - muscle_percent_define_insert (name, command_line_location (), value); + muscle_percent_define_insert (name, command_line_location (), + value ? value : "", + c == 'D' ? MUSCLE_PERCENT_DEFINE_D + : MUSCLE_PERCENT_DEFINE_F); } break; @@ -546,11 +577,13 @@ getargs (int argc, char *argv[]) break; case 'L': - language_argmatch (optarg, command_line_prio, NULL); + language_argmatch (optarg, command_line_prio, + command_line_location ()); break; case 'S': - skeleton_arg (AS_FILE_NAME (optarg), command_line_prio, NULL); + skeleton_arg (AS_FILE_NAME (optarg), command_line_prio, + command_line_location ()); break; case 'T': @@ -562,10 +595,7 @@ getargs (int argc, char *argv[]) exit (EXIT_SUCCESS); case 'W': - if (optarg) - FLAGS_ARGMATCH (warnings, optarg); - else - warnings_flag |= warnings_all; + FLAGS_ARGMATCH (warnings, optarg); break; case 'b': @@ -649,12 +679,20 @@ 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); } current_file = grammar_file = uniqstr_new (argv[optind]); MUSCLE_INSERT_C_STRING ("file_name", grammar_file); } + +void +tr (char *s, char from, char to) +{ + for (; *s; s++) + if (*s == from) + *s = to; +}