options: simplify the handling of -W

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 35b6a2a6132d4abc18b11569c26c7ee8834fb51f..cebfd783a8997b871bf8438834eb4eb9369118a5 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,6 +1,6 @@
 /* Parse command line arguments for Bison.
 
 /* Parse command line arguments for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000-2011 Free Software
+   Copyright (C) 1984, 1986, 1989, 1992, 2000-2013 Free Software

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


@@ -26,25 +26,14 @@
 #include <c-strcase.h>
 #include <configmake.h>
 #include <error.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__
-# define __GNU_LIBRARY__
-# define HACK_FOR___GNU_LIBRARY___PROTOTYPE 1
-#endif
-

 #include <getopt.h>
 #include <getopt.h>

-
-#ifdef HACK_FOR___GNU_LIBRARY___PROTOTYPE
-# undef __GNU_LIBRARY__
-# undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
-#endif
+#include <progname.h>

 
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
 #include "muscle-tab.h"
 
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
 #include "muscle-tab.h"

+#include "quote.h"

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


@@ -52,14 +41,14 @@ bool graph_flag;
 bool xml_flag;
 bool no_lines_flag;
 bool token_table_flag;
 bool xml_flag;
 bool no_lines_flag;
 bool token_table_flag;

-bool yacc_flag;        /* for -y */
+bool yacc_flag; /* for -y */

 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 

+int feature_flag = feature_caret;

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

