X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/573a6cd3568911ec7a698daea60fa24f36088cd2..0a9f1c7d45cc2b5757377a871fde8003ac16a082:/src/getargs.c?ds=inline diff --git a/src/getargs.c b/src/getargs.c index 92e9ef4e..7bc9a767 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -1,6 +1,7 @@ -/* Parse command line arguments for bison. - Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002 - Free Software Foundation, Inc. +/* Parse command line arguments for Bison. + + 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. @@ -16,29 +17,48 @@ 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 "getopt.h" -#include "argmatch.h" -#include "error.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 "struniq.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; @@ -54,15 +74,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 }; @@ -77,16 +98,17 @@ static const int trace_types[] = trace_grammar, trace_resource, trace_sets, - trace_time, trace_tools, + trace_skeleton, + trace_time, trace_all }; +ARGMATCH_VERIFY (trace_args, trace_types); static void trace_argmatch (char *args) { - ARGMATCH_ASSERT (trace_args, trace_types); if (args) { args = strtok (args, ","); @@ -117,7 +139,7 @@ static const char * const report_args[] = "none", "state", "states", "itemset", "itemsets", - "lookahead", "lookaheads", + "look-ahead", "lookahead", "lookaheads", "solved", "all", 0 @@ -128,16 +150,18 @@ 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 }; +ARGMATCH_VERIFY (report_args, report_types); static void report_argmatch (char *args) { - ARGMATCH_ASSERT (report_args, report_types); args = strtok (args, ","); do { @@ -184,9 +208,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 (_("\ @@ -216,7 +241,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\ + `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\ @@ -246,7 +271,7 @@ version (void) 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\ @@ -261,13 +286,21 @@ 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::"; + +/* 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 }, /* Parser. */ { "name-prefix", required_argument, 0, 'p' }, @@ -293,7 +326,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 }, @@ -316,7 +349,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: @@ -324,7 +358,7 @@ getargs (int argc, char *argv[]) break; case 'y': - yacc_flag = 1; + yacc_flag = true; break; case 'h': @@ -334,10 +368,15 @@ getargs (int argc, char *argv[]) version (); exit (EXIT_SUCCESS); + case PRINT_LOCALEDIR_OPTION: + printf ("%s\n", LOCALEDIR); + 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 +393,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': @@ -408,5 +451,5 @@ getargs (int argc, char *argv[]) usage (EXIT_FAILURE); } - current_file = grammar_file = struniq_new (argv[optind]); + current_file = grammar_file = uniqstr_new (argv[optind]); }