X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c0629aa10fe22573baa1212ef4fdf25e5d683dcc..c7925b99:/src/options.c diff --git a/src/options.c b/src/options.c index 9732bd3a..b951c5d6 100644 --- a/src/options.c +++ b/src/options.c @@ -22,14 +22,16 @@ #include "xalloc.h" #include "system.h" #include "getopt.h" +#include "files.h" #include "getargs.h" #include "gram.h" #include "symtab.h" #include "lex.h" +#include "output.h" #include "options.h" /* Shorts options. */ -const char *shortopts = "yvgdhrltknVo:b:p:S:"; +const char *shortopts = "yvegdhrltknVo:b:p:S:"; /* Long options. */ struct option *longopts = NULL; @@ -45,18 +47,22 @@ const struct option_table_struct option_table[] = /* Operation modes. */ {opt_cmd_line, "help", no_argument, 0, 0, 'h'}, {opt_cmd_line, "version", no_argument, 0, 0, 'V'}, - + /* Parser. */ /* was 'a'; apparently unused -wjh */ {opt_cmd_line, "name-prefix", required_argument, 0, 0, 'p'}, + {opt_cmd_line, "include", required_argument, 0, 0, 'I'}, /* Output. */ {opt_cmd_line, "file-prefix", required_argument, 0, 0, 'b'}, + {opt_cmd_line, "output", required_argument, 0, 0, 'o'}, {opt_cmd_line, "output-file", required_argument, 0, 0, 'o'}, - {opt_cmd_line, "graph", no_argument, 0, 0, 'g'}, + {opt_cmd_line, "graph", optional_argument, 0, 0, 'g'}, /* Hidden. */ - {opt_cmd_line, "statistics", no_argument, &statistics_flag, 0, 1}, + /* Fixme: What is this `1' doing here!!! Sounds dead wrong. See + locations too below. */ + {opt_cmd_line, "trace", no_argument, &trace_flag, 0, 1}, /* * Percent declarations. @@ -76,46 +82,44 @@ const struct option_table_struct option_table[] = {opt_percent, "nonassoc", 0, NULL, tok_nonassoc, 0}, {opt_percent, "binary", 0, NULL, tok_nonassoc, 0}, {opt_percent, "prec", 0, NULL, tok_prec, 0}, -#if 0 - /* For the time being, this is not enabled yet, while it's possible - though, since we use obstacks. The only risk is with semantic - parsers which will output an `include' of an output file: be sure - that the naem included is indeed the name of the output file. */ - /* FIXME Should we activate this options ? */ - {opt_both, "output-file", required_argument, &spec_outfile, tok_setopt, 'o'}, - {opt_both, "file-prefix", required_argument,&spec_file_prefix,tok_setopt,'b'}, - {opt_both, "name-prefix", required_argument,&spec_name_prefix,tok_setopt,'p'}, -#endif - {opt_percent, "header_extension", 0, NULL, tok_hdrext, 0}, - {opt_percent, "source_extension", 0, NULL, tok_srcext, 0}, + {opt_percent, "error-verbose", 0, &error_verbose, tok_intopt, 0}, + + /* FIXME: semantic parsers will output an `include' of an + output file: be sure that the naem included is indeed the name of + the output file. */ /* FIXME Should we activate this options ? + */ + {opt_both, "output", required_argument, &spec_outfile, tok_stropt, 'o'}, + {opt_both, "file-prefix", required_argument,&spec_file_prefix,tok_stropt,'b'}, + {opt_both, "name-prefix", required_argument,&spec_name_prefix,tok_stropt,'p'}, + {opt_percent, "define", 0, NULL, tok_define, 0}, - {opt_percent, "semantic_parser", 0, &semantic_parser, tok_noop, 0}, - {opt_percent, "pure_parser", 0, &pure_parser, tok_noop, 0}, + {opt_percent, "semantic-parser", 0, &semantic_parser, tok_intopt, 0}, + {opt_percent, "pure-parser", 0, &pure_parser, tok_intopt, 0}, /* * Percent and command line declarations. */ /* FIXME Usually option use `-' to separe words on command line - and `_' for percent option. But here the separator are always + and `_' for percent option. But here the separator are always the same, the char `-'. */ /* Output. */ - {opt_both, "defines", no_argument, &defines_flag, tok_noop, 'd'}, - {opt_both, "verbose", no_argument, &verbose_flag, tok_noop, 'v'}, + {opt_both, "defines", optional_argument, &defines_flag, tok_intopt, 'd'}, + {opt_both, "verbose", no_argument, &verbose_flag, tok_intopt, 'v'}, /* Operation modes. */ - {opt_both, "fixed-output-files", no_argument, &yacc_flag, tok_noop, 'y'}, - {opt_both, "yacc", no_argument, &yacc_flag, tok_noop, 'y'}, + {opt_both, "fixed-output-files", no_argument, &yacc_flag, tok_intopt, 'y'}, + {opt_both, "yacc", no_argument, &yacc_flag, tok_intopt, 'y'}, /* Parser. */ - {opt_both, "debug", no_argument, &debug_flag, tok_noop, 'd'}, - {opt_both, "locations", no_argument, &locations_flag, tok_noop, 1}, - {opt_both, "no-lines", no_argument, &no_lines_flag, tok_noop, 'l'}, - {opt_both, "no-parser", no_argument, &no_parser_flag, tok_noop, 'n'}, + {opt_both, "debug", no_argument, &debug_flag, tok_intopt, 't'}, + {opt_both, "locations", no_argument, &locations_flag, tok_intopt, 1}, + {opt_both, "no-lines", no_argument, &no_lines_flag, tok_intopt, 'l'}, + {opt_both, "no-parser", no_argument, &no_parser_flag, tok_intopt, 'n'}, {opt_both, "raw", no_argument, 0, tok_obsolete, 'r'}, {opt_both, "skeleton", required_argument, 0, tok_skel, 'S'}, - {opt_both, "token-table", no_argument, &token_table_flag, tok_noop, 'k'}, + {opt_both, "token-table", no_argument, &token_table_flag, tok_intopt, 'k'}, {0, 0, 0, 0, 0, 0} }; @@ -144,7 +148,14 @@ create_long_option_table () /* Copy the struct information in the longoptions. */ longopts[j].name = option_table[i].name; longopts[j].has_arg = option_table[i].has_arg; - longopts[j].flag = option_table[i].set_flag; + /* When an options is declared having 'optional_argument' and + a flag is specified to be set, the option is skipped on + command line. So we never use a flag when a command line + option is declared 'optional_argument. */ + if (longopts[j].has_arg == optional_argument) + longopts[j].flag = NULL; + else + longopts[j].flag = option_table[i].set_flag; longopts[j++].val = option_table[i].val; } longopts[number_options].name = NULL;