-int warnings_flag = warnings_none;

 
 static struct bison_language const valid_languages[] = {
   { "c", "c-skel.m4", ".c", ".h", true },
 
 static struct bison_language const valid_languages[] = {
   { "c", "c-skel.m4", ".c", ".h", true },


@@ -74,63 +63,86 @@ 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;
 

-char *program_name;
+/** Decode an option's key.
+ *
+ *  \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 arg      the subarguments to decode.
+ *                  If null, then activate all the flags.
+ *  \param no       length of the potential "no-" prefix.
+ *                  Can be 0 or 3. If 3, negate the action of the subargument.
+ *
+ *  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
+flag_argmatch (const char *option,
+               const char * const keys[], const int values[],
+               int all, int *flags, char *arg, size_t no)
+{
+  int value = 0;
+  value = XARGMATCH (option, arg + no, keys, values);

 
 

+  if (value)
+    {
+      if (no)
+        *flags &= ~value;
+      else
+        *flags |= value;
+    }
+  else
+    {
+      if (no)
+        *flags |= all;
+      else
+        *flags &= ~all;
+    }
+}

 
 /** 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.
 
 /** 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.
  *  \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 and no-KEY sets all flags.
- *  Thus no-none = all and no-all = none.

  */
 static void
 flags_argmatch (const char *option,
  */
 static void
 flags_argmatch (const char *option,

-               const char * const keys[], const int values[],
-               int *flags, char *args)
+                const char * const keys[], const int values[],
+                int all, int *flags, char *args)

 {
   if (args)
 {
   if (args)

-    {
-      args = strtok (args, ",");
-      while (args)
-       {
-         int no = strncmp (args, "no-", 3) == 0 ? 3 : 0;
-         int value = XARGMATCH (option, args + no, keys, values);
-         if (value == 0)
-           if (no)
-             *flags = ~0;
-           else
-             *flags = 0;
-         else
-           if (no)
-             *flags &= ~value;
-           else
-             *flags |= value;
-         args = strtok (NULL, ",");
-       }
-    }
+    for (args = strtok (args, ","); args; args = strtok (NULL, ","))
+      {
+        size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
+        flag_argmatch (option, keys,
+                       values, all, flags, args, no);
+      }

   else
   else

-    *flags = ~0;
+    *flags |= all;

 }
 
 }
 

+

 /** Decode a set of sub arguments.
  *
  *  \param FlagName  the flag familly to update.
  *  \param Args      the effective sub arguments to decode.
 /** Decode a set of sub arguments.
  *
  *  \param FlagName  the flag familly to update.
  *  \param Args      the effective sub arguments to decode.

+ *  \param All       the "all" value.

  *
  *  \arg FlagName_args   the list of keys.
  *  \arg FlagName_types  the list of values.
  *  \arg FlagName_flag   the flag to update.
  */
  *
  *  \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)                                 \
+#define FLAGS_ARGMATCH(FlagName, Args, All)                             \

   flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \
   flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \

-                 &FlagName ## _flag, Args)
+                  All, &FlagName ## _flag, Args)

 
 
 /*----------------------.
 
 
 /*----------------------.


@@ -171,8 +183,6 @@ ARGMATCH_VERIFY (report_args, report_types);
 
 static const char * const trace_args[] =
 {
 
 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 traces",
   "scan       - grammar scanner traces",
   "parse      - grammar parser traces",
   "none       - no traces",
   "scan       - grammar scanner traces",
   "parse      - grammar parser traces",


@@ -217,29 +227,125 @@ ARGMATCH_VERIFY (trace_args, trace_types);
 | --warnings's handling.  |
 `------------------------*/
 
 | --warnings's handling.  |
 `------------------------*/
 

-static const char * const warnings_args[] =
+/** Decode a single argument from -W.
+ *
+ *  \param flags    the flags to update
+ *  \param arg      the subarguments to decode.
+ *                  If null, then activate all the flags.
+ *  \param no       length of the potential "no-" prefix.
+ *                  Can be 0 or 3. If 3, negate the action of the subargument.
+ *  \param err      length of a potential "error=".
+ *                  Can be 0 or 5. If 5, treat the subargument as a CATEGORY.
+ *
+ *  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
+warning_argmatch (int *flags, char *arg, size_t no, size_t err)

 {
 {

-  /* 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",
-  "all             - all of the above",
-  "error           - warnings are errors",
+  int value = 0;
+  if (!err || arg[no + err++] != '\0')
+    value = XARGMATCH ("--warning", arg + no + err,
+                       warnings_args, warnings_types);
+
+  if (value)
+    {
+      if (no)
+        *flags &= ~value;
+      else
+        {
+          if (err)
+            warnings_flag |= value;
+          *flags |= value;
+        }
+    }
+  else
+    {
+      /* With a simpler 'if (no)' version, -Werror means -Werror=all
+         (or rather, -Werror=no-none, but that syntax is invalid).
+         The difference is:
+         - Werror activates all errors, but not the warnings
+         - Werror=all activates errors, and all warnings */
+      if (no ? !err : err)
+        *flags |= Wall;
+      else
+        *flags &= ~Wall;
+    }
+}
+
+/** Decode a comma-separated list of arguments from -W.
+ *
+ *  \param args     comma separated list of effective subarguments to decode.
+ *                  If 0, then activate all the flags.
+ */
+static void
+warnings_argmatch (char *args)
+{
+  if (args)
+    for (args = strtok (args, ","); args; args = strtok (NULL, ","))
+      {
+        size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
+        size_t err = STRPREFIX_LIT ("error", args + no) ? 5 : 0;
+
+        warning_argmatch (err ? &errors_flag : &warnings_flag,
+                          args, no, err);
+      }
+  else
+    warnings_flag |= Wall;
+}
+
+const char * const warnings_args[] =
+{
+  "none",
+  "midrule-values",
+  "yacc",
+  "conflicts-sr",
+  "conflicts-rr",
+  "deprecated",
+  "precedence",
+  "other",
+  "all",
+  "error",

   0
 };
 
   0
 };
 

-static const int warnings_types[] =
+const int warnings_types[] =

 {
 {

-  warnings_none,
-  warnings_midrule_values,
-  warnings_yacc,
-  warnings_all,
-  warnings_error
+  Wnone,
+  Wmidrule_values,
+  Wyacc,
+  Wconflicts_sr,
+  Wconflicts_rr,
+  Wdeprecated,
+  Wprecedence,
+  Wother,
+  Wall,
+  Werror

 };
 
 ARGMATCH_VERIFY (warnings_args, warnings_types);
 
 };
 
 ARGMATCH_VERIFY (warnings_args, warnings_types);
 

+/*-----------------------.
+| --feature's handling.  |
+`-----------------------*/
+
+static const char * const feature_args[] =
+{
+  "none",
+  "caret", "diagnostics-show-caret",
+  "all",
+  0
+};
+
+static const int feature_types[] =
+{
+  feature_none,
+  feature_caret, feature_caret,
+  feature_all
+};
+
+ARGMATCH_VERIFY (feature_args, feature_types);

 
 /*-------------------------------------------.
 | Display the help message and exit STATUS.  |
 
 /*-------------------------------------------.
 | Display the help message and exit STATUS.  |


@@ -252,13 +358,13 @@ usage (int status)
 {
   if (status != 0)
     fprintf (stderr, _("Try `%s --help' for more information.\n"),
 {
   if (status != 0)
     fprintf (stderr, _("Try `%s --help' for more information.\n"),

-            program_name);
+             program_name);

   else
     {
       /* For ../build-aux/cross-options.pl to work, use the format:
   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.  */
+                ^  -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 (_("\
 
       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\


@@ -284,24 +390,25 @@ Operation modes:\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\
       --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\

+  -f, --feature[=FEATURE]    activate miscellaneous features\n\

 \n\
 "), stdout);
 
       fputs (_("\
 Parser:\n\
   -L, --language=LANGUAGE          specify the output programming language\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 tracing\n\
                                    same as `-Dparse.trace'\n\
       --locations                  enable location support\n\
   -S, --skeleton=FILE              specify the skeleton to use\n\
   -t, --debug                      instrument the parser for tracing\n\
                                    same as `-Dparse.trace'\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\
+  -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\
   -p, --name-prefix=PREFIX         prepend PREFIX to the external symbols\n\

-  -l, --no-lines                   don't generate `#line' directives\n\
+                                   deprecated by '-Dapi.prefix=PREFIX'\n\
+  -l, --no-lines                   don't generate '#line' directives\n\

   -k, --token-table                include a table of token names\n\
   -k, --token-table                include a table of token names\n\

-\n\

 "), stdout);
 "), stdout);

+      putc ('\n', stdout);

 
       /* Keep -d and --defines separate so that ../build-aux/cross-options.pl
        * won't assume that -d also takes an argument.  */
 
       /* Keep -d and --defines separate so that ../build-aux/cross-options.pl
        * won't assume that -d also takes an argument.  */


@@ -317,19 +424,24 @@ Output:\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\
   -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);
 "), stdout);

+      putc ('\n', stdout);

 
       fputs (_("\
 Warning categories include:\n\
 
       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\
+  `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\
+  `deprecated'        obsolete constructs\n\
+  `precedence'        useless precedence and associativity\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[=CATEGORY]'  treat warnings as errors\n\

 "), stdout);
 "), stdout);

+      putc ('\n', stdout);

 
       fputs (_("\
 THINGS is a list of comma separated words that can include:\n\
 
       fputs (_("\
 THINGS is a list of comma separated words that can include:\n\


@@ -340,8 +452,34 @@ THINGS is a list of comma separated words that can include:\n\
   `all'          include all the above information\n\
   `none'         disable the report\n\
 "), stdout);
   `all'          include all the above information\n\
   `none'         disable the report\n\
 "), stdout);

+      putc ('\n', stdout);

 
 

-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      fputs (_("\
+FEATURE is a list of comma separated words that can include:\n\
+  `caret'        show errors with carets\n\
+  `all'          all of the above\n\
+  `none'         disable all of the above\n\
+  "), stdout);
+
+      putc ('\n', stdout);
+      printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      printf (_("%s home page: <%s>.\n"), PACKAGE_NAME, PACKAGE_URL);
+      fputs (_("General help using GNU software: "
+               "<http://www.gnu.org/gethelp/>.\n"),
+             stdout);
+      /* Don't output this redundant message for English locales.
+         Note we still output for 'C' so that it gets included in the
+         man page.  */
+      const char *lc_messages = setlocale (LC_MESSAGES, NULL);
+      if (lc_messages && !STREQ (lc_messages, "en_"))
+        /* TRANSLATORS: Replace LANG_CODE in this URL with your language
+           code <http://translationproject.org/team/LANG_CODE.html> to
+           form one of the URLs at http://translationproject.org/team/.
+           Otherwise, replace the entire URL with your translation team's
+           email address.  */
+        fputs (_("Report translation bugs to "
+                 "<http://translationproject.org/team/>.\n"), stdout);
+      fputs (_("For complete documentation, run: info bison.\n"), stdout);

     }
 
   exit (status);
     }
 
   exit (status);


@@ -363,14 +501,14 @@ version (void)
   putc ('\n', stdout);
 
   fprintf (stdout,
   putc ('\n', stdout);
 
   fprintf (stdout,

-          _("Copyright (C) %d Free Software Foundation, Inc.\n"),
-          PACKAGE_COPYRIGHT_YEAR);
+           _("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\
 "),

-        stdout);
+         stdout);

 }
 
 
 }
 
 


@@ -387,7 +525,8 @@ skeleton_arg (char const *arg, int prio, location loc)
       skeleton = arg;
     }
   else if (prio == skeleton_prio)
       skeleton = arg;
     }
   else if (prio == skeleton_prio)

-    complain_at (loc, _("multiple skeleton declarations are invalid"));
+    complain (&loc, complaint,
+              _("multiple skeleton declarations are invalid"));

 }
 
 void
 }
 
 void


@@ -399,20 +538,20 @@ language_argmatch (char const *arg, int prio, location loc)
     {
       int i;
       for (i = 0; valid_languages[i].language[0]; i++)
     {
       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 = _("invalid language `%s'");
+        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;
 
     }
   else if (language_prio == prio)
     msg = _("multiple language declarations are invalid");
   else
     return;
 

-  complain_at (loc, msg, arg);
+  complain (&loc, complaint, msg, quotearg_colon (arg));

 }
 
 /*----------------------.
 }
 
 /*----------------------.


@@ -431,6 +570,7 @@ static char const short_options[] =
   "W::"
   "b:"
   "d"
   "W::"
   "b:"
   "d"

+  "f::"

   "e"
   "g::"
   "h"
   "e"
   "g::"
   "h"


@@ -458,41 +598,42 @@ enum
 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' },
-  { "print-localedir", no_argument,      0,   PRINT_LOCALEDIR_OPTION },
-  { "print-datadir",   no_argument,      0,   PRINT_DATADIR_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. */

-  { "name-prefix",   required_argument,          0,   'p' },
+  { "name-prefix",   required_argument,   0,   'p' },

   { "include",       required_argument,   0,   'I' },
 
   /* Output. */
   { "include",       required_argument,   0,   'I' },
 
   /* Output. */

-  { "file-prefix", required_argument,  0,   'b' },
-  { "output",     required_argument,   0,   'o' },
-  { "output-file", required_argument,  0,   'o' },
-  { "graph",      optional_argument,   0,   'g' },
+  { "file-prefix", required_argument,   0,   'b' },
+  { "output",      required_argument,   0,   'o' },
+  { "output-file", required_argument,   0,   'o' },
+  { "graph",       optional_argument,   0,   'g' },

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

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

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

-  { "verbose",    no_argument,         0,   'v' },
+  { "verbose",     no_argument,         0,   'v' },

 
   /* Hidden. */
   { "trace",         optional_argument,   0,     'T' },
 
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },
 
   /* Hidden. */
   { "trace",         optional_argument,   0,     'T' },
 
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },

