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:
Akim Demaille
2012-02-08 10:28:58 +01:00
parent 270ff8be14
commit 4c787a31df
13 changed files with 61 additions and 54 deletions

View File

@@ -26,6 +26,7 @@
#include "complain.h"
#include "gram.h"
#include "quote.h"
#include "symtab.h"
/*-------------------------------------------------------------------.
@@ -409,10 +410,10 @@ void
symbol_make_alias (symbol *sym, symbol *str, location loc)
{
if (str->alias)
warn_at (loc, _("symbol '%s' used more than once as a literal string"),
warn_at (loc, _("symbol %s used more than once as a literal string"),
str->tag);
else if (sym->alias)
warn_at (loc, _("symbol '%s' given more than one literal string"),
warn_at (loc, _("symbol %s given more than one literal string"),
sym->tag);
else
{