mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-09 20:33:03 +00:00
Don't include quote.h; not needed.
(get_merge_function): Reword warning to be consistent with type clash diagnostic in grammar_current_rule_check.
This commit is contained in:
@@ -22,7 +22,6 @@
|
||||
|
||||
#include "system.h"
|
||||
#include "quotearg.h"
|
||||
#include "quote.h"
|
||||
#include "getargs.h"
|
||||
#include "files.h"
|
||||
#include "symtab.h"
|
||||
@@ -138,8 +137,8 @@ get_merge_function (const char* name, const char* type,
|
||||
merge_functions = head.next;
|
||||
}
|
||||
else if (strcmp (type, syms->next->type) != 0)
|
||||
warn_at (loc, _("result type clash on merge function %s: `%s' vs. `%s'"),
|
||||
name, type, syms->next->type);
|
||||
warn_at (loc, _("result type clash (`%s' `%s') on merge function %s"),
|
||||
type, syms->next->type, name);
|
||||
return n;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user