X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f68a49ed4942714616e692f0fa2a8315368bae3b..refs/heads/master:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 15c765a4..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. * @@ -250,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 { @@ -292,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\ @@ -311,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\ @@ -322,37 +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\ - `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\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); @@ -465,12 +464,10 @@ static char const short_options[] = "b:" "d" "f::" - "e" "g::" "h" "k" "l" - "n" "o:" "p:" "r:" @@ -500,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' }, @@ -529,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' }, @@ -538,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 @@ -574,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 ()); @@ -666,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;