X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/049016237e8ad3666609295234ed550e66cc185c..0fe9720964da510a2b359af390a3053aace65f9f:/src/muscle-tab.c?ds=sidebyside diff --git a/src/muscle-tab.c b/src/muscle-tab.c index 936af700..86363f50 100644 --- a/src/muscle-tab.c +++ b/src/muscle-tab.c @@ -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); @@ -157,12 +157,9 @@ muscle_grow (const char *key, const char *val, const char *separator) { /* Grow the current value. */ char *new_val; - obstack_sgrow (&muscle_obstack, entry->value); + obstack_printf (&muscle_obstack, "%s%s%s", entry->value, separator, val); free (entry->storage); - obstack_sgrow (&muscle_obstack, separator); - obstack_sgrow (&muscle_obstack, val); - obstack_1grow (&muscle_obstack, 0); - new_val = obstack_finish (&muscle_obstack); + new_val = obstack_finish0 (&muscle_obstack); entry->value = entry->storage = xstrdup (new_val); obstack_free (&muscle_obstack, new_val); } @@ -181,8 +178,7 @@ muscle_syncline_grow (char const *key, location loc) obstack_quote (&muscle_obstack, quotearg_style (c_quoting_style, loc.start.file)); obstack_sgrow (&muscle_obstack, ")["); - obstack_1grow (&muscle_obstack, 0); - extension = obstack_finish (&muscle_obstack); + extension = obstack_finish0 (&muscle_obstack); muscle_grow (key, extension, ""); obstack_free (&muscle_obstack, extension); } @@ -202,7 +198,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, "["); @@ -210,8 +206,7 @@ void muscle_pair_list_grow (const char *muscle, obstack_sgrow (&muscle_obstack, ", "); obstack_quote (&muscle_obstack, a2); obstack_sgrow (&muscle_obstack, "]"); - obstack_1grow (&muscle_obstack, 0); - pair = obstack_finish (&muscle_obstack); + pair = obstack_finish0 (&muscle_obstack); muscle_grow (muscle, pair, ",\n"); obstack_free (&muscle_obstack, pair); } @@ -268,13 +263,8 @@ muscle_boundary_grow (char const *key, boundary bound) char *extension; obstack_sgrow (&muscle_obstack, "[["); obstack_escape (&muscle_obstack, bound.file); - obstack_1grow (&muscle_obstack, ':'); - obstack_printf (&muscle_obstack, "%d", bound.line); - obstack_1grow (&muscle_obstack, '.'); - obstack_printf (&muscle_obstack, "%d", bound.column); - obstack_sgrow (&muscle_obstack, "]]"); - obstack_1grow (&muscle_obstack, '\0'); - extension = obstack_finish (&muscle_obstack); + obstack_printf (&muscle_obstack, ":%d.%d]]", bound.line, bound.column); + extension = obstack_finish0 (&muscle_obstack); muscle_grow (key, extension, ""); obstack_free (&muscle_obstack, extension); } @@ -315,11 +305,10 @@ muscle_location_grow (char const *key, location loc) static char * string_decode (char const *key) { - char const *value; + char const *value = muscle_find_const (key); char *value_decoded; char *result; - value = muscle_find_const (key); if (!value) return NULL; do { @@ -358,8 +347,7 @@ location_decode (char const *key) { char *boundary_str; aver (*++value == ']'); - obstack_1grow (&muscle_obstack, '\0'); - boundary_str = obstack_finish (&muscle_obstack); + boundary_str = obstack_finish0 (&muscle_obstack); switch (*++value) { case ',': @@ -400,7 +388,7 @@ muscle_user_name_list_grow (char const *key, char const *user_name, * otherwise \a variable. */ static char const * -muscle_percent_variable_update (char const *variable) +muscle_percent_variable_update (char const *variable, location variable_loc) { typedef struct { @@ -410,8 +398,13 @@ muscle_percent_variable_update (char const *variable) const conversion_type conversion[] = { { "api.push_pull", "api.push-pull", }, + { "api.tokens.prefix", "api.token.prefix", }, + { "lex_symbol", "api.token.constructor", }, { "location_type", "api.location.type", }, - { "lr.keep_unreachable_states", "lr.keep-unreachable-states", }, + { "lr.default-reductions", "lr.default-reduction", }, + { "lr.keep-unreachable-states", "lr.keep-unreachable-state", }, + { "lr.keep_unreachable_states", "lr.keep-unreachable-state", }, + { "namespace", "api.namespace", }, }; char const *res = variable; int i; @@ -419,6 +412,9 @@ muscle_percent_variable_update (char const *variable) if (STREQ (conversion[i].obsolete, variable)) { res = conversion[i].updated; + complain (&variable_loc, Wdeprecated, + _("deprecated %%define variable name: %s, use %s"), + quote (variable), quote_n (1, res)); break; } return res; @@ -430,7 +426,7 @@ muscle_percent_define_insert (char const *var, location variable_loc, muscle_percent_define_how how) { /* Backward compatibility. */ - char const *variable = muscle_percent_variable_update (var); + char const *variable = muscle_percent_variable_update (var, variable_loc); char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); char const *loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")"); char const *syncline_name = @@ -441,16 +437,16 @@ muscle_percent_define_insert (char const *var, location variable_loc, if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE && muscle_find_const (name)) { + muscle_percent_define_how how_old = atoi (muscle_find_const (how_name)); unsigned i = 0; - muscle_percent_define_how how_old = - atoi (muscle_find_const (how_name)); if (how_old == MUSCLE_PERCENT_DEFINE_F) return; - complain_at_indent (variable_loc, &i, - _("%%define variable %s redefined"), quote (variable)); + complain_indent (&variable_loc, complaint, &i, + _("%%define variable %s redefined"), + quote (variable)); i += SUB_INDENT; - complain_at_indent (muscle_percent_define_get_loc (variable), &i, - _("previous definition")); + location loc = muscle_percent_define_get_loc (variable); + complain_indent (&loc, complaint, &i, _("previous definition")); } MUSCLE_INSERT_STRING (name, value); @@ -463,61 +459,72 @@ muscle_percent_define_insert (char const *var, location variable_loc, MUSCLE_INSERT_INT (how_name, how); } -char * -muscle_percent_define_get (char const *variable) +/* 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 *name; - char const *usage_name; - char *value; + char const *val = value ? "" : "false"; + char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); - name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); - usage_name = UNIQSTR_CONCAT ("percent_define_bison_variables(", - 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); +} - muscle_insert (usage_name, ""); - value = string_decode (name); +char * +muscle_percent_define_get (char const *variable) +{ + char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); + char const *usage_name = + UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")"); + char *value = string_decode (name); if (!value) value = xstrdup (""); + + muscle_insert (usage_name, ""); return value; } location muscle_percent_define_get_loc (char const *variable) { - char const *loc_name; - loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")"); + char const *loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")"); if (!muscle_find_const (loc_name)) - fatal(_("%s: undefined %%define variable %s"), - "muscle_percent_define_get_loc", quote (variable)); + complain (NULL, fatal, _("%s: undefined %%define variable %s"), + "muscle_percent_define_get_loc", quote (variable)); return location_decode (loc_name); } char const * muscle_percent_define_get_syncline (char const *variable) { - char const *syncline_name; - char const *syncline; - syncline_name = + char const *syncline_name = UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")"); - syncline = muscle_find_const (syncline_name); + char const *syncline = muscle_find_const (syncline_name); if (!syncline) - fatal(_("%s: undefined %%define variable %s"), - "muscle_percent_define_get_syncline", quote (variable)); + complain (NULL, fatal, _("%s: undefined %%define variable %s"), + "muscle_percent_define_get_syncline", quote (variable)); return syncline; } bool muscle_percent_define_ifdef (char const *variable) { - char const *name; - char const *usage_name; - char const *value; - - name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); - usage_name = + char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); + char const *usage_name = UNIQSTR_CONCAT ("percent_define_bison_variables(", variable, ")"); - - value = muscle_find_const (name); + char const *value = muscle_find_const (name); if (value) { muscle_insert (usage_name, ""); @@ -530,31 +537,30 @@ muscle_percent_define_ifdef (char const *variable) bool muscle_percent_define_flag_if (char const *variable) { - char const *invalid_boolean_name; - bool result = false; - - invalid_boolean_name = + char const *invalid_boolean_name = UNIQSTR_CONCAT ("percent_define_invalid_boolean(", variable, ")"); + bool result = false; 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"), - quote (variable)); + location loc = muscle_percent_define_get_loc (variable); + complain (&loc, complaint, + _("invalid value for %%define Boolean variable %s"), + quote (variable)); } free (value); } else - fatal(_("%s: undefined %%define variable %s"), - "muscle_percent_define_flag", quote (variable)); + complain (NULL, fatal, _("%s: undefined %%define variable %s"), + "muscle_percent_define_flag", quote (variable)); return result; } @@ -562,12 +568,9 @@ muscle_percent_define_flag_if (char const *variable) void muscle_percent_define_default (char const *variable, char const *value) { - char const *name; - char const *loc_name; - char const *syncline_name; - name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); - loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")"); - syncline_name = + char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); + char const *loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")"); + char const *syncline_name = UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")"); if (!muscle_find_const (name)) { @@ -588,30 +591,26 @@ muscle_percent_define_check_values (char const * const *values) for (; *values; ++values) { char const * const *variablep = values; - char const *name; - char *value; - - name = UNIQSTR_CONCAT ("percent_define(", *variablep, ")"); - - value = string_decode (name); + char const *name = UNIQSTR_CONCAT ("percent_define(", *variablep, ")"); + char *value = string_decode (name); if (value) { for (++values; *values; ++values) { - if (0 == strcmp (value, *values)) + if (STREQ (value, *values)) break; } if (!*values) { unsigned i = 0; location loc = muscle_percent_define_get_loc (*variablep); - complain_at_indent (loc, &i, - _("invalid value for %%define variable %s: %s"), - quote (*variablep), quote_n (1, value)); + complain_indent (&loc, complaint, &i, + _("invalid value for %%define variable %s: %s"), + quote (*variablep), quote_n (1, value)); i += SUB_INDENT; for (values = variablep + 1; *values; ++values) - complain_at_indent (loc, &i, _("accepted value: %s"), - quote (*values)); + complain_indent (&loc, complaint | no_caret, &i, + _("accepted value: %s"), quote (*values)); } else { @@ -621,8 +620,8 @@ muscle_percent_define_check_values (char const * const *values) free (value); } else - fatal (_("%s: undefined %%define variable %s"), - "muscle_percent_define_check_values", quote (*variablep)); + complain (NULL, fatal, _("%s: undefined %%define variable %s"), + "muscle_percent_define_check_values", quote (*variablep)); } } @@ -630,8 +629,7 @@ void muscle_percent_code_grow (char const *qualifier, location qualifier_loc, char const *code, location code_loc) { - char const *name; - name = UNIQSTR_CONCAT ("percent_code(", qualifier, ")"); + char const *name = UNIQSTR_CONCAT ("percent_code(", qualifier, ")"); muscle_code_grow (name, code, code_loc); muscle_user_name_list_grow ("percent_code_user_qualifiers", qualifier, qualifier_loc); @@ -645,8 +643,9 @@ muscle_percent_code_grow (char const *qualifier, location qualifier_loc, static inline bool muscle_m4_output (muscle_entry *entry, FILE *out) { - fprintf (out, "m4_define([b4_%s],\n", entry->key); - fprintf (out, "[[%s]])\n\n\n", entry->value); + fprintf (out, + "m4_define([b4_%s],\n" + "[[%s]])\n\n\n", entry->key, entry->value); return true; }