X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/13b712d7d492da45303f20502adcf6a8c5a7afa2..1dce289a0070373300f399b2230c0dbdf366e729:/src/muscle-tab.h?ds=sidebyside diff --git a/src/muscle-tab.h b/src/muscle-tab.h index b8438218..66975624 100644 --- a/src/muscle-tab.h +++ b/src/muscle-tab.h @@ -1,7 +1,6 @@ /* Muscle table manager for Bison, - Copyright (C) 2001-2003, 2006-2007, 2009-2012 Free Software - Foundation, Inc. + Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -35,46 +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) \ +# define MUSCLE_INSERTF(Key, Format, Value) \ do { \ - obstack_fgrow1 (&muscle_obstack, "%d", Value); \ - obstack_1grow (&muscle_obstack, 0); \ - muscle_insert (Key, obstack_finish (&muscle_obstack)); \ + obstack_printf (&muscle_obstack, Format, Value); \ + muscle_insert (Key, obstack_finish0 (&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_INT(Key, Value) \ + MUSCLE_INSERTF(Key, "%d", 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_LONG_INT(Key, Value) \ + MUSCLE_INSERTF(Key, "%ld", Value) -#define MUSCLE_INSERT_STRING(Key, Value) \ +/* Key -> Value, but don't apply escaping to Value. */ +# define MUSCLE_INSERT_STRING_RAW(Key, Value) \ + MUSCLE_INSERTF(Key, "%s", Value) + +/* Key -> Value, applying M4 escaping to Value. */ +# define MUSCLE_INSERT_STRING(Key, Value) \ do { \ obstack_escape (&muscle_obstack, Value); \ - obstack_1grow (&muscle_obstack, 0); \ - muscle_insert (Key, obstack_finish (&muscle_obstack)); \ + muscle_insert (Key, obstack_finish0 (&muscle_obstack)); \ } while (0) -#define MUSCLE_INSERT_C_STRING(Key, Value) \ +# define MUSCLE_INSERT_C_STRING(Key, Value) \ do { \ obstack_escape (&muscle_obstack, \ quotearg_style (c_quoting_style, Value)); \ - obstack_1grow (&muscle_obstack, 0); \ - muscle_insert (Key, obstack_finish (&muscle_obstack)); \ + muscle_insert (Key, obstack_finish0 (&muscle_obstack)); \ } while (0) /* Append VALUE to the current value of KEY. If KEY did not already @@ -97,14 +90,6 @@ 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); -/* 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 with digraphs, so it must not contain `[' or `]'. */ @@ -131,6 +116,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