X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/75c21b618d2ee31e72f7b78b4a03d400514e433f..095a1d11ca90852ad224bbf9823bf88b7fff9a57:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 56cee921..48a48b00 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. + 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -44,7 +44,7 @@ #include "complain.h" #include "files.h" #include "getargs.h" -#include "muscle_tab.h" +#include "muscle-tab.h" #include "uniqstr.h" bool debug_flag; @@ -176,10 +176,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 +196,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 +218,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 +250,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,14 +283,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 locations computation\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); @@ -304,7 +316,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\ @@ -360,7 +372,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) { @@ -368,18 +380,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; @@ -400,10 +405,7 @@ language_argmatch (char const *arg, int prio, location const *loc) else return; - if (loc) - complain_at (*loc, msg, arg); - else - complain (msg, arg); + complain_at (loc, msg, arg); } /*----------------------. @@ -413,6 +415,8 @@ language_argmatch (char const *arg, int prio, location const *loc) /* Shorts options. Should be computed from long_options. */ static char const short_options[] = + "D:" + "F:" "L:" "S:" "T::" @@ -479,6 +483,8 @@ 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,6 +503,19 @@ static struct option const long_options[] = # define AS_FILE_NAME(File) (File) #endif +/* Build a location for the current command line argument. */ +static +location +command_line_location (void) +{ + location res; + /* "" is used in GCC's messages about -D. */ + boundary_set (&res.start, uniqstr_new (""), optind, -1); + res.end = res.start; + return res; +} + + void getargs (int argc, char *argv[]) { @@ -506,15 +525,25 @@ getargs (int argc, char *argv[]) != -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; - case 'd': - /* Here, the -d and --defines options are differentiated. */ - defines_flag = true; - if (optarg) - spec_defines_file = xstrdup (AS_FILE_NAME (optarg)); + case 'D': /* -DNAME[=VALUE]. */ + case 'F': /* -FNAME[=VALUE]. */ + { + char* name = optarg; + char* value = strchr (optarg, '='); + if (value) + *value++ = 0; + muscle_percent_define_insert (name, command_line_location (), + value ? value : "", + c == 'D' ? MUSCLE_PERCENT_DEFINE_D + : MUSCLE_PERCENT_DEFINE_F); + } break; case 'I': @@ -522,11 +551,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': @@ -548,6 +579,13 @@ getargs (int argc, char *argv[]) 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)); + break; + case 'g': graph_flag = true; if (optarg) @@ -627,3 +665,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; +}