Merge remote-tracking branch 'origin/maint'

[bison.git] / src / muscle-tab.h

diff --git a/src/muscle-tab.h b/src/muscle-tab.h
index e06126b338b92b49f37319ba6965d43959f17dce..5f701ae41a242aaee5dc7fb840d12a178230db2d 100644 (file)
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,6 +1,6 @@
 /* Muscle table manager for Bison,
-   Copyright (C) 2001, 2002, 2003, 2006, 2007, 2009 Free Software
-   Foundation, Inc.
+
+   Copyright (C) 2001-2003, 2006-2012 Free Software Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
 
@@ -20,6 +20,8 @@
 #ifndef MUSCLE_TAB_H_
 # define MUSCLE_TAB_H_
 
+# include <quotearg.h>
+
 # include "location.h"
 
 void muscle_init (void);
@@ -32,61 +34,63 @@ void muscle_free (void);
 /* An obstack dedicated to receive muscle keys and values.  */
 extern struct obstack muscle_obstack;
 
-#define MUSCLE_INSERT_BOOL(Key, Value)                         \
-do {                                                           \
-  int v = Value;                                               \
-  MUSCLE_INSERT_INT (Key, v);                                  \
+#define MUSCLE_INSERT_BOOL(Key, Value)                          \
+do {                                                            \
+  int v__ = Value;                                              \
+  MUSCLE_INSERT_INT (Key, v__);                                 \
 } while(0)
 
-#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));       \
+#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));        \
 } while(0)
 
-#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));       \
+#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));        \
 } while(0)
 
-#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));       \
+/* Key -> Value, but don't apply escaping to 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 {                                                           \
+/* Key -> Value, applying M4 escaping to Value. */
+#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));       \
+  obstack_1grow (&muscle_obstack, 0);                           \
+  muscle_insert (Key, obstack_finish (&muscle_obstack));        \
 } while(0)
 
-#define MUSCLE_OBSTACK_SGROW(Obstack, Value)                   \
-do {                                                           \
-  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_OBSTACK_SGROW(Obstack, Value)            \
+do {                                                    \
+  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;    \
+      }                                                 \
 } while(0)
 
-#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));       \
+#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));        \
 } while(0)
 
 /* Append VALUE to the current value of KEY.  If KEY did not already
@@ -107,7 +111,7 @@ void muscle_code_grow (const char *key, const char *value, location loc);
    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);
+                            const char *a1, const char *a2);
 
 /* In the format `[[file_name:line.column]], [[file_name:line.column]]', append
    LOC to MUSCLE.  Use digraphs for special characters in each file name.  */
@@ -143,6 +147,13 @@ void muscle_percent_define_insert (char const *variable, location variable_loc,
                                    char const *value,
                                    muscle_percent_define_how how);
 
+/* Make sure that VARIABLE is set to the boolean VALUE.  Warn on mismatches
+   only, but accept repeated declaration.  Used for backward compatibility
+   between old directives such as %pure-parser, and the recommended use of
+   variables (%define api.pure).   */
+void muscle_percent_define_ensure (char const *variable, location variable_loc,
+                                   bool value);
+
 /* Mimic b4_percent_define_get in ../data/bison.m4 exactly.  That is, if the
    %define variable VARIABLE is defined, return its value.  Otherwise, return
    the empty string.  Also, record Bison's usage of VARIABLE by defining