From d0e1e1291b10372d71ad3d6cb66b333ea91097e7 Mon Sep 17 00:00:00 2001
From: Gaius Mulley <gaiusmod2@gmail.com>
Date: Thu, 25 Apr 2024 18:31:55 +0100
Subject: [PATCH] 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 <gaiusmod2@gmail.com>
---
 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 7686620a2475..a8e572eff507 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
-- 
GitLab