Improves options in the manual.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 45b0dc847f22101eebd19dea64f4579ac4ff553f..aebc240128ae485c005dbd528b35429419b681c9 100644 (file)
--- 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, 2003, 2004,
 /* Parse command line arguments for Bison.
 
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,

-   2005, 2006, 2007 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -20,12 +20,13 @@
 
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"

-#include "revision.h"
+#include "output.h"

 
 #include <argmatch.h>
 #include <c-strcase.h>
 #include <configmake.h>
 #include <error.h>
 
 #include <argmatch.h>
 #include <c-strcase.h>
 #include <configmake.h>
 #include <error.h>

+#include <quotearg.h>

 
 /* Hack to get <getopt.h> to declare getopt with a prototype.  */
 #if lint && ! defined __GNU_LIBRARY__
 
 /* Hack to get <getopt.h> to declare getopt with a prototype.  */
 #if lint && ! defined __GNU_LIBRARY__


@@ -43,6 +44,7 @@
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"

+#include "muscle_tab.h"

 #include "uniqstr.h"
 
 bool debug_flag;
 #include "uniqstr.h"
 
 bool debug_flag;


@@ -58,7 +60,6 @@ bool error_verbose = false;
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;

-bool pure_parser = false;

 
 int report_flag = report_none;
 int trace_flag = trace_none;
 
 int report_flag = report_none;
 int trace_flag = trace_none;


@@ -71,9 +72,9 @@ static struct bison_language const valid_languages[] = {
   { "", "", "", "", false }
 };
 
   { "", "", "", "", false }
 };
 

-static int skeleton_prio = 2;
+int skeleton_prio = default_prio;

 const char *skeleton = NULL;
 const char *skeleton = NULL;

-static int language_prio = 2;
+int language_prio = default_prio;

 struct bison_language const *language = &valid_languages[0];
 const char *include = NULL;
 
 struct bison_language const *language = &valid_languages[0];
 const char *include = NULL;
 


@@ -175,6 +176,7 @@ static const char * const trace_args[] =
   "grammar    - reading, reducing the grammar",
   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",
   "grammar    - reading, reducing the grammar",
   "resource   - memory consumption (where available)",
   "sets       - grammar sets: firsts, nullable etc.",

+  "muscles    - m4 definitions passed to the skeleton",

   "tools      - m4 invocation",
   "m4         - m4 traces",
   "skeleton   - skeleton postprocessing",
   "tools      - m4 invocation",
   "m4         - m4 traces",
   "skeleton   - skeleton postprocessing",


@@ -193,6 +195,7 @@ static const int trace_types[] =
   trace_grammar,
   trace_resource,
   trace_sets,
   trace_grammar,
   trace_resource,
   trace_sets,

+  trace_muscles,

   trace_tools,
   trace_m4,
   trace_skeleton,
   trace_tools,
   trace_m4,
   trace_skeleton,


