X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/de5ab9400a4aaeb9ea63b489118e7dd2b30873f2..72cd9a913f6d282c5e24990505c2c820bda2bf1b:/src/muscle-tab.h

diff --git a/src/muscle-tab.h b/src/muscle-tab.h
index ce198629..5f701ae4 100644
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,7 +1,6 @@
 /* Muscle table manager for Bison,
 
-   Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008, 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.
 
@@ -21,6 +20,8 @@
 #ifndef MUSCLE_TAB_H_
 # define MUSCLE_TAB_H_
 
+# include <quotearg.h>
+
 # include "location.h"
 
 void muscle_init (void);
@@ -33,40 +34,40 @@ 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)
 
 /* 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));	\
+#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)
 
 /* Key -> Value, applying M4 escaping to Value. */
-#define MUSCLE_INSERT_STRING(Key, Value)			\
-do {								\
+#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)            \
@@ -75,21 +76,21 @@ do {                                                    \
   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;  \
+      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
@@ -110,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.  */
@@ -136,7 +137,7 @@ typedef enum {
 /* Define the muscles for %define variable VARIABLE with VALUE specified
    at VARIABLE_LOC in the manner HOW unless it was specified in the
    grammar file while the previous definition for VARIABLE was specified
-   with -F/--force-define.  Warn if a previous definition is being
+   with -F/--force-define.  Complain if a previous definition is being
    overridden and the new definition is specified in the grammar file.
    (These rules support the documented behavior as long as command-line
    definitions are processed before grammar file definitions.)  Record