Use Flist for records.

1 files changed, 33 insertions, 47 deletions

diff --git a/src/vhdl/translate/trans-chap3.adb b/src/vhdl/translate/trans-chap3.adb
index e585cc747..3538a6ac6 100644
--- a/src/vhdl/translate/trans-chap3.adb
+++ b/src/vhdl/translate/trans-chap3.adb
@@ -409,15 +409,14 @@ package body Trans.Chap3 is
          when Iir_Kind_Record_Type_Definition
             | Iir_Kind_Record_Subtype_Definition =>
             declare
+               List : constant Iir_Flist :=
+                 Get_Elements_Declaration_List (Get_Base_Type (Def));
                El   : Iir;
                Res  : Natural;
-               List : Iir_List;
             begin
                Res := 2;
-               List := Get_Elements_Declaration_List (Get_Base_Type (Def));
-               for I in Natural loop
+               for I in Flist_First .. Flist_Last (List) loop
                   El := Get_Nth_Element (List, I);
-                  exit when El = Null_Iir;
                   Res := Res + Get_File_Signature_Length (Get_Type (El));
                end loop;
                return Res;
@@ -448,15 +447,14 @@ package body Trans.Chap3 is
          when Iir_Kind_Record_Type_Definition
             | Iir_Kind_Record_Subtype_Definition =>
             declare
+               List : constant Iir_Flist :=
+                 Get_Elements_Declaration_List (Get_Base_Type (Def));
                El   : Iir;
-               List : Iir_List;
             begin
                Res (Off) := '<';
                Off := Off + 1;
-               List := Get_Elements_Declaration_List (Get_Base_Type (Def));
-               for I in Natural loop
+               for I in Flist_First .. Flist_Last (List) loop
                   El := Get_Nth_Element (List, I);
-                  exit when El = Null_Iir;
                   Get_File_Signature (Get_Type (El), Res, Off);
                end loop;
                Res (Off) := '>';
@@ -577,17 +575,16 @@ package body Trans.Chap3 is
 
          when Iir_Kind_Record_Subtype_Definition =>
             declare
-               El_List : constant Iir_List :=
+               El_List : constant Iir_Flist :=
                  Get_Elements_Declaration_List (Def);
-               El_Blist : constant Iir_List :=
+               El_Blist : constant Iir_Flist :=
                  Get_Elements_Declaration_List (Get_Base_Type (Def));
                El : Iir;
                Bel : Iir;
                Bel_Info : Field_Info_Acc;
             begin
-               for I in Natural loop
+               for I in Flist_First .. Flist_Last (El_Blist) loop
                   Bel := Get_Nth_Element (El_Blist, I);
-                  exit when Bel = Null_Iir;
                   Bel_Info := Get_Info (Bel);
                   if Bel_Info.Field_Bound /= O_Fnode_Null then
                      El := Get_Nth_Element (El_List, I);
@@ -656,15 +653,14 @@ package body Trans.Chap3 is
 
          when Iir_Kind_Record_Subtype_Definition =>
             declare
-               El_List : constant Iir_List :=
+               El_List : constant Iir_Flist :=
                  Get_Elements_Declaration_List (Def);
                El : Iir;
                El_Info : Field_Info_Acc;
             begin
                Targ := Stabilize (Targ);
-               for I in Natural loop
+               for I in Flist_First .. Flist_Last (El_List) loop
                   El := Get_Nth_Element (El_List, I);
-                  exit when El = Null_Iir;
                   El_Info := Get_Info (Get_Base_Element_Declaration (El));
                   if El_Info.Field_Bound /= O_Fnode_Null then
                      Create_Composite_Subtype_Bounds
@@ -1040,16 +1036,15 @@ package body Trans.Chap3 is
    procedure Translate_Record_Type_Bounds
      (Def : Iir_Record_Type_Definition; Info : Type_Info_Acc)
    is
-      List : constant Iir_List := Get_Elements_Declaration_List (Def);
+      List : constant Iir_Flist := Get_Elements_Declaration_List (Def);
       El : Iir;
       El_Tinfo : Type_Info_Acc;
       El_Info : Field_Info_Acc;
       Constr : O_Element_List;
    begin
       Start_Record_Type (Constr);
