maint: post-release administrivia

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 4e64f302399f39b841058506e653a2d8fac39e50..599cbbad3e2dd7d35cfdf77c7ba8c0f3a5238e26 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -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;


@@ -79,8 +81,6 @@ 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.
  *
 
 /** Decode an option's set of keys.
  *


@@ -311,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);


@@ -418,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));

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


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


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


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


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