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

style: rename duplicate_directive as duplicate_rule_directive

Browse Source 
* src/complain.h, src/complain.c: here.
Adjust callers.
This commit is contained in:
Akim Demaille
2019-01-16 07:13:43 +01:00
parent 169fe80c7f
commit 2c8fb4d126
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/complain.c
View File

@@ -400,11 +400,10 @@ deprecated_directive (location const *loc, char const *old, char const *upd)
} }
void void
duplicate_directive (char const *directive, duplicate_rule_directive (char const *directive,
location first, location second) location first, location second)
{ {
unsigned i = 0;
complain (&second, complaint, _("only one %s allowed per rule"), directive); complain (&second, complaint, _("only one %s allowed per rule"), directive);
i += SUB_INDENT; unsigned i = SUB_INDENT;
complain_indent (&first, complaint, &i, _("previous declaration")); complain_indent (&first, complaint, &i, _("previous declaration"));
} }

2
src/complain.h
View File

@@ -127,7 +127,7 @@ void deprecated_directive (location const *loc,
char const *obsolete, char const *updated); char const *obsolete, char const *updated);
/** Report a repeated directive for a rule. */ /** Report a repeated directive for a rule. */
void duplicate_directive (char const *directive, void duplicate_rule_directive (char const *directive,
location first, location second); location first, location second);
/** Warnings treated as errors shouldn't stop the execution as regular /** Warnings treated as errors shouldn't stop the execution as regular

8
src/reader.c
View File

@@ -467,7 +467,7 @@ grammar_current_rule_prec_set (symbol *precsym, location loc)
not defined separately as a token. */ not defined separately as a token. */
symbol_class_set (precsym, token_sym, loc, false); symbol_class_set (precsym, token_sym, loc, false);
if (current_rule->ruleprec) if (current_rule->ruleprec)
duplicate_directive ("%prec", duplicate_rule_directive ("%prec",
current_rule->ruleprec->location, loc); current_rule->ruleprec->location, loc);
else else
current_rule->ruleprec = precsym; current_rule->ruleprec = precsym;
@@ -483,7 +483,7 @@ grammar_current_rule_empty_set (location loc)
if (warning_is_unset (Wempty_rule)) if (warning_is_unset (Wempty_rule))
warning_argmatch ("empty-rule", 0, 0); warning_argmatch ("empty-rule", 0, 0);
if (current_rule->percent_empty_loc.start.file) if (current_rule->percent_empty_loc.start.file)
duplicate_directive ("%empty", duplicate_rule_directive ("%empty",
current_rule->percent_empty_loc, loc); current_rule->percent_empty_loc, loc);
else else
current_rule->percent_empty_loc = loc; current_rule->percent_empty_loc = loc;
@@ -501,7 +501,7 @@ grammar_current_rule_dprec_set (int dprec, location loc)
complain (&loc, complaint, _("%s must be followed by positive number"), complain (&loc, complaint, _("%s must be followed by positive number"),
"%dprec"); "%dprec");
else if (current_rule->dprec != 0) else if (current_rule->dprec != 0)
duplicate_directive ("%dprec", duplicate_rule_directive ("%dprec",
current_rule->dprec_location, loc); current_rule->dprec_location, loc);
else else
{ {
@@ -520,7 +520,7 @@ grammar_current_rule_merge_set (uniqstr name, location loc)
complain (&loc, Wother, _("%s affects only GLR parsers"), complain (&loc, Wother, _("%s affects only GLR parsers"),
"%merge"); "%merge");
if (current_rule->merger != 0) if (current_rule->merger != 0)
duplicate_directive ("%merge", duplicate_rule_directive ("%merge",
current_rule->merger_declaration_location, loc); current_rule->merger_declaration_location, loc);
else else
{ {