tests: minor fixes/simplifications

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index c9fc9bfc4f87f3a11a633bb0ca3103876f0bf21e..06e6e972be3ee13f26970fadac923dec92534e94 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,7 +1,7 @@
 /* Parse command line arguments for Bison.
 
 /* Parse command line arguments for Bison.
 

-   Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   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.
 


@@ -40,28 +40,29 @@
 # undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
 #endif
 
 # undef HACK_FOR___GNU_LIBRARY___PROTOTYPE
 #endif
 

+#include <progname.h>
+

 #include "complain.h"
 #include "files.h"
 #include "getargs.h"
 #include "complain.h"
 #include "files.h"
 #include "getargs.h"

+#include "muscle-tab.h"
+#include "quote.h"

 #include "uniqstr.h"
 
 #include "uniqstr.h"
 

-bool debug_flag;

 bool defines_flag;
 bool graph_flag;
 bool xml_flag;
 bool defines_flag;
 bool graph_flag;
 bool xml_flag;

-bool locations_flag;

 bool no_lines_flag;
 bool token_table_flag;
 bool no_lines_flag;
 bool token_table_flag;

-bool yacc_flag;        /* for -y */
-
-bool error_verbose = false;
+bool yacc_flag; /* for -y */

 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 
 int report_flag = report_none;
 int trace_flag = trace_none;
 
 bool nondeterministic_parser = false;
 bool glr_parser = false;
 
 int report_flag = report_none;
 int trace_flag = trace_none;

-int warnings_flag = warnings_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 },
 
 static struct bison_language const valid_languages[] = {
   { "c", "c-skel.m4", ".c", ".h", true },


@@ -70,46 +71,58 @@ 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;
 

-char *program_name;
-

 
 /** 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 flags    the flags to update

- *  \param args     colon separated list of effective subarguments to decode.
+ *  \param args     comma separated list of effective subarguments to decode.

  *                  If 0, then activate all the flags.
  *
  *                  If 0, then activate all the flags.
  *

- *  The special value 0 resets the flags to 0.
+ *  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
 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)
     {
       args = strtok (args, ",");
       while (args)
 {
   if (args)
     {
       args = strtok (args, ",");
       while (args)

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

     }
   else
     }
   else

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

 }
 
 /** Decode a set of sub arguments.
 }
 
 /** Decode a set of sub arguments.


@@ -119,11 +132,12 @@ flags_argmatch (const char *option,
  *
  *  \arg FlagName_args   the list of keys.
  *  \arg FlagName_types  the list of values.
  *
  *  \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.
  */
  *  \arg FlagName_flag   the flag to update.
  */

-#define FLAGS_ARGMATCH(FlagName, Args)                                 \
+#define FLAGS_ARGMATCH(FlagName, Args)                                  \

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

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

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


@@ -174,10 +188,12 @@ 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",
   "time       - time consumption",
   "tools      - m4 invocation",
   "m4         - m4 traces",
   "skeleton   - skeleton postprocessing",
   "time       - time consumption",

+  "ielr       - IELR conversion",

   "all        - all of the above",
   0
 };
   "all        - all of the above",
   0
 };


@@ -192,10 +208,12 @@ 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_time,
   trace_tools,
   trace_m4,
   trace_skeleton,
   trace_time,

+  trace_ielr,

   trace_all
 };
 
   trace_all
 };
 


@@ -212,7 +230,10 @@ static const char * const warnings_args[] =
      that argmatch_valid be more readable.  */
   "none            - no warnings",
   "midrule-values  - unset or unused midrule values",
      that argmatch_valid be more readable.  */
   "none            - no warnings",
   "midrule-values  - unset or unused midrule values",

-  "yacc            - incompatibilities with POSIX YACC",
+  "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
   "all             - all of the above",
   "error           - warnings are errors",
   0


@@ -223,6 +244,9 @@ static const int warnings_types[] =
   warnings_none,
   warnings_midrule_values,
   warnings_yacc,
   warnings_none,
   warnings_midrule_values,
   warnings_yacc,

+  warnings_conflicts_sr,
+  warnings_conflicts_rr,
+  warnings_other,

   warnings_all,
   warnings_error
 };
   warnings_all,
   warnings_error
 };


