Merge remote-tracking branch 'origin/maint'

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

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index bfb78036817e03a2d57cca9f613f3e930fcb5722..8e5698127cd81e51d3a15ad0a1ef51212ca72e69 100644 (file)
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -1,7 +1,6 @@
 /* Muscle table manager for Bison.
 
 /* Muscle table manager for Bison.
 

-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2001-2012 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -22,12 +21,12 @@
 #include "system.h"
 
 #include <hash.h>
 #include "system.h"
 
 #include <hash.h>

-#include <quotearg.h>

 
 #include "complain.h"
 #include "files.h"
 
 #include "complain.h"
 #include "files.h"

-#include "muscle-tab.h"

 #include "getargs.h"
 #include "getargs.h"

+#include "muscle-tab.h"
+#include "quote.h"

 
 /* A key-value pair, along with storage that can be reclaimed when
    this pair is no longer needed.  */
 
 /* A key-value pair, along with storage that can be reclaimed when
    this pair is no longer needed.  */


@@ -51,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


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


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


@@ -178,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);
-  MUSCLE_OBSTACK_SGROW (&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);
 }


@@ -203,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, "[[[");
-  MUSCLE_OBSTACK_SGROW (&muscle_obstack, a1);
-  obstack_sgrow (&muscle_obstack, "]], [[");
-  MUSCLE_OBSTACK_SGROW (&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);
 }


@@ -260,65 +254,67 @@ 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;

-  MUSCLE_OBSTACK_SGROW (&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_sgrow  (&muscle_obstack, "[[");
+  obstack_escape (&muscle_obstack, bound.file);
+  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)                                           \
-  case '$':                                                                   \
-    aver (*++(Value) == ']');                                                 \
-    aver (*++(Value) == '[');                                                 \
-    obstack_sgrow (&muscle_obstack, "$");                                     \
-    break;                                                                    \
-  case '@':                                                                   \
-    switch (*++(Value))                                                       \
-      {                                                                       \
-        case '@': obstack_sgrow (&muscle_obstack, "@" ); break;               \
-        case '{': obstack_sgrow (&muscle_obstack, "[" ); break;               \
-        case '}': obstack_sgrow (&muscle_obstack, "]" ); break;               \
-        default: aver (false); break;                                         \
-      }                                                                       \
-    break;                                                                    \
-  default:                                                                    \
-    obstack_1grow (&muscle_obstack, *(Value));                                \
+#define COMMON_DECODE(Value)                                    \
+  case '$':                                                     \
+    aver (*++(Value) == ']');                                   \
+    aver (*++(Value) == '[');                                   \
+    obstack_sgrow (&muscle_obstack, "$");                       \
+    break;                                                      \
+  case '@':                                                     \
+    switch (*++(Value))                                         \
+      {                                                         \
+        case '@': obstack_sgrow (&muscle_obstack, "@" ); break; \
+        case '{': obstack_sgrow (&muscle_obstack, "[" ); break; \
+        case '}': obstack_sgrow (&muscle_obstack, "]" ); break; \
+        default: aver (false); break;                           \
+      }                                                         \
+    break;                                                      \
+  default:                                                      \
+    obstack_1grow (&muscle_obstack, *(Value));                  \

     break;
 
     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);


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


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


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


@@ -393,7 +388,7 @@ muscle_user_name_list_grow (char const *key, char const *user_name,
  * otherwise \a variable. */
 static
 char const *
  * 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
   {
 {
   typedef struct
   {


@@ -406,25 +401,20 @@ muscle_percent_variable_update (char const *variable)
       { "lr.keep_unreachable_states", "lr.keep-unreachable-states", },
       { "namespace", "api.namespace", },
     };
       { "lr.keep_unreachable_states", "lr.keep-unreachable-states", },
       { "namespace", "api.namespace", },
     };

+  char const *res = variable;

   int i;
   int i;

-  for (i = 0; i < sizeof conversion / sizeof *conversion; ++i)
-    if (!strcmp (conversion[i].obsolete, variable))
-      return conversion[i].updated;
-  return variable;
+  for (i = 0; i < ARRAY_CARDINALITY (conversion); ++i)
+    if (STREQ (conversion[i].obsolete, variable))
+      {
+        res = conversion[i].updated;
+        complain_at (variable_loc, Wdeprecated,
+                     _("deprecated %%define variable name: %s, use %s"),
+                     quote (variable), quote_n (1, res));
+        break;
+      }
+  return res;

 }
 
 }
 

