diff options
| author | Tristan Gingold <tgingold@free.fr> | 2021-10-03 21:03:33 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2021-10-03 21:03:33 +0200 |
| commit | 169f89c649dbeb97ef90e8405fdaad8b85651490 (patch) | |
| tree | e07c0e5b54a6fa40bb2a876485568d80e03b3bc9 | |
| parent | f11aa29812b75a42771c9fef4f94474b886cf0f3 (diff) | |
| download | ghdl-169f89c649dbeb97ef90e8405fdaad8b85651490.tar.gz ghdl-169f89c649dbeb97ef90e8405fdaad8b85651490.tar.bz2 ghdl-169f89c649dbeb97ef90e8405fdaad8b85651490.zip | |
grt-change_generics: handle subtype for elements. Fix #1386
| -rw-r--r-- | src/grt/grt-change_generics.adb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/grt/grt-change_generics.adb b/src/grt/grt-change_generics.adb index 6cddfdadd..23fbc9806 100644 --- a/src/grt/grt-change_generics.adb +++ b/src/grt/grt-change_generics.adb @@ -76,6 +76,7 @@ package body Grt.Change_Generics is is El_Rti : constant Ghdl_Rti_Access := Arr_Rti.Element; Idx_Rti : constant Ghdl_Rti_Access := Arr_Rti.Indexes (0); + El_Base_Rti : Ghdl_Rti_Access; Idx_Base_Rti : Ghdl_Rti_Access; St_Rng, Rng : Ghdl_Range_Ptr; Arr : Ghdl_E8_Array_Base_Ptr; @@ -101,7 +102,12 @@ package body Grt.Change_Generics is return; end if; -- - Element must be E8 enum. - if El_Rti.Kind /= Ghdl_Rtik_Type_E8 then + if El_Rti.Kind = Ghdl_Rtik_Subtype_Scalar then + El_Base_Rti := To_Ghdl_Rtin_Subtype_Scalar_Acc (El_Rti).Basetype; + else + El_Base_Rti := El_Rti; + end if; + if El_Base_Rti.Kind /= Ghdl_Rtik_Type_E8 then Error_Override ("non enumerated element type not supported for " & "override of generic", Over); return; @@ -118,7 +124,7 @@ package body Grt.Change_Generics is Arr := To_Ghdl_E8_Array_Base_Ptr (Ghdl_Malloc (Len)); for I in Over.Value'range loop Ghdl_Value_E8_Char (Arr (Ghdl_Index_Type (I - Over.Value'First)), Err, - Over.Value (I), El_Rti); + Over.Value (I), El_Base_Rti); if Err then Error_Override ("invalid character for override of generic", Over); return; |