NEWS: update.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 9f6aef4a57a907c6c99824f4b0caa7e6af30d35e..1185e40944a157013c0720c0e10bdd0b3c09ae0c 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,104 +1,148 @@
-/* Parse command line arguments for bison.
-   Copyright 1984, 1986, 1989, 1992, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+/* Parse command line arguments for Bison.
+
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2012 Free Software
+   Foundation, Inc.

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

-   Bison is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.

 
 

-   Bison is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
    You should have received a copy of the GNU General Public License
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 

+#include <config.h>

 #include "system.h"
 #include "system.h"

-#include "getopt.h"
-#include "argmatch.h"
-#include "complain.h"
-#include "getargs.h"
-#include "files.h"
+#include "output.h"

 
 

-int debug_flag = 0;
-int defines_flag = 0;
-int locations_flag = 0;
-int no_lines_flag = 0;
-int no_parser_flag = 0;
-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;
+#include <argmatch.h>
+#include <c-strcase.h>
+#include <configmake.h>
+#include <error.h>

 
 

-const char *skeleton = NULL;
-const char *include = NULL;
+/* Hack to get <getopt.h> to declare getopt with a prototype.  */
+#if lint && ! defined __GNU_LIBRARY__
+# define __GNU_LIBRARY__
+# define HACK_FOR___GNU_LIBRARY___PROTOTYPE 1
+#endif

 
 

-extern char *program_name;
+#include <getopt.h>

 
 

+#ifdef HACK_FOR___GNU_LIBRARY___PROTOTYPE
+# undef __GNU_LIBRARY__
+# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
+#endif

 
 

-/*---------------------.
-| --trace's handling.  |
-`---------------------*/
+#include <progname.h>

 
 

-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",
-  "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",
-  "all        - all of the above",
-  0
-};
+#include "complain.h"
+#include "files.h"
+#include "getargs.h"
+#include "muscle-tab.h"
+#include "quote.h"
+#include "uniqstr.h"

 
 

-static const int trace_types[] =
-{
-  trace_none,
-  trace_automaton,
-  trace_bitsets,
-  trace_grammar,
-  trace_resource,
-  trace_sets,
-  trace_time,
-  trace_tools,
-  trace_all
+bool debug_flag;
+bool defines_flag;
+bool graph_flag;
+bool xml_flag;
+bool locations_flag;
+bool no_lines_flag;
+bool token_table_flag;
+bool yacc_flag;        /* for -y */
+
+bool error_verbose = false;
+
+bool nondeterministic_parser = false;
+bool glr_parser = false;
+
+int report_flag = report_none;
+int trace_flag = trace_none;
+int warnings_flag = warnings_conflicts_sr | warnings_conflicts_rr
+                    | warnings_other;
+
+static struct bison_language const valid_languages[] = {
+  { "c", "c-skel.m4", ".c", ".h", true },
+  { "c++", "c++-skel.m4", ".cc", ".hh", true },
+  { "java", "java-skel.m4", ".java", ".java", false },
+  { "", "", "", "", false }

 };
 
 };
 

+int skeleton_prio = default_prio;
+const char *skeleton = NULL;
+int language_prio = default_prio;
+struct bison_language const *language = &valid_languages[0];
+const char *include = NULL;

 
 

+
+/** Decode an option's set of keys.
+ *
+ *  \param option   option being decoded.
+ *  \param keys     array of valid subarguments.
+ *  \param values   array of corresponding (int) values.
+ *  \param all      the all value.
+ *  \param flags    the flags to update
+ *  \param args     comma separated list of effective subarguments to decode.
+ *                  If 0, then activate all the flags.
+ *
+ *  If VALUE != 0 then KEY sets flags and no-KEY clears them.
+ *  If VALUE == 0 then KEY clears all flags from \c all and no-KEY sets all
+ *  flags from \c all.  Thus no-none = all and no-all = none.
+ */

 static void
 static void

-trace_argmatch (char *args)
+flags_argmatch (const char *option,
+               const char * const keys[], const int values[],
+               int all, int *flags, char *args)

 {
 {

-  ARGMATCH_ASSERT (trace_args, trace_types);

   if (args)
     {
       args = strtok (args, ",");
   if (args)
     {
       args = strtok (args, ",");

-      do
+      while (args)

        {
        {

-         int trace = XARGMATCH ("--trace", args,
-                                trace_args, trace_types);
-         if (trace == trace_none)
-           trace_flag = trace_none;
+         int no = strncmp (args, "no-", 3) == 0 ? 3 : 0;
+         int value = XARGMATCH (option, args + no, keys, values);
+         if (value == 0)
+           {
+             if (no)
+               *flags |= all;
+             else
+               *flags &= ~all;
+           }

          else
          else

-           trace_flag |= trace;
+           {
+             if (no)
+               *flags &= ~value;
+             else
+               *flags |= value;
+           }
+         args = strtok (NULL, ",");

        }
        }

-      while ((args = strtok (NULL, ",")));

     }
   else
     }
   else

-    trace_flag = trace_all;
+    *flags |= all;

 }
 
 }
 