+  { "feature",     optional_argument,   0,   'f' },

 
   /* Operation modes.  */
   { "fixed-output-files", no_argument,  0,   'y' },
 
   /* Operation modes.  */
   { "fixed-output-files", no_argument,  0,   'y' },

-  { "yacc",              no_argument,  0,   'y' },
+  { "yacc",               no_argument,  0,   'y' },

 
   /* Parser.  */
 
   /* Parser.  */

-  { "debug",         no_argument,               0,   't' },
-  { "define",        required_argument,         0,   'D' },
+  { "debug",          no_argument,               0,   't' },
+  { "define",         required_argument,         0,   'D' },

   { "force-define",   required_argument,         0,   'F' },
   { "force-define",   required_argument,         0,   'F' },

-  { "locations",      no_argument,              0, LOCATIONS_OPTION },
+  { "locations",      no_argument,               0, LOCATIONS_OPTION },

   { "no-lines",       no_argument,               0,   'l' },
   { "raw",            no_argument,               0,     0 },
   { "skeleton",       required_argument,         0,   'S' },
   { "no-lines",       no_argument,               0,   'l' },
   { "raw",            no_argument,               0,     0 },
   { "skeleton",       required_argument,         0,   'S' },


@@ -517,7 +658,7 @@ command_line_location (void)
 {
   location res;
   /* "<command line>" is used in GCC's messages about -D. */
 {
   location res;
   /* "<command line>" is used in GCC's messages about -D. */

-  boundary_set (&res.start, uniqstr_new ("<command line>"), optind, -1);
+  boundary_set (&res.start, uniqstr_new ("<command line>"), optind - 1, -1);

   res.end = res.start;
   return res;
 }
   res.end = res.start;
   return res;
 }


