X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5a893c2b262ca9cb1ab0385c776ce933f2f48533..c826013fb38c98861ef0fc5d4dc3fb3fb4f555be:/src/getargs.c?ds=sidebyside diff --git a/src/getargs.c b/src/getargs.c index c36cabfd..45679852 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-2010 Free Software + Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -44,20 +44,16 @@ #include "complain.h" #include "files.h" #include "getargs.h" -#include "muscle_tab.h" +#include "muscle-tab.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 nondeterministic_parser = false; bool glr_parser = false; @@ -72,9 +68,9 @@ static struct bison_language const valid_languages[] = { { "", "", "", "", false } }; -static int skeleton_prio = 2; +int skeleton_prio = default_prio; const char *skeleton = NULL; -static int language_prio = 2; +int language_prio = default_prio; struct bison_language const *language = &valid_languages[0]; const char *include = NULL; @@ -87,10 +83,12 @@ char *program_name; * \param keys array of valid subarguments. * \param values array of corresponding (int) values. * \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 and no-KEY sets all flags. + * Thus no-none = all and no-all = none. */ static void flags_argmatch (const char *option, @@ -102,11 +100,18 @@ flags_argmatch (const char *option, 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 = ~0; + else + *flags = 0; else - *flags |= value; + if (no) + *flags &= ~value; + else + *flags |= value; args = strtok (NULL, ","); } } @@ -176,10 +181,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 +201,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 +223,7 @@ 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", "all - all of the above", "error - warnings are errors", 0 @@ -246,9 +255,15 @@ 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.\n\ \n\ "), stdout); @@ -273,15 +288,17 @@ 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 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\ + -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 +322,7 @@ 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\ `all' all the warnings\n\ `no-CATEGORY' turn off warnings in CATEGORY\n\ `none' turn off all the warnings\n\ @@ -369,11 +386,7 @@ skeleton_arg (char const *arg, int prio, location loc) skeleton = arg; } else if (prio == skeleton_prio) - { - char const *msg = - _("multiple skeleton declarations are invalid"); - complain_at (loc, msg); - } + complain_at (loc, _("multiple skeleton declarations are invalid")); } void @@ -409,6 +422,7 @@ language_argmatch (char const *arg, int prio, location loc) Should be computed from long_options. */ static char const short_options[] = "D:" + "F:" "L:" "S:" "T::" @@ -476,6 +490,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 }, @@ -497,7 +512,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. */ @@ -524,14 +539,16 @@ getargs (int argc, char *argv[]) break; case 'D': /* -DNAME[=VALUE]. */ + case 'F': /* -FNAME[=VALUE]. */ { char* name = optarg; char* value = strchr (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; @@ -540,11 +557,13 @@ getargs (int argc, char *argv[]) break; case 'L': - language_argmatch (optarg, 0, command_line_location ()); + language_argmatch (optarg, command_line_prio, + command_line_location ()); break; case 'S': - skeleton_arg (AS_FILE_NAME (optarg), 0, command_line_location ()); + skeleton_arg (AS_FILE_NAME (optarg), command_line_prio, + command_line_location ()); break; case 'T': @@ -603,7 +622,9 @@ getargs (int argc, char *argv[]) break; case 't': - debug_flag = true; + muscle_percent_define_insert ("parse.trace", + command_line_location (), "", + MUSCLE_PERCENT_DEFINE_D); break; case 'v': @@ -621,7 +642,8 @@ getargs (int argc, char *argv[]) break; case LOCATIONS_OPTION: - locations_flag = true; + muscle_percent_define_ensure ("locations", + command_line_location (), true); break; case PRINT_LOCALEDIR_OPTION: @@ -652,3 +674,11 @@ getargs (int argc, char *argv[]) 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; +}