X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/59da312bc7a98d2cea04dceb53fc9e7b6c9c1ee3..9fe5a4571e33f8d2a38051a3699a317dce70ec9d:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 9661fefe..cb90c362 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -20,13 +20,13 @@ #include #include "system.h" -#include "revision.h" #include "output.h" #include #include #include #include +#include /* Hack to get to declare getopt with a prototype. */ #if lint && ! defined __GNU_LIBRARY__ @@ -44,6 +44,7 @@ #include "complain.h" #include "files.h" #include "getargs.h" +#include "muscle_tab.h" #include "uniqstr.h" bool debug_flag; @@ -253,6 +254,9 @@ Generate LALR(1) and GLR parsers.\n\ fputs (_("\ Mandatory arguments to long options are mandatory for short options too.\n\ +"), stdout); + fputs (_("\ +The same is true for optional arguments.\n\ "), stdout); fputs (_("\ @@ -263,13 +267,14 @@ Operation modes:\n\ --print-localedir output directory containing locale-dependent data\n\ --print-datadir output directory containing skeletons and XSLT\n\ -y, --yacc emulate POSIX Yacc\n\ - -W, --warnings=[CATEGORY] report the warnings falling in CATEGORY\n\ + -W, --warnings[=CATEGORY] report the warnings falling in CATEGORY\n\ \n\ "), stdout); fputs (_("\ Parser:\n\ -L, --language=LANGUAGE specify the output programming language\n\ + (this is an experimental feature)\n\ -S, --skeleton=FILE specify the skeleton to use\n\ -t, --debug instrument the parser for debugging\n\ --locations enable locations computation\n\ @@ -279,9 +284,12 @@ Parser:\n\ \n\ "), stdout); + /* Keep -d and --defines separate so that ../build-aux/cross-options.pl + * won't assume that -d also takes an argument. */ fputs (_("\ Output:\n\ - -d, --defines[=FILE] also produce a header file\n\ + --defines[=FILE] also produce a header file\n\ + -d likewise but cannot specify FILE (for POSIX Yacc)\n\ -r, --report=THINGS also produce details on the automaton\n\ --report-file=FILE write report to FILE\n\ -v, --verbose same as `--report=state'\n\ @@ -332,7 +340,6 @@ 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); @@ -403,8 +410,30 @@ language_argmatch (char const *arg, int prio, location const *loc) | Process the options. | `----------------------*/ -/* Shorts options. */ -static char const short_options[] = "yvegxdhr:L:ltknVo:b:p:S:T::W"; +/* Shorts options. + Should be computed from long_options. */ +static char const short_options[] = + "L:" + "S:" + "T::" + "V" + "W::" + "b:" + "d" + "e" + "g::" + "h" + "k" + "l" + "n" + "o:" + "p:" + "r:" + "t" + "v" + "x::" + "y" + ; /* Values for long options that do not have single-letter equivalents. */ enum @@ -481,27 +510,17 @@ getargs (int argc, char *argv[]) /* Certain long options cause getopt_long to return 0. */ break; - case 'b': - spec_file_prefix = AS_FILE_NAME (optarg); - break; - - case 'g': - /* Here, the -g and --graph=FILE options are differentiated. */ - graph_flag = true; + case 'd': + /* Here, the -d and --defines options are differentiated. */ + defines_flag = true; if (optarg) - spec_graph_file = xstrdup (AS_FILE_NAME (optarg)); + spec_defines_file = xstrdup (AS_FILE_NAME (optarg)); break; - case 'x': - /* Here, the -x and --xml=FILE options are differentiated. */ - xml_flag = true; - if (optarg) - spec_xml_file = xstrdup (AS_FILE_NAME (optarg)); + case 'I': + include = AS_FILE_NAME (optarg); break; - case 'h': - usage (EXIT_SUCCESS); - case 'L': language_argmatch (optarg, 0, NULL); break; @@ -510,17 +529,34 @@ getargs (int argc, char *argv[]) skeleton_arg (AS_FILE_NAME (optarg), 0, NULL); break; - case 'I': - include = AS_FILE_NAME (optarg); + case 'T': + FLAGS_ARGMATCH (trace, optarg); break; - case 'd': - /* Here, the -d and --defines options are differentiated. */ - defines_flag = true; + case 'V': + version (); + exit (EXIT_SUCCESS); + + case 'W': if (optarg) - spec_defines_file = xstrdup (AS_FILE_NAME (optarg)); + FLAGS_ARGMATCH (warnings, optarg); + else + warnings_flag |= warnings_all; + break; + + case 'b': + spec_file_prefix = AS_FILE_NAME (optarg); + break; + + case 'g': + graph_flag = true; + if (optarg) + spec_graph_file = xstrdup (AS_FILE_NAME (optarg)); break; + case 'h': + usage (EXIT_SUCCESS); + case 'k': token_table_flag = true; break; @@ -541,35 +577,22 @@ getargs (int argc, char *argv[]) FLAGS_ARGMATCH (report, optarg); break; - case REPORT_FILE_OPTION: - spec_verbose_file = xstrdup (AS_FILE_NAME (optarg)); - break; - - case 'T': - 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; + case 'x': + xml_flag = true; + if (optarg) + spec_xml_file = xstrdup (AS_FILE_NAME (optarg)); break; - case 'W': - if (optarg) - FLAGS_ARGMATCH (warnings, optarg); - else - warnings_flag |= warnings_all; + case 'y': + yacc_flag = true; break; case LOCATIONS_OPTION: @@ -584,6 +607,10 @@ getargs (int argc, char *argv[]) printf ("%s\n", compute_pkgdatadir ()); exit (EXIT_SUCCESS); + case REPORT_FILE_OPTION: + spec_verbose_file = xstrdup (AS_FILE_NAME (optarg)); + break; + default: usage (EXIT_FAILURE); } @@ -598,4 +625,5 @@ getargs (int argc, char *argv[]) } current_file = grammar_file = uniqstr_new (argv[optind]); + MUSCLE_INSERT_C_STRING ("file_name", grammar_file); }