Sync from automake 1.7.5.

[bison.git] / src / muscle_tab.h

diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index 8865538fc50ca38448fe28e0574d5a3057498ab2..4dd9b0be57d639e74d9810ce2feaf3e0f85a28e2 100644 (file)
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -1,5 +1,5 @@
 /* Muscle table manager for Bison,
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -21,16 +21,10 @@
 #ifndef MUSCLE_TAB_H_
 # define MUSCLE_TAB_H_
 
-typedef struct muscle_entry_s
-{
-  const char *key;
-  char *value;
-} muscle_entry_t;
-
-void muscle_init PARAMS ((void));
-void muscle_insert PARAMS ((const char *key, char *value));
-char *muscle_find PARAMS ((const char *key));
-void muscle_free PARAMS ((void));
+void muscle_init (void);
+void muscle_insert (const char *key, char *value);
+char *muscle_find (const char *key);
+void muscle_free (void);
 
 
 /* An obstack dedicated to receive muscle keys and values.  */
@@ -57,9 +51,25 @@ extern struct obstack muscle_obstack;
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \
 }
 
-#define MUSCLE_GROW_STRING_PAIR(Key, Value1, Value2)           \
+#define MUSCLE_OBSTACK_SGROW(Obstack, Value)                   \
+{                                                              \
+  char const *p;                                               \
+  for (p = Value; *p; p++)                                     \
+    switch (*p)                                                        \
+      {                                                                \
+      case '$':        obstack_sgrow (Obstack, "$]["); break;          \
+      case '@':        obstack_sgrow (Obstack, "@@" ); break;          \
+      case '[':        obstack_sgrow (Obstack, "@{" ); break;          \
+      case ']':        obstack_sgrow (Obstack, "@}" ); break;          \
+      default: obstack_1grow (Obstack, *p); break;             \
+      }                                                                \
+}
+
+#define MUSCLE_INSERT_C_STRING(Key, Value)                     \
 {                                                              \
-  obstack_sgrow (&muscle_obstack, Value1);                     \
+  MUSCLE_OBSTACK_SGROW (&muscle_obstack,                       \
+                       quotearg_style (c_quoting_style,        \
+                                       Value));                \
   obstack_1grow (&muscle_obstack, 0);                          \
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \
 }
@@ -68,17 +78,16 @@ extern struct obstack muscle_obstack;
    previous value.  Uses MUSCLE_OBSTACK.  De-allocates the previously
    associated value.  VALUE and SEPARATOR are copied.  */
 
-void muscle_grow PARAMS ((const char *key,
-                         const char *value, const char *separator));
+void muscle_grow (const char *key, const char *value, const char *separator);
 
 /* MUSCLE is an M4 list of pairs.  Create or extend it with the pair
    (A1, A2).  Note that because the muscle values are output *double*
    quoted, one needs to strip the first level of quotes to reach the
    list itself.  */
 
-void muscle_pair_list_grow PARAMS ((const char *muscle,
-                                   const char *a1, const char *a2));
+void muscle_pair_list_grow (const char *muscle,
+                           const char *a1, const char *a2);
 
-void muscles_m4_output PARAMS ((FILE *out));
+void muscles_m4_output (FILE *out);
 
 #endif /* not MUSCLE_TAB_H_ */