+/** 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_all    the all value.
+ *  \arg FlagName_flag   the flag to update.
+ */
+#define FLAGS_ARGMATCH(FlagName, Args)                                 \
+  flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \
+                 FlagName ## _all, &FlagName ## _flag, Args)
+

 
 /*----------------------.
 | --report's handling.  |
 
 /*----------------------.
 | --report's handling.  |


@@ -111,7 +155,7 @@ static const char * const report_args[] =
   "none",
   "state", "states",
   "itemset", "itemsets",
   "none",
   "state", "states",
   "itemset", "itemsets",

-  "lookahead", "lookaheads",
+  "lookahead", "lookaheads", "look-ahead",

   "solved",
   "all",
   0
   "solved",
   "all",
   0


@@ -122,95 +166,204 @@ static const int report_types[] =
   report_none,
   report_states, report_states,
   report_states | report_itemsets, report_states | report_itemsets,
   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_lookahead_tokens,
+  report_states | report_lookahead_tokens,
+  report_states | report_lookahead_tokens,

   report_states | report_solved_conflicts,
   report_all
 };
 
   report_states | report_solved_conflicts,
   report_all
 };
 

+ARGMATCH_VERIFY (report_args, report_types);

 
 

-static void
-report_argmatch (char *args)
+
+/*---------------------.
+| --trace's handling.  |
+`---------------------*/
+
+static const char * const trace_args[] =

 {
 {

-  ARGMATCH_ASSERT (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, ",")));
-}
+  /* In a series of synonyms, present the most meaningful first, so
+     that argmatch_valid be more readable.  */
+  "none       - no traces",
+  "scan       - grammar scanner traces",
+  "parse      - grammar parser traces",
+  "automaton  - construction of the automaton",
+  "bitsets    - use of bitsets",
+  "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",
+  "time       - time consumption",
+  "ielr       - IELR conversion",
+  "all        - all of the above",
+  0
+};

 
 

-/*---------------------------.
-| Display the help message.  |
-`---------------------------*/
+static const int trace_types[] =
+{
+  trace_none,
+  trace_scan,
+  trace_parse,
+  trace_automaton,
+  trace_bitsets,
+  trace_grammar,
+  trace_resource,
+  trace_sets,
+  trace_muscles,
+  trace_tools,
+  trace_m4,
+  trace_skeleton,
+  trace_time,
+  trace_ielr,
+  trace_all
+};

 
 

-static void
-usage (FILE *stream)
+ARGMATCH_VERIFY (trace_args, trace_types);
+
+
+/*------------------------.
+| --warnings's handling.  |
+`------------------------*/
+
+static const char * const warnings_args[] =

 {
 {

-  /* 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);
+  /* In a series of synonyms, present the most meaningful first, so
+     that argmatch_valid be more readable.  */
+  "none            - no warnings",
+  "midrule-values  - unset or unused midrule values",
+  "yacc            - incompatibilities with POSIX Yacc",
+  "conflicts-sr    - S/R conflicts",
+  "conflicts-rr    - R/R conflicts",
+  "other           - all other warnings",
+  "all             - all of the above",
+  "error           - warnings are errors",
+  0
+};

 
 

-  fprintf (stream, _("\
-Usage: %s [OPTION]... FILE\n"), program_name);
-  putc ('\n', stream);
+static const int warnings_types[] =
+{
+  warnings_none,
+  warnings_midrule_values,
+  warnings_yacc,
+  warnings_conflicts_sr,
+  warnings_conflicts_rr,
+  warnings_other,
+  warnings_all,
+  warnings_error
+};

 
 

-  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);
+ARGMATCH_VERIFY (warnings_args, warnings_types);

 
 

-  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);

 
 

