warnings: organize variadic complaints call

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

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index ce6ac2523f933520707fbfe1b12b466c37477124..be97b800fdb0b5611c8f620eaeb31d3a7351a7f6 100644 (file)
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -50,7 +50,7 @@ hash_compare_muscles (void const *x, void const *y)
 {
   muscle_entry const *m1 = x;
   muscle_entry const *m2 = y;
 {
   muscle_entry const *m1 = x;
   muscle_entry const *m2 = y;

-  return strcmp (m1->key, m2->key) == 0;
+  return STREQ (m1->key, m2->key);

 }
 
 static size_t
 }
 
 static size_t


@@ -80,7 +80,7 @@ muscle_init (void)
   obstack_init (&muscle_obstack);
 
   muscle_table = hash_initialize (HT_INITIAL_CAPACITY, NULL, hash_muscle,
   obstack_init (&muscle_obstack);
 
   muscle_table = hash_initialize (HT_INITIAL_CAPACITY, NULL, hash_muscle,

-                                 hash_compare_muscles, muscle_entry_free);
+                                  hash_compare_muscles, muscle_entry_free);

 
   /* Version and input file.  */
   MUSCLE_INSERT_STRING ("version", VERSION);
 
   /* Version and input file.  */
   MUSCLE_INSERT_STRING ("version", VERSION);


@@ -157,12 +157,9 @@ muscle_grow (const char *key, const char *val, const char *separator)
     {
       /* Grow the current value. */
       char *new_val;
     {
       /* Grow the current value. */
       char *new_val;

-      obstack_sgrow (&muscle_obstack, entry->value);
+      obstack_printf (&muscle_obstack, "%s%s%s", entry->value, separator, val);

       free (entry->storage);
       free (entry->storage);

-      obstack_sgrow (&muscle_obstack, separator);
-      obstack_sgrow (&muscle_obstack, val);
-      obstack_1grow (&muscle_obstack, 0);
-      new_val = obstack_finish (&muscle_obstack);
+      new_val = obstack_finish0 (&muscle_obstack);

       entry->value = entry->storage = xstrdup (new_val);
       obstack_free (&muscle_obstack, new_val);
     }
       entry->value = entry->storage = xstrdup (new_val);
       obstack_free (&muscle_obstack, new_val);
     }


@@ -177,12 +174,11 @@ static void
 muscle_syncline_grow (char const *key, location loc)
 {
   char *extension = NULL;
 muscle_syncline_grow (char const *key, location loc)
 {
   char *extension = NULL;

-  obstack_fgrow1 (&muscle_obstack, "]b4_syncline(%d, [[", loc.start.line);
-  obstack_escape (&muscle_obstack,
-                  quotearg_style (c_quoting_style, loc.start.file));
-  obstack_sgrow (&muscle_obstack, "]])[");
-  obstack_1grow (&muscle_obstack, 0);
-  extension = obstack_finish (&muscle_obstack);
+  obstack_printf (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line);
+  obstack_quote (&muscle_obstack,
+                 quotearg_style (c_quoting_style, loc.start.file));
+  obstack_sgrow (&muscle_obstack, ")[");
+  extension = obstack_finish0 (&muscle_obstack);

   muscle_grow (key, extension, "");
   obstack_free (&muscle_obstack, extension);
 }
   muscle_grow (key, extension, "");
   obstack_free (&muscle_obstack, extension);
 }


@@ -202,16 +198,15 @@ muscle_code_grow (const char *key, const char *val, location loc)
 
 
 void muscle_pair_list_grow (const char *muscle,
 
 
 void muscle_pair_list_grow (const char *muscle,

-                           const char *a1, const char *a2)
+                            const char *a1, const char *a2)

 {
   char *pair;
 {
   char *pair;

-  obstack_sgrow (&muscle_obstack, "[[[");
-  obstack_escape (&muscle_obstack, a1);
-  obstack_sgrow (&muscle_obstack, "]], [[");
-  obstack_escape (&muscle_obstack, a2);
-  obstack_sgrow (&muscle_obstack, "]]]");
-  obstack_1grow (&muscle_obstack, 0);
-  pair = obstack_finish (&muscle_obstack);
+  obstack_sgrow (&muscle_obstack, "[");
+  obstack_quote (&muscle_obstack, a1);
+  obstack_sgrow (&muscle_obstack, ", ");
+  obstack_quote (&muscle_obstack, a2);
+  obstack_sgrow (&muscle_obstack, "]");
+  pair = obstack_finish0 (&muscle_obstack);

   muscle_grow (muscle, pair, ",\n");
   obstack_free (&muscle_obstack, pair);
 }
   muscle_grow (muscle, pair, ",\n");
   obstack_free (&muscle_obstack, pair);
 }


