From ee0e651d9b3946910d513e6a670453e25e5f014d Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Tue, 2 Aug 2016 06:02:07 +0200 Subject: Rewrite error messages. --- src/vhdl/translate/trans-chap1.adb | 2 +- src/vhdl/translate/trans-chap3.adb | 3 +-- src/vhdl/translate/trans_be.adb | 2 +- src/vhdl/translate/translation.adb | 10 +++++----- 4 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src/vhdl/translate') diff --git a/src/vhdl/translate/trans-chap1.adb b/src/vhdl/translate/trans-chap1.adb index 3bff1a42e..4c5083ef6 100644 --- a/src/vhdl/translate/trans-chap1.adb +++ b/src/vhdl/translate/trans-chap1.adb @@ -222,7 +222,7 @@ package body Trans.Chap1 is Prev_Subprg_Instance : Subprgs.Subprg_Instance_Stack; begin if Get_Foreign_Flag (Arch) then - Error_Msg_Sem ("FOREIGN architectures are not yet handled", Arch); + Error_Msg_Sem (+Arch, "FOREIGN architectures are not yet handled"); end if; Info := Add_Info (Arch, Kind_Block); diff --git a/src/vhdl/translate/trans-chap3.adb b/src/vhdl/translate/trans-chap3.adb index e39d42ed6..f7a5da6a4 100644 --- a/src/vhdl/translate/trans-chap3.adb +++ b/src/vhdl/translate/trans-chap3.adb @@ -298,8 +298,7 @@ package body Trans.Chap3 is else if Translation.Flag_Only_32b then Error_Msg_Sem - ("range of " & Disp_Node (Get_Type_Declarator (St)) - & " is too large", St); + (+St, "range of %n is too large", +Get_Type_Declarator (St)); return Precision_32; end if; return Precision_64; diff --git a/src/vhdl/translate/trans_be.adb b/src/vhdl/translate/trans_be.adb index 8a8fa63ee..998271ef6 100644 --- a/src/vhdl/translate/trans_be.adb +++ b/src/vhdl/translate/trans_be.adb @@ -129,7 +129,7 @@ package body Trans_Be is begin case Get_Kind (Decl) is when Iir_Kind_Architecture_Body => - Error_Msg_Sem ("FOREIGN architectures are not yet handled", Decl); + Error_Msg_Sem (+Decl, "FOREIGN architectures are not yet handled"); when Iir_Kind_Procedure_Declaration | Iir_Kind_Function_Declaration => null; diff --git a/src/vhdl/translate/translation.adb b/src/vhdl/translate/translation.adb index 79999f78a..27da99f97 100644 --- a/src/vhdl/translate/translation.adb +++ b/src/vhdl/translate/translation.adb @@ -107,7 +107,7 @@ package body Translation is when others => if Get_Expr_Staticness (Expr) /= Locally then Error_Msg_Sem - ("value of FOREIGN attribute must be locally static", Expr); + (+Expr, "value of FOREIGN attribute must be locally static"); Nam_Length := 0; else raise Internal_Error; @@ -135,7 +135,7 @@ package body Translation is end loop; if P > Nam_Length then Error_Msg_Sem - ("missing subprogram/library name after VHPIDIRECT", Spec); + (+Spec, "missing subprogram/library name after VHPIDIRECT"); end if; -- Extract library. Lf := P; @@ -154,7 +154,7 @@ package body Translation is end loop; Sl := P; if P < Nam_Length then - Error_Msg_Sem ("garbage at end of VHPIDIRECT", Spec); + Error_Msg_Sem (+Spec, "garbage at end of VHPIDIRECT"); end if; -- Accept empty library. @@ -178,8 +178,8 @@ package body Translation is return Foreign_Info_Type'(Kind => Foreign_Intrinsic); else Error_Msg_Sem - ("value of 'FOREIGN attribute does not begin with VHPIDIRECT", - Spec); + (+Spec, + "value of 'FOREIGN attribute does not begin with VHPIDIRECT"); return Foreign_Bad; end if; end Translate_Foreign_Id; -- cgit v1.2.3