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

muscle: factor the field retrieval

Browse Source 
* src/muscle-tab.c (muscle_percent_define_get_raw): New.
Use it where appropriate.
(location_decode): No longer fetch the value from the table,
take the value as argument.
This commit is contained in:
Akim Demaille
2013-04-14 10:21:22 +02:00
parent 0f9583b69b
commit d9cfa2bee2
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/muscle-tab.c
View File

@@ -344,10 +344,9 @@ string_decode (char const *key)
/* Reverse of muscle_location_grow. */ /* Reverse of muscle_location_grow. */
static location static location
location_decode (char const *key) location_decode (char const *value)
{ {
location loc; location loc;
char const *value = muscle_find_const (key);
aver (value); aver (value);
aver (*value == '['); aver (*value == '[');
aver (*++value == '['); aver (*++value == '[');
@@ -557,6 +556,20 @@ muscle_percent_define_use (char const *variable)
muscle_insert (muscle_name (variable, "bison_variables"), ""); muscle_insert (muscle_name (variable, "bison_variables"), "");
} }
/* The value of %define variable VARIABLE (corresponding to FIELD, if
defined). Do not register as used, but diagnose unset variables. */
char const *
muscle_percent_define_get_raw (char const *variable, char const *field)
{
uniqstr name = muscle_name (variable, field);
char const *res = muscle_find_const (name);
if (!res)
complain (NULL, fatal, _("%s: undefined %%define variable %s"),
"muscle_percent_define_get_raw", quote (variable));
return res;
}
char * char *
muscle_percent_define_get (char const *variable) muscle_percent_define_get (char const *variable)
{ {
@@ -571,22 +584,13 @@ muscle_percent_define_get (char const *variable)
location location
muscle_percent_define_get_loc (char const *variable) muscle_percent_define_get_loc (char const *variable)
{ {
uniqstr loc_name = muscle_name (variable, "loc"); return location_decode (muscle_percent_define_get_raw (variable, "loc"));
if (!muscle_find_const (loc_name))
complain (NULL, fatal, _("%s: undefined %%define variable %s"),
"muscle_percent_define_get_loc", quote (variable));
return location_decode (loc_name);
} }
char const * char const *
muscle_percent_define_get_syncline (char const *variable) muscle_percent_define_get_syncline (char const *variable)
{ {
uniqstr syncline_name = muscle_name (variable, "syncline"); return muscle_percent_define_get_raw (variable, "syncline");
char const *syncline = muscle_find_const (syncline_name);
if (!syncline)
complain (NULL, fatal, _("%s: undefined %%define variable %s"),
"muscle_percent_define_get_syncline", quote (variable));
return syncline;
} }
bool bool