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

use a more consistent quoting style.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

35
src/muscle-tab.c
View File

@@ -21,12 +21,12 @@
#include "system.h"
#include <hash.h>
#include <quotearg.h>
#include "complain.h"
#include "files.h"
#include "muscle-tab.h"
#include "getargs.h"
#include "muscle-tab.h"
#include "quote.h"
/* A key-value pair, along with storage that can be reclaimed when
this pair is no longer needed. */
@@ -425,8 +425,8 @@ muscle_percent_define_insert (char const *variable, location variable_loc,
free (variable_tr);
return;
}
complain_at (variable_loc, _("%%define variable '%s' redefined"),
variable);
complain_at (variable_loc, _("%%define variable %s redefined"),
quote (variable));
complain_at (muscle_percent_define_get_loc (variable),
_("previous definition"));
}
@@ -467,8 +467,8 @@ muscle_percent_define_get_loc (char const *variable)
char const *loc_name;
loc_name = UNIQSTR_CONCAT ("percent_define_loc(", variable, ")");
if (!muscle_find_const (loc_name))
fatal(_("undefined %%define variable '%s' passed to"
" muscle_percent_define_get_loc"), variable);
fatal(_("%s: undefined %%define variable %s"),
"muscle_percent_define_get_loc", quote (variable));
return muscle_location_decode (loc_name);
}
@@ -481,8 +481,8 @@ muscle_percent_define_get_syncline (char const *variable)
UNIQSTR_CONCAT ("percent_define_syncline(", variable, ")");
syncline = muscle_find_const (syncline_name);
if (!syncline)
fatal(_("undefined %%define variable '%s' passed to"
" muscle_percent_define_get_syncline"), variable);
fatal(_("%s: undefined %%define variable %s"),
"muscle_percent_define_get_syncline", quote (variable));
return syncline;
}
@@ -527,14 +527,14 @@ muscle_percent_define_flag_if (char const *variable)
{
muscle_insert (invalid_boolean_name, "");
complain_at(muscle_percent_define_get_loc (variable),
_("invalid value for %%define Boolean variable '%s'"),
variable);
_("invalid value for %%define Boolean variable %s"),
quote (variable));
}
free (value);
}
else
fatal(_("undefined %%define variable '%s' passed to muscle_percent_define_flag_if"),
variable);
fatal(_("%s: undefined %%define variable %s"),
"muscle_percent_define_flag", quote (variable));
return result;
}
@@ -585,10 +585,10 @@ muscle_percent_define_check_values (char const * const *values)
{
location loc = muscle_percent_define_get_loc (*variablep);
complain_at(loc,
_("invalid value for %%define variable '%s': '%s'"),
*variablep, value);
_("invalid value for %%define variable %s: %s"),
quote (*variablep), quote_n (1, value));
for (values = variablep + 1; *values; ++values)
complain_at (loc, _("accepted value: '%s'"), *values);
complain_at (loc, _("accepted value: %s"), quote (*values));
}
else
{
@@ -598,9 +598,8 @@ muscle_percent_define_check_values (char const * const *values)
free (value);
}
else
fatal(_("undefined %%define variable '%s' passed to"
" muscle_percent_define_check_values"),
*variablep);
fatal (_("%s: undefined %%define variable %s"),
"muscle_percent_define_check_values", quote (*variablep));
}
}