diff options
| -rw-r--r-- | src/errorout.adb | 17 | ||||
| -rw-r--r-- | src/errorout.ads | 1 | ||||
| -rw-r--r-- | src/synth/netlists-errors.adb | 13 | ||||
| -rw-r--r-- | src/vhdl/vhdl-errors.adb | 2 |
4 files changed, 23 insertions, 10 deletions
diff --git a/src/errorout.adb b/src/errorout.adb index ab05c956a..f113623ae 100644 --- a/src/errorout.adb +++ b/src/errorout.adb @@ -158,17 +158,22 @@ package body Errorout is procedure Output_Identifier (Id : Name_Id) is begin - Report_Handler.Message (""""); Report_Handler.Message (Name_Table.Image (Id)); - Report_Handler.Message (""""); end Output_Identifier; - procedure Output_Character (C : Character) is + procedure Output_Quoted_Identifier (Id : Name_Id) is + begin + Report_Handler.Message (""""); + Output_Identifier (Id); + Report_Handler.Message (""""); + end Output_Quoted_Identifier; + + procedure Output_Quoted_Character (C : Character) is begin Report_Handler.Message ("'"); Report_Handler.Message ((1 => C)); Report_Handler.Message ("'"); - end Output_Character; + end Output_Quoted_Character; procedure Location_To_Position (Location : Location_Type; File : out Source_File_Entry; @@ -322,13 +327,13 @@ package body Errorout is end if; when Earg_Id => if Format = 'i' then - Output_Identifier (Arg.Val_Id); + Output_Quoted_Identifier (Arg.Val_Id); else raise Internal_Error; end if; when Earg_Char => if Format = 'c' then - Output_Character (Arg.Val_Char); + Output_Quoted_Character (Arg.Val_Char); else raise Internal_Error; end if; diff --git a/src/errorout.ads b/src/errorout.ads index f8cd0eb29..6834f5a0b 100644 --- a/src/errorout.ads +++ b/src/errorout.ads @@ -262,6 +262,7 @@ package Errorout is procedure Register_Earg_Handler (Kind : Earg_Kind; Handler : Earg_Handler); + procedure Output_Quoted_Identifier (Id : Name_Id); procedure Output_Identifier (Id : Name_Id); procedure Output_Location (Err : Error_Record; Loc : Location_Type); procedure Output_Message (S : String); diff --git a/src/synth/netlists-errors.adb b/src/synth/netlists-errors.adb index b67af38d1..86f703ca7 100644 --- a/src/synth/netlists-errors.adb +++ b/src/synth/netlists-errors.adb @@ -61,6 +61,13 @@ package body Netlists.Errors is end case; end Output_Name_1; + procedure Output_Name (N : Sname) is + begin + Output_Message (""""); + Output_Name_1 (N); + Output_Message (""""); + end Output_Name; + procedure Synth_Instance_Handler (Format : Character; Err : Error_Record; Val : Uns32) is @@ -69,7 +76,7 @@ package body Netlists.Errors is begin case Format is when 'n' => - Output_Name_1 (Get_Instance_Name (Inst)); + Output_Name (Get_Instance_Name (Inst)); when 'i' => Output_Message ("i"); Output_Uns32 (Uns32 (Inst)); @@ -96,7 +103,7 @@ package body Netlists.Errors is else Name := Get_Output_Desc (Get_Module (Inst), Idx).Name; end if; - Output_Name_1 (Name); + Output_Name (Name); end; when others => raise Internal_Error; @@ -110,7 +117,7 @@ package body Netlists.Errors is N : constant Sname := Sname (Val); begin if Format = 'n' then - Output_Name_1 (N); + Output_Name (N); else raise Internal_Error; end if; diff --git a/src/vhdl/vhdl-errors.adb b/src/vhdl/vhdl-errors.adb index 15eadf19e..dfae1afe8 100644 --- a/src/vhdl/vhdl-errors.adb +++ b/src/vhdl/vhdl-errors.adb @@ -1096,7 +1096,7 @@ package body Vhdl.Errors is begin case Format is when 'i' => - Output_Identifier (Get_Identifier (N)); + Output_Quoted_Identifier (Get_Identifier (N)); when 'l' => Output_Location (Err, Get_Location (N)); when 'n' => |