@@ -241,12 +265,19 @@ 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
     {
   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 (_("\
       printf (_("Usage: %s [OPTION]... FILE\n"), program_name);
       fputs (_("\

-Generate LALR(1) and GLR parsers.\n\
+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);
 
 \n\
 "), stdout);
 


@@ -265,20 +296,23 @@ 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\
       --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\
 \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\
-  -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\
+  -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\
+  -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);
 
 \n\
 "), stdout);
 


@@ -302,7 +336,10 @@ Output:\n\
       fputs (_("\
 Warning categories include:\n\
   `midrule-values'  unset or unused midrule values\n\
       fputs (_("\
 Warning categories include:\n\
   `midrule-values'  unset or unused midrule values\n\

-  `yacc'            incompatibilities with POSIX YACC\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\
   `all'             all the warnings\n\
   `no-CATEGORY'     turn off warnings in CATEGORY\n\
   `none'            turn off all the warnings\n\


@@ -342,14 +379,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);

 }
 
 
 }
 
 


@@ -358,7 +395,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)
     {


@@ -366,18 +403,11 @@ skeleton_arg (char const *arg, int prio, location const *loc)
       skeleton = arg;
     }
   else if (prio == skeleton_prio)
       skeleton = arg;
     }
   else if (prio == skeleton_prio)

-    {
-      char const *msg =
-       _("multiple skeleton declarations are invalid");
-      if (loc)
-       complain_at (*loc, msg);
-      else
-       complain (msg);
-    }
+    complain_at (loc, _("multiple skeleton declarations are invalid"));

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


@@ -385,23 +415,20 @@ language_argmatch (char const *arg, int prio, location const *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;
 

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

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


@@ -411,6 +438,8 @@ language_argmatch (char const *arg, int prio, location const *loc)
 /* Shorts options.
    Should be computed from long_options.  */
 static char const short_options[] =
 /* Shorts options.
    Should be computed from long_options.  */
 static char const short_options[] =

+  "D:"
+  "F:"

   "L:"
   "S:"
   "T::"
   "L:"
   "S:"
   "T::"


@@ -445,25 +474,25 @@ 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' },
 
   /* Hidden. */
   { "trace",         optional_argument,   0,     'T' },


@@ -473,11 +502,13 @@ static struct option const long_options[] =
 
   /* 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' },
-  { "locations",      no_argument,              0, LOCATIONS_OPTION },
+  { "debug",          no_argument,               0,   't' },
+  { "define",         required_argument,         0,   'D' },
+  { "force-define",   required_argument,         0,   'F' },
+  { "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' },


@@ -495,132 +526,173 @@ 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;
 
   while ((c = getopt_long (argc, argv, short_options, long_options, NULL))
 void
 getargs (int argc, char *argv[])
 {
   int c;
 
   while ((c = getopt_long (argc, argv, short_options, long_options, NULL))

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

     switch (c)
       {
     switch (c)
       {

-      case 0:
-       /* Certain long options cause getopt_long to return 0.  */
-       break;
+        /* ASCII Sorting for short options (i.e., upper case then
+           lower case), and then long-only options.  */

 
 

-      case 'd':
-       /* Here, the -d and --defines options are differentiated.  */
-       defines_flag = true;
-       if (optarg)
-         spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
-       break;
+      case 0:
+        /* Certain long options cause getopt_long to return 0.  */
+        break;
+
+      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;

 
       case 'I':
 
       case 'I':

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

 
       case 'L':
 
       case 'L':

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

 
       case 'S':
 
       case 'S':

-       skeleton_arg (AS_FILE_NAME (optarg), 0, NULL);
-       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);
+        break;

 
       case 'V':
 
       case 'V':

-       version ();
-       exit (EXIT_SUCCESS);
+        version ();
+        exit (EXIT_SUCCESS);

 
       case 'W':
 
       case 'W':

-       if (optarg)
-         FLAGS_ARGMATCH (warnings, optarg);
-       else
-         warnings_flag |= warnings_all;
-       break;
+        FLAGS_ARGMATCH (warnings, 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)
+          spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+        break;

 
       case 'g':
 
       case 'g':

-       graph_flag = true;
-       if (optarg)
-         spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
-       break;
+        graph_flag = true;
+        if (optarg)
+          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);
+        break;

 
       case 't':
 
       case 't':

-       debug_flag = true;
-       break;
+        muscle_percent_define_insert ("parse.trace",
+                                      command_line_location (), "",
+                                      MUSCLE_PERCENT_DEFINE_D);
+        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)
+          spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
+        break;

 
       case 'y':
 
       case 'y':

-       yacc_flag = true;
-       break;
+        yacc_flag = true;
+        break;

 
       case LOCATIONS_OPTION:
 
       case LOCATIONS_OPTION:

-       locations_flag = true;
-       break;
+        muscle_percent_define_ensure ("locations",
+                                      command_line_location (), true);
+        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", compute_pkgdatadir ());
+        exit (EXIT_SUCCESS);

 
       case REPORT_FILE_OPTION:
 
       case REPORT_FILE_OPTION:

-       spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
-       break;
+        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);
     }
 
   current_file = grammar_file = uniqstr_new (argv[optind]);
       usage (EXIT_FAILURE);
     }
 
   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;

 }
 }