Rearrange initialization of the parser state variables so that the

[bison.git] / src / muscle_tab.h

diff --git a/src/muscle_tab.h b/src/muscle_tab.h
index cffdf1bda84b1ee2d368df59976e835a9b732844..c53bfda1a93cd42fb27d4a043e42fde785040537 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, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -24,8 +24,8 @@
 # include "location.h"
 
 void muscle_init (void);
-void muscle_insert (const char *key, char *value);
-char *muscle_find (const char *key);
+void muscle_insert (char const *key, char const *value);
+char *muscle_find (char const *key);
 void muscle_free (void);
 
 
@@ -52,13 +52,20 @@ do {                                                                \
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \
 } while(0)
 
-#define MUSCLE_INSERT_STRING(Key, Value)                       \
+#define MUSCLE_INSERT_STRING_RAW(Key, Value)                   \
 do {                                                           \
   obstack_sgrow (&muscle_obstack, Value);                      \
   obstack_1grow (&muscle_obstack, 0);                          \
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \
 } while(0)
 
+#define MUSCLE_INSERT_STRING(Key, Value)                       \
+do {                                                           \
+  MUSCLE_OBSTACK_SGROW (&muscle_obstack, Value);                \
+  obstack_1grow (&muscle_obstack, 0);                          \
+  muscle_insert (Key, obstack_finish (&muscle_obstack));       \
+} while(0)
+
 #define MUSCLE_OBSTACK_SGROW(Obstack, Value)                   \
 do {                                                           \
   char const *p;                                               \