@@ -245,6 +248,11 @@ usage (int status)
             program_name);
   else
     {
             program_name);
   else
     {

+      /* For ../build-aux/cross-options.pl to work, use the format:
+               ^  -S, --long[=ARGS] (whitespace)
+        A --long option is required.
+        Otherwise, add exceptions to ../build-aux/cross-options.pl.  */
+

       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\
 Generate LALR(1) and GLR parsers.\n\
       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\
 Generate LALR(1) and GLR parsers.\n\


@@ -253,6 +261,9 @@ Generate LALR(1) and GLR parsers.\n\
 
       fputs (_("\
 Mandatory arguments to long options are mandatory for short options too.\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 (_("\
 "), stdout);
 
       fputs (_("\


@@ -261,30 +272,51 @@ Operation modes:\n\
   -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\
   -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\

+      --print-datadir        output directory containing skeletons and XSLT\n\

   -y, --yacc                 emulate POSIX Yacc\n\
   -y, --yacc                 emulate POSIX Yacc\n\

+  -W, --warnings[=CATEGORY]  report the warnings falling in CATEGORY\n\

 \n\
 "), stdout);
 
       fputs (_("\
 Parser:\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\
   -S, --skeleton=FILE        specify the skeleton to use\n\
   -t, --debug                instrument the parser for debugging\n\

-      --locations            enable locations computation\n\
+      --locations            enable location support\n\
+  -D, --define=NAME[=VALUE]  same as `%define NAME \"VALUE\"'\n\

   -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
   -l, --no-lines             don't generate `#line' directives\n\
   -k, --token-table          include a table of token names\n\
 \n\
 "), stdout);
 
   -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\n\
   -l, --no-lines             don't generate `#line' directives\n\
   -k, --token-table          include a table of token names\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\
       fputs (_("\
 Output:\n\

-  -d, --defines              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\
   -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\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\
   -v, --verbose              same as `--report=state'\n\
   -b, --file-prefix=PREFIX   specify a PREFIX for output files\n\
   -o, --output=FILE          leave output to FILE\n\

-  -g, --graph                also output a graph of the automaton\n\
-  -x, --xml                  also output an xml of the automaton\n\
+  -g, --graph[=FILE]         also output a graph of the automaton\n\
+  -x, --xml[=FILE]           also output an XML report of the automaton\n\
+                             (the XML schema is experimental)\n\
+\n\
+"), stdout);
+
+      fputs (_("\
+Warning categories include:\n\
+  `midrule-values'  unset or unused midrule values\n\
+  `yacc'            incompatibilities with POSIX YACC\n\
+  `all'             all the warnings\n\
+  `no-CATEGORY'     turn off warnings in CATEGORY\n\
+  `none'            turn off all the warnings\n\
+  `error'           treat warnings as errors\n\

 \n\
 "), stdout);
 
 \n\
 "), stdout);
 


@@ -316,12 +348,12 @@ version (void)
      continue.  */
   printf (_("bison (GNU Bison) %s"), VERSION);
   putc ('\n', stdout);
      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,
   fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout);
   putc ('\n', stdout);
 
   fprintf (stdout,

-          _("Copyright (C) %d Free Software Foundation, Inc.\n"), 2006);
+          _("Copyright (C) %d Free Software Foundation, Inc.\n"),
+          PACKAGE_COPYRIGHT_YEAR);

 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\
 
   fputs (_("\
 This is free software; see the source for copying conditions.  There is NO\n\


@@ -336,7 +368,7 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 `--------------------------------------*/
 
 void
 `--------------------------------------*/
 
 void

-skeleton_arg (char const *arg, int prio, location const *loc)
+skeleton_arg (char const *arg, int prio, location loc)

 {
   if (prio < skeleton_prio)
     {
 {
   if (prio < skeleton_prio)
     {


@@ -347,15 +379,12 @@ skeleton_arg (char const *arg, int prio, location const *loc)
     {
       char const *msg =
        _("multiple skeleton declarations are invalid");
     {
       char const *msg =
        _("multiple skeleton declarations are invalid");

-      if (loc)
-       complain_at (*loc, msg);
-      else
-       complain (msg);
+      complain_at (loc, msg);

     }
 }
 
 void
     }
 }
 
 void

-language_argmatch (char const *arg, int prio, location const *loc)
+language_argmatch (char const *arg, int prio, location loc)

 {
   char const *msg;
 
 {
   char const *msg;
 


@@ -376,24 +405,46 @@ language_argmatch (char const *arg, int prio, location const *loc)
   else
     return;
 
   else
     return;
 

-  if (loc)
-    complain_at (*loc, msg, arg);
-  else
-    complain (msg, arg);
+  complain_at (loc, msg, arg);

 }
 
 /*----------------------.
 | Process the options.  |
 `----------------------*/
 
 }
 
 /*----------------------.
 | 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[] =
+  "D:"
+  "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
 {
   LOCATIONS_OPTION = CHAR_MAX + 1,
 
 /* Values for long options that do not have single-letter equivalents.  */
 enum
 {
   LOCATIONS_OPTION = CHAR_MAX + 1,

-  PRINT_LOCALEDIR_OPTION
+  PRINT_LOCALEDIR_OPTION,
+  PRINT_DATADIR_OPTION,
+  REPORT_FILE_OPTION

 };
 
 static struct option const long_options[] =
 };
 
 static struct option const long_options[] =


@@ -402,6 +453,7 @@ static struct option const long_options[] =
   { "help",            no_argument,      0,   'h' },
   { "version",         no_argument,      0,   'V' },
   { "print-localedir", no_argument,      0,   PRINT_LOCALEDIR_OPTION },
   { "help",            no_argument,      0,   'h' },
   { "version",         no_argument,      0,   'V' },
   { "print-localedir", no_argument,      0,   PRINT_LOCALEDIR_OPTION },

+  { "print-datadir",   no_argument,      0,   PRINT_DATADIR_OPTION   },

   { "warnings",        optional_argument, 0,   'W' },
 
   /* Parser. */
   { "warnings",        optional_argument, 0,   'W' },
 
   /* Parser. */


@@ -415,6 +467,7 @@ static struct option const long_options[] =
   { "graph",      optional_argument,   0,   'g' },
   { "xml",         optional_argument,   0,   'x' },
   { "report",     required_argument,   0,   'r' },
   { "graph",      optional_argument,   0,   'g' },
   { "xml",         optional_argument,   0,   'x' },
   { "report",     required_argument,   0,   'r' },

+  { "report-file", required_argument,   0,   REPORT_FILE_OPTION },

   { "verbose",    no_argument,         0,   'v' },
 
   /* Hidden. */
   { "verbose",    no_argument,         0,   'v' },
 
   /* Hidden. */


@@ -429,6 +482,7 @@ static struct option const long_options[] =
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },

+  { "define",        required_argument,         0,   'D' },

   { "locations",      no_argument,              0, LOCATIONS_OPTION },
   { "no-lines",       no_argument,               0,   'l' },
   { "raw",            no_argument,               0,     0 },
   { "locations",      no_argument,              0, LOCATIONS_OPTION },
   { "no-lines",       no_argument,               0,   'l' },
   { "raw",            no_argument,               0,     0 },


@@ -447,6 +501,19 @@ static struct option const long_options[] =
 # define AS_FILE_NAME(File) (File)
 #endif
 
 # define AS_FILE_NAME(File) (File)
 #endif
 

+/* Build a location for the current command line argument. */
+static
+location
+command_line_location (void)
+{
+  location res;
+  /* "<command line>" is used in GCC's messages about -D. */
+  boundary_set (&res.start, uniqstr_new ("<command line>"), optind, -1);
+  res.end = res.start;
+  return res;
+}
+
+

 void
 getargs (int argc, char *argv[])
 {
 void
 getargs (int argc, char *argv[])
 {


@@ -456,50 +523,73 @@ getargs (int argc, char *argv[])
         != -1)
     switch (c)
       {
         != -1)
     switch (c)
       {

+        /* ASCII Sorting for short options (i.e., upper case then
+           lower case), and then long-only options.  */
+

       case 0:
        /* Certain long options cause getopt_long to return 0.  */
        break;
 
       case 0:
        /* Certain long options cause getopt_long to return 0.  */
        break;
 

-      case 'b':
-       spec_file_prefix = AS_FILE_NAME (optarg);
+      case 'D': /* -DNAME[=VALUE]. */
+        {
+          char* name = optarg;
+          char* value = strchr (optarg, '=');
+          if (value)
+            *value++ = 0;
+          muscle_percent_define_insert (name, command_line_location (),
+                                        value ? value : "");
+        }

        break;
 
        break;
 

-      case 'g':
-       /* Here, the -g and --graph=FILE options are differentiated.  */
-       graph_flag = true;
-       if (optarg)
-         spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+      case 'I':
+       include = AS_FILE_NAME (optarg);

        break;
 
        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 'L':
+       language_argmatch (optarg, command_line_prio,
+                          command_line_location ());

        break;
 
        break;
 

-      case 'h':
-       usage (EXIT_SUCCESS);
+      case 'S':
+       skeleton_arg (AS_FILE_NAME (optarg), command_line_prio,
+                     command_line_location ());
+       break;

 
 

-      case 'L':
-       language_argmatch (optarg, 0, NULL);
+      case 'T':
+       FLAGS_ARGMATCH (trace, optarg);

        break;
 
        break;
 

-      case 'S':
-       skeleton_arg (AS_FILE_NAME (optarg), 0, NULL);
+      case 'V':
+       version ();
+       exit (EXIT_SUCCESS);
+
+      case 'W':
+       if (optarg)
+         FLAGS_ARGMATCH (warnings, optarg);
+       else
+         warnings_flag |= warnings_all;

        break;
 
        break;
 

-      case 'I':
-       include = AS_FILE_NAME (optarg);
+      case 'b':
+       spec_file_prefix = AS_FILE_NAME (optarg);

        break;
 
       case 'd':
        break;
 
       case 'd':

-       /* Here, the -d and --defines options are differentiated.  */
-       defines_flag = true;
+        /* Here, the -d and --defines options are differentiated.  */
+        defines_flag = true;
+        if (optarg)
+          spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+        break;
+
+      case 'g':
+       graph_flag = true;

        if (optarg)
        if (optarg)

-         spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+         spec_graph_file = xstrdup (AS_FILE_NAME (optarg));

        break;
 
        break;
 

+      case 'h':
+       usage (EXIT_SUCCESS);
+

       case 'k':
        token_table_flag = true;
        break;
       case 'k':
        token_table_flag = true;
        break;


@@ -520,31 +610,22 @@ getargs (int argc, char *argv[])
        FLAGS_ARGMATCH (report, optarg);
        break;
 
        FLAGS_ARGMATCH (report, optarg);
        break;
 

-      case 'T':
-       FLAGS_ARGMATCH (trace, optarg);
-       break;
-

       case 't':
        debug_flag = true;
        break;
 
       case 't':
        debug_flag = true;
        break;
 

-      case 'V':
-       version ();
-       exit (EXIT_SUCCESS);
-

       case 'v':
        report_flag |= report_states;
        break;
 
       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;
 
        break;
 

-      case 'W':
-       if (optarg)
-         FLAGS_ARGMATCH (warnings, optarg);
-       else
-         warnings_flag |= warnings_all;
+      case 'y':
+       yacc_flag = true;

        break;
 
       case LOCATIONS_OPTION:
        break;
 
       case LOCATIONS_OPTION:


@@ -555,6 +636,14 @@ getargs (int argc, char *argv[])
        printf ("%s\n", LOCALEDIR);
        exit (EXIT_SUCCESS);
 
        printf ("%s\n", LOCALEDIR);
        exit (EXIT_SUCCESS);
 

+      case PRINT_DATADIR_OPTION:
+       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);
       }
       default:
        usage (EXIT_FAILURE);
       }


@@ -569,4 +658,5 @@ getargs (int argc, char *argv[])
     }
 
   current_file = grammar_file = uniqstr_new (argv[optind]);
     }
 
   current_file = grammar_file = uniqstr_new (argv[optind]);

+  MUSCLE_INSERT_C_STRING ("file_name", grammar_file);

 }
 }