maint: post-release administrivia

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index d65cfc0941ab8d65d9906b7260e1f04de6c3bc41..599cbbad3e2dd7d35cfdf77c7ba8c0f3a5238e26 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-2012 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,7 +26,6 @@
 #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__
 
 /* Hack to get <getopt.h> to declare getopt with a prototype.  */
 #if lint && ! defined __GNU_LIBRARY__


@@ -41,10 +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 "muscle-tab.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;


@@ -63,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 },


@@ -78,26 +81,25 @@ 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 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.
  *  \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.
+ *  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)
     {
 {
   if (args)
     {


@@ -107,20 +109,24 @@ flags_argmatch (const char *option,
          int no = strncmp (args, "no-", 3) == 0 ? 3 : 0;
          int value = XARGMATCH (option, args + no, keys, values);
          if (value == 0)
          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;
+           {
+             if (no)
+               *flags |= all;
+             else
+               *flags &= ~all;
+           }

          else
          else

-           if (no)
-             *flags &= ~value;
-           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.


@@ -130,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)

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


@@ -228,6 +235,9 @@ static const char * const warnings_args[] =
   "none            - no warnings",
   "midrule-values  - unset or unused midrule values",
   "yacc            - incompatibilities with POSIX Yacc",
   "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
   "all             - all of the above",
   "error           - warnings are errors",
   0


@@ -238,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
 };


@@ -298,10 +311,11 @@ Parser:\n\
   -S, --skeleton=FILE              specify the skeleton to use\n\
   -t, --debug                      instrument the parser for debugging\n\
       --locations                  enable location support\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\
+  -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\
 \n\
 "), stdout);
   -k, --token-table                include a table of token names\n\
 \n\
 "), stdout);


@@ -327,6 +341,9 @@ Output:\n\
 Warning categories include:\n\
   `midrule-values'  unset or unused midrule values\n\
   `yacc'            incompatibilities with POSIX Yacc\n\
 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\
   `all'             all the warnings\n\
   `no-CATEGORY'     turn off warnings in CATEGORY\n\
   `none'            turn off all the warnings\n\


@@ -402,20 +419,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_at (loc, msg, quotearg_colon (arg));

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


@@ -546,7 +563,7 @@ getargs (int argc, char *argv[])
       case 'F': /* -FNAME[=VALUE]. */
         {
           char* name = optarg;
       case 'F': /* -FNAME[=VALUE]. */
         {
           char* name = optarg;

-          char* value = strchr (optarg, '=');
+          char* value = mbschr (optarg, '=');

           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),
           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),


@@ -579,10 +596,7 @@ 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':
        break;
 
       case 'b':


@@ -593,13 +607,19 @@ getargs (int argc, char *argv[])
         /* Here, the -d and --defines options are differentiated.  */
         defines_flag = true;
         if (optarg)
         /* 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':
        graph_flag = true;
        if (optarg)
         break;
 
       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':


@@ -636,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':


@@ -656,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;
 


@@ -666,9 +690,9 @@ 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);
     }
 
       usage (EXIT_FAILURE);
     }