-  fputs (_("\
-Parser:\n\
-  -S, --skeleton=FILE        specify the skeleton to use\n\
-  -t, --debug                instrument the parser for debugging\n\
-      --locations            enable locations computation\n\
-  -p, --name-prefix=PREFIX   prepend PREFIX to the external symbols\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);
+/*-------------------------------------------.
+| Display the help message and exit STATUS.  |
+`-------------------------------------------*/

 
 

-  fputs (_("\
+static void usage (int) ATTRIBUTE_NORETURN;
+
+static void
+usage (int status)
+{
+  if (status != 0)
+    fprintf (stderr, _("Try `%s --help' for more information.\n"),
+            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 a deterministic LR or generalized LR (GLR) parser employing\n\
+LALR(1), IELR(1), or canonical LR(1) parser tables.  IELR(1) and\n\
+canonical LR(1) support is experimental.\n\
+\n\
+"), stdout);
+
+      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 (_("\
+\n\
+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\
+      --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\
+\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 location support\n\
+  -D, --define=NAME[=VALUE]        similar to `%define NAME \"VALUE\"'\n\
+  -F, --force-define=NAME[=VALUE]  override `%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);
+
+      /* Keep -d and --defines separate so that ../build-aux/cross-options.pl
+       * won't assume that -d also takes an argument.  */
+      fputs (_("\

 Output:\n\
 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 produce a VCG description of the automaton\n\
-"), stream);
-  putc ('\n', stream);
-
-  fputs (_("\
+  -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\
+  `conflicts-sr'    S/R conflicts (enabled by default)\n\
+  `conflicts-rr'    R/R conflicts (enabled by default)\n\
+  `other'           all other warnings (enabled by default)\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);
+
+      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\
 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\
   `solved'       describe shift/reduce conflicts solving\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\

-"), stream);
-  putc ('\n', stream);
+"), stdout);

 
 

-  fputs (_("\
-Report bugs to <bug-bison@gnu.org>.\n"), stream);
+      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+    }
+
+  exit (status);

 }
 
 
 }
 
 


@@ -219,38 +372,116 @@ Report bugs to <bug-bison@gnu.org>.\n"), stream);
 `------------------------------*/
 
 static void
 `------------------------------*/
 
 static void

-version (FILE *stream)
+version (void)

 {
   /* Some efforts were made to ease the translators' task, please
      continue.  */
 {
   /* 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"),
+          PACKAGE_COPYRIGHT_YEAR);

 
   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\
 "),
 
   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);

 }
 
 
 }
 
 

+/*-------------------------------------.
+| --skeleton and --language handling.  |
+`--------------------------------------*/
+
+void
+skeleton_arg (char const *arg, int prio, location loc)
+{
+  if (prio < skeleton_prio)
+    {
+      skeleton_prio = prio;
+      skeleton = arg;
+    }
+  else if (prio == skeleton_prio)
+    complain_at (loc, _("multiple skeleton declarations are invalid"));
+}
+
+void
+language_argmatch (char const *arg, int prio, location loc)
+{
+  char const *msg;
+
+  if (prio < language_prio)
+    {
+      int i;
+      for (i = 0; valid_languages[i].language[0]; i++)
+        if (c_strcasecmp (arg, valid_languages[i].language) == 0)
+          {
+            language_prio = prio;
+            language = &valid_languages[i];
+            return;
+          }
+      msg = _("%s: invalid language");
+    }
+  else if (language_prio == prio)
+    msg = _("multiple language declarations are invalid");
+  else
+    return;
+
+  complain_at (loc, msg, quotearg_colon (arg));
+}
+

 /*----------------------.
 | Process the options.  |
 `----------------------*/
 
 /*----------------------.
 | Process the options.  |
 `----------------------*/
 

-/* Shorts options.  */
-const char *short_options = "yvegdhr:ltknVo:b:p:S:T::";
+/* Shorts options.
+   Should be computed from long_options.  */
+static char const short_options[] =
+  "D:"
+  "F:"
+  "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,
+  PRINT_LOCALEDIR_OPTION,
+  PRINT_DATADIR_OPTION,
+  REPORT_FILE_OPTION
+};

 
 static struct option const long_options[] =
 {
   /* Operation modes. */
 
 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 },
+  { "print-datadir",   no_argument,      0,   PRINT_DATADIR_OPTION   },
+  { "warnings",        optional_argument, 0,   'W' },

 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },
 
   /* Parser. */
   { "name-prefix",   required_argument,          0,   'p' },


@@ -261,24 +492,14 @@ static struct option const long_options[] =
   { "output",     required_argument,   0,   'o' },
   { "output-file", required_argument,  0,   'o' },
   { "graph",      optional_argument,   0,   'g' },
   { "output",     required_argument,   0,   'o' },
   { "output-file", required_argument,  0,   'o' },
   { "graph",      optional_argument,   0,   'g' },

+  { "xml",         optional_argument,   0,   'x' },

   { "report",     required_argument,   0,   'r' },
   { "report",     required_argument,   0,   'r' },

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

   { "verbose",    no_argument,         0,   'v' },
 
   /* Hidden. */
   { "trace",         optional_argument,   0,     'T' },
 
   { "verbose",    no_argument,         0,   'v' },
 
   /* 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' },
 
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },
 


@@ -288,11 +509,13 @@ static struct option const long_options[] =
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },

-  { "locations",      no_argument, &locations_flag,     1 },
+  { "define",        required_argument,         0,   'D' },
+  { "force-define",   required_argument,         0,   'F' },
+  { "locations",      no_argument,              0, LOCATIONS_OPTION },

   { "no-lines",       no_argument,               0,   'l' },
   { "no-lines",       no_argument,               0,   'l' },

-  { "no-parser",      no_argument,               0,   'n' },

   { "raw",            no_argument,               0,     0 },
   { "skeleton",       required_argument,         0,   'S' },
   { "raw",            no_argument,               0,     0 },
   { "skeleton",       required_argument,         0,   'S' },

+  { "language",       required_argument,         0,   'L' },

   { "token-table",    no_argument,               0,   'k' },
 
   {0, 0, 0, 0}
   { "token-table",    no_argument,               0,   'k' },
 
   {0, 0, 0, 0}


@@ -306,105 +529,170 @@ 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[])
 {
   int c;
 
 void
 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)
       {
     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 'y':
-       yacc_flag = 1;
+      case 'D': /* -DNAME[=VALUE]. */
+      case 'F': /* -FNAME[=VALUE]. */
+        {
+          char* name = optarg;
+          char* value = mbschr (optarg, '=');
+          if (value)
+            *value++ = 0;
+          muscle_percent_define_insert (name, command_line_location (),
+                                        value ? value : "",
+                                        c == 'D' ? MUSCLE_PERCENT_DEFINE_D
+                                                 : MUSCLE_PERCENT_DEFINE_F);
+        }

        break;
 
        break;
 

-      case 'h':
-       usage (stdout);
-       exit (0);
+      case 'I':
+       include = AS_FILE_NAME (optarg);
+       break;

 
 

-      case 'V':
-       version (stdout);
-       exit (0);
+      case 'L':
+       language_argmatch (optarg, command_line_prio,
+                          command_line_location ());
+       break;

 
 

-      case 'g':
-       /* Here, the -g and --graph=FILE options are differentiated.  */
-       graph_flag = 1;
-       spec_graph_file = AS_FILE_NAME (optarg);
+      case 'S':
+       skeleton_arg (AS_FILE_NAME (optarg), command_line_prio,
+                     command_line_location ());

        break;
 
        break;
 

-      case 'v':
-       report_flag |= report_states;
+      case 'T':
+       FLAGS_ARGMATCH (trace, optarg);

        break;
 
        break;
 

-      case 'S':
-       skeleton = AS_FILE_NAME (optarg);
+      case 'V':
+       version ();
+       exit (EXIT_SUCCESS);
+
+      case 'W':
+       FLAGS_ARGMATCH (warnings, optarg);

        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 = 1;
+        /* 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 = AS_FILE_NAME (optarg);
+         spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+       break;
+
+      case 'h':
+       usage (EXIT_SUCCESS);
+
+      case 'k':
+       token_table_flag = true;

        break;
 
       case 'l':
        break;
 
       case 'l':

-       no_lines_flag = 1;
+       no_lines_flag = true;

        break;
 
        break;
 

-      case 'k':
-       token_table_flag = 1;
+      case 'o':
+       spec_outfile = AS_FILE_NAME (optarg);

        break;
 
        break;
 

-      case 'n':
-       no_parser_flag = 1;
+      case 'p':
+       spec_name_prefix = optarg;
+       break;
+
+      case 'r':
+       FLAGS_ARGMATCH (report, optarg);

        break;
 
       case 't':
        break;
 
       case 't':

-       debug_flag = 1;
+       debug_flag = true;

        break;
 
        break;
 

-      case 'o':
-       spec_outfile = AS_FILE_NAME (optarg);
+      case 'v':
+       report_flag |= report_states;

        break;
 
        break;
 

-      case 'b':
-       spec_file_prefix = AS_FILE_NAME (optarg);
+      case 'x':
+       xml_flag = true;
+       if (optarg)
+         spec_xml_file = xstrdup (AS_FILE_NAME (optarg));

        break;
 
        break;
 

-      case 'p':
-       spec_name_prefix = optarg;
+      case 'y':
+       yacc_flag = true;

        break;
 
        break;
 

-      case 'r':
-       report_argmatch (optarg);
+      case LOCATIONS_OPTION:
+       locations_flag = true;

        break;
 
        break;
 

-      case 'T':
-       trace_argmatch (optarg);
+      case PRINT_LOCALEDIR_OPTION:
+       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:
        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, _("%s: missing operand"), quotearg_colon (argv[argc - 1]));
+      else
+        error (0, 0, _("extra operand %s"), quote (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]);
+  MUSCLE_INSERT_C_STRING ("file_name", grammar_file);
+}
+
+void
+tr (char *s, char from, char to)
+{
+  for (; *s; s++)
+    if (*s == from)
+      *s = to;

 }
 }