Rework for vhdl08 generate: change rtis.

1 files changed, 30 insertions, 6 deletions

diff --git a/src/grt/grt-rtis.ads b/src/grt/grt-rtis.ads
index b5d307b25..e71174076 100644
--- a/src/grt/grt-rtis.ads
+++ b/src/grt/grt-rtis.ads
@@ -35,45 +35,55 @@ package Grt.Rtis is
       Ghdl_Rtik_Package,
       Ghdl_Rtik_Package_Body,
       Ghdl_Rtik_Entity,
+
       Ghdl_Rtik_Architecture,
       Ghdl_Rtik_Process,
       Ghdl_Rtik_Block,
       Ghdl_Rtik_If_Generate,
       Ghdl_Rtik_For_Generate,
-      Ghdl_Rtik_Instance, --10
+
+      Ghdl_Rtik_Generate_Body, -- 10
+      Ghdl_Rtik_Instance,
       Ghdl_Rtik_Constant,
       Ghdl_Rtik_Iterator,
       Ghdl_Rtik_Variable,
+
       Ghdl_Rtik_Signal,
-      Ghdl_Rtik_File, -- 15
+      Ghdl_Rtik_File,
       Ghdl_Rtik_Port,
       Ghdl_Rtik_Generic,
       Ghdl_Rtik_Alias,
+
       Ghdl_Rtik_Guard,
-      Ghdl_Rtik_Component, -- 20
+      Ghdl_Rtik_Component,
       Ghdl_Rtik_Attribute,
       Ghdl_Rtik_Type_B1,        --  Enum
       Ghdl_Rtik_Type_E8,
+
       Ghdl_Rtik_Type_E32,
-      Ghdl_Rtik_Type_I32,       --  25 Scalar
+      Ghdl_Rtik_Type_I32,       --  Scalar
       Ghdl_Rtik_Type_I64,
       Ghdl_Rtik_Type_F64,
       Ghdl_Rtik_Type_P32,
+
       Ghdl_Rtik_Type_P64,
       Ghdl_Rtik_Type_Access,
       Ghdl_Rtik_Type_Array,
       Ghdl_Rtik_Type_Record,
       Ghdl_Rtik_Type_File,
+
       Ghdl_Rtik_Subtype_Scalar,
       Ghdl_Rtik_Subtype_Array,
       Ghdl_Rtik_Subtype_Unconstrained_Array,
       Ghdl_Rtik_Subtype_Record,
       Ghdl_Rtik_Subtype_Access,
+
       Ghdl_Rtik_Type_Protected,
       Ghdl_Rtik_Element,
       Ghdl_Rtik_Unit64,
       Ghdl_Rtik_Unitptr,
       Ghdl_Rtik_Attribute_Transaction,
+
       Ghdl_Rtik_Attribute_Quiet,
       Ghdl_Rtik_Attribute_Stable,
       Ghdl_Rtik_Error);
@@ -127,7 +137,6 @@ package Grt.Rtis is
       Loc : Ghdl_Rti_Loc;
       Linecol : Ghdl_Index_Type;
       Parent : Ghdl_Rti_Access;
-      Size : Ghdl_Index_Type;
       Nbr_Child : Ghdl_Index_Type;
       Children : Ghdl_Rti_Arr_Acc;
    end record;
@@ -137,6 +146,22 @@ package Grt.Rtis is
    function To_Ghdl_Rti_Access is new Ada.Unchecked_Conversion
      (Source => Ghdl_Rtin_Block_Acc, Target => Ghdl_Rti_Access);
 
+   type Ghdl_Rtin_Generate is record
+      Common : Ghdl_Rti_Common;
+      Name : Ghdl_C_String;
+      Loc : Ghdl_Rti_Loc;
+      Linecol : Ghdl_Index_Type;
+      Parent : Ghdl_Rti_Access;
+      --  Only for for_generate_statement.
+      Size : Ghdl_Index_Type;
+      Child : Ghdl_Rti_Access;
+   end record;
+   type Ghdl_Rtin_Generate_Acc is access Ghdl_Rtin_Generate;
+   function To_Ghdl_Rtin_Generate_Acc is new Ada.Unchecked_Conversion
+     (Source => Ghdl_Rti_Access, Target => Ghdl_Rtin_Generate_Acc);
+   function To_Ghdl_Rti_Access is new Ada.Unchecked_Conversion
+     (Source => Ghdl_Rtin_Generate_Acc, Target => Ghdl_Rti_Access);
+
    type Ghdl_Rtin_Block_Filename is record
       Block : Ghdl_Rtin_Block;
       Filename : Ghdl_C_String;
@@ -361,7 +386,6 @@ package Grt.Rtis is
       Loc => Null_Rti_Loc,
       Linecol => 0,
       Parent => null,
-      Size => 0,
       Nbr_Child => 0,
       Children => null);