X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f7737e2e16cb9a49c258ac4b82b2b5f4fa9d0f18..927b425baae16fc1d50e092b78b944e281b521f6:/src/muscle_tab.h

diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index 00e9edfe..9e8ac24f 100644
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -1,5 +1,5 @@
-/* Definitions for macrotab.c and callers, part of bison,
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+/* Muscle table manager for Bison,
+   Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -15,39 +15,39 @@
 
    You should have received a copy of the GNU General Public License
    along with Bison; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifndef MUSCLE_TAB_H_
 # define MUSCLE_TAB_H_
 
-# define MTABSIZE 101
+# include "location.h"
 
-typedef struct muscle_entry_s
-{
-  const char *key;
-  const 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_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.  */
 extern struct obstack muscle_obstack;
 
+#define MUSCLE_INSERT_BOOL(Key, Value)				\
+{								\
+  int v = Value;						\
+  MUSCLE_INSERT_INT (Key, v);					\
+}
+
 #define MUSCLE_INSERT_INT(Key, Value)				\
 {								\
-  obstack_fgrow1 (&muscle_obstack, "%d", Value);	       	\
+  obstack_fgrow1 (&muscle_obstack, "%d", Value);		\
   obstack_1grow (&muscle_obstack, 0);				\
   muscle_insert (Key, obstack_finish (&muscle_obstack));	\
 }
 
 #define MUSCLE_INSERT_LONG_INT(Key, Value)			\
 {								\
-  obstack_fgrow1 (&muscle_obstack, "%ld", Value);	       	\
+  obstack_fgrow1 (&muscle_obstack, "%ld", Value);		\
   obstack_1grow (&muscle_obstack, 0);				\
   muscle_insert (Key, obstack_finish (&muscle_obstack));	\
 }
@@ -59,15 +59,50 @@ 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_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)			\
+{								\
+  MUSCLE_OBSTACK_SGROW (&muscle_obstack,			\
+			quotearg_style (c_quoting_style,	\
+					Value));		\
+  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 (const char *key, const char *value, const char *separator);
+
+
+/* Append VALUE to the current value of KEY, using muscle_grow.  But
+   in addition, issue a synchronization line for the location LOC.  */
+
+void muscle_code_grow (const char *key, const char *value, location loc);
+
+
+/* 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 (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_ */