Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 13:23:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

variables: simplify the upgrade of namespace into api.namespace.

Browse Source 
This patch simplifies "variables: rename namespace as api.namespace",
commit 6750106107.
Suggested by Joel E. Denny in
http://lists.gnu.org/archive/html/bison-patches/2009-07/msg00006.html

	* src/muscle-tab.c (muscle_percent_variable_update): New.
	(muscle_percent_define_insert): Use it in replacement of the
	previous tr invocation.
	Remove variable_tr, no longer needed.
	* data/bison.m4 (b4_percent_define_copy_, b4_percent_define_copy):
	Remove.
	* data/c++.m4: No longer handle namespace -> api.namespace.
	* tests/input.at (%define backward compatibility): Check that
	namespace is treated as api.namespace.
This commit is contained in:
Akim Demaille
2009-08-19 14:24:15 +02:00
parent d59e456dbf
commit 171ad99d64
5 changed files with 57 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/muscle-tab.c
View File

@@ -389,6 +389,30 @@ 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 (!strcmp (conversion[i].obsolete, variable))
return conversion[i].updated;
return variable;
}
#define MUSCLE_USER_NAME_CONVERT(NAME, PREFIX, USER_NAME, SUFFIX) \
do { \
char *tmp; \
@@ -406,20 +430,13 @@ 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);
MUSCLE_USER_NAME_CONVERT (name, "percent_define(", variable, ")");
MUSCLE_USER_NAME_CONVERT (loc_name, "percent_define_loc(", variable, ")");
@@ -434,10 +451,7 @@ 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;
}
return;
complain_at (variable_loc, _("%s `%s' redefined"),
"%define variable", variable);
complain_at (muscle_percent_define_get_loc (variable),
@@ -452,8 +466,6 @@ 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"