From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1499) id 09E443858D38; Thu, 25 Apr 2024 17:33:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09E443858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1714066397; bh=Y618mk+eP4yPdTmJlSWvrVyE+jKBcHvuFudRvqZ5AxY=; h=From:To:Subject:Date:From; b=ffjbkZk/XlZzqLnoIAaoZFnExouv08yJYRoPhIrFUxeGIkkpRlbaSR4/V8VASQATY J75vAmiwgFN+2RZw9qtWrfY0feUO2s8ITvVm1wxwUfm14LFesx2Pb3no1ApwV3FUEp cj5zSX8zikl0su/WU7+I4kwIxg1B7wOd/4lSYFJ0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Gaius Mulley To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-10124] PR modula2/114836 Avoid concatenation of error strings to aid error locale translation X-Act-Checkin: gcc X-Git-Author: Gaius Mulley X-Git-Refname: refs/heads/master X-Git-Oldrev: c96c2a304b4a98116520cce497fbf5bab7465f23 X-Git-Newrev: d0e1e1291b10372d71ad3d6cb66b333ea91097e7 Message-Id: <20240425173317.09E443858D38@sourceware.org> Date: Thu, 25 Apr 2024 17:33:15 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d0e1e1291b10372d71ad3d6cb66b333ea91097e7 commit r14-10124-gd0e1e1291b10372d71ad3d6cb66b333ea91097e7 Author: Gaius Mulley Date: Thu Apr 25 18:31:55 2024 +0100 PR modula2/114836 Avoid concatenation of error strings to aid error locale translation This patch avoids a concatenation of error strings making locale translation of the error message easier. gcc/m2/ChangeLog: PR modula2/114836 * gm2-compiler/M2Range.mod (FoldTypeAssign): Avoid error string concatenation. Signed-off-by: Gaius Mulley Diff: --- gcc/m2/gm2-compiler/M2Range.mod | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gcc/m2/gm2-compiler/M2Range.mod b/gcc/m2/gm2-compiler/M2Range.mod index 7686620a247..a8e572eff50 100644 --- a/gcc/m2/gm2-compiler/M2Range.mod +++ b/gcc/m2/gm2-compiler/M2Range.mod @@ -1706,20 +1706,17 @@ BEGIN THEN (* Expression type compatibility rules for pass by reference parameters. *) compatible := ParameterTypeCompatible (tokenNo, - '{%4EN} parameter failure due to expression incompatibility ' + - 'between actual parameter {%3ad} and the {%4N} formal {%2ad} parameter in procedure {%1ad}', + '{%4EN} parameter failure due to expression incompatibility between actual parameter {%3ad} and the {%4N} formal {%2ad} parameter in procedure {%1ad}', procedure, formal, actual, paramNo, TRUE) ELSIF GetPIM () THEN (* Assignment type compatibility rules for pass by value PIM parameters. *) compatible := ParameterTypeCompatible (tokenNo, - '{%4EN} parameter failure due to assignment incompatibility ' + - 'between actual parameter {%3ad} and the {%4N} formal {%2ad} parameter in procedure {%1ad}', + '{%4EN} parameter failure due to assignment incompatibility between actual parameter {%3ad} and the {%4N} formal {%2ad} parameter in procedure {%1ad}', procedure, formal, actual, paramNo, FALSE) ELSE compatible := ParameterTypeCompatible (tokenNo, - '{%4EN} parameter failure due to parameter incompatibility ' + - 'between actual parameter {%3ad} and the {%4N} formal {%2ad} parameter in procedure {%1ad}', + '{%4EN} parameter failure due to parameter incompatibility between actual parameter {%3ad} and the {%4N} formal {%2ad} parameter in procedure {%1ad}', procedure, formal, actual, paramNo, FALSE) END ; IF compatible