X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f47dbf6befd8c97f385bb1c7a3902e9563018b7c..21fe08cadcb84fddd5038ac6857a904dbe1ad885:/src/getargs.c?ds=sidebyside diff --git a/src/getargs.c b/src/getargs.c index 23b06394..6961ab3b 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 - Free Software Foundation, Inc. + Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -17,10 +17,12 @@ You should have received a copy of the GNU General Public License along with Bison; see the file COPYING. If not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. */ +#include #include "system.h" +#include "revision.h" #include #include @@ -43,16 +45,24 @@ #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 graph_flag; +bool locations_flag; +bool no_lines_flag; +bool no_parser_flag; +bool token_table_flag; +bool yacc_flag; /* for -y */ + +bool error_verbose = false; + +bool nondeterministic_parser = false; +bool glr_parser = false; +bool pure_parser = false; + int report_flag = report_none; -int token_table_flag = 0; -int yacc_flag = 0; /* for -y */ -int graph_flag = 0; int trace_flag = trace_none; +int warnings_flag = warnings_none; const char *skeleton = NULL; const char *include = NULL; @@ -60,6 +70,85 @@ const char *include = NULL; extern char *program_name; +/** Decode an option's set of keys. + * + * \param option option being decoded. + * \paran keys array of valid subarguments. + * \param values array of corresponding (int) values. + * \param flag the flags to update + * \param args colon separated list of effective subarguments to decode. + * If 0, then activate all the flags. + * + * The special value 0 resets the flags to 0. + */ +static void +flags_argmatch (const char *option, + const char * const keys[], const int values[], + int *flags, char *args) +{ + if (args) + { + args = strtok (args, ","); + do + { + int value = XARGMATCH (option, args, keys, values); + if (value == 0) + *flags = 0; + else + *flags |= value; + } + while ((args = strtok (NULL, ","))); + } + else + *flags = ~0; +} + +/** Decode a set of sub arguments. + * + * \param FlagName the flag familly to update. + * \param args the effective sub arguments to decode. + * + * \arg FlagName_args the list of keys. + * \arg FlagName_types the list of values. + * \arg FlagName_flag the flag to update. + */ +#define FLAGS_ARGMATCH(FlagName, Args) \ + flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \ + &FlagName ## _flag, Args) + + +/*----------------------. +| --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", "look-ahead", + "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_lookahead_tokens, + report_states | report_lookahead_tokens, + report_states | report_lookahead_tokens, + report_states | report_solved_conflicts, + report_all +}; + +ARGMATCH_VERIFY (report_args, report_types); + + /*---------------------. | --trace's handling. | `---------------------*/ @@ -68,15 +157,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", + "none - no traces", "scan - grammar scanner traces", "parse - grammar parser traces", - "automaton - contruction of the automaton", + "automaton - construction of the automaton", "bitsets - use of bitsets", - "grammar - reading, reducing of the grammar", + "grammar - reading, reducing the grammar", "resource - memory consumption (where available)", "sets - grammar sets: firsts, nullable etc.", - "tools - m4 invocation and preserve the temporary file", + "tools - m4 invocation", + "m4 - m4 traces", "skeleton - skeleton postprocessing", "time - time consumption", "all - all of the above", @@ -94,79 +184,39 @@ static const int trace_types[] = trace_resource, trace_sets, trace_tools, + trace_m4, trace_skeleton, trace_time, trace_all }; +ARGMATCH_VERIFY (trace_args, trace_types); -static void -trace_argmatch (char *args) -{ - verify (trace_constraint, ARGMATCH_CONSTRAINT (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; -} +/*------------------------. +| --warnings's handling. | +`------------------------*/ -/*----------------------. -| --report's handling. | -`----------------------*/ - -static const char * const report_args[] = +static const char * const warnings_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", + "none - no warnings", + "error - warnings are errors", + "yacc - incompatibilities with POSIX YACC", + "all - all of the above", 0 }; -static const int report_types[] = +static const int warnings_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 + warnings_none, + warnings_error, + warnings_yacc, + warnings_all }; - -static void -report_argmatch (char *args) -{ - verify (report_constraint, ARGMATCH_CONSTRAINT (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, ","))); -} +ARGMATCH_VERIFY (warnings_args, warnings_types); /*-------------------------------------------. @@ -186,7 +236,7 @@ usage (int status) /* Some efforts were made to ease the translators' task, please continue. */ fputs (_("\ -GNU bison generates parsers for LALR(1) grammars.\n"), stdout); +GNU bison generates LALR(1) and GLR parsers.\n"), stdout); putc ('\n', stdout); fprintf (stdout, _("\ @@ -201,9 +251,10 @@ for the equivalent short option also. Similarly for optional arguments.\n"), 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"), stdout); + -h, --help display this help and exit\n\ + -V, --version output version information and exit\n\ + --print-localedir output directory containing locale-dependent data\n\ + -y, --yacc emulate POSIX Yacc\n"), stdout); putc ('\n', stdout); fputs (_("\ @@ -233,7 +284,7 @@ Output:\n\ 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\ + `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\ @@ -241,7 +292,7 @@ THINGS is a list of comma separated words that can include:\n\ putc ('\n', stdout); fputs (_("\ -Report bugs to .\n"), stdout); +Report bugs to <" PACKAGE_BUGREPORT ">.\n"), stdout); } exit (status); @@ -259,11 +310,12 @@ version (void) continue. */ printf (_("bison (GNU Bison) %s"), VERSION); putc ('\n', stdout); + printf ("%s", revision); fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout); putc ('\n', stdout); fprintf (stdout, - _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2002); + _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2006); fputs (_("\ This is free software; see the source for copying conditions. There is NO\n\ @@ -278,13 +330,22 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ `----------------------*/ /* Shorts options. */ -const char *short_options = "yvegdhr:ltknVo:b:p:S:T::"; +static char const short_options[] = "yvegdhr:ltknVo:b:p:S:T::W"; + +/* Values for long options that do not have single-letter equivalents. */ +enum +{ + LOCATIONS_OPTION = CHAR_MAX + 1, + PRINT_LOCALEDIR_OPTION +}; static struct option const long_options[] = { /* Operation modes. */ - { "help", no_argument, 0, 'h' }, - { "version", no_argument, 0, 'V' }, + { "help", no_argument, 0, 'h' }, + { "version", no_argument, 0, 'V' }, + { "print-localedir", no_argument, 0, PRINT_LOCALEDIR_OPTION }, + { "warnings", optional_argument, 0, 'W' }, /* Parser. */ { "name-prefix", required_argument, 0, 'p' }, @@ -310,7 +371,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 }, @@ -341,26 +402,19 @@ getargs (int argc, char *argv[]) /* Certain long options cause getopt_long to return 0. */ break; - case 'y': - yacc_flag = 1; + case 'b': + spec_file_prefix = AS_FILE_NAME (optarg); break; - case 'h': - usage (EXIT_SUCCESS); - - case 'V': - 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': - report_flag |= report_states; - break; + case 'h': + usage (EXIT_SUCCESS); case 'S': skeleton = AS_FILE_NAME (optarg); @@ -372,47 +426,67 @@ 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; - break; - case 'k': - token_table_flag = 1; + token_table_flag = true; break; - case 'n': - no_parser_flag = 1; + case 'l': + no_lines_flag = true; break; - case 't': - debug_flag = 1; + case 'n': + no_parser_flag = true; break; case 'o': spec_outfile = AS_FILE_NAME (optarg); break; - case 'b': - spec_file_prefix = AS_FILE_NAME (optarg); - break; - case 'p': spec_name_prefix = optarg; break; case 'r': - report_argmatch (optarg); + FLAGS_ARGMATCH (report, optarg); break; case 'T': - trace_argmatch (optarg); + FLAGS_ARGMATCH (trace, optarg); break; + case 't': + debug_flag = true; + break; + + case 'V': + version (); + exit (EXIT_SUCCESS); + + case 'v': + report_flag |= report_states; + break; + + case 'y': + yacc_flag = true; + break; + + case 'W': + FLAGS_ARGMATCH (warnings, optarg); + break; + + case LOCATIONS_OPTION: + locations_flag = true; + break; + + case PRINT_LOCALEDIR_OPTION: + printf ("%s\n", LOCALEDIR); + exit (EXIT_SUCCESS); + default: usage (EXIT_FAILURE); }