Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-11 05:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

warnings: fusion of complain and complain_at

Browse Source 
These functions are very similar, and keeping them seperate makes
future improvements difficult, so merge them.

This impacts 89 calls.

* src/bootstrap.conf: Adjust.
* src/complain.c (complain, complain_at): Merge into...
(complain): this.
(complain_args): Adjust.
* src/complain.h, src/conflicts.c, src/files.c, src/getargs.c,
* src/gram.c, src/location.c, src/muscle-tab.c, src/parse-gram.y,
* src/reader.c, src/reduce.c, src/scan-code.l, src/scan-gram.l,
* src/scan-skel.l, src/symlist.c, src/symtab.c:
Adjust.

Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
This commit is contained in:
Theophile Ranquet
2012-10-01 13:44:20 +00:00
committed by Akim Demaille
parent a49f4904c3
commit bb8e56ff67
19 changed files with 161 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/conflicts.c
View File

@@ -561,7 +561,7 @@ conflicts_print (void)
{
if (! glr_parser && expected_rr_conflicts != -1)
{
complain (Wother, _("%%expect-rr applies only to GLR parsers"));
complain (NULL, Wother, _("%%expect-rr applies only to GLR parsers"));
expected_rr_conflicts = -1;
}
@@ -577,12 +577,12 @@ conflicts_print (void)
if (expected != -1)
{
if (expected != total)
complain (complaint,
complain (NULL, complaint,
_("shift/reduce conflicts: %d found, %d expected"),
total, expected);
}
else if (total)
complain (Wconflicts_sr,
complain (NULL, Wconflicts_sr,
ngettext ("%d shift/reduce conflict",
"%d shift/reduce conflicts",
total),
@@ -599,12 +599,12 @@ conflicts_print (void)
if (expected != -1)
{
if (expected != total)
complain (complaint,
complain (NULL, complaint,
_("reduce/reduce conflicts: %d found, %d expected"),
total, expected);
}
else if (total)
complain (Wconflicts_rr,
complain (NULL, Wconflicts_rr,
ngettext ("%d reduce/reduce conflict",
"%d reduce/reduce conflicts",
total),