regen.

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

diff --git a/src/muscle-tab.c b/src/muscle-tab.c
index 370a353871e3cda949e41088f576a1ebd8733898..47d9fb654421817b5cc6511c7f759aeff685303e 100644 (file)
--- a/src/muscle-tab.c
+++ b/src/muscle-tab.c
@@ -1,6 +1,6 @@
 /* Muscle table manager for Bison.
 
 /* Muscle table manager for Bison.
 

-   Copyright (C) 2001-2011 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.
 


@@ -21,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.  */


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


@@ -179,7 +179,7 @@ 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,
   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));
+                        quotearg_style (c_quoting_style, loc.start.file));

   obstack_sgrow (&muscle_obstack, "]])[");
   obstack_1grow (&muscle_obstack, 0);
   extension = obstack_finish (&muscle_obstack);
   obstack_sgrow (&muscle_obstack, "]])[");
   obstack_1grow (&muscle_obstack, 0);
   extension = obstack_finish (&muscle_obstack);


@@ -202,7 +202,7 @@ 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;
   obstack_sgrow (&muscle_obstack, "[[[");
 {
   char *pair;
   obstack_sgrow (&muscle_obstack, "[[[");


@@ -407,7 +407,7 @@ muscle_percent_variable_update (char const *variable)
     };
   int i;
   for (i = 0; i < sizeof conversion / sizeof *conversion; ++i)
     };
   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;
 }
       return conversion[i].updated;
   return variable;
 }


@@ -439,10 +439,10 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
         atoi (muscle_find_const (how_name));
       if (how_old == MUSCLE_PERCENT_DEFINE_F)
         return;
         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 (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);


@@ -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))
   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);
+    complain (fatal, _("%s: undefined %%define variable %s"),
+          "muscle_percent_define_get_loc", quote (variable));

   return muscle_location_decode (loc_name);
 }
 
   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)
     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);
+    complain (fatal, _("%s: undefined %%define variable %s"),
+          "muscle_percent_define_get_syncline", quote (variable));

   return syncline;
 }
 
   return syncline;
 }
 


@@ -555,22 +555,23 @@ muscle_percent_define_flag_if (char const *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;
 }


@@ -614,17 +615,18 @@ muscle_percent_define_check_values (char const * const *values)
         {
           for (++values; *values; ++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);
                 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
             {


@@ -634,9 +636,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));

     }
 }
 
     }
 }