@@ -529,15 +670,15 @@ getargs (int argc, char *argv[])
   int c;
 
   while ((c = getopt_long (argc, argv, short_options, long_options, NULL))
   int c;
 
   while ((c = getopt_long (argc, argv, short_options, long_options, NULL))

-        != -1)
+         != -1)

     switch (c)
       {
         /* ASCII Sorting for short options (i.e., upper case then
            lower case), and then long-only options.  */
 
       case 0:
     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;
+        /* Certain long options cause getopt_long to return 0.  */
+        break;

 
       case 'D': /* -DNAME[=VALUE]. */
       case 'F': /* -FNAME[=VALUE]. */
 
       case 'D': /* -DNAME[=VALUE]. */
       case 'F': /* -FNAME[=VALUE]. */


@@ -551,124 +692,137 @@ getargs (int argc, char *argv[])
                                         c == 'D' ? MUSCLE_PERCENT_DEFINE_D
                                                  : MUSCLE_PERCENT_DEFINE_F);
         }
                                         c == 'D' ? MUSCLE_PERCENT_DEFINE_D
                                                  : MUSCLE_PERCENT_DEFINE_F);
         }

-       break;
+        break;

 
       case 'I':
 
       case 'I':

-       include = AS_FILE_NAME (optarg);
-       break;
+        include = AS_FILE_NAME (optarg);
+        break;

 
       case 'L':
 
       case 'L':

