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

muscles: a function for backward compatibility

Browse Source 
Based on commit 171ad99d64 from master.

* src/muscle-tab.c (muscle_percent_variable_update): New.
(muscle_percent_define_insert): Use it.
Define the variables with their initial value.
This commit is contained in:
Akim Demaille
2012-10-09 12:13:55 +02:00
parent 211c818502
commit 2aa5b25995
1 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/muscle-tab.c
View File

@@ -396,31 +396,45 @@ muscle_user_name_list_grow (char const *key, char const *user_name,
muscle_grow (key, "]]", ""); 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", },
};
char const *res = variable;
int i;
for (i = 0; i < ARRAY_CARDINALITY (conversion); ++i)
if (STREQ (conversion[i].obsolete, variable))
{
res = conversion[i].updated;
break;
}
return res;
}
void void
muscle_percent_define_insert (char const *variable, location variable_loc, muscle_percent_define_insert (char const *var, location variable_loc,
char const *value, char const *value,
muscle_percent_define_how how) muscle_percent_define_how how)
{ {
char *variable_tr = NULL; /* Backward compatibility. */
char const *name; char const *variable = muscle_percent_variable_update (var);
char const *loc_name; char const *name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
char const *syncline_name; char const *loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
char const *how_name; char const *syncline_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;
}
name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
syncline_name =
UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")"); UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
how_name = UNIQSTR_CONCAT ("percent_define_how(", variable, ")"); char const *how_name = UNIQSTR_CONCAT ("percent_define_how(", variable, ")");
/* Command-line options are processed before the grammar file. */ /* Command-line options are processed before the grammar file. */
if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE
@@ -430,10 +444,7 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
muscle_percent_define_how how_old = muscle_percent_define_how how_old =
atoi (muscle_find_const (how_name)); atoi (muscle_find_const (how_name));
if (how_old == MUSCLE_PERCENT_DEFINE_F) if (how_old == MUSCLE_PERCENT_DEFINE_F)
{ return;
free (variable_tr);
return;
}
complain_at_indent (variable_loc, &i, complain_at_indent (variable_loc, &i,
_("%%define variable %s redefined"), quote (variable)); _("%%define variable %s redefined"), quote (variable));
i += SUB_INDENT; i += SUB_INDENT;
@@ -449,8 +460,6 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
muscle_user_name_list_grow ("percent_define_user_variables", variable, muscle_user_name_list_grow ("percent_define_user_variables", variable,
variable_loc); variable_loc);
MUSCLE_INSERT_INT (how_name, how); MUSCLE_INSERT_INT (how_name, how);
free (variable_tr);
} }
char * char *