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

use -Wdeprecated for obsolete %define variable names

Browse Source 
* src/muscle-tab.c (muscle_percent_variable_update): Here.
* tests/input.at (%define backward compatibility): Update expectations.
This commit is contained in:
Akim Demaille
2012-08-20 09:54:40 +02:00
parent 518e88308f
commit 2a8be426c3
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/muscle-tab.c
View File

@@ -388,7 +388,7 @@ muscle_user_name_list_grow (char const *key, char const *user_name,
* otherwise \a variable. */ * otherwise \a variable. */
static static
char const * char const *
muscle_percent_variable_update (char const *variable) muscle_percent_variable_update (char const *variable, location variable_loc)
{ {
typedef struct typedef struct
{ {
@@ -401,11 +401,18 @@ muscle_percent_variable_update (char const *variable)
{ "lr.keep_unreachable_states", "lr.keep-unreachable-states", }, { "lr.keep_unreachable_states", "lr.keep-unreachable-states", },
{ "namespace", "api.namespace", }, { "namespace", "api.namespace", },
}; };
char const *res = variable;
int i; 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)) if (STREQ (conversion[i].obsolete, variable))
return conversion[i].updated; {
return variable; res = conversion[i].updated;
complain_at (variable_loc, Wdeprecated,
_("deprecated %%define variable name: %s, use %s"),
quote (variable), quote_n (1, res));
break;
}
return res;
} }
void void
@@ -419,7 +426,7 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
char const *how_name; char const *how_name;
/* Permit certain names with underscores for backward compatibility. */ /* 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, ")"); name = UNIQSTR_CONCAT ("percent_define(", variable, ")");
loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")"); loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");

9
tests/input.at
View File

@@ -1180,7 +1180,8 @@ AT_DATA([[input.y]],
start: ; start: ;
]]) ]])
AT_BISON_CHECK([[input.y]], [1], [], AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither' [[input.y:1.9-21: warning: deprecated %define variable name: 'api.push_pull', use 'api.push-pull' [-Wdeprecated]
input.y:1.9-21: invalid value for %define variable 'api.push-pull': 'neither'
input.y:1.9-21: accepted value: 'pull' input.y:1.9-21: accepted value: 'pull'
input.y:1.9-21: accepted value: 'push' input.y:1.9-21: accepted value: 'push'
input.y:1.9-21: accepted value: 'both' input.y:1.9-21: accepted value: 'both'
@@ -1192,7 +1193,8 @@ AT_DATA([[input.y]],
start: ; start: ;
]]) ]])
AT_BISON_CHECK([[input.y]], [1], [], AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:1.9-34: invalid value for %define Boolean variable 'lr.keep-unreachable-states' [[input.y:1.9-34: warning: deprecated %define variable name: 'lr.keep_unreachable_states', use 'lr.keep-unreachable-states' [-Wdeprecated]
input.y:1.9-34: invalid value for %define Boolean variable 'lr.keep-unreachable-states'
]]) ]])
AT_DATA([[input.y]], AT_DATA([[input.y]],
@@ -1202,7 +1204,8 @@ AT_DATA([[input.y]],
start: ; start: ;
]]) ]])
AT_BISON_CHECK([[input.y]], [1], [], AT_BISON_CHECK([[input.y]], [1], [],
[[input.y:2.9-21: %define variable 'api.namespace' redefined [[input.y:1.9-17: warning: deprecated %define variable name: 'namespace', use 'api.namespace' [-Wdeprecated]
input.y:2.9-21: %define variable 'api.namespace' redefined
input.y:1.9-17: previous definition input.y:1.9-17: previous definition
]]) ]])