(readpipe): Remove decl.

[bison.git] / src / muscle_tab.h

diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index 00e9edfe0ae4b2db20dfaf2acc83106d983f582e..8865538fc50ca38448fe28e0574d5a3057498ab2 100644 (file)
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -1,4 +1,4 @@
-/* Definitions for macrotab.c and callers, part of bison,
+/* Muscle table manager for Bison,
    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
@@ -21,17 +21,15 @@
 #ifndef MUSCLE_TAB_H_
 # define MUSCLE_TAB_H_
 
-# define MTABSIZE 101
-
 typedef struct muscle_entry_s
 {
   const char *key;
-  const char *value;
+  char *value;
 } muscle_entry_t;
 
 void muscle_init PARAMS ((void));
-void muscle_insert PARAMS ((const char *key, const char *value));
-const char *muscle_find PARAMS ((const char *key));
+void muscle_insert PARAMS ((const char *key, char *value));
+char *muscle_find PARAMS ((const char *key));
 void muscle_free PARAMS ((void));
 
 
@@ -59,14 +57,27 @@ extern struct obstack muscle_obstack;
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \
 }
 
-#define MUSCLE_INSERT_PREFIX(Key, Value)                               \
-{                                                                      \
-  obstack_fgrow2 (&muscle_obstack, "%s%s",                             \
-                 spec_name_prefix ? spec_name_prefix : "yy", Value);   \
-  obstack_1grow (&muscle_obstack, 0);                                  \
-  muscle_insert (Key, obstack_finish (&muscle_obstack));               \
+#define MUSCLE_GROW_STRING_PAIR(Key, Value1, Value2)           \
+{                                                              \
+  obstack_sgrow (&muscle_obstack, Value1);                     \
+  obstack_1grow (&muscle_obstack, 0);                          \
+  muscle_insert (Key, obstack_finish (&muscle_obstack));       \
 }
 
+/* Insert (KEY, VALUE).  If KEY already existed, overwrite the
+   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));
+
+/* 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 muscles_m4_output PARAMS ((FILE *out));