X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4aa9d1ff9ca9b838fe02a9bfe5ae4b0f935e5451..5aaad6c43154f3e69c4e49616d29b1f95b012881:/src/muscle-tab.c

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index e366d33b..57050d05 100644
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -21,12 +21,12 @@
 #include "system.h"
 
 #include <hash.h>
-#include <quotearg.h>
 
 #include "complain.h"
 #include "files.h"
-#include "muscle-tab.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.  */
@@ -50,7 +50,7 @@ hash_compare_muscles (void const *x, void const *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
@@ -407,7 +407,7 @@ muscle_percent_variable_update (char const *variable)
     };
   int i;
   for (i = 0; i < sizeof conversion / sizeof *conversion; ++i)
-    if (!strcmp (conversion[i].obsolete, variable))
+    if (STREQ (conversion[i].obsolete, variable))
       return conversion[i].updated;
   return variable;
 }
@@ -439,8 +439,8 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
         atoi (muscle_find_const (how_name));
       if (how_old == MUSCLE_PERCENT_DEFINE_F)
         return;
-      complain_at (variable_loc, _("%%define variable '%s' redefined"),
-                   variable);
+      complain_at (variable_loc, _("%%define variable %s redefined"),
+                   quote (variable));
       complain_at (muscle_percent_define_get_loc (variable),
                    _("previous definition"));
     }
@@ -503,8 +503,8 @@ muscle_percent_define_get_loc (char const *variable)
   char const *loc_name;
   loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
   if (!muscle_find_const (loc_name))
-    fatal(_("undefined %%define variable '%s' passed to"
-            " muscle_percent_define_get_loc"), variable);
+    fatal(_("%s: undefined %%define variable %s"),
+          "muscle_percent_define_get_loc", quote (variable));
   return muscle_location_decode (loc_name);
 }
 
@@ -517,8 +517,8 @@ muscle_percent_define_get_syncline (char const *variable)
     UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
   syncline = muscle_find_const (syncline_name);
   if (!syncline)
-    fatal(_("undefined %%define variable '%s' passed to"
-            " muscle_percent_define_get_syncline"), variable);
+    fatal(_("%s: undefined %%define variable %s"),
+          "muscle_percent_define_get_syncline", quote (variable));
   return syncline;
 }
 
@@ -555,22 +555,22 @@ muscle_percent_define_flag_if (char const *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;
-      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, "");
           complain_at(muscle_percent_define_get_loc (variable),
-                      _("invalid value for %%define Boolean variable '%s'"),
-                      variable);
+                      _("invalid value for %%define Boolean variable %s"),
+                      quote (variable));
         }
       free (value);
     }
   else
-    fatal(_("undefined %%define variable '%s' passed to muscle_percent_define_flag_if"),
-          variable);
+    fatal(_("%s: undefined %%define variable %s"),
+          "muscle_percent_define_flag", quote (variable));
 
   return result;
 }
@@ -614,17 +614,17 @@ muscle_percent_define_check_values (char const * const *values)
         {
           for (++values; *values; ++values)
             {
-              if (0 == strcmp (value, *values))
+              if (STREQ (value, *values))
                 break;
             }
           if (!*values)
             {
               location loc = muscle_percent_define_get_loc (*variablep);
               complain_at(loc,
-                          _("invalid value for %%define variable '%s': '%s'"),
-                          *variablep, value);
+                          _("invalid value for %%define variable %s: %s"),
+                          quote (*variablep), quote_n (1, value));
               for (values = variablep + 1; *values; ++values)
-                complain_at (loc, _("accepted value: '%s'"), *values);
+                complain_at (loc, _("accepted value: %s"), quote (*values));
             }
           else
             {
@@ -634,9 +634,8 @@ muscle_percent_define_check_values (char const * const *values)
           free (value);
         }
       else
-        fatal(_("undefined %%define variable '%s' passed to"
-                " muscle_percent_define_check_values"),
-              *variablep);
+        fatal (_("%s: undefined %%define variable %s"),
+               "muscle_percent_define_check_values", quote (*variablep));
     }
 }