muscle-tab.c (bison-3.8.1.tar.xz) | : | muscle-tab.c (bison-3.8.2.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 509 | skipping to change at line 509 | |||
uniqstr how_name = muscle_name (variable, "how"); | uniqstr how_name = muscle_name (variable, "how"); | |||
uniqstr kind_name = muscle_name (variable, "kind"); | uniqstr kind_name = muscle_name (variable, "kind"); | |||
/* Command-line options are processed before the grammar file. */ | /* Command-line options are processed before the grammar file. */ | |||
bool warned = false; | bool warned = false; | |||
if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE) | if (how == MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE) | |||
{ | { | |||
char const *current_value = muscle_find_const (name); | char const *current_value = muscle_find_const (name); | |||
if (current_value) | if (current_value) | |||
{ | { | |||
long l = strtol (muscle_find_const (how_name), NULL, 10); | ||||
muscle_percent_define_how how_old | muscle_percent_define_how how_old | |||
= atoi (muscle_find_const (how_name)); | = 0 <= l && l <= INT_MAX ? l : INT_MAX; | |||
if (how_old == MUSCLE_PERCENT_DEFINE_F) | if (how_old == MUSCLE_PERCENT_DEFINE_F) | |||
goto end; | goto end; | |||
/* If assigning the same value, make it a warning. */ | /* If assigning the same value, make it a warning. */ | |||
warnings warn = STREQ (value, current_value) ? Wother : complaint; | warnings warn = STREQ (value, current_value) ? Wother : complaint; | |||
complain (&variable_loc, warn, | complain (&variable_loc, warn, | |||
_("%%define variable %s redefined"), | _("%%define variable %s redefined"), | |||
quote (variable)); | quote (variable)); | |||
location loc = muscle_percent_define_get_loc (variable); | location loc = muscle_percent_define_get_loc (variable); | |||
subcomplain (&loc, warn, _("previous definition")); | subcomplain (&loc, warn, _("previous definition")); | |||
fixits_register (&variable_loc, ""); | fixits_register (&variable_loc, ""); | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |