diff options
| author | Tristan Gingold <tgingold@free.fr> | 2019-08-05 08:09:00 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2019-08-05 08:09:00 +0200 |
| commit | 8c7b05c79661cd140305c214de9b00747042723c (patch) | |
| tree | 7348e9c0ceecf87513da5bb94ade85aaa09e6e48 /src | |
| parent | 714e8f8fa56a1abd238e6a9d97e7f6a4eb8e82ac (diff) | |
| download | ghdl-8c7b05c79661cd140305c214de9b00747042723c.tar.gz ghdl-8c7b05c79661cd140305c214de9b00747042723c.tar.bz2 ghdl-8c7b05c79661cd140305c214de9b00747042723c.zip | |
synth: improve support of vhdl08. Fix #882
Diffstat (limited to 'src')
| -rw-r--r-- | src/synth/synth-decls.adb | 17 | ||||
| -rw-r--r-- | src/vhdl/vhdl-annotations.adb | 10 |
2 files changed, 22 insertions, 5 deletions
diff --git a/src/synth/synth-decls.adb b/src/synth/synth-decls.adb index b31e2c1cb..53a5b0c5f 100644 --- a/src/synth/synth-decls.adb +++ b/src/synth/synth-decls.adb @@ -205,10 +205,19 @@ package body Synth.Decls is Etyp : Type_Acc; Bnds : Bound_Array_Acc; begin - -- LRM93 12.3.1.3 - -- The elaboration of an index constraint consists of the - -- declaration of each of the discrete ranges in the index - -- constraint in some order that is not defined by the language. + -- VHDL08 + if Get_Array_Element_Constraint (Atype) /= Null_Node + or else + (Get_Resolution_Indication (Atype) /= Null_Node + and then + (Get_Kind (Get_Resolution_Indication (Atype)) + = Iir_Kind_Array_Element_Resolution)) + then + -- This subtype has created a new anonymous subtype for the + -- element. + Synth_Subtype_Indication (Syn_Inst, El_Type); + end if; + Etyp := Get_Value_Type (Syn_Inst, El_Type); if Etyp.Kind = Type_Bit diff --git a/src/vhdl/vhdl-annotations.adb b/src/vhdl/vhdl-annotations.adb index d61117bb4..cb44f98f0 100644 --- a/src/vhdl/vhdl-annotations.adb +++ b/src/vhdl/vhdl-annotations.adb @@ -383,7 +383,15 @@ package body Vhdl.Annotations is end if; when Iir_Kind_Array_Subtype_Definition => - if Get_Array_Element_Constraint (Def) /= Null_Node then + if Get_Array_Element_Constraint (Def) /= Null_Node + or else + (Get_Resolution_Indication (Def) /= Null_Node + and then + (Get_Kind (Get_Resolution_Indication (Def)) + = Iir_Kind_Array_Element_Resolution)) + then + -- This subtype has created a new anonymous subtype for the + -- element. Annotate_Type_Definition (Block_Info, Get_Element_Subtype (Def)); end if; |