From bc6038978f5fdd2c25bb30cc678811a26ad5a444 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Sun, 16 Dec 2012 10:20:46 +0100 Subject: [PATCH] %define variables: support value changes in deprecation * src/muscle-tab.c (define_directive): Be robust to "assignment" containing '='. (muscle_percent_variable_update): Upgrade "variant" to "api.value.type". Support such upgrade patterns. Adjust callers. * data/bison.m4: Use api.value.type for variants. * tests/c++.at: Adjust tests. --- data/bison.m4 | 12 +++++++-- src/muscle-tab.c | 69 +++++++++++++++++++++++++++++++++++++----------- tests/c++.at | 4 +-- 3 files changed, 66 insertions(+), 19 deletions(-) diff --git a/data/bison.m4 b/data/bison.m4 index 03bcc069..26ef5c62 100644 --- a/data/bison.m4 +++ b/data/bison.m4 @@ -821,13 +821,12 @@ m4_percent_define_default([[api.token.prefix]], [[]]) # b4_parse_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT]) # b4_parse_trace_if([IF-DEBUG-TRACES-ARE-ENABLED], [IF-NOT]) # b4_token_ctor_if([IF-YYLEX-RETURNS-A-TOKEN], [IF-NOT]) -# b4_variant_if([IF-VARIANT-ARE-USED], [IF-NOT]) # ---------------------------------------------- b4_percent_define_if_define([token_ctor], [api.token.constructor]) b4_percent_define_if_define([locations]) # Whether locations are tracked. b4_percent_define_if_define([parse.assert]) b4_percent_define_if_define([parse.trace]) -b4_percent_define_if_define([variant]) + # b4_bison_locations_if([IF-TRUE]) # -------------------------------- @@ -854,6 +853,15 @@ b4_define_flag_if([error_verbose]) b4_error_verbose_if([m4_define([b4_token_table_flag], [1])]) +# b4_variant_if([IF-VARIANT-ARE-USED], [IF-NOT]) +# ---------------------------------------------- +b4_percent_define_if_define([variant]) +m4_case(b4_percent_define_get([[api.value.type]]), + [variant], [m4_define([b4_variant_flag], [[1]])], + [m4_define([b4_variant_flag], [[0]])]) +b4_define_flag_if([variant]) + + ## ----------------------------------------------------------- ## ## After processing the skeletons, check that all the user's ## ## %define variables and %code qualifiers were used by Bison. ## diff --git a/src/muscle-tab.c b/src/muscle-tab.c index 28cfe561..e40da8d3 100644 --- a/src/muscle-tab.c +++ b/src/muscle-tab.c @@ -384,21 +384,43 @@ muscle_user_name_list_grow (char const *key, char const *user_name, muscle_grow (key, "]]", ""); } + +/** Return an allocated string that represents the %define directive + that performs the assignment. + + @param assignment "VAR", or "VAR=VAL". + @param value default value if VAL \a assignment has no '='. + + For instance: + "foo", NULL => "%define foo" + "foo", "baz" => "%define foo baz" + "foo=bar", NULL => "%define foo bar" + "foo=bar", "baz" => "%define foo bar" + "foo=", NULL => "%define foo" + "foo=", "baz" => "%define foo" + */ + static char * define_directive (char const *assignment, char const *value) { - char const *fmt = value && *value ? "%%define %s %s" : "%%define %s"; + char *eq = strchr (assignment, '='); + char const *fmt = !eq && value && *value ? "%%define %s %s" : "%%define %s"; char *res = xmalloc (strlen (fmt) + strlen (assignment) + (value ? strlen (value) : 0)); sprintf (res, fmt, assignment, value); + eq = strchr (res, '='); + if (eq) + *eq = eq[1] ? ' ' : '\0'; return res; } /** If the \a variable name is obsolete, return the name to use, - * otherwise \a variable. */ + * otherwise \a variable. If the \a value is obsolete, update it too. + * + * Allocates the returned value. */ static -char const * +char * muscle_percent_variable_update (char const *variable, location variable_loc, char const **value) { @@ -417,22 +439,37 @@ muscle_percent_variable_update (char const *variable, location variable_loc, { "lr.keep-unreachable-states", "lr.keep-unreachable-state", }, { "lr.keep_unreachable_states", "lr.keep-unreachable-state", }, { "namespace", "api.namespace", }, + { "variant=", "api.value.type=variant", }, + { "variant=true", "api.value.type=variant", }, { NULL, NULL, } }; - char const *res = variable; conversion_type const *c; for (c = conversion; c->obsolete; ++c) - if (STREQ (c->obsolete, variable)) - { - char *old = define_directive (c->obsolete, *value); - char *upd = define_directive (c->updated, *value); - deprecated_directive (&variable_loc, old, upd); - free (old); - free (upd); - res = c->updated; - break; + { + char const *eq = strchr (c->obsolete, '='); + if (eq + ? (!strncmp (c->obsolete, variable, eq - c->obsolete) + && STREQ (eq + 1, *value)) + : STREQ (c->obsolete, variable)) + { + char *old = define_directive (c->obsolete, *value); + char *upd = define_directive (c->updated, *value); + deprecated_directive (&variable_loc, old, upd); + free (old); + free (upd); + char *res = xstrdup (c->updated); + { + char *eq2 = strchr (res, '='); + if (eq2) + { + *eq2 = '\0'; + *value = eq2 + 1; + } + } + return res; + } } - return res; + return xstrdup (variable); } void @@ -455,7 +492,7 @@ muscle_percent_define_insert (char const *var, location variable_loc, muscle_percent_define_how how_old = atoi (muscle_find_const (how_name)); unsigned i = 0; if (how_old == MUSCLE_PERCENT_DEFINE_F) - return; + goto end; complain_indent (&variable_loc, complaint, &i, _("%%define variable %s redefined"), quote (variable)); @@ -472,6 +509,8 @@ muscle_percent_define_insert (char const *var, location variable_loc, muscle_user_name_list_grow ("percent_define_user_variables", variable, variable_loc); MUSCLE_INSERT_INT (how_name, how); + end: + free (variable); } /* This is used for backward compatibility, e.g., "%define api.pure" diff --git a/tests/c++.at b/tests/c++.at index 19856fff..6b10f88c 100644 --- a/tests/c++.at +++ b/tests/c++.at @@ -34,7 +34,7 @@ AT_DATA_GRAMMAR([list.yy], [[%debug %skeleton "lalr1.cc" %defines -%define variant +%define api.value.type variant ]m4_bpatsubst([$1], [\\n], [ ])[ @@ -456,7 +456,7 @@ AT_DATA_GRAMMAR([[input.yy]], } %defines -%define variant +%define api.value.type variant %define parse.error verbose %define parse.trace %% -- 2.45.2