[gcc r12-6451] [Ada] Simplify construction of messages about configurable runtime
Pierre-Marie de Rodat
pmderodat@gcc.gnu.org
Tue Jan 11 13:26:59 GMT 2022
https://gcc.gnu.org/g:42c54add83708c37b350c71a2979f2d7483a1656
commit r12-6451-g42c54add83708c37b350c71a2979f2d7483a1656
Author: Piotr Trojanek <trojanek@adacore.com>
Date: Mon Jan 3 16:48:01 2022 +0100
[Ada] Simplify construction of messages about configurable runtime
gcc/ada/
* errout.adb (Error_Msg_CRT): Build message with string
concatenation; it is slightly repetitive but much easier to
read.
Diff:
---
gcc/ada/errout.adb | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/gcc/ada/errout.adb b/gcc/ada/errout.adb
index b3c385682f7..b8626376b0c 100644
--- a/gcc/ada/errout.adb
+++ b/gcc/ada/errout.adb
@@ -827,27 +827,14 @@ package body Errout is
-------------------
procedure Error_Msg_CRT (Feature : String; N : Node_Id) is
- CNRT : constant String := " not allowed in no run time mode";
- CCRT : constant String := " not supported by configuration>";
-
- S : String (1 .. Feature'Length + 1 + CCRT'Length);
- L : Natural;
-
begin
- S (1) := '|';
- S (2 .. Feature'Length + 1) := Feature;
- L := Feature'Length + 2;
-
if No_Run_Time_Mode then
- S (L .. L + CNRT'Length - 1) := CNRT;
- L := L + CNRT'Length - 1;
+ Error_Msg_N ('|' & Feature & " not allowed in no run time mode", N);
else pragma Assert (Configurable_Run_Time_Mode);
- S (L .. L + CCRT'Length - 1) := CCRT;
- L := L + CCRT'Length - 1;
+ Error_Msg_N ('|' & Feature & " not supported by configuration>", N);
end if;
- Error_Msg_N (S (1 .. L), N);
Configurable_Run_Time_Violations := Configurable_Run_Time_Violations + 1;
end Error_Msg_CRT;
More information about the Gcc-cvs
mailing list