-       language_argmatch (optarg, command_line_prio,
-                          command_line_location ());
-       break;
+        language_argmatch (optarg, command_line_prio,
+                           command_line_location ());
+        break;

 
       case 'S':
 
       case 'S':

-       skeleton_arg (AS_FILE_NAME (optarg), command_line_prio,
-                     command_line_location ());
-       break;
+        skeleton_arg (AS_FILE_NAME (optarg), command_line_prio,
+                      command_line_location ());
+        break;

 
       case 'T':
 
       case 'T':

-       FLAGS_ARGMATCH (trace, optarg);
-       break;
+        FLAGS_ARGMATCH (trace, optarg, trace_all);
+        break;

 
       case 'V':
 
       case 'V':

-       version ();
-       exit (EXIT_SUCCESS);
+        version ();
+        exit (EXIT_SUCCESS);
+
+      case 'f':
+        FLAGS_ARGMATCH (feature, optarg, feature_all);
+        break;

 
       case 'W':
 
       case 'W':

-       if (optarg)
-         FLAGS_ARGMATCH (warnings, optarg);
-       else
-         warnings_flag |= warnings_all;
-       break;
+        warnings_argmatch (optarg);
+        break;

 
       case 'b':
 
       case 'b':

-       spec_file_prefix = AS_FILE_NAME (optarg);
-       break;
+        spec_file_prefix = AS_FILE_NAME (optarg);
+        break;

 
       case 'd':
         /* Here, the -d and --defines options are differentiated.  */
         defines_flag = true;
         if (optarg)
 
       case 'd':
         /* Here, the -d and --defines options are differentiated.  */
         defines_flag = true;
         if (optarg)

