maint: post-release administrivia

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 92846b64720a0d9caaaa9b7bc78990381a3f03e5..599cbbad3e2dd7d35cfdf77c7ba8c0f3a5238e26 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.
 


@@ -20,7 +20,6 @@
 
 #include <config.h>
 #include "system.h"
 
 #include <config.h>
 #include "system.h"

-#include "revision.h"

 #include "output.h"
 
 #include <argmatch.h>
 #include "output.h"
 
 #include <argmatch.h>


@@ -41,9 +40,13 @@
 # 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"
 
 bool debug_flag;
 #include "uniqstr.h"
 
 bool debug_flag;


@@ -62,7 +65,8 @@ bool glr_parser = false;
 
 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;
+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 },


@@ -71,46 +75,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,
                const char * const keys[], const int values[],
  */
 static void
 flags_argmatch (const char *option,
                const char * const keys[], const int values[],

-               int *flags, char *args)
+               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);
+         int no = strncmp (args, "no-", 3) == 0 ? 3 : 0;
+         int value = XARGMATCH (option, args + no, keys, values);

          if (value == 0)
          if (value == 0)

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

          else
          else

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

          args = strtok (NULL, ",");
        }
     }
   else
          args = strtok (NULL, ",");
        }
     }
   else

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

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


@@ -120,11 +136,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.
  */
 #define FLAGS_ARGMATCH(FlagName, Args)                                 \
   flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \
  *  \arg FlagName_flag   the flag to update.
  */
 #define FLAGS_ARGMATCH(FlagName, Args)                                 \
   flags_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \

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

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


@@ -175,10 +192,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
 };


@@ -193,10 +212,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
 };
 


@@ -213,7 +234,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


@@ -224,6 +248,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
 };


@@ -245,9 +272,16 @@ 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 (_("\
       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);
 


@@ -266,19 +300,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\
-  -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 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\
+                                   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\

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


@@ -302,7 +340,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\


@@ -338,7 +379,6 @@ 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);
 
   fputs (_("Written by Robert Corbett and Richard Stallman.\n"), stdout);
   putc ('\n', stdout);
 


@@ -359,7 +399,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)
     {


@@ -367,18 +407,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;
 


@@ -386,23 +419,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));

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


@@ -412,6 +442,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::"


@@ -478,6 +510,8 @@ static struct option const long_options[] =
 
   /* Parser.  */
   { "debug",         no_argument,               0,   't' },
 
   /* Parser.  */
   { "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 },
   { "locations",      no_argument,              0, LOCATIONS_OPTION },
   { "no-lines",       no_argument,               0,   'l' },
   { "raw",            no_argument,               0,     0 },


@@ -496,6 +530,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[])
 {


@@ -505,15 +552,25 @@ 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 'd':
-       /* Here, the -d and --defines options are differentiated.  */
-       defines_flag = true;
-       if (optarg)
-         spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+      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':
        break;
 
       case 'I':


@@ -521,11 +578,13 @@ getargs (int argc, char *argv[])
        break;
 
       case 'L':
        break;
 
       case 'L':

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

        break;
 
       case 'S':
        break;
 
       case 'S':

-       skeleton_arg (AS_FILE_NAME (optarg), 0, NULL);
+       skeleton_arg (AS_FILE_NAME (optarg), command_line_prio,
+                     command_line_location ());

        break;
 
       case 'T':
        break;
 
       case 'T':


@@ -537,20 +596,30 @@ getargs (int argc, char *argv[])
        exit (EXIT_SUCCESS);
 
       case 'W':
        exit (EXIT_SUCCESS);
 
       case 'W':

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

        break;
 
       case 'b':
        spec_file_prefix = AS_FILE_NAME (optarg);
        break;
 
        break;
 
       case 'b':
        spec_file_prefix = AS_FILE_NAME (optarg);
        break;
 

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

       case 'g':
        graph_flag = true;
        if (optarg)
       case 'g':
        graph_flag = true;
        if (optarg)

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

        break;
 
       case 'h':
        break;
 
       case 'h':


@@ -587,7 +656,10 @@ getargs (int argc, char *argv[])
       case 'x':
        xml_flag = true;
        if (optarg)
       case 'x':
        xml_flag = true;
        if (optarg)

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

        break;
 
       case 'y':
        break;
 
       case 'y':


@@ -607,6 +679,7 @@ getargs (int argc, char *argv[])
        exit (EXIT_SUCCESS);
 
       case REPORT_FILE_OPTION:
        exit (EXIT_SUCCESS);
 
       case REPORT_FILE_OPTION:

+        free (spec_verbose_file);

        spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
        break;
 
        spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
        break;
 


@@ -617,11 +690,20 @@ getargs (int argc, char *argv[])
   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;

 }
 }