@@ -259,32 +254,35 @@ muscle_find (char const *key)
 }
 
 
 }
 
 

-void
+/* In the format `file_name:line.column', append BOUND to MUSCLE.  Use
+   digraphs for special characters in the file name.  */
+
+static void

 muscle_boundary_grow (char const *key, boundary bound)
 {
   char *extension;
 muscle_boundary_grow (char const *key, boundary bound)
 {
   char *extension;

+  obstack_sgrow  (&muscle_obstack, "[[");

   obstack_escape (&muscle_obstack, bound.file);
   obstack_escape (&muscle_obstack, bound.file);

-  obstack_1grow (&muscle_obstack, ':');
-  obstack_fgrow1 (&muscle_obstack, "%d", bound.line);
-  obstack_1grow (&muscle_obstack, '.');
-  obstack_fgrow1 (&muscle_obstack, "%d", bound.column);
-  obstack_1grow (&muscle_obstack, '\0');
-  extension = obstack_finish (&muscle_obstack);
+  obstack_printf (&muscle_obstack, ":%d.%d]]", bound.line, bound.column);
+  extension = obstack_finish0 (&muscle_obstack);

   muscle_grow (key, extension, "");
   obstack_free (&muscle_obstack, extension);
 }
 
   muscle_grow (key, extension, "");
   obstack_free (&muscle_obstack, extension);
 }
 

-void
+
+/* In the format `[[file_name:line.column]], [[file_name:line.column]]',
+   append LOC to MUSCLE.  Use digraphs for special characters in each
+   file name.  */
+
+static void

 muscle_location_grow (char const *key, location loc)
 {
 muscle_location_grow (char const *key, location loc)
 {

-  muscle_grow (key, "[[", "");

   muscle_boundary_grow (key, loc.start);
   muscle_boundary_grow (key, loc.start);

-  muscle_grow (key, "]], [[", "");
+  muscle_grow (key, "", ", ");

   muscle_boundary_grow (key, loc.end);
   muscle_boundary_grow (key, loc.end);

-  muscle_grow (key, "]]", "");

 }
 
 }
 

-#define MUSCLE_COMMON_DECODE(Value)                             \
+#define COMMON_DECODE(Value)                                    \

   case '$':                                                     \
     aver (*++(Value) == ']');                                   \
     aver (*++(Value) == '[');                                   \
   case '$':                                                     \
     aver (*++(Value) == ']');                                   \
     aver (*++(Value) == '[');                                   \


@@ -303,21 +301,20 @@ muscle_location_grow (char const *key, location loc)
     obstack_1grow (&muscle_obstack, *(Value));                  \
     break;
 
     obstack_1grow (&muscle_obstack, *(Value));                  \
     break;
 

-/* Reverse of MUSCLE_OBSTACK_SGROW.  */
+/* Reverse of obstack_escape.  */

 static char *
 static char *

