diff options
| author | Tristan Gingold <tgingold@free.fr> | 2014-09-02 21:17:16 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2014-09-02 21:17:16 +0200 |
| commit | e6ffb98cb5ad3f07bcaf79323d8ab8411688c494 (patch) | |
| tree | 46a91868b6e4aeb5354249c74507b3e92e85f01f /simulate/annotations.adb | |
| parent | e393e8b7babd9d2dbe5e6bb7816b82036b857a1f (diff) | |
| download | ghdl-e6ffb98cb5ad3f07bcaf79323d8ab8411688c494.tar.gz ghdl-e6ffb98cb5ad3f07bcaf79323d8ab8411688c494.tar.bz2 ghdl-e6ffb98cb5ad3f07bcaf79323d8ab8411688c494.zip | |
Keep names in the tree.
This is a large change to improve error locations and allow pretty printing.
Diffstat (limited to 'simulate/annotations.adb')
| -rw-r--r-- | simulate/annotations.adb | 8 |
1 files changed, 5 insertions, 3 deletions
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); |