-      for I in Natural loop
+      for I in Flist_First .. Flist_Last (List) loop
          El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
          El_Tinfo := Get_Info (Get_Type (El));
          if Is_Unbounded_Type (El_Tinfo) then
             El_Info := Get_Info (El);
@@ -1065,7 +1060,7 @@ package body Trans.Chap3 is
    procedure Translate_Record_Type (Def : Iir_Record_Type_Definition)
    is
       Info       : constant Type_Info_Acc := Get_Info (Def);
-      List       : constant Iir_List := Get_Elements_Declaration_List (Def);
+      List       : constant Iir_Flist := Get_Elements_Declaration_List (Def);
       Is_Unbounded : constant Boolean :=
         Get_Constraint_State (Def) /= Fully_Constrained;
       El_List    : O_Element_List;
@@ -1084,9 +1079,8 @@ package body Trans.Chap3 is
       Need_Size := False;
 
       --  First, translate the anonymous type of the elements.
-      for I in Natural loop
+      for I in Flist_First .. Flist_Last (List) loop
          El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
          El_Type := Get_Type (El);
          if Get_Info (El_Type) = null then
             Push_Identifier_Prefix (Mark, Get_Identifier (El));
@@ -1104,9 +1098,8 @@ package body Trans.Chap3 is
       Info.Ortho_Type (Mode_Signal) := O_Tnode_Null;
       for Kind in Mode_Value .. Type_To_Last_Object_Kind (Def) loop
          Start_Record_Type (El_List);
-         for I in Natural loop
+         for I in Flist_First .. Flist_Last (List) loop
             El := Get_Nth_Element (List, I);
-            exit when El = Null_Iir;
             Field_Info := Get_Info (El);
             El_Tinfo := Get_Info (Get_Type (El));
             if Is_Complex_Type (El_Tinfo)
@@ -1152,11 +1145,11 @@ package body Trans.Chap3 is
       Base_Type  : constant Iir := Get_Base_Type (Def);
       Base_Info  : constant Type_Info_Acc := Get_Info (Base_Type);
       Info       : constant Type_Info_Acc := Get_Info (Def);
-      El_List    : constant Iir_List := Get_Elements_Declaration_List (Def);
+      El_List    : constant Iir_Flist := Get_Elements_Declaration_List (Def);
       Type_Mark  : constant Iir := Get_Subtype_Type_Mark (Def);
-      El_Blist   : constant Iir_List :=
+      El_Blist   : constant Iir_Flist :=
         Get_Elements_Declaration_List (Base_Type);
-      El_Tm_List : Iir_List;
+      El_Tm_List : Iir_Flist;
       El, B_El   : Iir_Element_Declaration;
       El_Type    : Iir;
       El_Btype   : Iir;
@@ -1179,9 +1172,8 @@ package body Trans.Chap3 is
          El_Tm_List := El_Blist;
       end if;
       Has_New_Constraints := False;
-      for I in Natural loop
+      for I in Flist_First .. Flist_Last (El_List) loop
          El := Get_Nth_Element (El_List, I);
-         exit when El = Null_Iir;
          El_Type := Get_Type (El);
          if Is_Fully_Constrained_Type (El) then
             El_Btype := Get_Type (Get_Nth_Element (El_Tm_List, I));
@@ -1223,10 +1215,8 @@ package body Trans.Chap3 is
          Start_Record_Type (Rec);
          New_Record_Field (Rec, Info.S.Box_Field (Kind), Wki_Base,
                            Info.B.Base_Type (Kind));
-         for I in Natural loop
+         for I in Flist_First .. Flist_Last (El_Blist) loop
             B_El := Get_Nth_Element (El_Blist, I);
-            exit when B_El = Null_Iir;
-
             El := Get_Nth_Element (El_List, I);
 
             --  This element has been locally constrained.
@@ -1266,7 +1256,7 @@ package body Trans.Chap3 is
    is
       Info : constant Type_Info_Acc := Get_Info (Def);
       Base : constant O_Dnode := Info.C (Kind).Builder_Base_Param;
