mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-10 04:43:03 +00:00
use a more consistent quoting style.
See <http://lists.gnu.org/archive/html/bug-bison/2012-01/msg00120.html>.
Use quotearg as often as possible instead of leaving the choice of
the quotes to the translators. Use shorter messages. Factor similar
messages to a single format, to make localization easier.
* src/files.c, src/getargs.c, src/muscle-tab.c, src/reader.c
* src/scan-code.l, src/scan-gram.l, src/symtab.c:
Use quote() or quotearg_colon() on printf arguments instead of
quotes in the format string.
* data/bison.m4: Keep sync with the changes in muscle-tab.c.
* tests/skeletons.at, tests/input.at, tests/regression.at: Adjust
expected messages.
(cherry picked from commit 4a9cd8f24a)
Conflicts:
src/muscle-tab.c
This commit is contained in:
@@ -754,13 +754,13 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
|
||||
{
|
||||
if (rule->midrule_parent_rule)
|
||||
complain_at (dollar_loc,
|
||||
_("$$ for the midrule at $%d of '%s'"
|
||||
_("$$ for the midrule at $%d of %s"
|
||||
" has no declared type"),
|
||||
rule->midrule_parent_rhs_index,
|
||||
effective_rule->content.sym->tag);
|
||||
quote (effective_rule->content.sym->tag));
|
||||
else
|
||||
complain_at (dollar_loc, _("$$ of '%s' has no declared type"),
|
||||
rule->content.sym->tag);
|
||||
complain_at (dollar_loc, _("$$ of %s has no declared type"),
|
||||
quote (rule->content.sym->tag));
|
||||
}
|
||||
else
|
||||
untyped_var_seen = true;
|
||||
@@ -781,8 +781,8 @@ handle_action_dollar (symbol_list *rule, char *text, location dollar_loc)
|
||||
if (!type_name)
|
||||
{
|
||||
if (union_seen | tag_seen)
|
||||
complain_at (dollar_loc, _("$%s of '%s' has no declared type"),
|
||||
cp, effective_rule->content.sym->tag);
|
||||
complain_at (dollar_loc, _("$%s of %s has no declared type"),
|
||||
cp, quote (effective_rule->content.sym->tag));
|
||||
else
|
||||
untyped_var_seen = true;
|
||||
type_name = "";
|
||||
|
||||
Reference in New Issue
Block a user