X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/abf3f74b216c0ef4a5195ae1a5ebb7123b672387..9fd33c2b6ef5d98ac14ac7d83bc453b148fda768:/src/muscle-tab.c diff --git a/src/muscle-tab.c b/src/muscle-tab.c index 06f37d83..57050d05 100644 --- a/src/muscle-tab.c +++ b/src/muscle-tab.c @@ -21,12 +21,12 @@ #include "system.h" #include -#include #include "complain.h" #include "files.h" -#include "muscle-tab.h" #include "getargs.h" +#include "muscle-tab.h" +#include "quote.h" /* A key-value pair, along with storage that can be reclaimed when this pair is no longer needed. */ @@ -50,7 +50,7 @@ hash_compare_muscles (void const *x, void const *y) { muscle_entry const *m1 = x; muscle_entry const *m2 = y; - return strcmp (m1->key, m2->key) == 0; + return STREQ (m1->key, m2->key); } static size_t @@ -80,7 +80,7 @@ muscle_init (void) obstack_init (&muscle_obstack); muscle_table = hash_initialize (HT_INITIAL_CAPACITY, NULL, hash_muscle, - hash_compare_muscles, muscle_entry_free); + hash_compare_muscles, muscle_entry_free); /* Version and input file. */ MUSCLE_INSERT_STRING ("version", VERSION); @@ -179,7 +179,7 @@ muscle_syncline_grow (char const *key, location loc) char *extension = NULL; obstack_fgrow1 (&muscle_obstack, "]b4_syncline(%d, [[", loc.start.line); MUSCLE_OBSTACK_SGROW (&muscle_obstack, - quotearg_style (c_quoting_style, loc.start.file)); + quotearg_style (c_quoting_style, loc.start.file)); obstack_sgrow (&muscle_obstack, "]])["); obstack_1grow (&muscle_obstack, 0); extension = obstack_finish (&muscle_obstack); @@ -202,7 +202,7 @@ muscle_code_grow (const char *key, const char *val, location loc) void muscle_pair_list_grow (const char *muscle, - const char *a1, const char *a2) + const char *a1, const char *a2) { char *pair; obstack_sgrow (&muscle_obstack, "[[["); @@ -388,25 +388,42 @@ muscle_user_name_list_grow (char const *key, char const *user_name, muscle_grow (key, "]]", ""); } +/** If the \a variable name is obsolete, return the name to use, + * otherwise \a variable. */ +static +char const * +muscle_percent_variable_update (char const *variable) +{ + typedef struct + { + const char *obsolete; + const char *updated; + } conversion_type; + const conversion_type conversion[] = + { + { "api.push_pull", "api.push-pull", }, + { "lr.keep_unreachable_states", "lr.keep-unreachable-states", }, + { "namespace", "api.namespace", }, + }; + int i; + for (i = 0; i < sizeof conversion / sizeof *conversion; ++i) + if (STREQ (conversion[i].obsolete, variable)) + return conversion[i].updated; + return variable; +} + void muscle_percent_define_insert (char const *variable, location variable_loc, char const *value, muscle_percent_define_how how) { - char *variable_tr = NULL; char const *name; char const *loc_name; char const *syncline_name; char const *how_name; /* Permit certain names with underscores for backward compatibility. */ - if (0 == strcmp (variable, "api.push_pull") - || 0 == strcmp (variable, "lr.keep_unreachable_states")) - { - variable_tr = strdup (variable); - tr (variable_tr, '_', '-'); - variable = variable_tr; - } + variable = muscle_percent_variable_update (variable); name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")"); @@ -421,12 +438,9 @@ muscle_percent_define_insert (char const *variable, location variable_loc, muscle_percent_define_how how_old = atoi (muscle_find_const (how_name)); if (how_old == MUSCLE_PERCENT_DEFINE_F) - { - free (variable_tr); - return; - } - complain_at (variable_loc, _("%%define variable '%s' redefined"), - variable); + return; + complain_at (variable_loc, _("%%define variable %s redefined"), + quote (variable)); complain_at (muscle_percent_define_get_loc (variable), _("previous definition")); } @@ -439,8 +453,30 @@ muscle_percent_define_insert (char const *variable, location variable_loc, muscle_user_name_list_grow ("percent_define_user_variables", variable, variable_loc); MUSCLE_INSERT_INT (how_name, how); +} - free (variable_tr); +/* This is used for backward compatibility, e.g., "%define api.pure" + supersedes "%pure-parser". */ +void +muscle_percent_define_ensure (char const *variable, location loc, + bool value) +{ + char const *val = value ? "" : "false"; + char const *name; + name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); + + /* %pure-parser is deprecated in favor of `%define api.pure', so use + `%define api.pure' in a backward-compatible manner here. First, + don't complain if %pure-parser is specified multiple times. */ + if (!muscle_find_const (name)) + muscle_percent_define_insert (variable, loc, val, + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); + /* In all cases, use api.pure now so that the backend doesn't complain if + the skeleton ignores api.pure, but do warn now if there's a previous + conflicting definition from an actual %define. */ + if (muscle_percent_define_flag_if (variable) != value) + muscle_percent_define_insert (variable, loc, val, + MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE); } char * @@ -467,8 +503,8 @@ muscle_percent_define_get_loc (char const *variable) char const *loc_name; loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")"); if (!muscle_find_const (loc_name)) - fatal(_("undefined %%define variable '%s' passed to" - " muscle_percent_define_get_loc"), variable); + fatal(_("%s: undefined %%define variable %s"), + "muscle_percent_define_get_loc", quote (variable)); return muscle_location_decode (loc_name); } @@ -481,8 +517,8 @@ muscle_percent_define_get_syncline (char const *variable) UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")"); syncline = muscle_find_const (syncline_name); if (!syncline) - fatal(_("undefined %%define variable '%s' passed to" - " muscle_percent_define_get_syncline"), variable); + fatal(_("%s: undefined %%define variable %s"), + "muscle_percent_define_get_syncline", quote (variable)); return syncline; } @@ -519,22 +555,22 @@ muscle_percent_define_flag_if (char const *variable) if (muscle_percent_define_ifdef (variable)) { char *value = muscle_percent_define_get (variable); - if (value[0] == '\0' || 0 == strcmp (value, "true")) + if (value[0] == '\0' || STREQ (value, "true")) result = true; - else if (0 == strcmp (value, "false")) + else if (STREQ (value, "false")) result = false; else if (!muscle_find_const (invalid_boolean_name)) { muscle_insert (invalid_boolean_name, ""); complain_at(muscle_percent_define_get_loc (variable), - _("invalid value for %%define Boolean variable '%s'"), - variable); + _("invalid value for %%define Boolean variable %s"), + quote (variable)); } free (value); } else - fatal(_("undefined %%define variable '%s' passed to muscle_percent_define_flag_if"), - variable); + fatal(_("%s: undefined %%define variable %s"), + "muscle_percent_define_flag", quote (variable)); return result; } @@ -578,17 +614,17 @@ muscle_percent_define_check_values (char const * const *values) { for (++values; *values; ++values) { - if (0 == strcmp (value, *values)) + if (STREQ (value, *values)) break; } if (!*values) { location loc = muscle_percent_define_get_loc (*variablep); complain_at(loc, - _("invalid value for %%define variable '%s': '%s'"), - *variablep, value); + _("invalid value for %%define variable %s: %s"), + quote (*variablep), quote_n (1, value)); for (values = variablep + 1; *values; ++values) - complain_at (loc, _("accepted value: '%s'"), *values); + complain_at (loc, _("accepted value: %s"), quote (*values)); } else { @@ -598,9 +634,8 @@ muscle_percent_define_check_values (char const * const *values) free (value); } else - fatal(_("undefined %%define variable '%s' passed to" - " muscle_percent_define_check_values"), - *variablep); + fatal (_("%s: undefined %%define variable %s"), + "muscle_percent_define_check_values", quote (*variablep)); } }