From e6ffb98cb5ad3f07bcaf79323d8ab8411688c494 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Tue, 2 Sep 2014 21:17:16 +0200 Subject: Keep names in the tree. This is a large change to improve error locations and allow pretty printing. --- simulate/annotations.adb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'simulate/annotations.adb') diff --git a/simulate/annotations.adb b/simulate/annotations.adb index b447ba374..4508d8373 100644 --- a/simulate/annotations.adb +++ b/simulate/annotations.adb @@ -380,7 +380,7 @@ package body Annotations is when Iir_Kind_File_Type_Definition => declare - Type_Name : constant Iir := Get_Type_Mark (Def); + Type_Name : constant Iir := Get_Type (Get_File_Type_Mark (Def)); Res : String_Acc; begin if Get_Text_File_Flag (Def) @@ -617,8 +617,10 @@ package body Annotations is when Iir_Kind_Function_Declaration | Iir_Kind_Procedure_Declaration => - Annotate_Subprogram_Interfaces_Type (Block_Info, Decl); - Annotate_Subprogram_Specification (Block_Info, Decl); + if not Is_Second_Subprogram_Specification (Decl) then + Annotate_Subprogram_Interfaces_Type (Block_Info, Decl); + Annotate_Subprogram_Specification (Block_Info, Decl); + end if; when Iir_Kind_Function_Body | Iir_Kind_Procedure_Body => Annotate_Subprogram_Body (Block_Info, Decl); -- cgit v1.2.3