report: use %empty to denote empty rules

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index dbea65d5a499bd831e45fdd99153401fd2ff05ae..15c765a455d219708eb0426c9cb36ab55fa27906 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -84,23 +84,19 @@ flag_argmatch (const char *option,
                const char * const keys[], const int values[],
                int all, int *flags, char *arg, size_t no)
 {
-  int value = 0;
-  value = XARGMATCH (option, arg + no, keys, values);
+  int value = XARGMATCH (option, arg + no, keys, values);
 
-  if (value)
+  /* -rnone == -rno-all, and -rno-none == -rall.  */
+  if (!value)
     {
-      if (no)
-        *flags &= ~value;
-      else
-        *flags |= value;
+      value = all;
+      no = !no;
     }
+
+  if (no)
+    *flags &= ~value;
   else
-    {
-      if (no)
-        *flags |= all;
-      else
-        *flags &= ~all;
-    }
+    *flags |= value;
 }
 
 /** Decode an option's set of keys.
@@ -223,136 +219,6 @@ static const int trace_types[] =
 ARGMATCH_VERIFY (trace_args, trace_types);
 
 
-/*------------------------.
-| --warnings's handling.  |
-`------------------------*/
-
-/** Decode a single argument from -W.
- *
- *  \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 arg      the subarguments to decode.
- *                  If null, then activate all the flags.
- *  \param no       length of the potential "no-" prefix.
- *                  Can be 0 or 3. If 3, negate the action of the subargument.
- *  \param err      length of a potential "error=".
- *                  Can be 0 or 6. If 6, treat the subargument as a CATEGORY
- *
- *  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
-warning_argmatch (const char *option,
-                  const char * const keys[], const int values[],
-                  int all, int *flags, char *arg, size_t no, size_t err)
-{
-  int value = 0;
-  if (!err || arg[no + err++] != '\0')
-    value = XARGMATCH (option, arg + no + err, keys, values);
-
-  if (value)
-    {
-      if (no)
-        *flags &= ~value;
-      else
-        {
-          if (err)
-            warnings_flag |= value;
-          *flags |= value;
-        }
-    }
-  else
-    {
-      /* With a simpler 'if (no)' version, -Werror means -Werror=all
-         (or rather, -Werror=no-none, but that syntax is invalid).
-         The difference is:
-         - Werror activates all errors, but not the warnings
-         - Werror=all activates errors, and all warnings */
-      if (no ? !err : err)
-        *flags |= all;
-      else
-        *flags &= ~all;
-    }
-}
-
-/** Decode a comma-separated list of arguments from -W.
- *
- *  \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.
- */
-static void
-warnings_argmatch (const char *option,
-                   const char * const keys[], const int values[],
-                   int all, int *flags, char *args)
-{
-  if (args)
-    for (args = strtok (args, ","); args; args = strtok (NULL, ","))
-      {
-        size_t no = STRPREFIX_LIT ("no-", args) ? 3 : 0;
-        size_t err = STRPREFIX_LIT ("error", args + no) ? 5 : 0;
-
-        warning_argmatch (option, keys,
-                          values, all, err ? &errors_flag : flags,
-                          args, no, err);
-      }
-  else
-    *flags |= all;
-}
-
-/** Decode a set of sub arguments.
- *
- *  \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_flag   the flag to update.
- */
-#define WARNINGS_ARGMATCH(FlagName, Args, All)                          \
-  warnings_argmatch ("--" #FlagName, FlagName ## _args, FlagName ## _types, \
-                     All, &FlagName ## _flag, Args)
-
-const char * const warnings_args[] =
-{
-  "none",
-  "midrule-values",
-  "yacc",
-  "conflicts-sr",
-  "conflicts-rr",
-  "deprecated",
-  "precedence",
-  "other",
-  "all",
-  "error",
-  0
-};
-
-const int warnings_types[] =
-{
-  Wnone,
-  Wmidrule_values,
-  Wyacc,
-  Wconflicts_sr,
-  Wconflicts_rr,
-  Wdeprecated,
-  Wprecedence,
-  Wother,
-  Wall,
-  Werror
-};
-
-ARGMATCH_VERIFY (warnings_args, warnings_types);
-
 /*-----------------------.
 | --feature's handling.  |
 `-----------------------*/
@@ -461,6 +327,7 @@ Warning categories include:\n\
   `conflicts-sr'      S/R conflicts (enabled by default)\n\
   `conflicts-rr'      R/R conflicts (enabled by default)\n\
   `deprecated'        obsolete constructs\n\
+  `empty-rule'        empty rules without %empty\n\
   `precedence'        useless precedence and associativity\n\
   `other'             all other warnings (enabled by default)\n\
   `all'               all the warnings\n\
@@ -748,7 +615,7 @@ getargs (int argc, char *argv[])
         break;
 
       case 'W':
-        WARNINGS_ARGMATCH (warnings, optarg, Wall);
+        warnings_argmatch (optarg);
         break;
 
       case 'b':
@@ -817,8 +684,7 @@ getargs (int argc, char *argv[])
         break;
 
       case 'y':
-        warnings_flag |= Wyacc;
-        errors_flag |= Wyacc;
+        warning_argmatch ("error=yacc", 0, 6);
         yacc_flag = true;
         break;