From 4a3cb9e31936dda905082d9a27389c1622a3c55c Mon Sep 17 00:00:00 2001 From: Ghjuvan Lacambre Date: Thu, 15 Jul 2021 11:11:00 +0200 Subject: [PATCH] [Ada] Replace use of 'Image with use of Error_Msg_Uint gcc/ada/ * sem_case.adb (Composite_Case_Ops): Replace 'Image with Error_Msg_Uint. --- gcc/ada/sem_case.adb | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gcc/ada/sem_case.adb b/gcc/ada/sem_case.adb index cc7e988226d0..31f14d5353df 100644 --- a/gcc/ada/sem_case.adb +++ b/gcc/ada/sem_case.adb @@ -1717,12 +1717,12 @@ package body Sem_Case is and then List_Length (Expressions (Expr)) /= Nat (Part_Id'Last) then + Error_Msg_Uint_1 := UI_From_Int + (List_Length (Expressions (Expr))); + Error_Msg_Uint_2 := UI_From_Int (Int (Part_Id'Last)); Error_Msg_N - ("Array aggregate length" - & List_Length (Expressions (Expr))'Image - & " does not match length of" - & " statically constrained case selector" - & Part_Id'Last'Image, Expr); + ("array aggregate length ^ does not match length " & + "of statically constrained case selector ^", Expr); return; end if; @@ -1761,12 +1761,13 @@ package body Sem_Case is if not Unconstrained_Array_Case and then Strlen /= Nat (Part_Id'Last) then + Error_Msg_Uint_1 := UI_From_Int (Strlen); + Error_Msg_Uint_2 := UI_From_Int + (Int (Part_Id'Last)); Error_Msg_N - ("String literal length" - & Strlen'Image - & " does not match length of" - & " statically constrained case selector" - & Part_Id'Last'Image, Expr); + ("String literal length ^ does not match length" & + " of statically constrained case selector ^", + Expr); return; end if; -- 2.47.2