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 d1e0d0112ca1f23a39f45bd9e0ace6507dd67345..af6b615c3195f6a5bb9fb594b4cc7fb5da071f8d 100644 (file)
--- a/src/muscle-tab.h
+++ b/src/muscle-tab.h
@@ -1,6 +1,6 @@
 /* Muscle table manager for Bison,
 
 /* Muscle table manager for Bison,
 

-   Copyright (C) 2001-2003, 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc.

 
    This file is part of Bison, the GNU Compiler Compiler.
 
 
    This file is part of Bison, the GNU Compiler Compiler.
 


@@ -20,87 +20,93 @@
 #ifndef MUSCLE_TAB_H_
 # define MUSCLE_TAB_H_
 
 #ifndef MUSCLE_TAB_H_
 # define MUSCLE_TAB_H_
 

+# include <quotearg.h>
+

 # include "location.h"
 
 # include "location.h"
 

+/* The kind of value associated to this muscle, depending on the
+   syntax of the value: keyword (no delimiter, e.g., true), string
+   (double quotes, e.g., "foo.h"), or code (braces, e.g., {int}).  */
+typedef enum
+{
+  muscle_code,
+  muscle_keyword,
+  muscle_string
+} muscle_kind;
+
+/* Conversion from string.  */
+muscle_kind muscle_kind_new (char const *k);
+
+/* Conversion to string.  */
+char const *muscle_kind_string (muscle_kind k);
+
+
+/* Create the MUSCLE_TABLE, and initialize it with default values.
+   Also set up the MUSCLE_OBSTACK.  */

 void muscle_init (void);
 void muscle_init (void);

+
+/* Insert (KEY, VALUE).  If KEY already existed, overwrite the
+   previous value.  Otherwise create as a muscle_string type.  */

 void muscle_insert (char const *key, char const *value);
 void muscle_insert (char const *key, char const *value);

+
+/* Find the value of muscle KEY.  Unlike MUSCLE_FIND, this is always
+   reliable to determine whether KEY has a value.  */

 char const *muscle_find_const (char const *key);
 char const *muscle_find_const (char const *key);

+
+/* Find the value of muscle KEY.  Abort if muscle_insert was invoked
+   more recently than muscle_grow for KEY since muscle_find can't
+   return a char const *.  */

 char *muscle_find (char const *key);
 char *muscle_find (char const *key);

+
+/* Free all the memory consumed by the muscle machinery only.  */

 void muscle_free (void);
 
 
 /* An obstack dedicated to receive muscle keys and values.  */
 extern struct obstack muscle_obstack;
 
 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__);                                 \
-} 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));        \
-} 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));        \
-} while(0)
+# define MUSCLE_INSERT_BOOL(Key, Value)         \
+  do {                                          \
+    int v__ = Value;                            \
+    MUSCLE_INSERT_INT (Key, v__);               \
+  } while (0)
+
+# define MUSCLE_INSERTF(Key, Format, Value)                     \
+  do {                                                          \
+    obstack_printf (&muscle_obstack, Format, Value);            \
+    muscle_insert (Key, obstack_finish0 (&muscle_obstack));     \
+  } while (0)
+
+# define MUSCLE_INSERT_INT(Key, Value)          \
+  MUSCLE_INSERTF(Key, "%d", Value)
+
+# define MUSCLE_INSERT_LONG_INT(Key, Value)     \
+  MUSCLE_INSERTF(Key, "%ld", Value)

 
 /* Key -> Value, but don't apply escaping to Value. */
 
 /* 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_RAW(Key, Value)   \
+  MUSCLE_INSERTF(Key, "%s", Value)

 
 /* Key -> Value, applying M4 escaping to Value. */
 
 /* 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));        \
-} 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;    \
-      }                                                 \
-} 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));        \
-} while(0)
+# define MUSCLE_INSERT_STRING(Key, Value)                       \
+  do {                                                          \
+    obstack_escape (&muscle_obstack, Value);                    \
+    muscle_insert (Key, obstack_finish0 (&muscle_obstack));     \
+  } while (0)
+
+/* Key -> Value, applying C escaping to Value (and then M4). */
+# define MUSCLE_INSERT_C_STRING(Key, Value)                     \
+  MUSCLE_INSERT_STRING(Key, quotearg_style (c_quoting_style, Value))
+

 
 /* 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.  */
 
 /* 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);
 
 
 /* Append VALUE to the current value of KEY, using muscle_grow.  But
    in addition, issue a synchronization line for the location LOC.  */
 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);
 
 
 void muscle_code_grow (const char *key, const char *value, location loc);
 
 


@@ -111,24 +117,17 @@ void muscle_code_grow (const char *key, const char *value, location loc);
 void muscle_pair_list_grow (const char *muscle,
                             const char *a1, const char *a2);
 
 void muscle_pair_list_grow (const char *muscle,
                             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.  */
-void muscle_location_grow (char const *key, location loc);
-
-/* In the format `file_name:line.column', append BOUND to MUSCLE.  Use digraphs
-   for special characters in the file name.  */
-void muscle_boundary_grow (char const *key, boundary bound);
-

 /* Grow KEY for the occurrence of the name USER_NAME at LOC appropriately for
    use with b4_check_user_names in ../data/bison.m4.  USER_NAME is not escaped
 /* Grow KEY for the occurrence of the name USER_NAME at LOC appropriately for
    use with b4_check_user_names in ../data/bison.m4.  USER_NAME is not escaped

-   with digraphs, so it must not contain `[' or `]'.  */
+   with digraphs, so it must not contain '[' or ']'.  */

 void muscle_user_name_list_grow (char const *key, char const *user_name,
                                  location loc);
 
 /* Indicates whether a variable's value was specified with -D/--define, with
    -F/--force-define, or in the grammar file.  */
 typedef enum {
 void muscle_user_name_list_grow (char const *key, char const *user_name,
                                  location loc);
 
 /* Indicates whether a variable's value was specified with -D/--define, with
    -F/--force-define, or in the grammar file.  */
 typedef enum {

-  MUSCLE_PERCENT_DEFINE_D = 0, MUSCLE_PERCENT_DEFINE_F,
+  MUSCLE_PERCENT_DEFINE_D = 0,
+  MUSCLE_PERCENT_DEFINE_F,

   MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
 } muscle_percent_define_how;
 
   MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
 } muscle_percent_define_how;
 


@@ -142,6 +141,7 @@ typedef enum {
    this as a user occurrence of VARIABLE by invoking
    muscle_user_name_list_grow.  */
 void muscle_percent_define_insert (char const *variable, location variable_loc,
    this as a user occurrence of VARIABLE by invoking
    muscle_user_name_list_grow.  */
 void muscle_percent_define_insert (char const *variable, location variable_loc,

+                                   muscle_kind kind,

                                    char const *value,
                                    muscle_percent_define_how how);
 
                                    char const *value,
                                    muscle_percent_define_how how);
 


@@ -215,6 +215,8 @@ void muscle_percent_define_check_values (char const * const *values);
 void muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
                                char const *code, location code_loc);
 
 void muscle_percent_code_grow (char const *qualifier, location qualifier_loc,
                                char const *code, location code_loc);
 

+/* Output the definition of all the current muscles into a list of
+   m4_defines.  */

 void muscles_m4_output (FILE *out);
 
 #endif /* not MUSCLE_TAB_H_ */
 void muscles_m4_output (FILE *out);
 
 #endif /* not MUSCLE_TAB_H_ */