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 9e8ac24f246ec9550402c4e1b5e667542bcedd9e..c53bfda1a93cd42fb27d4a043e42fde785040537 100644 (file)
--- a/src/muscle_tab.h
+++ b/src/muscle_tab.h
@@ -1,5 +1,5 @@
 /* Muscle table manager for Bison,
 /* 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.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -24,8 +24,8 @@
 # include "location.h"
 
 void muscle_init (void);
 # 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);
 
 
 void muscle_free (void);
 
 


@@ -33,34 +33,41 @@ void muscle_free (void);
 extern struct obstack muscle_obstack;
 
 #define MUSCLE_INSERT_BOOL(Key, Value)                         \
 extern struct obstack muscle_obstack;
 
 #define MUSCLE_INSERT_BOOL(Key, Value)                         \

-{                                                              \
+do {                                                           \

   int v = Value;                                               \
   MUSCLE_INSERT_INT (Key, v);                                  \
   int v = Value;                                               \
   MUSCLE_INSERT_INT (Key, v);                                  \

-}
+} while(0)

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

-{                                                              \
+do {                                                           \

   obstack_fgrow1 (&muscle_obstack, "%d", Value);               \
   obstack_1grow (&muscle_obstack, 0);                          \
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \
   obstack_fgrow1 (&muscle_obstack, "%d", Value);               \
   obstack_1grow (&muscle_obstack, 0);                          \
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \

-}
+} while(0)

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

-{                                                              \
+do {                                                           \

   obstack_fgrow1 (&muscle_obstack, "%ld", Value);              \
   obstack_1grow (&muscle_obstack, 0);                          \
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \
   obstack_fgrow1 (&muscle_obstack, "%ld", Value);              \
   obstack_1grow (&muscle_obstack, 0);                          \
   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));       \
   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)                   \
 
 #define MUSCLE_OBSTACK_SGROW(Obstack, Value)                   \

-{                                                              \
+do {                                                           \

   char const *p;                                               \
   for (p = Value; *p; p++)                                     \
     switch (*p)                                                        \
   char const *p;                                               \
   for (p = Value; *p; p++)                                     \
     switch (*p)                                                        \


@@ -71,20 +78,20 @@ extern struct obstack muscle_obstack;
       case ']':        obstack_sgrow (Obstack, "@}" ); break;          \
       default: obstack_1grow (Obstack, *p); break;             \
       }                                                                \
       case ']':        obstack_sgrow (Obstack, "@}" ); break;          \
       default: obstack_1grow (Obstack, *p); break;             \
       }                                                                \

-}
+} while(0)

 
 #define MUSCLE_INSERT_C_STRING(Key, Value)                     \
 
 #define MUSCLE_INSERT_C_STRING(Key, Value)                     \

-{                                                              \
+do {                                                           \

   MUSCLE_OBSTACK_SGROW (&muscle_obstack,                       \
                        quotearg_style (c_quoting_style,        \
                                        Value));                \
   obstack_1grow (&muscle_obstack, 0);                          \
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \
   MUSCLE_OBSTACK_SGROW (&muscle_obstack,                       \
                        quotearg_style (c_quoting_style,        \
                                        Value));                \
   obstack_1grow (&muscle_obstack, 0);                          \
   muscle_insert (Key, obstack_finish (&muscle_obstack));       \

-}
+} while(0)

 
 

-/* 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.  */
+/* Append VALUE to the current value of KEY.  If KEY did not already
+   exist, create it.  Use MUSCLE_OBSTACK.  De-allocate the previously
+   associated value.  Copy VALUE and SEPARATOR.  */

 
 void muscle_grow (const char *key, const char *value, const char *separator);
 
 
 void muscle_grow (const char *key, const char *value, const char *separator);