FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

c++: use G_ instead of _

Browse source 
Since these strings are passed to error_at, they should be marked for
translation with G_, like other diagnostic messages, rather than _, which
forces immediate (redundant) translation.  The use of N_ is less
problematic, but also imprecise.

gcc/cp/ChangeLog:

	* parser.cc (cp_parser_primary_expression): Use G_.
	(cp_parser_using_enum): Likewise.
	* decl.cc (identify_goto): Likewise.
This commit is contained in:
Jason Merrill 2023-10-18 14:10:39 -04:00
parent 04d6c74564
commit f53de2baae
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/cp/decl.cc
View file

@ -3607,8 +3607,8 @@ identify_goto (tree decl, location_t loc, const location_t *locus,
{
bool complained
= emit_diagnostic (diag_kind, loc, 0,
decl ? N_("jump to label %qD")
: N_("jump to case label"), decl);
decl ? G_("jump to label %qD")
: G_("jump to case label"), decl);
if (complained && locus)
inform (*locus, " from here");
return complained;

16
gcc/cp/parser.cc
View file

@ -6206,8 +6206,8 @@ cp_parser_primary_expression (cp_parser *parser,
{
const char *msg
= (TREE_CODE (decl) == PARM_DECL
? _("parameter %qD may not appear in this context")
: _("local variable %qD may not appear in this context"));
? G_("parameter %qD may not appear in this context")
: G_("local variable %qD may not appear in this context"));
error_at (id_expression.get_location (), msg,
decl.get_value ());
return error_mark_node;
@ -22145,16 +22145,16 @@ cp_parser_using_enum (cp_parser *parser)
shall have a reachable enum-specifier. */
const char *msg = nullptr;
if (cxx_dialect < cxx20)
msg = _("%<using enum%> "
"only available with %<-std=c++20%> or %<-std=gnu++20%>");
msg = G_("%<using enum%> "
"only available with %<-std=c++20%> or %<-std=gnu++20%>");
else if (dependent_type_p (type))
msg = _("%<using enum%> of dependent type %qT");
msg = G_("%<using enum%> of dependent type %qT");
else if (TREE_CODE (type) != ENUMERAL_TYPE)
msg = _("%<using enum%> of non-enumeration type %q#T");
msg = G_("%<using enum%> of non-enumeration type %q#T");
else if (!COMPLETE_TYPE_P (type))
msg = _("%<using enum%> of incomplete type %qT");
msg = G_("%<using enum%> of incomplete type %qT");
else if (OPAQUE_ENUM_P (type))
msg = _("%<using enum%> of %qT before its enum-specifier");
msg = G_("%<using enum%> of %qT before its enum-specifier");
if (msg)
{
location_t loc = make_location (start, start, end);