Merge branch 'maint'

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 06e6e972be3ee13f26970fadac923dec92534e94..dadcbbb9108600a5b6899989f7232ac00186c1cf 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -61,8 +61,6 @@ bool glr_parser = false;
 
 int report_flag = report_none;
 int trace_flag = trace_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 },
@@ -129,15 +127,15 @@ flags_argmatch (const char *option,
  *
  *  \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_all    the all value.
  *  \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, \
-                  FlagName ## _all, &FlagName ## _flag, Args)
+                  All, &FlagName ## _flag, Args)
 
 
 /*----------------------.
@@ -241,19 +239,18 @@ static const char * const warnings_args[] =
 
 static const int warnings_types[] =
 {
-  warnings_none,
-  warnings_midrule_values,
-  warnings_yacc,
-  warnings_conflicts_sr,
-  warnings_conflicts_rr,
-  warnings_other,
-  warnings_all,
-  warnings_error
+  Wnone,
+  Wmidrule_values,
+  Wyacc,
+  Wconflicts_sr,
+  Wconflicts_rr,
+  Wother,
+  Wall,
+  Werror
 };
 
 ARGMATCH_VERIFY (warnings_args, warnings_types);
 
-
 /*-------------------------------------------.
 | Display the help message and exit STATUS.  |
 `-------------------------------------------*/
@@ -308,10 +305,11 @@ Parser:\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\
-  -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);
@@ -403,7 +401,8 @@ skeleton_arg (char const *arg, int prio, location loc)
       skeleton = arg;
     }
   else if (prio == skeleton_prio)
-    complain_at (loc, _("multiple skeleton declarations are invalid"));
+    complain_at (loc, complaint,
+                 _("multiple skeleton declarations are invalid"));
 }
 
 void
@@ -428,7 +427,7 @@ language_argmatch (char const *arg, int prio, location loc)
   else
     return;
 
-  complain_at (loc, msg, quotearg_colon (arg));
+  complain_at (loc, complaint, msg, quotearg_colon (arg));
 }
 
 /*----------------------.
@@ -559,7 +558,7 @@ getargs (int argc, char *argv[])
       case 'F': /* -FNAME[=VALUE]. */
         {
           char* name = optarg;
-          char* value = mbschr (optarg, '=');
+          char* value = strchr (optarg, '=');
           if (value)
             *value++ = 0;
           muscle_percent_define_insert (name, command_line_location (),
@@ -584,7 +583,7 @@ getargs (int argc, char *argv[])
         break;
 
       case 'T':
-        FLAGS_ARGMATCH (trace, optarg);
+        FLAGS_ARGMATCH (trace, optarg, trace_all);
         break;
 
       case 'V':
@@ -592,7 +591,7 @@ getargs (int argc, char *argv[])
         exit (EXIT_SUCCESS);
 
       case 'W':
-        FLAGS_ARGMATCH (warnings, optarg);
+        FLAGS_ARGMATCH (warnings, optarg, Wall);
         break;
 
       case 'b':
@@ -603,13 +602,19 @@ getargs (int argc, char *argv[])
         /* 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)
-          spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+          {
+            free (spec_graph_file);
+            spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+          }
         break;
 
       case 'h':
@@ -632,7 +637,7 @@ getargs (int argc, char *argv[])
         break;
 
       case 'r':
-        FLAGS_ARGMATCH (report, optarg);
+        FLAGS_ARGMATCH (report, optarg, report_all);
         break;
 
       case 't':
@@ -648,7 +653,10 @@ getargs (int argc, char *argv[])
       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':
@@ -665,10 +673,11 @@ getargs (int argc, char *argv[])
         exit (EXIT_SUCCESS);
 
       case PRINT_DATADIR_OPTION:
-        printf ("%s\n", compute_pkgdatadir ());
+        printf ("%s\n", pkgdatadir ());
         exit (EXIT_SUCCESS);
 
       case REPORT_FILE_OPTION:
+        free (spec_verbose_file);
         spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
         break;