-#define MUSCLE_USER_NAME_CONVERT(NAME, PREFIX, USER_NAME, SUFFIX)    \
-do {                                                                 \
-  char *tmp;                                                         \
-  size_t length = strlen ((USER_NAME));                              \
-  tmp = xmalloc (sizeof (PREFIX) - 1 + length + sizeof (SUFFIX));    \
-  strcpy (tmp, (PREFIX));                                            \
-  strcpy (tmp + sizeof (PREFIX) - 1, (USER_NAME));                   \
-  strcpy (tmp + sizeof (PREFIX) - 1 + length, (SUFFIX));             \
-  (NAME) = uniqstr_new (tmp);                                        \
-  free (tmp);                                                        \
-} while (0)
-

 void
 muscle_percent_define_insert (char const *variable, location variable_loc,
                               char const *value,
 void
 muscle_percent_define_insert (char const *variable, location variable_loc,
                               char const *value,


@@ -436,26 +426,25 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
   char const *how_name;
 
   /* Permit certain names with underscores for backward compatibility.  */
   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);

 
 

-  MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (syncline_name,
-                            "percent_define_syncline(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (how_name, "percent_define_how(", variable, ")");
+  name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
+  syncline_name =
+    UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
+  how_name = UNIQSTR_CONCAT ("percent_define_how(", variable, ")");

 
   /* Command-line options are processed before the grammar file.  */
   if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
       && muscle_find_const (name))
     {
 
   /* Command-line options are processed before the grammar file.  */
   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));

       if (how_old == MUSCLE_PERCENT_DEFINE_F)
         return;
       if (how_old == MUSCLE_PERCENT_DEFINE_F)
         return;

-      complain_at (variable_loc, _("%s `%s' redefined"),
-                   "%define variable", variable);
-      complain_at (muscle_percent_define_get_loc (variable),
-                   _("previous definition"));
+      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"));

     }
 
   MUSCLE_INSERT_STRING (name, value);
     }
 
   MUSCLE_INSERT_STRING (name, value);


@@ -475,8 +464,7 @@ muscle_percent_define_ensure (char const *variable, location loc,
                               bool value)
 {
   char const *val = value ? "" : "false";
                               bool value)
 {
   char const *val = value ? "" : "false";

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

 
   /* %pure-parser is deprecated in favor of `%define api.pure', so use
      `%define api.pure' in a backward-compatible manner here.  First,
 
   /* %pure-parser is deprecated in favor of `%define api.pure', so use
      `%define api.pure' in a backward-compatible manner here.  First,


@@ -495,58 +483,46 @@ muscle_percent_define_ensure (char const *variable, location loc,
 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;
-
-  MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (usage_name, "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;
-  MUSCLE_USER_NAME_CONVERT (loc_name, "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(_("undefined %%define variable `%s' passed to muscle_percent_define_get_loc"),
-          variable);
-  return muscle_location_decode (loc_name);
+    complain (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;
-  MUSCLE_USER_NAME_CONVERT (syncline_name,
-                            "percent_define_syncline(", variable, ")");
-  syncline = muscle_find_const (syncline_name);
+  char const *syncline_name =
+    UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
+  char const *syncline = muscle_find_const (syncline_name);

   if (!syncline)
   if (!syncline)

-    fatal(_("undefined %%define variable `%s' passed to muscle_percent_define_get_syncline"),
-          variable);
+    complain (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;
-
-  MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (usage_name, "percent_define_bison_variables(",
-                            variable, ")");
-
-  value = muscle_find_const (name);
+  char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
+  char const *usage_name =
+    UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")");
+  char const *value = muscle_find_const (name);

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


@@ -559,31 +535,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;
+  char const *invalid_boolean_name =
+    UNIQSTR_CONCAT ("percent_define_invalid_boolean(", variable, ")");

   bool result = false;
 
   bool result = false;
 

-  MUSCLE_USER_NAME_CONVERT (invalid_boolean_name,
-                            "percent_define_invalid_boolean(", variable, ")");
-

   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'"),
-                      variable);
+          location loc = muscle_percent_define_get_loc (variable);
+          complain_at (loc, complaint,
+                       _("invalid value for %%define Boolean variable %s"),
+                       quote (variable));

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

-    fatal(_("undefined %%define variable `%s' passed to muscle_percent_define_flag_if"),
-          variable);
+    complain (fatal, _("%s: undefined %%define variable %s"),
+              "muscle_percent_define_flag", quote (variable));

 
   return result;
 }
 
   return result;
 }


@@ -591,13 +566,10 @@ 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;
-  MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")");
-  MUSCLE_USER_NAME_CONVERT (syncline_name,
-                            "percent_define_syncline(", variable, ")");
+  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))
     {
       location loc;
   if (!muscle_find_const (name))
     {
       location loc;


@@ -617,27 +589,24 @@ 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;
-
-      MUSCLE_USER_NAME_CONVERT (name, "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)
             {
               location loc = muscle_percent_define_get_loc (*variablep);
                 break;
             }
           if (!*values)
             {
               location loc = muscle_percent_define_get_loc (*variablep);

-              complain_at(loc,
-                          _("invalid value for %%define variable `%s': `%s'"),
-                          *variablep, value);
+              complain_at (loc, complaint,
+                           _("invalid value for %%define variable %s: %s"),
+                           quote (*variablep), quote_n (1, value));

               for (values = variablep + 1; *values; ++values)
               for (values = variablep + 1; *values; ++values)

-                complain_at (loc, _("accepted value: `%s'"), *values);
+                complain_at (loc, complaint, _("accepted value: %s"),
+                             quote (*values));

             }
           else
             {
             }
           else
             {


@@ -647,9 +616,8 @@ muscle_percent_define_check_values (char const * const *values)
           free (value);
         }
       else
           free (value);
         }
       else

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

     }
 }
 
     }
 }
 


@@ -657,8 +625,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;
-  MUSCLE_USER_NAME_CONVERT (name, "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);


@@ -672,8 +639,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;
 }