-      List : Iir_List;
+      List : constant Iir_Flist := Get_Elements_Declaration_List (Def);
       El   : Iir_Element_Declaration;
 
       Off_Var    : O_Dnode;
@@ -1295,10 +1285,8 @@ package body Trans.Chap3 is
       New_Assign_Stmt (New_Obj (Off_Var), Off_Val);
 
       --  Set memory for each complex element.
-      List := Get_Elements_Declaration_List (Def);
-      for I in Natural loop
+      for I in Flist_First .. Flist_Last (List) loop
          El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
          El_Type := Get_Type (El);
          El_Tinfo := Get_Info (El_Type);
          if Is_Complex_Type (El_Tinfo)
@@ -1994,7 +1982,7 @@ package body Trans.Chap3 is
    procedure Create_Record_Size_Var (Def : Iir; Kind : Object_Kind_Type)
    is
       Info        : constant Type_Info_Acc := Get_Info (Def);
-      List        : constant Iir_List := Get_Elements_Declaration_List (Def);
+      List        : constant Iir_Flist := Get_Elements_Declaration_List (Def);
       El          : Iir_Element_Declaration;
       El_Type     : Iir;
       El_Tinfo    : Type_Info_Acc;
@@ -2021,9 +2009,8 @@ package body Trans.Chap3 is
             Res := Realign (Res, Ghdl_Signal_Ptr);
       end case;
 
-      for I in Natural loop
+      for I in Flist_First .. Flist_Last (List) loop
          El := Get_Nth_Element (List, I);
-         exit when El = Null_Iir;
          El_Type := Get_Type (El);
          El_Tinfo := Get_Info (El_Type);
          if Get_Type_Staticness (El_Type) /= Locally
@@ -2159,13 +2146,13 @@ package body Trans.Chap3 is
             end;
          when Iir_Kind_Record_Type_Definition =>
             declare
-               List : constant Iir_List := Get_Elements_Declaration_List (Def);
+               List : constant Iir_Flist :=
+                 Get_Elements_Declaration_List (Def);
                El   : Iir;
                Asub : Iir;
             begin
-               for I in Natural loop
+               for I in Flist_First .. Flist_Last (List) loop
                   El := Get_Nth_Element (List, I);
-                  exit when El = Null_Iir;
                   Asub := Get_Type (El);
                   if Is_Anonymous_Type_Definition (Asub) then
                      Handle_A_Subtype (Asub);
@@ -2174,13 +2161,13 @@ package body Trans.Chap3 is
             end;
          when Iir_Kind_Record_Subtype_Definition =>
             declare
-               List : constant Iir_List := Get_Elements_Declaration_List (Def);
+               List : constant Iir_Flist :=
+                 Get_Elements_Declaration_List (Def);
                El   : Iir;
                Asub : Iir;
             begin
-               for I in Natural loop
+               for I in Flist_First .. Flist_Last (List) loop
                   El := Get_Nth_Element (List, I);
-                  exit when El = Null_Iir;
                   if Get_Kind (El) = Iir_Kind_Record_Element_Constraint then
                      Asub := Get_Type (El);
                      if Is_Anonymous_Type_Definition (Asub) then
@@ -2993,7 +2980,7 @@ package body Trans.Chap3 is
             end;
          when Type_Mode_Unbounded_Record =>
             declare
-               El_List : constant Iir_List :=
+               El_List : constant Iir_Flist :=
                  Get_Elements_Declaration_List (Atype);
                El : Iir;
                El_Type : Iir;
@@ -3007,9 +2994,8 @@ package body Trans.Chap3 is
                --  Size of base type
                Res := New_Lit (New_Sizeof (Type_Info.B.Base_Type (Kind),
                                            Ghdl_Index_Type));
-               for I in Natural loop
+               for I in Flist_First .. Flist_Last (El_List) loop
                   El := Get_Nth_Element (El_List, I);
-                  exit when El = Null_Iir;
                   El_Type := Get_Type (El);
                   El_Type_Info := Get_Info (El_Type);
                   if El_Type_Info.Type_Mode in Type_Mode_Unbounded then