muscle: minor refactoring

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

diff --git a/src/muscle-tab.h b/src/muscle-tab.h
index 7eff4f5a9e60c01b543a267cd789cf99dfd797e7..59c87510f73d8ff0a56261624a7a76fcd19e04a9 100644 (file)
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,6 +1,6 @@
 /* Muscle table manager for Bison,
 
 /* Muscle table manager for Bison,
 

-   Copyright (C) 2001-2003, 2006-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc.

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


@@ -34,41 +34,39 @@ void muscle_free (void);
 /* An obstack dedicated to receive muscle keys and values.  */
 extern struct obstack muscle_obstack;
 
 /* An obstack dedicated to receive muscle keys and values.  */
 extern struct obstack muscle_obstack;
 

-#define MUSCLE_INSERT_BOOL(Key, Value)                          \
-  do {                                                          \
-    int v__ = Value;                                            \
-    MUSCLE_INSERT_INT (Key, v__);                               \
+# define MUSCLE_INSERT_BOOL(Key, Value)         \
+  do {                                          \
+    int v__ = Value;                            \
+    MUSCLE_INSERT_INT (Key, v__);               \

   } while (0)
 
   } while (0)
 

-#define MUSCLE_INSERTF(Key, Format, Value)                      \
+# define MUSCLE_INSERTF(Key, Format, Value)                     \

   do {                                                          \
     obstack_printf (&muscle_obstack, Format, Value);            \
     muscle_insert (Key, obstack_finish0 (&muscle_obstack));     \
   } while (0)
 
   do {                                                          \
     obstack_printf (&muscle_obstack, Format, Value);            \
     muscle_insert (Key, obstack_finish0 (&muscle_obstack));     \
   } while (0)
 

-#define MUSCLE_INSERT_INT(Key, Value)                           \
+# define MUSCLE_INSERT_INT(Key, Value)          \

   MUSCLE_INSERTF(Key, "%d", Value)
 
   MUSCLE_INSERTF(Key, "%d", Value)
 

-#define MUSCLE_INSERT_LONG_INT(Key, Value)                      \
+# define MUSCLE_INSERT_LONG_INT(Key, Value)     \

   MUSCLE_INSERTF(Key, "%ld", Value)
 
 /* Key -> Value, but don't apply escaping to Value. */
   MUSCLE_INSERTF(Key, "%ld", Value)
 
 /* Key -> Value, but don't apply escaping to Value. */

-#define MUSCLE_INSERT_STRING_RAW(Key, Value)                    \
+# define MUSCLE_INSERT_STRING_RAW(Key, Value)   \

   MUSCLE_INSERTF(Key, "%s", Value)
 
 /* Key -> Value, applying M4 escaping to Value. */
   MUSCLE_INSERTF(Key, "%s", Value)
 
 /* Key -> Value, applying M4 escaping to Value. */

-#define MUSCLE_INSERT_STRING(Key, Value)                        \
+# define MUSCLE_INSERT_STRING(Key, Value)                       \

   do {                                                          \
     obstack_escape (&muscle_obstack, Value);                    \
     muscle_insert (Key, obstack_finish0 (&muscle_obstack));     \
   } while (0)
 
   do {                                                          \
     obstack_escape (&muscle_obstack, Value);                    \
     muscle_insert (Key, obstack_finish0 (&muscle_obstack));     \
   } while (0)
 

-#define MUSCLE_INSERT_C_STRING(Key, Value)                      \
-  do {                                                          \
-    obstack_escape (&muscle_obstack,                            \
-                    quotearg_style (c_quoting_style, Value));   \
-    muscle_insert (Key, obstack_finish0 (&muscle_obstack));     \
-  } while (0)
+/* Key -> Value, applying C escaping to Value (and then M4). */
+# define MUSCLE_INSERT_C_STRING(Key, Value)                     \
+  MUSCLE_INSERT_STRING(Key, quotearg_style (c_quoting_style, Value))
+

 
 /* Append VALUE to the current value of KEY.  If KEY did not already
    exist, create it.  Use MUSCLE_OBSTACK.  De-allocate the previously
 
 /* Append VALUE to the current value of KEY.  If KEY did not already
    exist, create it.  Use MUSCLE_OBSTACK.  De-allocate the previously


@@ -92,7 +90,7 @@ void muscle_pair_list_grow (const char *muscle,
 
 /* Grow KEY for the occurrence of the name USER_NAME at LOC appropriately for
    use with b4_check_user_names in ../data/bison.m4.  USER_NAME is not escaped
 
 /* Grow KEY for the occurrence of the name USER_NAME at LOC appropriately for
    use with b4_check_user_names in ../data/bison.m4.  USER_NAME is not escaped

-   with digraphs, so it must not contain `[' or `]'.  */
+   with digraphs, so it must not contain '[' or ']'.  */

 void muscle_user_name_list_grow (char const *key, char const *user_name,
                                  location loc);
 
 void muscle_user_name_list_grow (char const *key, char const *user_name,
                                  location loc);