Hi!
I've noticed a lot of diagnostic messages in the C FE aren't marked
for translation.
The reason is some weird coding style which wraps the string
literals into (), especially when they don't fit on a single line.
With that fixed, there were 83 unique similar messages
"both %<something%> and %<something%> in declaration specifiers"
marked for translation, which is very unfriendly to translators,
the patch brings that down to 4 (if it was ok to change order,
it could be even 3):
msgid "both %qs and %qs in declaration specifiers"
msgid "both %qs and %<__int%d%> in declaration specifiers"
msgid "both %qs and %<_Float%d%s%> in declaration specifiers"
msgid "both %<__int%d%> and %qs in declaration specifiers"
Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk?
2025-09-05 Jakub Jelinek <ja...@redhat.com>
* c-decl.cc (pushtag): Remove ()s around string literal
in call to diagnostic function.
(diagnose_mismatched_decls): Likewise.
(c_check_switch_jump_warnings): Likewise.
(grokdeclarator): Likewise.
(warn_cxx_compat_finish_struct): Likewise.
(build_enumerator): Formatting fix.
(declspecs_add_type): Remove ()s around string literal
in call to diagnostic function, simplify
"both %<something%> and %<something%>" starting format
strings to "both %qs and %qs" with appropriate arguments.
Formatting fixes.
* c-typeck.cc (build_external_ref): Remove ()s around string
literal in call to diagnostic function.
(build_conditional_expr): Likewise.
* c-parser.cc (c_parser_transaction): Use G_() around string
literals. Formatting fix.
(c_parser_transaction_expression): Likewise.
--- gcc/c/c-decl.cc.jj 2025-08-15 22:31:17.246081682 +0200
+++ gcc/c/c-decl.cc 2025-09-04 10:05:13.190060298 +0200
@@ -1726,8 +1726,8 @@ pushtag (location_t loc, tree name, tree
{
auto_diagnostic_group d;
if (warning_at (loc, OPT_Wc___compat,
- ("using %qD as both a typedef and a tag is "
- "invalid in C++"), b->decl)
+ "using %qD as both a typedef and a tag is "
+ "invalid in C++", b->decl)
&& b->locus != UNKNOWN_LOCATION)
inform (b->locus, "originally defined here");
}
@@ -2630,9 +2630,8 @@ diagnose_mismatched_decls (tree newdecl,
&& !DECL_EXTERNAL (olddecl))
warned |= warning_at (DECL_SOURCE_LOCATION (newdecl),
OPT_Wc___compat,
- ("duplicate declaration of %qD is "
- "invalid in C++"),
- newdecl);
+ "duplicate declaration of %qD is "
+ "invalid in C++", newdecl);
}
/* warnings */
@@ -4368,8 +4367,8 @@ c_check_switch_jump_warnings (struct c_s
{
saw_error = true;
error_at (case_loc,
- ("switch jumps into scope of identifier with "
- "variably modified type"));
+ "switch jumps into scope of identifier with "
+ "variably modified type");
emitted = true;
}
else if (flag_openmp
@@ -7768,8 +7767,8 @@ grokdeclarator (const struct c_declarato
{
auto_diagnostic_group d;
if (warning_at (declarator->id_loc, OPT_Wc___compat,
- ("using %qD as both a typedef and a tag is "
- "invalid in C++"), decl)
+ "using %qD as both a typedef and a tag is "
+ "invalid in C++", decl)
&& b->locus != UNKNOWN_LOCATION)
inform (b->locus, "originally defined here");
}
@@ -8267,9 +8266,8 @@ grokdeclarator (const struct c_declarato
|| TREE_CODE (TREE_TYPE (decl)) == ENUMERAL_TYPE)
&& TYPE_NAME (TREE_TYPE (decl)) == NULL_TREE)
warning_at (DECL_SOURCE_LOCATION (decl), OPT_Wc___compat,
- ("non-local variable %qD with anonymous type is "
- "questionable in C++"),
- decl);
+ "non-local variable %qD with anonymous type is "
+ "questionable in C++", decl);
return decl;
}
@@ -9130,9 +9128,8 @@ warn_cxx_compat_finish_struct (tree fiel
&& tset.contains (DECL_NAME (x)))
{
warning_at (DECL_SOURCE_LOCATION (x), OPT_Wc___compat,
- ("using %qD as both field and typedef name is "
- "invalid in C++"),
- x);
+ "using %qD as both field and typedef name is "
+ "invalid in C++", x);
/* FIXME: It would be nice to report the location where
the typedef name is used. */
}
@@ -10331,9 +10328,9 @@ build_enumerator (location_t decl_loc, l
overflows.) */
warned_range = pedwarn (loc, OPT_Wpedantic,
"enumerator value outside the range of %qs",
- (TYPE_UNSIGNED (TREE_TYPE (value))
- ? "uintmax_t"
- : "intmax_t"));
+ TYPE_UNSIGNED (TREE_TYPE (value))
+ ? "uintmax_t"
+ : "intmax_t");
if (!warned_range && !int_fits_type_p (value, integer_type_node))
pedwarn_c11 (loc, OPT_Wpedantic,
"ISO C restricts enumerator values to range of %<int%> "
@@ -11955,8 +11952,8 @@ declspecs_add_type (location_t loc, stru
if (specs->typespec_word == cts_double)
{
error_at (loc,
- ("both %<long long%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long long", "double");
break;
}
pedwarn_c90 (loc, OPT_Wlong_long,
@@ -11967,61 +11964,60 @@ declspecs_add_type (location_t loc, stru
}
if (specs->short_p)
error_at (loc,
- ("both %<long%> and %<short%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "short");
else if (specs->typespec_word == cts_auto_type)
error_at (loc,
- ("both %<long%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "__auto_type");
else if (specs->typespec_word == cts_void)
error_at (loc,
- ("both %<long%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "void");
else if (specs->typespec_word == cts_int_n)
error_at (loc,
- ("both %<long%> and %<__int%d%> in "
- "declaration specifiers"),
- int_n_data[specs->u.int_n_idx].bitsize);
+ "both %qs and %<__int%d%> in declaration specifiers",
+ "long", int_n_data[specs->u.int_n_idx].bitsize);
else if (specs->typespec_word == cts_bool)
error_at (loc,
- ("both %<long%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "_Bool");
else if (specs->typespec_word == cts_bitint)
error_at (loc,
- ("both %<long%> and %<_BitInt%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "_BitInt");
else if (specs->typespec_word == cts_char)
error_at (loc,
- ("both %<long%> and %<char%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "char");
else if (specs->typespec_word == cts_float)
error_at (loc,
- ("both %<long%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "float");
else if (specs->typespec_word == cts_floatn_nx)
error_at (loc,
- ("both %<long%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "long",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (specs->typespec_word == cts_dfloat32)
error_at (loc,
- ("both %<long%> and %<_Decimal32%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "_Decimal32");
else if (specs->typespec_word == cts_dfloat64)
error_at (loc,
- ("both %<long%> and %<_Decimal64%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "_Decimal64");
else if (specs->typespec_word == cts_dfloat128)
error_at (loc,
- ("both %<long%> and %<_Decimal128%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "_Decimal128");
else if (specs->typespec_word == cts_dfloat64x)
error_at (loc,
- ("both %<long%> and %<_Decimal64x%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "_Decimal64x");
else
{
specs->long_p = true;
@@ -12032,65 +12028,64 @@ declspecs_add_type (location_t loc, stru
dupe = specs->short_p;
if (specs->long_p)
error_at (loc,
- ("both %<long%> and %<short%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "short");
else if (specs->typespec_word == cts_auto_type)
error_at (loc,
- ("both %<short%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "__auto_type");
else if (specs->typespec_word == cts_void)
error_at (loc,
- ("both %<short%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "void");
else if (specs->typespec_word == cts_int_n)
error_at (loc,
- ("both %<short%> and %<__int%d%> in "
- "declaration specifiers"),
- int_n_data[specs->u.int_n_idx].bitsize);
+ "both %qs and %<__int%d%> in declaration specifiers",
+ "short", int_n_data[specs->u.int_n_idx].bitsize);
else if (specs->typespec_word == cts_bool)
error_at (loc,
- ("both %<short%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "_Bool");
else if (specs->typespec_word == cts_bitint)
error_at (loc,
- ("both %<short%> and %<_BitInt%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "_BitInt");
else if (specs->typespec_word == cts_char)
error_at (loc,
- ("both %<short%> and %<char%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "char");
else if (specs->typespec_word == cts_float)
error_at (loc,
- ("both %<short%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "float");
else if (specs->typespec_word == cts_double)
error_at (loc,
- ("both %<short%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "double");
else if (specs->typespec_word == cts_floatn_nx)
error_at (loc,
- ("both %<short%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "short",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (specs->typespec_word == cts_dfloat32)
error_at (loc,
- ("both %<short%> and %<_Decimal32%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "_Decimal32");
else if (specs->typespec_word == cts_dfloat64)
error_at (loc,
- ("both %<short%> and %<_Decimal64%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "_Decimal64");
else if (specs->typespec_word == cts_dfloat128)
error_at (loc,
- ("both %<short%> and %<_Decimal128%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "_Decimal128");
else if (specs->typespec_word == cts_dfloat64x)
error_at (loc,
- ("both %<short%> and %<_Decimal64x%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "_Decimal64x");
else
{
specs->short_p = true;
@@ -12101,52 +12096,52 @@ declspecs_add_type (location_t loc, stru
dupe = specs->signed_p;
if (specs->unsigned_p)
error_at (loc,
- ("both %<signed%> and %<unsigned%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "unsigned");
else if (specs->typespec_word == cts_auto_type)
error_at (loc,
- ("both %<signed%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "__auto_type");
else if (specs->typespec_word == cts_void)
error_at (loc,
- ("both %<signed%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "void");
else if (specs->typespec_word == cts_bool)
error_at (loc,
- ("both %<signed%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "_Bool");
else if (specs->typespec_word == cts_float)
error_at (loc,
- ("both %<signed%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "float");
else if (specs->typespec_word == cts_double)
error_at (loc,
- ("both %<signed%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "double");
else if (specs->typespec_word == cts_floatn_nx)
error_at (loc,
- ("both %<signed%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "signed",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (specs->typespec_word == cts_dfloat32)
error_at (loc,
- ("both %<signed%> and %<_Decimal32%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "_Decimal32");
else if (specs->typespec_word == cts_dfloat64)
error_at (loc,
- ("both %<signed%> and %<_Decimal64%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "_Decimal64");
else if (specs->typespec_word == cts_dfloat128)
error_at (loc,
- ("both %<signed%> and %<_Decimal128%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "_Decimal128");
else if (specs->typespec_word == cts_dfloat64x)
error_at (loc,
- ("both %<signed%> and %<_Decimal64x%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "_Decimal64x");
else
{
specs->signed_p = true;
@@ -12157,52 +12152,52 @@ declspecs_add_type (location_t loc, stru
dupe = specs->unsigned_p;
if (specs->signed_p)
error_at (loc,
- ("both %<signed%> and %<unsigned%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "unsigned");
else if (specs->typespec_word == cts_auto_type)
error_at (loc,
- ("both %<unsigned%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "__auto_type");
else if (specs->typespec_word == cts_void)
error_at (loc,
- ("both %<unsigned%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "void");
else if (specs->typespec_word == cts_bool)
error_at (loc,
- ("both %<unsigned%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "_Bool");
else if (specs->typespec_word == cts_float)
error_at (loc,
- ("both %<unsigned%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "float");
else if (specs->typespec_word == cts_double)
error_at (loc,
- ("both %<unsigned%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "double");
else if (specs->typespec_word == cts_floatn_nx)
error_at (loc,
- ("both %<unsigned%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "unsigned",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (specs->typespec_word == cts_dfloat32)
error_at (loc,
- ("both %<unsigned%> and %<_Decimal32%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "_Decimal32");
else if (specs->typespec_word == cts_dfloat64)
error_at (loc,
- ("both %<unsigned%> and %<_Decimal64%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "_Decimal64");
else if (specs->typespec_word == cts_dfloat128)
error_at (loc,
- ("both %<unsigned%> and %<_Decimal128%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "_Decimal128");
else if (specs->typespec_word == cts_dfloat64x)
error_at (loc,
- ("both %<unsigned%> and %<_Decimal64x%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "_Decimal64x");
else
{
specs->unsigned_p = true;
@@ -12216,48 +12211,48 @@ declspecs_add_type (location_t loc, stru
"ISO C90 does not support complex types");
if (specs->typespec_word == cts_auto_type)
error_at (loc,
- ("both %<complex%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "__auto_type");
else if (specs->typespec_word == cts_void)
error_at (loc,
- ("both %<complex%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "void");
else if (specs->typespec_word == cts_bool)
error_at (loc,
- ("both %<complex%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_Bool");
else if (specs->typespec_word == cts_bitint)
error_at (loc,
- ("both %<complex%> and %<_BitInt%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_BitInt");
else if (specs->typespec_word == cts_dfloat32)
error_at (loc,
- ("both %<complex%> and %<_Decimal32%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_Decimal32");
else if (specs->typespec_word == cts_dfloat64)
error_at (loc,
- ("both %<complex%> and %<_Decimal64%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_Decimal64");
else if (specs->typespec_word == cts_dfloat128)
error_at (loc,
- ("both %<complex%> and %<_Decimal128%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_Decimal128");
else if (specs->typespec_word == cts_dfloat64x)
error_at (loc,
- ("both %<complex%> and %<_Decimal64x%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_Decimal64x");
else if (specs->typespec_word == cts_fract)
error_at (loc,
- ("both %<complex%> and %<_Fract%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_Fract");
else if (specs->typespec_word == cts_accum)
error_at (loc,
- ("both %<complex%> and %<_Accum%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_Accum");
else if (specs->saturating_p)
error_at (loc,
- ("both %<complex%> and %<_Sat%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_Sat");
else
{
specs->complex_p = true;
@@ -12269,72 +12264,69 @@ declspecs_add_type (location_t loc, stru
pedwarn (loc, OPT_Wpedantic,
"ISO C does not support saturating types");
if (specs->typespec_word == cts_int_n)
- {
- error_at (loc,
- ("both %<_Sat%> and %<__int%d%> in "
- "declaration specifiers"),
- int_n_data[specs->u.int_n_idx].bitsize);
- }
+ error_at (loc,
+ "both %qs and %<__int%d%> in declaration specifiers",
+ "_Sat", int_n_data[specs->u.int_n_idx].bitsize);
else if (specs->typespec_word == cts_auto_type)
error_at (loc,
- ("both %<_Sat%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "__auto_type");
else if (specs->typespec_word == cts_void)
error_at (loc,
- ("both %<_Sat%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "void");
else if (specs->typespec_word == cts_bool)
error_at (loc,
- ("both %<_Sat%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "_Bool");
else if (specs->typespec_word == cts_bitint)
error_at (loc,
- ("both %<_Sat%> and %<_BitInt%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "_BitInt");
else if (specs->typespec_word == cts_char)
error_at (loc,
- ("both %<_Sat%> and %<char%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "char");
else if (specs->typespec_word == cts_int)
error_at (loc,
- ("both %<_Sat%> and %<int%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "int");
else if (specs->typespec_word == cts_float)
error_at (loc,
- ("both %<_Sat%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "float");
else if (specs->typespec_word == cts_double)
error_at (loc,
- ("both %<_Sat%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "double");
else if (specs->typespec_word == cts_floatn_nx)
error_at (loc,
- ("both %<_Sat%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "_Sat",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (specs->typespec_word == cts_dfloat32)
error_at (loc,
- ("both %<_Sat%> and %<_Decimal32%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "_Decimal32");
else if (specs->typespec_word == cts_dfloat64)
error_at (loc,
- ("both %<_Sat%> and %<_Decimal64%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "_Decimal64");
else if (specs->typespec_word == cts_dfloat128)
error_at (loc,
- ("both %<_Sat%> and %<_Decimal128%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "_Decimal128");
else if (specs->typespec_word == cts_dfloat64x)
error_at (loc,
- ("both %<_Sat%> and %<_Decimal64x%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "_Decimal64x");
else if (specs->complex_p)
error_at (loc,
- ("both %<_Sat%> and %<complex%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "complex");
else
{
specs->saturating_p = true;
@@ -12381,28 +12373,28 @@ declspecs_add_type (location_t loc, stru
case RID_AUTO_TYPE:
if (specs->long_p)
error_at (loc,
- ("both %<long%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "__auto_type");
else if (specs->short_p)
error_at (loc,
- ("both %<short%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "__auto_type");
else if (specs->signed_p)
error_at (loc,
- ("both %<signed%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "__auto_type");
else if (specs->unsigned_p)
error_at (loc,
- ("both %<unsigned%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "__auto_type");
else if (specs->complex_p)
error_at (loc,
- ("both %<complex%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "__auto_type");
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<__auto_type%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "__auto_type");
else
{
specs->typespec_word = cts_auto_type;
@@ -12425,19 +12417,16 @@ declspecs_add_type (location_t loc, stru
if (specs->long_p)
error_at (loc,
- ("both %<__int%d%> and %<long%> in "
- "declaration specifiers"),
- int_n_data[specs->u.int_n_idx].bitsize);
+ "both %<__int%d%> and %qs in declaration specifiers",
+ int_n_data[specs->u.int_n_idx].bitsize, "long");
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<__int%d%> in "
- "declaration specifiers"),
- int_n_data[specs->u.int_n_idx].bitsize);
+ "both %qs and %<__int%d%> in declaration specifiers",
+ "_Sat", int_n_data[specs->u.int_n_idx].bitsize);
else if (specs->short_p)
error_at (loc,
- ("both %<__int%d%> and %<short%> in "
- "declaration specifiers"),
- int_n_data[specs->u.int_n_idx].bitsize);
+ "both %<__int%d%> and %qs in declaration specifiers",
+ int_n_data[specs->u.int_n_idx].bitsize, "short");
else if (! int_n_enabled_p[specs->u.int_n_idx])
{
specs->typespec_word = cts_int_n;
@@ -12454,28 +12443,28 @@ declspecs_add_type (location_t loc, stru
case RID_VOID:
if (specs->long_p)
error_at (loc,
- ("both %<long%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "void");
else if (specs->short_p)
error_at (loc,
- ("both %<short%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "void");
else if (specs->signed_p)
error_at (loc,
- ("both %<signed%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "void");
else if (specs->unsigned_p)
error_at (loc,
- ("both %<unsigned%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "void");
else if (specs->complex_p)
error_at (loc,
- ("both %<complex%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "void");
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<void%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "void");
else
{
specs->typespec_word = cts_void;
@@ -12488,28 +12477,28 @@ declspecs_add_type (location_t loc, stru
"ISO C90 does not support boolean types");
if (specs->long_p)
error_at (loc,
- ("both %<long%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "_Bool");
else if (specs->short_p)
error_at (loc,
- ("both %<short%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "_Bool");
else if (specs->signed_p)
error_at (loc,
- ("both %<signed%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "_Bool");
else if (specs->unsigned_p)
error_at (loc,
- ("both %<unsigned%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "_Bool");
else if (specs->complex_p)
error_at (loc,
- ("both %<complex%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_Bool");
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<_Bool%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "_Bool");
else
{
specs->typespec_word = cts_bool;
@@ -12519,16 +12508,16 @@ declspecs_add_type (location_t loc, stru
case RID_CHAR:
if (specs->long_p)
error_at (loc,
- ("both %<long%> and %<char%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "char");
else if (specs->short_p)
error_at (loc,
- ("both %<short%> and %<char%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "char");
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<char%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "char");
else
{
specs->typespec_word = cts_char;
@@ -12538,8 +12527,8 @@ declspecs_add_type (location_t loc, stru
case RID_INT:
if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<int%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "int");
else
{
specs->typespec_word = cts_int;
@@ -12549,24 +12538,24 @@ declspecs_add_type (location_t loc, stru
case RID_FLOAT:
if (specs->long_p)
error_at (loc,
- ("both %<long%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "float");
else if (specs->short_p)
error_at (loc,
- ("both %<short%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "float");
else if (specs->signed_p)
error_at (loc,
- ("both %<signed%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "float");
else if (specs->unsigned_p)
error_at (loc,
- ("both %<unsigned%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "float");
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<float%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "float");
else
{
specs->typespec_word = cts_float;
@@ -12576,24 +12565,24 @@ declspecs_add_type (location_t loc, stru
case RID_DOUBLE:
if (specs->long_long_p)
error_at (loc,
- ("both %<long long%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long long", "double");
else if (specs->short_p)
error_at (loc,
- ("both %<short%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "double");
else if (specs->signed_p)
error_at (loc,
- ("both %<signed%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "signed", "double");
else if (specs->unsigned_p)
error_at (loc,
- ("both %<unsigned%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", "double");
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<double%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "double");
else
{
specs->typespec_word = cts_double;
@@ -12607,59 +12596,59 @@ declspecs_add_type (location_t loc, stru
"ISO C does not support the %<_Float%d%s%> type"
" before C23",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
if (specs->long_p)
error_at (loc,
- ("both %<long%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "long",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (specs->short_p)
error_at (loc,
- ("both %<short%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "short",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (specs->signed_p)
error_at (loc,
- ("both %<signed%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "signed",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (specs->unsigned_p)
error_at (loc,
- ("both %<unsigned%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "unsigned",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<_Float%d%s%> in "
- "declaration specifiers"),
+ "both %qs and %<_Float%d%s%> in declaration "
+ "specifiers", "_Sat",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
else if (FLOATN_NX_TYPE_NODE (specs->u.floatn_nx_idx) ==
NULL_TREE)
{
specs->typespec_word = cts_floatn_nx;
error_at (loc,
"%<_Float%d%s%> is not supported on this target",
floatn_nx_types[specs->u.floatn_nx_idx].n,
- (floatn_nx_types[specs->u.floatn_nx_idx].extended
- ? "x"
- : ""));
+ floatn_nx_types[specs->u.floatn_nx_idx].extended
+ ? "x"
+ : "");
}
else
{
@@ -12683,39 +12672,32 @@ declspecs_add_type (location_t loc, stru
str = "_Decimal64x";
if (specs->long_long_p)
error_at (loc,
- ("both %<long long%> and %qs in "
- "declaration specifiers"),
- str);
+ "both %qs and %qs in declaration specifiers",
+ "long long", str);
if (specs->long_p)
error_at (loc,
- ("both %<long%> and %qs in "
- "declaration specifiers"),
- str);
+ "both %qs and %qs in declaration specifiers",
+ "long", str);
else if (specs->short_p)
error_at (loc,
- ("both %<short%> and %qs in "
- "declaration specifiers"),
- str);
+ "both %qs and %qs in declaration specifiers",
+ "short", str);
else if (specs->signed_p)
error_at (loc,
- ("both %<signed%> and %qs in "
- "declaration specifiers"),
- str);
+ "both %qs and %qs in declaration specifiers",
+ "signed", str);
else if (specs->unsigned_p)
error_at (loc,
- ("both %<unsigned%> and %qs in "
- "declaration specifiers"),
- str);
+ "both %qs and %qs in declaration specifiers",
+ "unsigned", str);
else if (specs->complex_p)
error_at (loc,
- ("both %<complex%> and %qs in "
- "declaration specifiers"),
- str);
+ "both %qs and %qs in declaration specifiers",
+ "complex", str);
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %qs in "
- "declaration specifiers"),
- str);
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", str);
else if (i == RID_DFLOAT32)
specs->typespec_word = cts_dfloat32;
else if (i == RID_DFLOAT64)
@@ -12728,8 +12710,8 @@ declspecs_add_type (location_t loc, stru
}
if (!targetm.decimal_float_supported_p ())
error_at (loc,
- ("decimal floating-point not supported "
- "for this target"));
+ "decimal floating-point not supported "
+ "for this target");
pedwarn_c11 (loc, OPT_Wpedantic,
"ISO C does not support decimal floating-point "
"before C23");
@@ -12744,9 +12726,8 @@ declspecs_add_type (location_t loc, stru
str = "_Accum";
if (specs->complex_p)
error_at (loc,
- ("both %<complex%> and %qs in "
- "declaration specifiers"),
- str);
+ "both %qs and %qs in declaration specifiers",
+ "complex", str);
else if (i == RID_FRACT)
specs->typespec_word = cts_fract;
else
@@ -12762,20 +12743,20 @@ declspecs_add_type (location_t loc, stru
case RID_BITINT:
if (specs->long_p)
error_at (loc,
- ("both %<long%> and %<_BitInt%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "long", "_BitInt");
else if (specs->short_p)
error_at (loc,
- ("both %<short%> and %<_BitInt%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "short", "_BitInt");
else if (specs->complex_p)
error_at (loc,
- ("both %<complex%> and %<_BitInt%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "complex", "_BitInt");
else if (specs->saturating_p)
error_at (loc,
- ("both %<_Sat%> and %<_BitInt%> in "
- "declaration specifiers"));
+ "both %qs and %qs in declaration specifiers",
+ "_Sat", "_BitInt");
else
{
specs->typespec_word = cts_bitint;
--- gcc/c/c-typeck.cc.jj 2025-08-23 15:00:03.711795308 +0200
+++ gcc/c/c-typeck.cc 2025-09-04 10:08:23.673556421 +0200
@@ -3717,8 +3717,8 @@ build_external_ref (location_t loc, tree
&& C_TYPE_DEFINED_IN_STRUCT (TREE_TYPE (ref)))
{
warning_at (loc, OPT_Wc___compat,
- ("enum constant defined in struct or union "
- "is not visible in C++"));
+ "enum constant defined in struct or union "
+ "is not visible in C++");
inform (DECL_SOURCE_LOCATION (ref), "enum constant defined here");
}
@@ -6421,9 +6421,8 @@ build_conditional_expr (location_t colon
&& TREE_CODE (t2) == ENUMERAL_TYPE
&& TYPE_MAIN_VARIANT (t1) != TYPE_MAIN_VARIANT (t2))
warning_at (colon_loc, OPT_Wc___compat,
- ("different enum types in conditional is "
- "invalid in C++: %qT vs %qT"),
- t1, t2);
+ "different enum types in conditional is "
+ "invalid in C++: %qT vs %qT", t1, t2);
}
if (warn_zero_as_null_pointer_constant
--- gcc/c/c-parser.cc.jj 2025-08-27 10:20:32.362413128 +0200
+++ gcc/c/c-parser.cc 2025-09-04 10:07:10.749514998 +0200
@@ -30173,10 +30173,12 @@ c_parser_transaction (c_parser *parser,
if (flag_tm)
stmt = c_finish_transaction (loc, stmt, this_in);
else
- error_at (loc, (keyword == RID_TRANSACTION_ATOMIC ?
- "%<__transaction_atomic%> without transactional memory support enabled"
- : "%<__transaction_relaxed %> "
- "without transactional memory support enabled"));
+ error_at (loc,
+ keyword == RID_TRANSACTION_ATOMIC
+ ? G_("%<__transaction_atomic%> without transactional memory "
+ "support enabled")
+ : G_("%<__transaction_relaxed %> without transactional memory "
+ "support enabled"));
return stmt;
}
@@ -30240,10 +30242,12 @@ c_parser_transaction_expression (c_parse
parser->in_transaction = old_in;
if (!flag_tm)
- error_at (loc, (keyword == RID_TRANSACTION_ATOMIC ?
- "%<__transaction_atomic%> without transactional memory support enabled"
- : "%<__transaction_relaxed %> "
- "without transactional memory support enabled"));
+ error_at (loc,
+ keyword == RID_TRANSACTION_ATOMIC
+ ? G_("%<__transaction_atomic%> without transactional memory "
+ "support enabled")
+ : G_("%<__transaction_relaxed %> without transactional memory "
+ "support enabled"));
set_c_expr_source_range (&ret, loc, loc);
Jakub
