X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/473d0a75671169bda82caff3803b91ece9514cae..e62f1a899168bdf1658dd6d934dea407491a80ff:/src/getargs.c?ds=sidebyside diff --git a/src/getargs.c b/src/getargs.c index 372f7fc9..969c6611 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, 2002 +/* Parse command line arguments for Bison. + + Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -20,23 +21,43 @@ 02111-1307, USA. */ #include "system.h" -#include "getopt.h" -#include "argmatch.h" + +#include +#include + +/* Hack to get to declare getopt with a prototype. */ +#if lint && ! defined __GNU_LIBRARY__ +# define __GNU_LIBRARY__ +# define HACK_FOR___GNU_LIBRARY___PROTOTYPE 1 +#endif + +#include + +#ifdef HACK_FOR___GNU_LIBRARY___PROTOTYPE +# undef __GNU_LIBRARY__ +# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE +#endif + #include "complain.h" -#include "getargs.h" #include "files.h" +#include "getargs.h" +#include "uniqstr.h" -int debug_flag = 0; -int defines_flag = 0; -int locations_flag = 0; -int no_lines_flag = 0; -int no_parser_flag = 0; +bool debug_flag; +bool defines_flag; +bool locations_flag; +bool no_lines_flag; +bool no_parser_flag; int report_flag = report_none; -int token_table_flag = 0; -int yacc_flag = 0; /* for -y */ -int graph_flag = 0; +bool token_table_flag; +bool yacc_flag; /* for -y */ +bool graph_flag; int trace_flag = trace_none; +bool nondeterministic_parser = false; +bool glr_parser = false; +bool pure_parser = false; + const char *skeleton = NULL; const char *include = NULL; @@ -52,15 +73,16 @@ static const char * const trace_args[] = /* In a series of synonyms, present the most meaningful first, so that argmatch_valid be more readable. */ "none - no report", - "scan - scanner traces", - "parse - parser traces", + "scan - grammar scanner traces", + "parse - grammar parser traces", "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", + "skeleton - skeleton postprocessing", + "time - time consumption", "all - all of the above", 0 }; @@ -75,8 +97,9 @@ static const int trace_types[] = trace_grammar, trace_resource, trace_sets, - trace_time, trace_tools, + trace_skeleton, + trace_time, trace_all }; @@ -84,7 +107,7 @@ static const int trace_types[] = static void trace_argmatch (char *args) { - ARGMATCH_ASSERT (trace_args, trace_types); + verify (trace_constraint, ARGMATCH_CONSTRAINT (trace_args, trace_types)); if (args) { args = strtok (args, ","); @@ -115,7 +138,7 @@ static const char * const report_args[] = "none", "state", "states", "itemset", "itemsets", - "lookahead", "lookaheads", + "look-ahead", "lookahead", "lookaheads", "solved", "all", 0 @@ -126,7 +149,9 @@ 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_look_ahead_tokens, + report_states | report_look_ahead_tokens, + report_states | report_look_ahead_tokens, report_states | report_solved_conflicts, report_all }; @@ -135,7 +160,7 @@ static const int report_types[] = static void report_argmatch (char *args) { - ARGMATCH_ASSERT (report_args, report_types); + verify (report_constraint, ARGMATCH_CONSTRAINT (report_args, report_types)); args = strtok (args, ","); do { @@ -149,37 +174,45 @@ report_argmatch (char *args) while ((args = strtok (NULL, ","))); } -/*---------------------------. -| Display the help message. | -`---------------------------*/ + +/*-------------------------------------------. +| Display the help message and exit STATUS. | +`-------------------------------------------*/ + +static void usage (int) ATTRIBUTE_NORETURN; static void -usage (FILE *stream) +usage (int status) { - /* Some efforts were made to ease the translators' task, please - continue. */ - fputs (_("\ -GNU bison generates parsers for LALR(1) grammars.\n"), stream); - putc ('\n', stream); + if (status != 0) + fprintf (stderr, _("Try `%s --help' for more information.\n"), + program_name); + else + { + /* Some efforts were made to ease the translators' task, please + continue. */ + fputs (_("\ +GNU bison generates parsers for LALR(1) grammars.\n"), stdout); + putc ('\n', stdout); - fprintf (stream, _("\ + fprintf (stdout, _("\ Usage: %s [OPTION]... FILE\n"), program_name); - putc ('\n', stream); + putc ('\n', stdout); - fputs (_("\ + fputs (_("\ If a long option shows an argument as mandatory, then it is mandatory\n\ for the equivalent short option also. Similarly for optional arguments.\n"), - stream); - putc ('\n', stream); + stdout); + putc ('\n', stdout); - fputs (_("\ + fputs (_("\ Operation modes:\n\ -h, --help display this help and exit\n\ -V, --version output version information and exit\n\ - -y, --yacc emulate POSIX yacc\n"), stream); - putc ('\n', stream); + -y, --yacc emulate POSIX yacc\n"), stdout); + putc ('\n', stdout); - fputs (_("\ + fputs (_("\ Parser:\n\ -S, --skeleton=FILE specify the skeleton to use\n\ -t, --debug instrument the parser for debugging\n\ @@ -188,10 +221,10 @@ Parser:\n\ -l, --no-lines don't generate `#line' directives\n\ -n, --no-parser generate the tables only\n\ -k, --token-table include a table of token names\n\ -"), stream); - putc ('\n', stream); +"), stdout); + putc ('\n', stdout); - fputs (_("\ + fputs (_("\ Output:\n\ -d, --defines also produce a header file\n\ -r, --report=THINGS also produce details on the automaton\n\ @@ -199,22 +232,25 @@ Output:\n\ -b, --file-prefix=PREFIX specify a PREFIX for output files\n\ -o, --output=FILE leave output to FILE\n\ -g, --graph also produce a VCG description of the automaton\n\ -"), stream); - putc ('\n', stream); +"), stdout); + putc ('\n', stdout); - fputs (_("\ + 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\ + `look-ahead' explicitly associate look-ahead tokens 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); +"), stdout); + putc ('\n', stdout); - fputs (_("\ -Report bugs to .\n"), stream); + fputs (_("\ +Report bugs to .\n"), stdout); + } + + exit (status); } @@ -223,23 +259,23 @@ Report bugs to .\n"), stream); `------------------------------*/ static void -version (FILE *stream) +version (void) { /* Some efforts were made to ease the translators' task, please continue. */ - fprintf (stream, _("bison (GNU Bison) %s"), VERSION); - putc ('\n', stream); - fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stream); - putc ('\n', stream); + printf (_("bison (GNU Bison) %s"), VERSION); + putc ('\n', stdout); + fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout); + putc ('\n', stdout); - fprintf (stream, - _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2002); + fprintf (stdout, + _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2005); fputs (_("\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ "), - stream); + stdout); } @@ -250,6 +286,12 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ /* Shorts options. */ const char *short_options = "yvegdhr:ltknVo:b:p:S:T::"; +/* Values for long options that do not have single-letter equivalents. */ +enum +{ + LOCATIONS_OPTION = CHAR_MAX + 1 +}; + static struct option const long_options[] = { /* Operation modes. */ @@ -271,18 +313,6 @@ static struct option const long_options[] = /* 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' }, @@ -292,7 +322,7 @@ static struct option const long_options[] = /* Parser. */ { "debug", no_argument, 0, 't' }, - { "locations", no_argument, &locations_flag, 1 }, + { "locations", no_argument, 0, LOCATIONS_OPTION }, { "no-lines", no_argument, 0, 'l' }, { "no-parser", no_argument, 0, 'n' }, { "raw", no_argument, 0, 0 }, @@ -315,7 +345,8 @@ getargs (int argc, char *argv[]) { int c; - while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) != EOF) + while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) + != -1) switch (c) { case 0: @@ -323,21 +354,21 @@ getargs (int argc, char *argv[]) break; case 'y': - yacc_flag = 1; + yacc_flag = true; break; case 'h': - usage (stdout); - exit (0); + usage (EXIT_SUCCESS); case 'V': - version (stdout); - exit (0); + version (); + exit (EXIT_SUCCESS); case 'g': /* Here, the -g and --graph=FILE options are differentiated. */ - graph_flag = 1; - spec_graph_file = AS_FILE_NAME (optarg); + graph_flag = true; + if (optarg) + spec_graph_file = AS_FILE_NAME (optarg); break; case 'v': @@ -354,25 +385,29 @@ getargs (int argc, char *argv[]) case 'd': /* Here, the -d and --defines options are differentiated. */ - defines_flag = 1; + defines_flag = true; if (optarg) spec_defines_file = AS_FILE_NAME (optarg); break; case 'l': - no_lines_flag = 1; + no_lines_flag = true; + break; + + case LOCATIONS_OPTION: + locations_flag = true; break; case 'k': - token_table_flag = 1; + token_table_flag = true; break; case 'n': - no_parser_flag = 1; + no_parser_flag = true; break; case 't': - debug_flag = 1; + debug_flag = true; break; case 'o': @@ -396,19 +431,17 @@ getargs (int argc, char *argv[]) break; default: - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); - exit (1); + usage (EXIT_FAILURE); } - if (optind == argc) + if (argc - optind != 1) { - fprintf (stderr, _("%s: no grammar file given\n"), program_name); - exit (1); + if (argc - optind < 1) + error (0, 0, _("missing operand after `%s'"), argv[argc - 1]); + else + error (0, 0, _("extra operand `%s'"), argv[optind + 1]); + usage (EXIT_FAILURE); } - if (optind < argc - 1) - fprintf (stderr, _("%s: extra arguments ignored after `%s'\n"), - program_name, argv[optind]); - infile = argv[optind]; + current_file = grammar_file = uniqstr_new (argv[optind]); }