-muscle_string_decode (char const *key)
+string_decode (char const *key)

 {
 {

-  char const *value;
+  char const *value = muscle_find_const (key);

   char *value_decoded;
   char *result;
 
   char *value_decoded;
   char *result;
 

-  value = muscle_find_const (key);

   if (!value)
     return NULL;
   do {
     switch (*value)
       {
   if (!value)
     return NULL;
   do {
     switch (*value)
       {

-        MUSCLE_COMMON_DECODE (value)
+        COMMON_DECODE (value)

         case '[':
         case ']':
           aver (false);
         case '[':
         case ']':
           aver (false);


@@ -332,7 +329,7 @@ muscle_string_decode (char const *key)
 
 /* Reverse of muscle_location_grow.  */
 static location
 
 /* Reverse of muscle_location_grow.  */
 static location

-muscle_location_decode (char const *key)
+location_decode (char const *key)

 {
   location loc;
   char const *value = muscle_find_const (key);
 {
   location loc;
   char const *value = muscle_find_const (key);


@@ -342,7 +339,7 @@ muscle_location_decode (char const *key)
   while (*++value)
     switch (*value)
       {
   while (*++value)
     switch (*value)
       {

-        MUSCLE_COMMON_DECODE (value)
+        COMMON_DECODE (value)

         case '[':
           aver (false);
           break;
         case '[':
           aver (false);
           break;


@@ -350,8 +347,7 @@ muscle_location_decode (char const *key)
           {
             char *boundary_str;
             aver (*++value == ']');
           {
             char *boundary_str;
             aver (*++value == ']');

-            obstack_1grow (&muscle_obstack, '\0');
-            boundary_str = obstack_finish (&muscle_obstack);
+            boundary_str = obstack_finish0 (&muscle_obstack);

             switch (*++value)
               {
                 case ',':
             switch (*++value)
               {
                 case ',':


@@ -388,25 +384,49 @@ muscle_user_name_list_grow (char const *key, char const *user_name,
   muscle_grow (key, "]]", "");
 }
 
   muscle_grow (key, "]]", "");
 }
 

+/** If the \a variable name is obsolete, return the name to use,
+ * otherwise \a variable. */
+static
+char const *
+muscle_percent_variable_update (char const *variable, location variable_loc)
+{
+  typedef struct
+  {
+    const char *obsolete;
+    const char *updated;
+  } conversion_type;
+  const conversion_type conversion[] =
+    {
+      { "api.push_pull", "api.push-pull", },
+      { "lr.keep_unreachable_states", "lr.keep-unreachable-states", },
+      { "namespace", "api.namespace", },
+    };
+  char const *res = variable;
+  int i;
+  for (i = 0; i < ARRAY_CARDINALITY (conversion); ++i)
+    if (STREQ (conversion[i].obsolete, 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
 muscle_percent_define_insert (char const *variable, location variable_loc,
                               char const *value,
                               muscle_percent_define_how how)
 {
 void
 muscle_percent_define_insert (char const *variable, location variable_loc,
                               char const *value,
                               muscle_percent_define_how how)
 {

-  char *variable_tr = NULL;

   char const *name;
   char const *loc_name;
   char const *syncline_name;
   char const *how_name;
 
   /* Permit certain names with underscores for backward compatibility.  */
   char const *name;
   char const *loc_name;
   char const *syncline_name;
   char const *how_name;
 
   /* Permit certain names with underscores for backward compatibility.  */

-  if (0 == strcmp (variable, "api.push_pull")
-      || 0 == strcmp (variable, "lr.keep_unreachable_states"))
-    {
-      variable_tr = strdup (variable);
-      tr (variable_tr, '_', '-');
-      variable = variable_tr;
-    }
+  variable = muscle_percent_variable_update (variable, variable_loc);

 
   name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
   loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
 
   name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
   loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");


@@ -418,17 +438,17 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
       && muscle_find_const (name))
     {
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
       && muscle_find_const (name))
     {

-      muscle_percent_define_how how_old =
-        atoi (muscle_find_const (how_name));
+      muscle_percent_define_how how_old = atoi (muscle_find_const (how_name));
+      unsigned i = 0;

       if (how_old == MUSCLE_PERCENT_DEFINE_F)
       if (how_old == MUSCLE_PERCENT_DEFINE_F)

-        {
-          free (variable_tr);
-          return;
-        }
-      complain_at (variable_loc, _("%%define variable %s redefined"),
-                   quote (variable));
-      complain_at (muscle_percent_define_get_loc (variable),
-                   _("previous definition"));
+        return;
+      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);
     }
 
   MUSCLE_INSERT_STRING (name, value);


@@ -439,65 +459,74 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
   muscle_user_name_list_grow ("percent_define_user_variables", variable,
                               variable_loc);
   MUSCLE_INSERT_INT (how_name, how);
   muscle_user_name_list_grow ("percent_define_user_variables", variable,
                               variable_loc);
   MUSCLE_INSERT_INT (how_name, how);

+}
+
+/* This is used for backward compatibility, e.g., "%define api.pure"
+   supersedes "%pure-parser".  */
+void
+muscle_percent_define_ensure (char const *variable, location loc,
+                              bool value)
+{
+  char const *val = value ? "" : "false";
+  char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");

 
 

-  free (variable_tr);
+  /* %pure-parser is deprecated in favor of `%define api.pure', so use
+     `%define api.pure' in a backward-compatible manner here.  First,
+     don't complain if %pure-parser is specified multiple times.  */
+  if (!muscle_find_const (name))
+    muscle_percent_define_insert (variable, loc, val,
+                                  MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+  /* In all cases, use api.pure now so that the backend doesn't complain if
+     the skeleton ignores api.pure, but do warn now if there's a previous
+     conflicting definition from an actual %define.  */
+  if (muscle_percent_define_flag_if (variable) != value)
+    muscle_percent_define_insert (variable, loc, val,
+                                  MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);

 }
 
 char *
 muscle_percent_define_get (char const *variable)
 {
 }
 
 char *
 muscle_percent_define_get (char const *variable)
 {

-  char const *name;
-  char const *usage_name;
-  char *value;
-
-  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
-  usage_name = UNIQSTR_CONCAT ("percent_define_bison_variables(",
-                               variable, ")");
-
-  muscle_insert (usage_name, "");
-  value = muscle_string_decode (name);
+  char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  char const *usage_name =
+    UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")");
+  char *value = string_decode (name);

   if (!value)
     value = xstrdup ("");
   if (!value)
     value = xstrdup ("");

+
+  muscle_insert (usage_name, "");

   return value;
 }
 
 location
 muscle_percent_define_get_loc (char const *variable)
 {
   return value;
 }
 
 location
 muscle_percent_define_get_loc (char const *variable)
 {

-  char const *loc_name;
-  loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
+  char const *loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");

   if (!muscle_find_const (loc_name))
   if (!muscle_find_const (loc_name))

-    fatal(_("%s: undefined %%define variable %s"),
-          "muscle_percent_define_get_loc", quote (variable));
-  return muscle_location_decode (loc_name);
+    complain (NULL, fatal, _("%s: undefined %%define variable %s"),
+              "muscle_percent_define_get_loc", quote (variable));
+  return location_decode (loc_name);

 }
 
 char const *
 muscle_percent_define_get_syncline (char const *variable)
 {
 }
 
 char const *
 muscle_percent_define_get_syncline (char const *variable)
 {

-  char const *syncline_name;
-  char const *syncline;
-  syncline_name =
+  char const *syncline_name =

     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");

-  syncline = muscle_find_const (syncline_name);
+  char const *syncline = muscle_find_const (syncline_name);

   if (!syncline)
   if (!syncline)

-    fatal(_("%s: undefined %%define variable %s"),
-          "muscle_percent_define_get_syncline", quote (variable));
+    complain (NULL, fatal, _("%s: undefined %%define variable %s"),
+              "muscle_percent_define_get_syncline", quote (variable));

   return syncline;
 }
 
 bool
 muscle_percent_define_ifdef (char const *variable)
 {
   return syncline;
 }
 
 bool
 muscle_percent_define_ifdef (char const *variable)
 {

-  char const *name;
-  char const *usage_name;
-  char const *value;
-
-  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
-  usage_name =
+  char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  char const *usage_name =

     UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")");
     UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")");

-
-  value = muscle_find_const (name);
+  char const *value = muscle_find_const (name);

   if (value)
     {
       muscle_insert (usage_name, "");
   if (value)
     {
       muscle_insert (usage_name, "");


@@ -510,31 +539,30 @@ muscle_percent_define_ifdef (char const *variable)
 bool
 muscle_percent_define_flag_if (char const *variable)
 {
 bool
 muscle_percent_define_flag_if (char const *variable)
 {

-  char const *invalid_boolean_name;
-  bool result = false;
-
-  invalid_boolean_name =
+  char const *invalid_boolean_name =

     UNIQSTR_CONCAT ("percent_define_invalid_boolean(", variable, ")");
     UNIQSTR_CONCAT ("percent_define_invalid_boolean(", variable, ")");

+  bool result = false;

 
   if (muscle_percent_define_ifdef (variable))
     {
       char *value = muscle_percent_define_get (variable);
 
   if (muscle_percent_define_ifdef (variable))
     {
       char *value = muscle_percent_define_get (variable);

-      if (value[0] == '\0' || 0 == strcmp (value, "true"))
+      if (value[0] == '\0' || STREQ (value, "true"))

         result = true;
         result = true;

-      else if (0 == strcmp (value, "false"))
+      else if (STREQ (value, "false"))

         result = false;
       else if (!muscle_find_const (invalid_boolean_name))
         {
           muscle_insert (invalid_boolean_name, "");
         result = false;
       else if (!muscle_find_const (invalid_boolean_name))
         {
           muscle_insert (invalid_boolean_name, "");

-          complain_at(muscle_percent_define_get_loc (variable),
-                      _("invalid value for %%define Boolean variable %s"),
-                      quote (variable));
+          location loc = muscle_percent_define_get_loc (variable);
+          complain (&loc, complaint,
+                    _("invalid value for %%define Boolean variable %s"),
+                    quote (variable));

         }
       free (value);
     }
   else
         }
       free (value);
     }
   else

-    fatal(_("%s: undefined %%define variable %s"),
-          "muscle_percent_define_flag", quote (variable));
+    complain (NULL, fatal, _("%s: undefined %%define variable %s"),
+              "muscle_percent_define_flag", quote (variable));

 
   return result;
 }
 
   return result;
 }


@@ -542,12 +570,9 @@ muscle_percent_define_flag_if (char const *variable)
 void
 muscle_percent_define_default (char const *variable, char const *value)
 {
 void
 muscle_percent_define_default (char const *variable, char const *value)
 {

-  char const *name;
-  char const *loc_name;
-  char const *syncline_name;
-  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
-  loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
-  syncline_name =
+  char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  char const *loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
+  char const *syncline_name =

     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
   if (!muscle_find_const (name))
     {
     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
   if (!muscle_find_const (name))
     {


@@ -568,27 +593,27 @@ muscle_percent_define_check_values (char const * const *values)
   for (; *values; ++values)
     {
       char const * const *variablep = values;
   for (; *values; ++values)
     {
       char const * const *variablep = values;

-      char const *name;
-      char *value;
-
-      name = UNIQSTR_CONCAT ("percent_define(", *variablep, ")");
-
-      value = muscle_string_decode (name);
+      char const *name = UNIQSTR_CONCAT ("percent_define(", *variablep, ")");
+      char *value = string_decode (name);

       if (value)
         {
           for (++values; *values; ++values)
             {
       if (value)
         {
           for (++values; *values; ++values)
             {

-              if (0 == strcmp (value, *values))
+              if (STREQ (value, *values))

                 break;
             }
           if (!*values)
             {
                 break;
             }
           if (!*values)
             {

+              unsigned i = 0;

               location loc = muscle_percent_define_get_loc (*variablep);
               location loc = muscle_percent_define_get_loc (*variablep);

-              complain_at(loc,
-                          _("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)
               for (values = variablep + 1; *values; ++values)

-                complain_at (loc, _("accepted value: %s"), quote (*values));
+                complain_at_indent (loc, complaint, &i, _("accepted value: %s"),
+                                    quote (*values));

             }
           else
             {
             }
           else
             {


@@ -598,8 +623,8 @@ muscle_percent_define_check_values (char const * const *values)
           free (value);
         }
       else
           free (value);
         }
       else

-        fatal (_("%s: undefined %%define variable %s"),
-               "muscle_percent_define_check_values", quote (*variablep));
+        complain (NULL, fatal, _("%s: undefined %%define variable %s"),
+                  "muscle_percent_define_check_values", quote (*variablep));

     }
 }
 
     }
 }
 


@@ -607,8 +632,7 @@ void
 muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
                           char const *code, location code_loc)
 {
 muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
                           char const *code, location code_loc)
 {

-  char const *name;
-  name = UNIQSTR_CONCAT ("percent_code(", qualifier, ")");
+  char const *name = UNIQSTR_CONCAT ("percent_code(", qualifier, ")");

   muscle_code_grow (name, code, code_loc);
   muscle_user_name_list_grow ("percent_code_user_qualifiers", qualifier,
                                qualifier_loc);
   muscle_code_grow (name, code, code_loc);
   muscle_user_name_list_grow ("percent_code_user_qualifiers", qualifier,
                                qualifier_loc);


@@ -622,8 +646,9 @@ muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
 static inline bool
 muscle_m4_output (muscle_entry *entry, FILE *out)
 {
 static inline bool
 muscle_m4_output (muscle_entry *entry, FILE *out)
 {

-  fprintf (out, "m4_define([b4_%s],\n", entry->key);
-  fprintf (out, "[[%s]])\n\n\n", entry->value);
+  fprintf (out,
+           "m4_define([b4_%s],\n"
+           "[[%s]])\n\n\n", entry->key, entry->value);

   return true;
 }
 
   return true;
 }