warnings: organize variadic complaints call

[bison.git] / src / muscle-tab.c

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index a55b6c496200a0775ce56f9d0d26f9a36187db37..be97b800fdb0b5611c8f620eaeb31d3a7351a7f6 100644 (file)
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -388,7 +388,7 @@ muscle_user_name_list_grow (char const *key, char const *user_name,
  * otherwise \a variable. */
 static
 char const *
-muscle_percent_variable_update (char const *variable)
+muscle_percent_variable_update (char const *variable, location variable_loc)
 {
   typedef struct
   {
@@ -401,11 +401,18 @@ muscle_percent_variable_update (char const *variable)
       { "lr.keep_unreachable_states", "lr.keep-unreachable-states", },
       { "namespace", "api.namespace", },
     };
+  char const *res = variable;
   int i;
-  for (i = 0; i < sizeof conversion / sizeof *conversion; ++i)
+  for (i = 0; i < ARRAY_CARDINALITY (conversion); ++i)
     if (STREQ (conversion[i].obsolete, variable))
-      return conversion[i].updated;
-  return variable;
+      {
+        res = conversion[i].updated;
+        complain (&variable_loc, Wdeprecated,
+                  _("deprecated %%define variable name: %s, use %s"),
+                  quote (variable), quote_n (1, res));
+        break;
+      }
+  return res;
 }
 
 void
@@ -419,7 +426,7 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
   char const *how_name;
 
   /* Permit certain names with underscores for backward compatibility.  */
-  variable = muscle_percent_variable_update (variable);
+  variable = muscle_percent_variable_update (variable, variable_loc);
 
   name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
   loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
@@ -432,12 +439,16 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
       && muscle_find_const (name))
     {
       muscle_percent_define_how how_old = atoi (muscle_find_const (how_name));
+      unsigned i = 0;
       if (how_old == MUSCLE_PERCENT_DEFINE_F)
         return;
-      complain_at (variable_loc, complaint, _("%%define variable %s redefined"),
-                   quote (variable));
-      location loc = muscle_percent_define_get_loc (variable);
-      complain_at (loc, complaint, _("previous definition"));
+      complain_at_indent (variable_loc, complaint, &i,
+                          _("%%define variable %s redefined"),
+                          quote (variable));
+      i += SUB_INDENT;
+      complain_at_indent (muscle_percent_define_get_loc (variable),
+                          complaint, &i,
+                          _("previous definition"));
     }
 
   MUSCLE_INSERT_STRING (name, value);
@@ -492,7 +503,7 @@ muscle_percent_define_get_loc (char const *variable)
 {
   char const *loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
   if (!muscle_find_const (loc_name))
-    complain (fatal, _("%s: undefined %%define variable %s"),
+    complain (NULL, fatal, _("%s: undefined %%define variable %s"),
               "muscle_percent_define_get_loc", quote (variable));
   return location_decode (loc_name);
 }
@@ -504,7 +515,7 @@ muscle_percent_define_get_syncline (char const *variable)
     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
   char const *syncline = muscle_find_const (syncline_name);
   if (!syncline)
-    complain (fatal, _("%s: undefined %%define variable %s"),
+    complain (NULL, fatal, _("%s: undefined %%define variable %s"),
               "muscle_percent_define_get_syncline", quote (variable));
   return syncline;
 }
@@ -543,14 +554,14 @@ muscle_percent_define_flag_if (char const *variable)
         {
           muscle_insert (invalid_boolean_name, "");
           location loc = muscle_percent_define_get_loc (variable);
-          complain_at (loc, complaint,
-                       _("invalid value for %%define Boolean variable %s"),
-                       quote (variable));
+          complain (&loc, complaint,
+                    _("invalid value for %%define Boolean variable %s"),
+                    quote (variable));
         }
       free (value);
     }
   else
-    complain (fatal, _("%s: undefined %%define variable %s"),
+    complain (NULL, fatal, _("%s: undefined %%define variable %s"),
               "muscle_percent_define_flag", quote (variable));
 
   return result;
@@ -593,13 +604,16 @@ muscle_percent_define_check_values (char const * const *values)
             }
           if (!*values)
             {
+              unsigned i = 0;
               location loc = muscle_percent_define_get_loc (*variablep);
-              complain_at (loc, complaint,
-                           _("invalid value for %%define variable %s: %s"),
-                           quote (*variablep), quote_n (1, value));
+              complain_at_indent
+                (loc, complaint, &i,
+                 _("invalid value for %%define variable %s: %s"),
+                 quote (*variablep), quote_n (1, value));
+              i += SUB_INDENT;
               for (values = variablep + 1; *values; ++values)
-                complain_at (loc, complaint, _("accepted value: %s"),
-                             quote (*values));
+                complain_at_indent (loc, complaint, &i, _("accepted value: %s"),
+                                    quote (*values));
             }
           else
             {
@@ -609,7 +623,7 @@ muscle_percent_define_check_values (char const * const *values)
           free (value);
         }
       else
-        complain (fatal, _("%s: undefined %%define variable %s"),
+        complain (NULL, fatal, _("%s: undefined %%define variable %s"),
                   "muscle_percent_define_check_values", quote (*variablep));
     }
 }