-          spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+          {
+            free (spec_defines_file);
+            spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+          }

         break;
 
       case 'g':
         break;
 
       case 'g':

-       graph_flag = true;
-       if (optarg)
-         spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
-       break;
+        graph_flag = true;
+        if (optarg)
+          {
+            free (spec_graph_file);
+            spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+          }
+        break;

 
       case 'h':
 
       case 'h':

-       usage (EXIT_SUCCESS);
+        usage (EXIT_SUCCESS);

 
       case 'k':
 
       case 'k':

-       token_table_flag = true;
-       break;
+        token_table_flag = true;
+        break;

 
       case 'l':
 
       case 'l':

-       no_lines_flag = true;
-       break;
+        no_lines_flag = true;
+        break;

 
       case 'o':
 
       case 'o':

-       spec_outfile = AS_FILE_NAME (optarg);
-       break;
+        spec_outfile = AS_FILE_NAME (optarg);
+        break;

 
       case 'p':
 
       case 'p':

-       spec_name_prefix = optarg;
-       break;
+        spec_name_prefix = optarg;
+        break;

 
       case 'r':
 
       case 'r':

-       FLAGS_ARGMATCH (report, optarg);
-       break;
+        FLAGS_ARGMATCH (report, optarg, report_all);
+        break;

 
       case 't':
         muscle_percent_define_insert ("parse.trace",
                                       command_line_location (), "",
                                       MUSCLE_PERCENT_DEFINE_D);
 
       case 't':
         muscle_percent_define_insert ("parse.trace",
                                       command_line_location (), "",
                                       MUSCLE_PERCENT_DEFINE_D);

-       break;
+        break;

 
       case 'v':
 
       case 'v':

-       report_flag |= report_states;
-       break;
+        report_flag |= report_states;
+        break;

 
       case 'x':
 
       case 'x':

-       xml_flag = true;
-       if (optarg)
-         spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
-       break;
+        xml_flag = true;
+        if (optarg)
+          {
+            free (spec_xml_file);
+            spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
+          }
+        break;

 
       case 'y':
 
       case 'y':

-       yacc_flag = true;
-       break;
+        warnings_flag |= Wyacc;
+        errors_flag |= Wyacc;
+        yacc_flag = true;
+        break;

 
       case LOCATIONS_OPTION:
         muscle_percent_define_ensure ("locations",
                                       command_line_location (), true);
 
       case LOCATIONS_OPTION:
         muscle_percent_define_ensure ("locations",
                                       command_line_location (), true);

-       break;
+        break;

 
       case PRINT_LOCALEDIR_OPTION:
 
       case PRINT_LOCALEDIR_OPTION:

-       printf ("%s\n", LOCALEDIR);
-       exit (EXIT_SUCCESS);
+        printf ("%s\n", LOCALEDIR);
+        exit (EXIT_SUCCESS);

 
       case PRINT_DATADIR_OPTION:
 
       case PRINT_DATADIR_OPTION:

-       printf ("%s\n", compute_pkgdatadir ());
-       exit (EXIT_SUCCESS);
+        printf ("%s\n", pkgdatadir ());
+        exit (EXIT_SUCCESS);

 
       case REPORT_FILE_OPTION:
 
       case REPORT_FILE_OPTION:

-       spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
-       break;
+        free (spec_verbose_file);
+        spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
+        break;

 
       default:
 
       default:

-       usage (EXIT_FAILURE);
+        usage (EXIT_FAILURE);

       }
 
   if (argc - optind != 1)
     {
       if (argc - optind < 1)
       }
 
   if (argc - optind != 1)
     {
       if (argc - optind < 1)

-       error (0, 0, _("missing operand after `%s'"), argv[argc - 1]);
+        error (0, 0, _("%s: missing operand"), quotearg_colon (argv[argc - 1]));

       else
       else

-       error (0, 0, _("extra operand `%s'"), argv[optind + 1]);
+        error (0, 0, _("extra operand %s"), quote (argv[optind + 1]));

       usage (EXIT_FAILURE);
     }
 
       usage (EXIT_FAILURE);
     }