public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-6911] c++: Allow translations of check_postcondition_result messages [PR109309] Date: Tue, 28 Mar 2023 15:50:49 +0000 (GMT) [thread overview] Message-ID: <20230328155049.69FCF38708AF@sourceware.org> (raw) https://gcc.gnu.org/g:af45b17d0a8fe3e7ae08662008a1f41e48a4a3eb commit r13-6911-gaf45b17d0a8fe3e7ae08662008a1f41e48a4a3eb Author: Jakub Jelinek <jakub@redhat.com> Date: Tue Mar 28 17:49:23 2023 +0200 c++: Allow translations of check_postcondition_result messages [PR109309] As mentioned in the PR, constructing a message from two parts by concatenating them prevents translations, unless one of the parts is a keyword which should be never translated. The following patch fixes that. 2023-03-28 Jakub Jelinek <jakub@redhat.com> PR c++/109309 * contracts.cc: Include intl.h. (check_postcondition_result): Don't form diagnostics from two halves of an English message to allow translations. Diff: --- gcc/cp/contracts.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc index 8aca1bade89..9d1cb558f4f 100644 --- a/gcc/cp/contracts.cc +++ b/gcc/cp/contracts.cc @@ -161,6 +161,7 @@ along with GCC; see the file COPYING3. If not see #include "tree-iterator.h" #include "print-tree.h" #include "stor-layout.h" +#include "intl.h" const int max_custom_roles = 32; static contract_role contract_build_roles[max_custom_roles] = { @@ -636,17 +637,15 @@ bool check_postcondition_result (tree decl, tree type, location_t loc) { if (VOID_TYPE_P (type)) - { - const char* what; - if (DECL_CONSTRUCTOR_P (decl)) - what = "constructor"; - else if (DECL_DESTRUCTOR_P (decl)) - what = "destructor"; - else - what = "function"; - error_at (loc, "%s does not return a value to test", what); - return false; - } + { + error_at (loc, + DECL_CONSTRUCTOR_P (decl) + ? G_("constructor does not return a value to test") + : DECL_DESTRUCTOR_P (decl) + ? G_("destructor does not return a value to test") + : G_("function does not return a value to test")); + return false; + } return true; }
reply other threads:[~2023-03-28 15:50 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230328155049.69FCF38708AF@sourceware.org \ --to=jakub@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).