X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/22c2cbc078dc5243041d10f4e6e1e5ce1aca36cf..f377f69fec28013c79db4efe12bbb9d48987fb2c:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 29b349a4..9f6aef4a 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -1,5 +1,6 @@ /* Parse command line arguments for bison. - Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc. + Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002 + Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -18,59 +19,132 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include -#include "getopt.h" #include "system.h" -#include "files.h" +#include "getopt.h" +#include "argmatch.h" #include "complain.h" #include "getargs.h" +#include "files.h" int debug_flag = 0; int defines_flag = 0; int locations_flag = 0; int no_lines_flag = 0; int no_parser_flag = 0; +int report_flag = report_none; int token_table_flag = 0; -int verbose_flag = 0; -int statistics_flag = 0; int yacc_flag = 0; /* for -y */ int graph_flag = 0; +int trace_flag = trace_none; const char *skeleton = NULL; +const char *include = NULL; extern char *program_name; -const char *shortopts = "yvgdhrltknVo:b:p:S:"; -static struct option longopts[] = + + +/*---------------------. +| --trace's handling. | +`---------------------*/ + +static const char * const trace_args[] = { - /* Operation modes. */ - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, - {"yacc", no_argument, 0, 'y'}, - {"fixed-output-files",no_argument, 0, 'y'}, + /* In a series of synonyms, present the most meaningful first, so + that argmatch_valid be more readable. */ + "none - no report", + "automaton - contruction of the automaton", + "bitsets - use of bitsets", + "grammar - reading, reducing of the grammar", + "resource - memory consumption (where available)", + "sets - grammar sets: firsts, nullable etc.", + "time - time consumption", + "tools - m4 invocation and preserve the temporary file", + "all - all of the above", + 0 +}; - /* Parser. */ - {"skeleton", required_argument, 0, 'S'}, - {"debug", no_argument, 0, 'd'}, - {"locations", no_argument, &locations_flag, 1}, - /* was 'a'; apparently unused -wjh */ - {"name-prefix", required_argument, 0, 'p'}, - {"no-lines", no_argument, 0, 'l'}, - {"no-parser", no_argument, 0, 'n'}, - {"raw", no_argument, 0, 'r'}, - {"token-table", no_argument, 0, 'k'}, +static const int trace_types[] = +{ + trace_none, + trace_automaton, + trace_bitsets, + trace_grammar, + trace_resource, + trace_sets, + trace_time, + trace_tools, + trace_all +}; - /* Output. */ - {"defines", no_argument, 0, 'd'}, - {"verbose", no_argument, 0, 'v'}, - {"file-prefix", required_argument, 0, 'b'}, - {"output-file", required_argument, 0, 'o'}, - {"graph", no_argument, 0, 'g'}, - /* Hidden. */ - {"statistics", no_argument, &statistics_flag, 1}, - {0, 0, 0, 0} +static void +trace_argmatch (char *args) +{ + ARGMATCH_ASSERT (trace_args, trace_types); + if (args) + { + args = strtok (args, ","); + do + { + int trace = XARGMATCH ("--trace", args, + trace_args, trace_types); + if (trace == trace_none) + trace_flag = trace_none; + else + trace_flag |= trace; + } + while ((args = strtok (NULL, ","))); + } + else + trace_flag = trace_all; +} + + +/*----------------------. +| --report's handling. | +`----------------------*/ + +static const char * const report_args[] = +{ + /* In a series of synonyms, present the most meaningful first, so + that argmatch_valid be more readable. */ + "none", + "state", "states", + "itemset", "itemsets", + "lookahead", "lookaheads", + "solved", + "all", + 0 }; +static const int report_types[] = +{ + report_none, + report_states, report_states, + report_states | report_itemsets, report_states | report_itemsets, + report_states | report_lookaheads, report_states | report_lookaheads, + report_states | report_solved_conflicts, + report_all +}; + + +static void +report_argmatch (char *args) +{ + ARGMATCH_ASSERT (report_args, report_types); + args = strtok (args, ","); + do + { + int report = XARGMATCH ("--report", args, + report_args, report_types); + if (report == report_none) + report_flag = report_none; + else + report_flag |= report; + } + while ((args = strtok (NULL, ","))); +} + /*---------------------------. | Display the help message. | `---------------------------*/ @@ -116,9 +190,23 @@ Parser:\n\ fputs (_("\ Output:\n\ -d, --defines also produce a header file\n\ - -v, --verbose also produce an explanation of the automaton\n\ + -r, --report=THINGS also produce details on the automaton\n\ + -v, --verbose same as `--report=state'\n\ -b, --file-prefix=PREFIX specify a PREFIX for output files\n\ - -o, --output-file=FILE leave output to FILE\n"), stream); + -o, --output=FILE leave output to FILE\n\ + -g, --graph also produce a VCG description of the automaton\n\ +"), stream); + putc ('\n', stream); + + 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 lookaheads to items\n\ + `solved' describe shift/reduce conflicts solving\n\ + `all' include all the above information\n\ + `none' disable the report\n\ +"), stream); putc ('\n', stream); fputs (_("\ @@ -135,14 +223,13 @@ version (FILE *stream) { /* Some efforts were made to ease the translators' task, please continue. */ - fprintf (stream, _("\ -bison (GNU Bison) %s"), VERSION); + fprintf (stream, _("bison (GNU Bison) %s"), VERSION); putc ('\n', stream); + fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stream); putc ('\n', stream); - fputs (_("\ -Copyright 1984, 1986, 1989, 1992, 2000, 2001 Free Software Foundation, Inc.\n"), - stream); + fprintf (stream, + _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2002); fputs (_("\ This is free software; see the source for copying conditions. There is NO\n\ @@ -156,12 +243,75 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ | Process the options. | `----------------------*/ +/* Shorts options. */ +const char *short_options = "yvegdhr:ltknVo:b:p:S:T::"; + +static struct option const long_options[] = +{ + /* Operation modes. */ + { "help", no_argument, 0, 'h' }, + { "version", no_argument, 0, 'V' }, + + /* Parser. */ + { "name-prefix", required_argument, 0, 'p' }, + { "include", required_argument, 0, 'I' }, + + /* Output. */ + { "file-prefix", required_argument, 0, 'b' }, + { "output", required_argument, 0, 'o' }, + { "output-file", required_argument, 0, 'o' }, + { "graph", optional_argument, 0, 'g' }, + { "report", required_argument, 0, 'r' }, + { "verbose", no_argument, 0, 'v' }, + + /* Hidden. */ + { "trace", optional_argument, 0, 'T' }, + + /* 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 ? + */ + { "output", required_argument, 0, 'o' }, + { "file-prefix", required_argument, 0, 'b' }, + { "name-prefix", required_argument, 0, 'p' }, + + /* + * Percent and command line declarations. + */ + + /* Output. */ + { "defines", optional_argument, 0, 'd' }, + + /* Operation modes. */ + { "fixed-output-files", no_argument, 0, 'y' }, + { "yacc", no_argument, 0, 'y' }, + + /* Parser. */ + { "debug", no_argument, 0, 't' }, + { "locations", no_argument, &locations_flag, 1 }, + { "no-lines", no_argument, 0, 'l' }, + { "no-parser", no_argument, 0, 'n' }, + { "raw", no_argument, 0, 0 }, + { "skeleton", required_argument, 0, 'S' }, + { "token-table", no_argument, 0, 'k' }, + + {0, 0, 0, 0} +}; + +/* Under DOS, there is no difference on the case. This can be + troublesome when looking for `.tab' etc. */ +#ifdef MSDOS +# define AS_FILE_NAME(File) (strlwr (File), (File)) +#else +# define AS_FILE_NAME(File) (File) +#endif + void getargs (int argc, char *argv[]) { int c; - while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != EOF) + while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) != EOF) switch (c) { case 0: @@ -181,19 +331,28 @@ getargs (int argc, char *argv[]) exit (0); case 'g': + /* Here, the -g and --graph=FILE options are differentiated. */ graph_flag = 1; + spec_graph_file = AS_FILE_NAME (optarg); break; case 'v': - verbose_flag = 1; + report_flag |= report_states; break; case 'S': - skeleton = optarg; + skeleton = AS_FILE_NAME (optarg); + break; + + case 'I': + include = AS_FILE_NAME (optarg); break; case 'd': + /* Here, the -d and --defines options are differentiated. */ defines_flag = 1; + if (optarg) + spec_defines_file = AS_FILE_NAME (optarg); break; case 'l': @@ -204,10 +363,6 @@ getargs (int argc, char *argv[]) token_table_flag = 1; break; - case 'r': - fatal (_("`%s' is no longer supported"), "--raw"); - break; - case 'n': no_parser_flag = 1; break; @@ -217,17 +372,25 @@ getargs (int argc, char *argv[]) break; case 'o': - spec_outfile = optarg; + spec_outfile = AS_FILE_NAME (optarg); break; case 'b': - spec_file_prefix = optarg; + spec_file_prefix = AS_FILE_NAME (optarg); break; case 'p': spec_name_prefix = optarg; break; + case 'r': + report_argmatch (optarg); + break; + + case 'T': + trace_argmatch (optarg); + break; + default: fprintf (stderr, _("Try `%s --help' for more information.\n"), program_name);