X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4323e0dac386d777d070c68564f1c0041b06935d..782e8187185a009ce698ad294c87e49a0a30c3a1:/src/muscle-tab.c?ds=sidebyside diff --git a/src/muscle-tab.c b/src/muscle-tab.c index 1168a9c3..be97b800 100644 --- a/src/muscle-tab.c +++ b/src/muscle-tab.c @@ -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); } @@ -177,12 +174,11 @@ static void muscle_syncline_grow (char const *key, location loc) { char *extension = NULL; - obstack_fgrow1 (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line); + obstack_printf (&muscle_obstack, "]b4_syncline(%d, ", loc.start.line); 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); } @@ -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_fgrow1 (&muscle_obstack, "%d", bound.line); - obstack_1grow (&muscle_obstack, '.'); - obstack_fgrow1 (&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 { @@ -413,11 +401,18 @@ muscle_percent_variable_update (char const *variable) { "lr.keep_unreachable_states", "lr.keep-unreachable-states", }, { "namespace", "api.namespace", }, }; + char const *res = variable; int i; - for (i = 0; i < sizeof conversion / sizeof *conversion; ++i) + for (i = 0; i < ARRAY_CARDINALITY (conversion); ++i) if (STREQ (conversion[i].obsolete, variable)) - return conversion[i].updated; - return 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; } void @@ -431,7 +426,7 @@ muscle_percent_define_insert (char const *variable, location variable_loc, char const *how_name; /* Permit certain names with underscores for backward compatibility. */ - variable = muscle_percent_variable_update (variable); + variable = muscle_percent_variable_update (variable, variable_loc); name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")"); @@ -443,14 +438,17 @@ muscle_percent_define_insert (char const *variable, 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)); + muscle_percent_define_how how_old = atoi (muscle_find_const (how_name)); + unsigned i = 0; if (how_old == MUSCLE_PERCENT_DEFINE_F) return; - complain_at (variable_loc, complaint, _("%%define variable %s redefined"), - quote (variable)); - location loc = muscle_percent_define_get_loc (variable); - complain_at (loc, complaint, _("previous definition")); + complain_at_indent (variable_loc, complaint, &i, + _("%%define variable %s redefined"), + quote (variable)); + i += SUB_INDENT; + complain_at_indent (muscle_percent_define_get_loc (variable), + complaint, &i, + _("previous definition")); } MUSCLE_INSERT_STRING (name, value); @@ -470,8 +468,7 @@ 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, ")"); + char const *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, @@ -490,58 +487,46 @@ muscle_percent_define_ensure (char const *variable, location loc, char * muscle_percent_define_get (char const *variable) { - char const *name; - char const *usage_name; - char *value; - - name = UNIQSTR_CONCAT ("percent_define(", variable, ")"); - usage_name = UNIQSTR_CONCAT ("percent_define_bison_variables(", - variable, ")"); - - muscle_insert (usage_name, ""); - value = string_decode (name); + 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)) - complain (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) - complain (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, ""); @@ -554,11 +539,9 @@ 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)) { @@ -571,14 +554,14 @@ muscle_percent_define_flag_if (char const *variable) { muscle_insert (invalid_boolean_name, ""); location loc = muscle_percent_define_get_loc (variable); - complain_at (loc, complaint, - _("invalid value for %%define Boolean variable %s"), - quote (variable)); + complain (&loc, complaint, + _("invalid value for %%define Boolean variable %s"), + quote (variable)); } free (value); } else - complain (fatal, _("%s: undefined %%define variable %s"), + complain (NULL, fatal, _("%s: undefined %%define variable %s"), "muscle_percent_define_flag", quote (variable)); return result; @@ -587,12 +570,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)) { @@ -613,12 +593,8 @@ 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) @@ -628,13 +604,16 @@ muscle_percent_define_check_values (char const * const *values) } if (!*values) { + unsigned i = 0; location loc = muscle_percent_define_get_loc (*variablep); - complain_at (loc, complaint, - _("invalid value for %%define variable %s: %s"), - quote (*variablep), quote_n (1, value)); + complain_at_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 (loc, complaint, _("accepted value: %s"), - quote (*values)); + complain_at_indent (loc, complaint, &i, _("accepted value: %s"), + quote (*values)); } else { @@ -644,7 +623,7 @@ muscle_percent_define_check_values (char const * const *values) free (value); } else - complain (fatal, _("%s: undefined %%define variable %s"), + complain (NULL, fatal, _("%s: undefined %%define variable %s"), "muscle_percent_define_check_values", quote (*variablep)); } } @@ -653,8 +632,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); @@ -668,8 +646,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; }