ghdllocal.adb(Build_Dependence): rebuild file dependencies.

vhdl: remove Get/Set_File_Dependence_List.
Fix #2388

8 files changed, 404 insertions, 433 deletions

diff --git a/src/ghdldrv/ghdldrv.adb b/src/ghdldrv/ghdldrv.adb
index 0313e6057..4a36f95c7 100644
--- a/src/ghdldrv/ghdldrv.adb
+++ b/src/ghdldrv/ghdldrv.adb
@@ -1659,18 +1659,19 @@ package body Ghdldrv is
             if Flag_Verbose then
                Put_Line (":");
                declare
-                  Dep_List : constant Iir_List :=
-                    Get_File_Dependence_List (File);
+                  Dep_List : Iir_List;
                   Dep_It : List_Iterator;
                   Dep_File : Iir;
                begin
-                  Dep_It := List_Iterate_Safe (Dep_List);
+                  Dep_List := Build_File_Dependences (File);
+                  Dep_It := List_Iterate (Dep_List);
                   while Is_Valid (Dep_It) loop
                      Put ("    ");
                      Dep_File := Get_Element (Dep_It);
                      Put_Line (Image (Get_Design_File_Filename (Dep_File)));
                      Next (Dep_It);
                   end loop;
+                  Destroy_Iir_List (Dep_List);
                end;
             else
                New_Line;
@@ -2004,8 +2005,8 @@ package body Ghdldrv is
          if Is_Makeable_File (File) then
             Put (Get_Object_Filename (File));
             Put (": ");
-            Dep_List := Get_File_Dependence_List (File);
-            Dep_It := List_Iterate_Safe (Dep_List);
+            Dep_List := Build_File_Dependences (File);
+            Dep_It := List_Iterate (Dep_List);
             while Is_Valid (Dep_It) loop
                Dep_File := Get_Element (Dep_It);
                if Dep_File /= File and then Is_Makeable_File (Dep_File)
@@ -2015,6 +2016,7 @@ package body Ghdldrv is
                end if;
                Next (Dep_It);
             end loop;
+            Destroy_Iir_List (Dep_List);
             New_Line;
          end if;
          Next (Files_It);
diff --git a/src/ghdldrv/ghdllocal.adb b/src/ghdldrv/ghdllocal.adb
index e7e8f5261..ecc36db39 100644
--- a/src/ghdldrv/ghdllocal.adb
+++ b/src/ghdldrv/ghdllocal.adb
@@ -1532,31 +1532,73 @@ package body Ghdllocal is
       end loop;
    end Check_No_Elab_Flag;
 
+   --  Append all the file on which FILE depends.
+   procedure Append_File_Dependences (File : Iir_Design_File; List : Iir_List)
+   is
+      Unit : Iir;
+      List_It : List_Iterator;
+      Dep_Unit : Iir;
+      Dep_Unit_File : Iir;
+   begin
+      --  Prepend the dependencies.
+      Unit := Get_First_Design_Unit (File);
+      while Unit /= Null_Iir loop
+         List_It := List_Iterate_Safe (Get_Dependence_List (Unit));
+         while Is_Valid (List_It) loop
+            Dep_Unit := Get_Element (List_It);
+            --  TODO: exclude anonymous configurations ?
+            --  A dependency could be an entity aspect.
+            Dep_Unit := Libraries.Find_Design_Unit (Dep_Unit);
+            if Dep_Unit /= Null_Iir then
+               case Get_Kind (Dep_Unit) is
+                  when Iir_Kind_Design_Unit =>
+                     Dep_Unit_File := Get_Parent (Dep_Unit);
+                     if not Get_Elab_Flag (Dep_Unit_File) then
+                        --  Add if not already in the list.
+                        Set_Elab_Flag (Dep_Unit_File, True);
+                        Append_File_Dependences (Dep_Unit_File, List);
+                        Append_Element (List, Dep_Unit_File);
+                     end if;
+                  when Iir_Kind_Foreign_Module =>
+                     null;
+                  when others =>
+                     raise Internal_Error;
+               end case;
+            end if;
+            Next (List_It);
+         end loop;
+         Unit := Get_Chain (Unit);
+      end loop;
+   end Append_File_Dependences;
+
+   procedure Clear_Elab_Flag (List : Iir_List)
+   is
+      It : List_Iterator;
+   begin
+      It := List_Iterate (List);
+      while Is_Valid (It) loop
+         Set_Elab_Flag (Get_Element (It), False);
+         Next (It);
+      end loop;
+   end Clear_Elab_Flag;
+
+   function Build_File_Dependences (File : Iir) return Iir_List
+   is
+      Res : Iir_List;
+   begin
+      Res := Create_Iir_List;
+      Set_Elab_Flag (File, True);
+      Append_File_Dependences (File, Res);
+
+      Clear_Elab_Flag (Res);
+      Set_Elab_Flag (File, False);
+
+      return Res;
+   end Build_File_Dependences;
+
    function Build_Dependence (Lib : Name_Id; Prim : Name_Id; Sec : Name_Id)
                              return Iir_List
    is
-      procedure Build_Dependence_List (File : Iir_Design_File; List : Iir_List)
-      is
-         El : Iir_Design_File;
-         Depend_List : Iir_List;
-         Depend_It : List_Iterator;
-      begin
-         if Get_Elab_Flag (File) then
-            return;
-         end if;
-
-         Set_Elab_Flag (File, True);
-         Depend_List := Get_File_Dependence_List (File);
-         if Depend_List /= Null_Iir_List then
-            Depend_It := List_Iterate (Depend_List);
-            while Is_Valid (Depend_It) loop
-               El := Get_Element (Depend_It);
-               Build_Dependence_List (El, List);
-               Next (Depend_It);
-            end loop;
-         end if;
-         Append_Element (List, File);
-      end Build_Dependence_List;
 
       use Vhdl.Configuration;
 
@@ -1652,9 +1694,15 @@ package body Ghdllocal is
       for I in Design_Units.First .. Design_Units.Last loop
          Unit := Design_Units.Table (I);
          File := Get_Design_File (Unit);
-         Build_Dependence_List (File, Files_List);
+         if not Get_Elab_Flag (File) then
+            Set_Elab_Flag (File, True);
+            Append_File_Dependences (File, Files_List);
+            Append_Element (Files_List, File);
+         end if;
       end loop;
 
+      Clear_Elab_Flag (Files_List);
+
       return Files_List;
    end Build_Dependence;
 
diff --git a/src/ghdldrv/ghdllocal.ads b/src/ghdldrv/ghdllocal.ads
index f476ae24c..953002923 100644
--- a/src/ghdldrv/ghdllocal.ads
+++ b/src/ghdldrv/ghdllocal.ads
@@ -130,9 +130,13 @@ package Ghdllocal is
    --  Raise errorout.compilation_error in case of error (parse error).
    procedure Load_All_Libraries_And_Files;
 
+   --  Return an ordered list of design_files to build LIB.PRIM.SEC.
    function Build_Dependence (Lib : Name_Id; Prim : Name_Id; Sec : Name_Id)
                              return Iir_List;
 
+   --  Return a list of design_file on which FILE depends.
+   function Build_File_Dependences (File : Iir) return Iir_List;
+
    --  Return True iff file FILE has been modified (the file time stamp does
    --  no correspond to what was recorded in the library).
    function Source_File_Modified (File : Iir_Design_File) return Boolean;
diff --git a/src/vhdl/vhdl-configuration.adb b/src/vhdl/vhdl-configuration.adb
index 9777cca6a..a05009c7a 100644
--- a/src/vhdl/vhdl-configuration.adb
+++ b/src/vhdl/vhdl-configuration.adb
@@ -35,7 +35,6 @@ package body Vhdl.Configuration is
    procedure Add_Design_Block_Configuration (Blk : Iir_Block_Configuration);
    procedure Add_Design_Aspect (Aspect : Iir; Add_Default : Boolean);
 
-   Current_File_Dependence : Iir_List := Null_Iir_List;
    Current_Configuration : Iir_Configuration_Declaration := Null_Iir;
 
    --  UNIT is a design unit of a configuration declaration.
@@ -48,18 +47,7 @@ package body Vhdl.Configuration is
       It : List_Iterator;
       El : Iir;
       Lib_Unit : Iir;
-      File : Iir_Design_File;
-      Prev_File_Dependence : Iir_List;
    begin
-      if Flag_Build_File_Dependence then
-         --  The current file depends on unit.
-         File := Get_Design_File (Unit);
-         if Current_File_Dependence /= Null_Iir_List then
-            --  (There is no dependency for default configuration).
-            Add_Element (Current_File_Dependence, File);
-         end if;
-      end if;
-
       --  If already in the table, then nothing to do.
       if Get_Configuration_Mark_Flag (Unit) then
          --  There might be some direct recursions:
@@ -82,26 +70,6 @@ package body Vhdl.Configuration is
 
       Lib_Unit := Get_Library_Unit (Unit);
 
-      if Flag_Build_File_Dependence then
-         --  Switch current_file_dependence to the design file of Unit.
-         Prev_File_Dependence := Current_File_Dependence;
-
-         if Get_Kind (Lib_Unit) = Iir_Kind_Configuration_Declaration
-           and then Get_Identifier (Lib_Unit) = Null_Identifier
-         then
-            --  Do not add dependence for default configuration.
-            Current_File_Dependence := Null_Iir_List;
-         else
-            File := Get_Design_File (Unit);
-            Current_File_Dependence := Get_File_Dependence_List (File);
-            --  Create a list if not yet created.
-            if Current_File_Dependence = Null_Iir_List then
-               Current_File_Dependence := Create_Iir_List;
-               Set_File_Dependence_List (File, Current_File_Dependence);
-            end if;
-         end if;
-      end if;
-
       if Flag_Load_All_Design_Units then
          --  Load and analyze UNIT.
          Load_Design_Unit (Unit, From);
@@ -198,15 +166,6 @@ package body Vhdl.Configuration is
 
       Set_Configuration_Done_Flag (Unit, True);
 
-      --  Restore now the file dependence.
-      --  Indeed, we may add a package body when we are in a package
-      --  declaration.  However, the later does not depend on the former.
-      --  The file which depends on the package declaration also depends on
-      --  the package body.
-      if Flag_Build_File_Dependence then
-         Current_File_Dependence := Prev_File_Dependence;
-      end if;
-
       if Get_Kind (Lib_Unit) = Iir_Kind_Package_Declaration then
          --  Add body (if any).
          declare
diff --git a/src/vhdl/vhdl-nodes.adb b/src/vhdl/vhdl-nodes.adb
index 3891f3f13..e3ece3128 100644
--- a/src/vhdl/vhdl-nodes.adb
+++ b/src/vhdl/vhdl-nodes.adb
@@ -1424,24 +1424,6 @@ package body Vhdl.Nodes is
       Set_Field0 (File, Lib);
    end Set_Library;
 
-   function Get_File_Dependence_List (File : Iir_Design_File) return Iir_List
-   is
-   begin
-      pragma Assert (File /= Null_Iir);
-      pragma Assert (Has_File_Dependence_List (Get_Kind (File)),
-                     "no field File_Dependence_List");
-      return Iir_To_Iir_List (Get_Field1 (File));
-   end Get_File_Dependence_List;
-
-   procedure Set_File_Dependence_List (File : Iir_Design_File; Lst : Iir_List)
-   is
-   begin
-      pragma Assert (File /= Null_Iir);
-      pragma Assert (Has_File_Dependence_List (Get_Kind (File)),
-                     "no field File_Dependence_List");
-      Set_Field1 (File, Iir_List_To_Iir (Lst));
-   end Set_File_Dependence_List;
-
    function Get_Design_File_Filename (File : Iir_Design_File) return Name_Id
    is
    begin
diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads
index 80d8b091b..23de77b2f 100644
--- a/src/vhdl/vhdl-nodes.ads
+++ b/src/vhdl/vhdl-nodes.ads
@@ -187,8 +187,6 @@ package Vhdl.Nodes is
    --   Get/Set_Library (Field0)
    --   Get/Set_Parent (Alias Field0)
    --
-   --   Get/Set_File_Dependence_List (Field1)
-   --
    --   Get/Set_Chain (Field2)
    --
    --  Time when the whole file has been analyzed.  This allows ordering
@@ -7760,11 +7758,6 @@ package Vhdl.Nodes is
    function Get_Library (File : Iir_Design_File) return Iir;
    procedure Set_Library (File : Iir_Design_File; Lib : Iir);
 
-   --  List of files which this design file depends on.
-   --  Field: Field1 (uc)
-   function Get_File_Dependence_List (File : Iir_Design_File) return Iir_List;
-   procedure Set_File_Dependence_List (File : Iir_Design_File; Lst : Iir_List);
-
    --  Identifier for the design file file name.
    --  Field: Field12 (pos)
    function Get_Design_File_Filename (File : Iir_Design_File) return Name_Id;
diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb
index 64757ba69..7fd44159b 100644
--- a/src/vhdl/vhdl-nodes_meta.adb
+++ b/src/vhdl/vhdl-nodes_meta.adb
@@ -24,7 +24,6 @@ package body Vhdl.Nodes_Meta is
       Field_Analysis_Time_Stamp => Type_Time_Stamp_Id,
       Field_Design_File_Source => Type_Source_File_Entry,
       Field_Library => Type_Iir,
-      Field_File_Dependence_List => Type_Iir_List,
       Field_Design_File_Filename => Type_Name_Id,
       Field_Design_File_Directory => Type_Name_Id,
       Field_Design_File => Type_Iir,
@@ -429,8 +428,6 @@ package body Vhdl.Nodes_Meta is
             return "design_file_source";
          when Field_Library =>
             return "library";
-         when Field_File_Dependence_List =>
-            return "file_dependence_list";
          when Field_Design_File_Filename =>
             return "design_file_filename";
          when Field_Design_File_Directory =>
@@ -1865,8 +1862,6 @@ package body Vhdl.Nodes_Meta is
             return Attr_None;
          when Field_Library =>
             return Attr_Ref;
-         when Field_File_Dependence_List =>
-            return Attr_None;
          when Field_Design_File_Filename =>
             return Attr_None;
          when Field_Design_File_Directory =>
@@ -2649,7 +2644,6 @@ package body Vhdl.Nodes_Meta is
       Field_Design_File_Source,
       Field_Elab_Flag,
       Field_Library,
-      Field_File_Dependence_List,
       Field_Chain,
       Field_First_Design_Unit,
       Field_Last_Design_Unit,
@@ -5396,328 +5390,328 @@ package body Vhdl.Nodes_Meta is
      (
       Iir_Kind_Unused => -1,
       Iir_Kind_Error => 6,
-      Iir_Kind_Design_File => 17,
-      Iir_Kind_Design_Unit => 33,
-      Iir_Kind_Library_Clause => 38,
-      Iir_Kind_Use_Clause => 42,
-      Iir_Kind_Context_Reference => 46,
-      Iir_Kind_PSL_Inherit_Spec => 50,
-      Iir_Kind_Integer_Literal => 55,
-      Iir_Kind_Floating_Point_Literal => 60,
-      Iir_Kind_Null_Literal => 62,
-      Iir_Kind_String_Literal8 => 73,
-      Iir_Kind_Physical_Int_Literal => 79,
-      Iir_Kind_Physical_Fp_Literal => 85,
-      Iir_Kind_Simple_Aggregate => 90,
-      Iir_Kind_Overflow_Literal => 93,
-      Iir_Kind_Unaffected_Waveform => 94,
-      Iir_Kind_Waveform_Element => 97,
-      Iir_Kind_Conditional_Waveform => 101,
-      Iir_Kind_Conditional_Expression => 105,
-      Iir_Kind_Association_Element_By_Expression => 114,
-      Iir_Kind_Association_Element_By_Name => 122,
-      Iir_Kind_Association_Element_By_Individual => 131,
-      Iir_Kind_Association_Element_Open => 138,
-      Iir_Kind_Association_Element_Package => 144,
-      Iir_Kind_Association_Element_Type => 152,
-      Iir_Kind_Association_Element_Subprogram => 158,
-      Iir_Kind_Association_Element_Terminal => 164,
-      Iir_Kind_Choice_By_Range => 172,
-      Iir_Kind_Choice_By_Expression => 180,
-      Iir_Kind_Choice_By_Others => 186,
-      Iir_Kind_Choice_By_None => 192,
-      Iir_Kind_Choice_By_Name => 199,
-      Iir_Kind_Entity_Aspect_Entity => 201,
-      Iir_Kind_Entity_Aspect_Configuration => 202,
-      Iir_Kind_Entity_Aspect_Open => 202,
-      Iir_Kind_Psl_Hierarchical_Name => 204,
-      Iir_Kind_Block_Configuration => 210,
-      Iir_Kind_Block_Header => 214,
-      Iir_Kind_Component_Configuration => 222,
-      Iir_Kind_Binding_Indication => 226,
-      Iir_Kind_Entity_Class => 228,
-      Iir_Kind_Attribute_Value => 236,
-      Iir_Kind_Signature => 241,
-      Iir_Kind_Aggregate_Info => 248,
-      Iir_Kind_Procedure_Call => 252,
-      Iir_Kind_Record_Element_Constraint => 260,
-      Iir_Kind_Array_Element_Resolution => 262,
-      Iir_Kind_Record_Resolution => 263,
-      Iir_Kind_Record_Element_Resolution => 266,
-      Iir_Kind_Break_Element => 270,
-      Iir_Kind_Attribute_Specification => 279,
-      Iir_Kind_Disconnection_Specification => 285,
-      Iir_Kind_Step_Limit_Specification => 291,
-      Iir_Kind_Configuration_Specification => 298,
-      Iir_Kind_Access_Type_Definition => 305,
-      Iir_Kind_Incomplete_Type_Definition => 312,
-      Iir_Kind_Interface_Type_Definition => 318,
-      Iir_Kind_File_Type_Definition => 324,
-      Iir_Kind_Protected_Type_Declaration => 335,
-      Iir_Kind_Record_Type_Definition => 345,
-      Iir_Kind_Array_Type_Definition => 356,
-      Iir_Kind_Array_Subtype_Definition => 373,
-      Iir_Kind_Record_Subtype_Definition => 386,
-      Iir_Kind_Access_Subtype_Definition => 394,
-      Iir_Kind_File_Subtype_Definition => 401,
-      Iir_Kind_Physical_Subtype_Definition => 411,
-      Iir_Kind_Floating_Subtype_Definition => 422,
-      Iir_Kind_Integer_Subtype_Definition => 432,
-      Iir_Kind_Enumeration_Subtype_Definition => 442,
-      Iir_Kind_Enumeration_Type_Definition => 453,
-      Iir_Kind_Integer_Type_Definition => 461,
-      Iir_Kind_Floating_Type_Definition => 469,
-      Iir_Kind_Physical_Type_Definition => 480,
-      Iir_Kind_Range_Expression => 488,
-      Iir_Kind_Protected_Type_Body => 496,
-      Iir_Kind_Wildcard_Type_Definition => 500,
-      Iir_Kind_Foreign_Vector_Type_Definition => 501,
-      Iir_Kind_Subtype_Definition => 508,
-      Iir_Kind_Scalar_Nature_Definition => 516,
-      Iir_Kind_Record_Nature_Definition => 529,
-      Iir_Kind_Array_Nature_Definition => 543,
-      Iir_Kind_Array_Subnature_Definition => 558,
-      Iir_Kind_Overload_List => 559,
-      Iir_Kind_Foreign_Module => 564,
-      Iir_Kind_Entity_Declaration => 577,
-      Iir_Kind_Configuration_Declaration => 587,
-      Iir_Kind_Context_Declaration => 593,
-      Iir_Kind_Package_Declaration => 608,
-      Iir_Kind_Package_Instantiation_Declaration => 622,
-      Iir_Kind_Vmode_Declaration => 634,
-      Iir_Kind_Vprop_Declaration => 646,
-      Iir_Kind_Vunit_Declaration => 659,
-      Iir_Kind_Package_Body => 667,
-      Iir_Kind_Architecture_Body => 680,
-      Iir_Kind_Type_Declaration => 687,
-      Iir_Kind_Anonymous_Type_Declaration => 693,
-      Iir_Kind_Subtype_Declaration => 701,
-      Iir_Kind_Nature_Declaration => 707,
-      Iir_Kind_Subnature_Declaration => 714,
-      Iir_Kind_Package_Header => 716,
-      Iir_Kind_Unit_Declaration => 725,
-      Iir_Kind_Library_Declaration => 733,
-      Iir_Kind_Component_Declaration => 743,
-      Iir_Kind_Attribute_Declaration => 750,
-      Iir_Kind_Group_Template_Declaration => 756,
-      Iir_Kind_Group_Declaration => 763,
-      Iir_Kind_Element_Declaration => 771,
-      Iir_Kind_Nature_Element_Declaration => 778,
-      Iir_Kind_Non_Object_Alias_Declaration => 786,
-      Iir_Kind_Psl_Declaration => 794,
-      Iir_Kind_Psl_Boolean_Parameter => 802,
-      Iir_Kind_Psl_Endpoint_Declaration => 816,
-      Iir_Kind_Enumeration_Literal => 828,
-      Iir_Kind_Function_Declaration => 855,
-      Iir_Kind_Procedure_Declaration => 879,
-      Iir_Kind_Function_Body => 889,
-      Iir_Kind_Procedure_Body => 900,
-      Iir_Kind_Function_Instantiation_Declaration => 911,
-      Iir_Kind_Procedure_Instantiation_Declaration => 921,
-      Iir_Kind_Terminal_Declaration => 931,
-      Iir_Kind_Object_Alias_Declaration => 943,
-      Iir_Kind_Free_Quantity_Declaration => 955,
-      Iir_Kind_Spectrum_Quantity_Declaration => 968,
-      Iir_Kind_Noise_Quantity_Declaration => 980,
-      Iir_Kind_Across_Quantity_Declaration => 996,
-      Iir_Kind_Through_Quantity_Declaration => 1012,
-      Iir_Kind_File_Declaration => 1027,
-      Iir_Kind_Guard_Signal_Declaration => 1041,
-      Iir_Kind_Signal_Declaration => 1058,
-      Iir_Kind_Variable_Declaration => 1071,
-      Iir_Kind_Constant_Declaration => 1086,
-      Iir_Kind_Iterator_Declaration => 1098,
-      Iir_Kind_Interface_Constant_Declaration => 1115,
-      Iir_Kind_Interface_Variable_Declaration => 1131,
-      Iir_Kind_Interface_Signal_Declaration => 1152,
-      Iir_Kind_Interface_File_Declaration => 1168,
-      Iir_Kind_Interface_Quantity_Declaration => 1184,
-      Iir_Kind_Interface_Terminal_Declaration => 1196,
-      Iir_Kind_Interface_Type_Declaration => 1208,
-      Iir_Kind_Interface_Package_Declaration => 1222,
-      Iir_Kind_Interface_Function_Declaration => 1242,
-      Iir_Kind_Interface_Procedure_Declaration => 1258,
-      Iir_Kind_Attribute_Implicit_Declaration => 1261,
-      Iir_Kind_Suspend_State_Declaration => 1265,
-      Iir_Kind_Identity_Operator => 1269,
-      Iir_Kind_Negation_Operator => 1273,
-      Iir_Kind_Absolute_Operator => 1277,
-      Iir_Kind_Not_Operator => 1281,
-      Iir_Kind_Implicit_Condition_Operator => 1285,
-      Iir_Kind_Condition_Operator => 1289,
-      Iir_Kind_Reduction_And_Operator => 1293,
-      Iir_Kind_Reduction_Or_Operator => 1297,
-      Iir_Kind_Reduction_Nand_Operator => 1301,
-      Iir_Kind_Reduction_Nor_Operator => 1305,
-      Iir_Kind_Reduction_Xor_Operator => 1309,
-      Iir_Kind_Reduction_Xnor_Operator => 1313,
-      Iir_Kind_And_Operator => 1318,
-      Iir_Kind_Or_Operator => 1323,
-      Iir_Kind_Nand_Operator => 1328,
-      Iir_Kind_Nor_Operator => 1333,
-      Iir_Kind_Xor_Operator => 1338,
-      Iir_Kind_Xnor_Operator => 1343,
-      Iir_Kind_Equality_Operator => 1348,
-      Iir_Kind_Inequality_Operator => 1353,
-      Iir_Kind_Less_Than_Operator => 1358,
-      Iir_Kind_Less_Than_Or_Equal_Operator => 1363,
-      Iir_Kind_Greater_Than_Operator => 1368,
-      Iir_Kind_Greater_Than_Or_Equal_Operator => 1373,
-      Iir_Kind_Match_Equality_Operator => 1378,
-      Iir_Kind_Match_Inequality_Operator => 1383,
-      Iir_Kind_Match_Less_Than_Operator => 1388,
-      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1393,
-      Iir_Kind_Match_Greater_Than_Operator => 1398,
-      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1403,
-      Iir_Kind_Sll_Operator => 1408,
-      Iir_Kind_Sla_Operator => 1413,
-      Iir_Kind_Srl_Operator => 1418,
-      Iir_Kind_Sra_Operator => 1423,
-      Iir_Kind_Rol_Operator => 1428,
-      Iir_Kind_Ror_Operator => 1433,
-      Iir_Kind_Addition_Operator => 1438,
-      Iir_Kind_Substraction_Operator => 1443,
-      Iir_Kind_Concatenation_Operator => 1448,
-      Iir_Kind_Multiplication_Operator => 1453,
-      Iir_Kind_Division_Operator => 1458,
-      Iir_Kind_Modulus_Operator => 1463,
-      Iir_Kind_Remainder_Operator => 1468,
-      Iir_Kind_Exponentiation_Operator => 1473,
-      Iir_Kind_Function_Call => 1481,
-      Iir_Kind_Aggregate => 1489,
-      Iir_Kind_Parenthesis_Expression => 1492,
-      Iir_Kind_Qualified_Expression => 1496,
-      Iir_Kind_Type_Conversion => 1501,
-      Iir_Kind_Allocator_By_Expression => 1506,
-      Iir_Kind_Allocator_By_Subtype => 1512,
-      Iir_Kind_Selected_Element => 1520,
-      Iir_Kind_Dereference => 1525,
-      Iir_Kind_Implicit_Dereference => 1530,
-      Iir_Kind_Slice_Name => 1537,
-      Iir_Kind_Indexed_Name => 1543,
-      Iir_Kind_Psl_Prev => 1549,
-      Iir_Kind_Psl_Stable => 1554,
-      Iir_Kind_Psl_Rose => 1559,
-      Iir_Kind_Psl_Fell => 1564,
-      Iir_Kind_Psl_Onehot => 1567,
-      Iir_Kind_Psl_Onehot0 => 1570,
-      Iir_Kind_Psl_Expression => 1572,
-      Iir_Kind_Sensitized_Process_Statement => 1594,
-      Iir_Kind_Process_Statement => 1615,
-      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1628,
-      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1641,
-      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1655,
-      Iir_Kind_Concurrent_Assertion_Statement => 1663,
-      Iir_Kind_Concurrent_Procedure_Call_Statement => 1670,
-      Iir_Kind_Concurrent_Break_Statement => 1678,
-      Iir_Kind_Psl_Assert_Directive => 1692,
-      Iir_Kind_Psl_Assume_Directive => 1704,
-      Iir_Kind_Psl_Cover_Directive => 1716,
-      Iir_Kind_Psl_Restrict_Directive => 1727,
-      Iir_Kind_Block_Statement => 1741,
-      Iir_Kind_If_Generate_Statement => 1752,
-      Iir_Kind_Case_Generate_Statement => 1761,
-      Iir_Kind_For_Generate_Statement => 1770,
-      Iir_Kind_Component_Instantiation_Statement => 1782,
-      Iir_Kind_Psl_Default_Clock => 1785,
-      Iir_Kind_Generate_Statement_Body => 1796,
-      Iir_Kind_If_Generate_Else_Clause => 1802,
-      Iir_Kind_Simple_Simultaneous_Statement => 1809,
-      Iir_Kind_Simultaneous_Null_Statement => 1813,
-      Iir_Kind_Simultaneous_Procedural_Statement => 1824,
-      Iir_Kind_Simultaneous_Case_Statement => 1833,
-      Iir_Kind_Simultaneous_If_Statement => 1842,
-      Iir_Kind_Simultaneous_Elsif => 1848,
-      Iir_Kind_Simple_Signal_Assignment_Statement => 1859,
-      Iir_Kind_Conditional_Signal_Assignment_Statement => 1870,
-      Iir_Kind_Selected_Waveform_Assignment_Statement => 1882,
-      Iir_Kind_Signal_Force_Assignment_Statement => 1892,
-      Iir_Kind_Signal_Release_Assignment_Statement => 1901,
-      Iir_Kind_Null_Statement => 1905,
-      Iir_Kind_Assertion_Statement => 1912,
-      Iir_Kind_Report_Statement => 1918,
-      Iir_Kind_Wait_Statement => 1926,
-      Iir_Kind_Variable_Assignment_Statement => 1933,
-      Iir_Kind_Conditional_Variable_Assignment_Statement => 1940,
-      Iir_Kind_Return_Statement => 1946,
-      Iir_Kind_For_Loop_Statement => 1957,
-      Iir_Kind_While_Loop_Statement => 1968,
-      Iir_Kind_Next_Statement => 1975,
-      Iir_Kind_Exit_Statement => 1982,
-      Iir_Kind_Case_Statement => 1991,
-      Iir_Kind_Procedure_Call_Statement => 1997,
-      Iir_Kind_Break_Statement => 2004,
-      Iir_Kind_If_Statement => 2014,
-      Iir_Kind_Suspend_State_Statement => 2019,
-      Iir_Kind_Elsif => 2025,
-      Iir_Kind_Character_Literal => 2032,
-      Iir_Kind_Simple_Name => 2039,
-      Iir_Kind_Selected_Name => 2047,
-      Iir_Kind_Operator_Symbol => 2052,
-      Iir_Kind_Reference_Name => 2057,
-      Iir_Kind_External_Constant_Name => 2066,
-      Iir_Kind_External_Signal_Name => 2076,
-      Iir_Kind_External_Variable_Name => 2086,
-      Iir_Kind_Selected_By_All_Name => 2092,
-      Iir_Kind_Parenthesis_Name => 2097,
-      Iir_Kind_Package_Pathname => 2101,
-      Iir_Kind_Absolute_Pathname => 2102,
-      Iir_Kind_Relative_Pathname => 2103,
-      Iir_Kind_Pathname_Element => 2108,
-      Iir_Kind_Base_Attribute => 2110,
-      Iir_Kind_Subtype_Attribute => 2115,
-      Iir_Kind_Element_Attribute => 2120,
-      Iir_Kind_Across_Attribute => 2125,
-      Iir_Kind_Through_Attribute => 2130,
-      Iir_Kind_Nature_Reference_Attribute => 2134,
-      Iir_Kind_Left_Type_Attribute => 2139,
-      Iir_Kind_Right_Type_Attribute => 2144,
-      Iir_Kind_High_Type_Attribute => 2149,
-      Iir_Kind_Low_Type_Attribute => 2154,
-      Iir_Kind_Ascending_Type_Attribute => 2159,
-      Iir_Kind_Image_Attribute => 2165,
-      Iir_Kind_Value_Attribute => 2171,
-      Iir_Kind_Pos_Attribute => 2177,
-      Iir_Kind_Val_Attribute => 2183,
-      Iir_Kind_Succ_Attribute => 2189,
-      Iir_Kind_Pred_Attribute => 2195,
-      Iir_Kind_Leftof_Attribute => 2201,
-      Iir_Kind_Rightof_Attribute => 2207,
-      Iir_Kind_Signal_Slew_Attribute => 2215,
-      Iir_Kind_Quantity_Slew_Attribute => 2223,
-      Iir_Kind_Ramp_Attribute => 2231,
-      Iir_Kind_Zoh_Attribute => 2239,
-      Iir_Kind_Ltf_Attribute => 2247,
-      Iir_Kind_Ztf_Attribute => 2257,
-      Iir_Kind_Dot_Attribute => 2264,
-      Iir_Kind_Integ_Attribute => 2271,
-      Iir_Kind_Quantity_Delayed_Attribute => 2279,
-      Iir_Kind_Above_Attribute => 2287,
-      Iir_Kind_Delayed_Attribute => 2296,
-      Iir_Kind_Stable_Attribute => 2305,
-      Iir_Kind_Quiet_Attribute => 2314,
-      Iir_Kind_Transaction_Attribute => 2323,
-      Iir_Kind_Event_Attribute => 2327,
-      Iir_Kind_Active_Attribute => 2331,
-      Iir_Kind_Last_Event_Attribute => 2335,
-      Iir_Kind_Last_Active_Attribute => 2339,
-      Iir_Kind_Last_Value_Attribute => 2343,
-      Iir_Kind_Driving_Attribute => 2347,
-      Iir_Kind_Driving_Value_Attribute => 2351,
-      Iir_Kind_Behavior_Attribute => 2351,
-      Iir_Kind_Structure_Attribute => 2351,
-      Iir_Kind_Simple_Name_Attribute => 2358,
-      Iir_Kind_Instance_Name_Attribute => 2363,
-      Iir_Kind_Path_Name_Attribute => 2368,
-      Iir_Kind_Left_Array_Attribute => 2375,
-      Iir_Kind_Right_Array_Attribute => 2382,
-      Iir_Kind_High_Array_Attribute => 2389,
-      Iir_Kind_Low_Array_Attribute => 2396,
-      Iir_Kind_Length_Array_Attribute => 2403,
-      Iir_Kind_Ascending_Array_Attribute => 2410,
-      Iir_Kind_Range_Array_Attribute => 2417,
-      Iir_Kind_Reverse_Range_Array_Attribute => 2424,
-      Iir_Kind_Attribute_Name => 2433
+      Iir_Kind_Design_File => 16,
+      Iir_Kind_Design_Unit => 32,
+      Iir_Kind_Library_Clause => 37,
+      Iir_Kind_Use_Clause => 41,
+      Iir_Kind_Context_Reference => 45,
+      Iir_Kind_PSL_Inherit_Spec => 49,
+      Iir_Kind_Integer_Literal => 54,
+      Iir_Kind_Floating_Point_Literal => 59,
+      Iir_Kind_Null_Literal => 61,
+      Iir_Kind_String_Literal8 => 72,
+      Iir_Kind_Physical_Int_Literal => 78,
+      Iir_Kind_Physical_Fp_Literal => 84,
+      Iir_Kind_Simple_Aggregate => 89,
+      Iir_Kind_Overflow_Literal => 92,
+      Iir_Kind_Unaffected_Waveform => 93,
+      Iir_Kind_Waveform_Element => 96,
+      Iir_Kind_Conditional_Waveform => 100,
+      Iir_Kind_Conditional_Expression => 104,
+      Iir_Kind_Association_Element_By_Expression => 113,
+      Iir_Kind_Association_Element_By_Name => 121,
+      Iir_Kind_Association_Element_By_Individual => 130,
+      Iir_Kind_Association_Element_Open => 137,
+      Iir_Kind_Association_Element_Package => 143,
+      Iir_Kind_Association_Element_Type => 151,
+      Iir_Kind_Association_Element_Subprogram => 157,
+      Iir_Kind_Association_Element_Terminal => 163,
+      Iir_Kind_Choice_By_Range => 171,
+      Iir_Kind_Choice_By_Expression => 179,
+      Iir_Kind_Choice_By_Others => 185,
+      Iir_Kind_Choice_By_None => 191,
+      Iir_Kind_Choice_By_Name => 198,
+      Iir_Kind_Entity_Aspect_Entity => 200,
+      Iir_Kind_Entity_Aspect_Configuration => 201,
+      Iir_Kind_Entity_Aspect_Open => 201,
+      Iir_Kind_Psl_Hierarchical_Name => 203,
+      Iir_Kind_Block_Configuration => 209,
+      Iir_Kind_Block_Header => 213,
+      Iir_Kind_Component_Configuration => 221,
+      Iir_Kind_Binding_Indication => 225,
+      Iir_Kind_Entity_Class => 227,
+      Iir_Kind_Attribute_Value => 235,
+      Iir_Kind_Signature => 240,
+      Iir_Kind_Aggregate_Info => 247,
+      Iir_Kind_Procedure_Call => 251,
+      Iir_Kind_Record_Element_Constraint => 259,
+      Iir_Kind_Array_Element_Resolution => 261,
+      Iir_Kind_Record_Resolution => 262,
+      Iir_Kind_Record_Element_Resolution => 265,
+      Iir_Kind_Break_Element => 269,
+      Iir_Kind_Attribute_Specification => 278,
+      Iir_Kind_Disconnection_Specification => 284,
+      Iir_Kind_Step_Limit_Specification => 290,
+      Iir_Kind_Configuration_Specification => 297,
+      Iir_Kind_Access_Type_Definition => 304,
+      Iir_Kind_Incomplete_Type_Definition => 311,
+      Iir_Kind_Interface_Type_Definition => 317,
+      Iir_Kind_File_Type_Definition => 323,
+      Iir_Kind_Protected_Type_Declaration => 334,
+      Iir_Kind_Record_Type_Definition => 344,
+      Iir_Kind_Array_Type_Definition => 355,
+      Iir_Kind_Array_Subtype_Definition => 372,
+      Iir_Kind_Record_Subtype_Definition => 385,
+      Iir_Kind_Access_Subtype_Definition => 393,
+      Iir_Kind_File_Subtype_Definition => 400,
+      Iir_Kind_Physical_Subtype_Definition => 410,
+      Iir_Kind_Floating_Subtype_Definition => 421,
+      Iir_Kind_Integer_Subtype_Definition => 431,
+      Iir_Kind_Enumeration_Subtype_Definition => 441,
+      Iir_Kind_Enumeration_Type_Definition => 452,
+      Iir_Kind_Integer_Type_Definition => 460,
+      Iir_Kind_Floating_Type_Definition => 468,
+      Iir_Kind_Physical_Type_Definition => 479,
+      Iir_Kind_Range_Expression => 487,
+      Iir_Kind_Protected_Type_Body => 495,
+      Iir_Kind_Wildcard_Type_Definition => 499,
+      Iir_Kind_Foreign_Vector_Type_Definition => 500,
+      Iir_Kind_Subtype_Definition => 507,
+      Iir_Kind_Scalar_Nature_Definition => 515,
+      Iir_Kind_Record_Nature_Definition => 528,
+      Iir_Kind_Array_Nature_Definition => 542,
+      Iir_Kind_Array_Subnature_Definition => 557,
+      Iir_Kind_Overload_List => 558,
+      Iir_Kind_Foreign_Module => 563,
+      Iir_Kind_Entity_Declaration => 576,
+      Iir_Kind_Configuration_Declaration => 586,
+      Iir_Kind_Context_Declaration => 592,
+      Iir_Kind_Package_Declaration => 607,
+      Iir_Kind_Package_Instantiation_Declaration => 621,
+      Iir_Kind_Vmode_Declaration => 633,
+      Iir_Kind_Vprop_Declaration => 645,
+      Iir_Kind_Vunit_Declaration => 658,
+      Iir_Kind_Package_Body => 666,
+      Iir_Kind_Architecture_Body => 679,
+      Iir_Kind_Type_Declaration => 686,
+      Iir_Kind_Anonymous_Type_Declaration => 692,
+      Iir_Kind_Subtype_Declaration => 700,
+      Iir_Kind_Nature_Declaration => 706,
+      Iir_Kind_Subnature_Declaration => 713,
+      Iir_Kind_Package_Header => 715,
+      Iir_Kind_Unit_Declaration => 724,
+      Iir_Kind_Library_Declaration => 732,
+      Iir_Kind_Component_Declaration => 742,
+      Iir_Kind_Attribute_Declaration => 749,
+      Iir_Kind_Group_Template_Declaration => 755,
+      Iir_Kind_Group_Declaration => 762,
+      Iir_Kind_Element_Declaration => 770,
+      Iir_Kind_Nature_Element_Declaration => 777,
+      Iir_Kind_Non_Object_Alias_Declaration => 785,
+      Iir_Kind_Psl_Declaration => 793,
+      Iir_Kind_Psl_Boolean_Parameter => 801,
+      Iir_Kind_Psl_Endpoint_Declaration => 815,
+      Iir_Kind_Enumeration_Literal => 827,
+      Iir_Kind_Function_Declaration => 854,
+      Iir_Kind_Procedure_Declaration => 878,
+      Iir_Kind_Function_Body => 888,
+      Iir_Kind_Procedure_Body => 899,
+      Iir_Kind_Function_Instantiation_Declaration => 910,
+      Iir_Kind_Procedure_Instantiation_Declaration => 920,
+      Iir_Kind_Terminal_Declaration => 930,
+      Iir_Kind_Object_Alias_Declaration => 942,
+      Iir_Kind_Free_Quantity_Declaration => 954,
+      Iir_Kind_Spectrum_Quantity_Declaration => 967,
+      Iir_Kind_Noise_Quantity_Declaration => 979,
+      Iir_Kind_Across_Quantity_Declaration => 995,
+      Iir_Kind_Through_Quantity_Declaration => 1011,
+      Iir_Kind_File_Declaration => 1026,
+      Iir_Kind_Guard_Signal_Declaration => 1040,
+      Iir_Kind_Signal_Declaration => 1057,
+      Iir_Kind_Variable_Declaration => 1070,
+      Iir_Kind_Constant_Declaration => 1085,
+      Iir_Kind_Iterator_Declaration => 1097,
+      Iir_Kind_Interface_Constant_Declaration => 1114,
+      Iir_Kind_Interface_Variable_Declaration => 1130,
+      Iir_Kind_Interface_Signal_Declaration => 1151,
+      Iir_Kind_Interface_File_Declaration => 1167,
+      Iir_Kind_Interface_Quantity_Declaration => 1183,
+      Iir_Kind_Interface_Terminal_Declaration => 1195,
+      Iir_Kind_Interface_Type_Declaration => 1207,
+      Iir_Kind_Interface_Package_Declaration => 1221,
+      Iir_Kind_Interface_Function_Declaration => 1241,
+      Iir_Kind_Interface_Procedure_Declaration => 1257,
+      Iir_Kind_Attribute_Implicit_Declaration => 1260,
+      Iir_Kind_Suspend_State_Declaration => 1264,
+      Iir_Kind_Identity_Operator => 1268,
+      Iir_Kind_Negation_Operator => 1272,
+      Iir_Kind_Absolute_Operator => 1276,
+      Iir_Kind_Not_Operator => 1280,
+      Iir_Kind_Implicit_Condition_Operator => 1284,
+      Iir_Kind_Condition_Operator => 1288,
+      Iir_Kind_Reduction_And_Operator => 1292,
+      Iir_Kind_Reduction_Or_Operator => 1296,
+      Iir_Kind_Reduction_Nand_Operator => 1300,
+      Iir_Kind_Reduction_Nor_Operator => 1304,
+      Iir_Kind_Reduction_Xor_Operator => 1308,
+      Iir_Kind_Reduction_Xnor_Operator => 1312,
+      Iir_Kind_And_Operator => 1317,
+      Iir_Kind_Or_Operator => 1322,
+      Iir_Kind_Nand_Operator => 1327,
+      Iir_Kind_Nor_Operator => 1332,
+      Iir_Kind_Xor_Operator => 1337,
+      Iir_Kind_Xnor_Operator => 1342,
+      Iir_Kind_Equality_Operator => 1347,
+      Iir_Kind_Inequality_Operator => 1352,
+      Iir_Kind_Less_Than_Operator => 1357,
+      Iir_Kind_Less_Than_Or_Equal_Operator => 1362,
+      Iir_Kind_Greater_Than_Operator => 1367,
+      Iir_Kind_Greater_Than_Or_Equal_Operator => 1372,
+      Iir_Kind_Match_Equality_Operator => 1377,
+      Iir_Kind_Match_Inequality_Operator => 1382,
+      Iir_Kind_Match_Less_Than_Operator => 1387,
+      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1392,
+      Iir_Kind_Match_Greater_Than_Operator => 1397,
+      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1402,
+      Iir_Kind_Sll_Operator => 1407,
+      Iir_Kind_Sla_Operator => 1412,
+      Iir_Kind_Srl_Operator => 1417,
+      Iir_Kind_Sra_Operator => 1422,
+      Iir_Kind_Rol_Operator => 1427,
+      Iir_Kind_Ror_Operator => 1432,
+      Iir_Kind_Addition_Operator => 1437,
+      Iir_Kind_Substraction_Operator => 1442,
+      Iir_Kind_Concatenation_Operator => 1447,
+      Iir_Kind_Multiplication_Operator => 1452,
+      Iir_Kind_Division_Operator => 1457,
+      Iir_Kind_Modulus_Operator => 1462,
+      Iir_Kind_Remainder_Operator => 1467,
+      Iir_Kind_Exponentiation_Operator => 1472,
+      Iir_Kind_Function_Call => 1480,
+      Iir_Kind_Aggregate => 1488,
+      Iir_Kind_Parenthesis_Expression => 1491,
+      Iir_Kind_Qualified_Expression => 1495,
+      Iir_Kind_Type_Conversion => 1500,
+      Iir_Kind_Allocator_By_Expression => 1505,
+      Iir_Kind_Allocator_By_Subtype => 1511,
+      Iir_Kind_Selected_Element => 1519,
+      Iir_Kind_Dereference => 1524,
+      Iir_Kind_Implicit_Dereference => 1529,
+      Iir_Kind_Slice_Name => 1536,
+      Iir_Kind_Indexed_Name => 1542,
+      Iir_Kind_Psl_Prev => 1548,
+      Iir_Kind_Psl_Stable => 1553,
+      Iir_Kind_Psl_Rose => 1558,
+      Iir_Kind_Psl_Fell => 1563,
+      Iir_Kind_Psl_Onehot => 1566,
+      Iir_Kind_Psl_Onehot0 => 1569,
+      Iir_Kind_Psl_Expression => 1571,
+      Iir_Kind_Sensitized_Process_Statement => 1593,
+      Iir_Kind_Process_Statement => 1614,
+      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1627,
+      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1640,
+      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1654,
+      Iir_Kind_Concurrent_Assertion_Statement => 1662,
+      Iir_Kind_Concurrent_Procedure_Call_Statement => 1669,
+      Iir_Kind_Concurrent_Break_Statement => 1677,
+      Iir_Kind_Psl_Assert_Directive => 1691,
+      Iir_Kind_Psl_Assume_Directive => 1703,
+      Iir_Kind_Psl_Cover_Directive => 1715,
+      Iir_Kind_Psl_Restrict_Directive => 1726,
+      Iir_Kind_Block_Statement => 1740,
+      Iir_Kind_If_Generate_Statement => 1751,
+      Iir_Kind_Case_Generate_Statement => 1760,
+      Iir_Kind_For_Generate_Statement => 1769,
+      Iir_Kind_Component_Instantiation_Statement => 1781,
+      Iir_Kind_Psl_Default_Clock => 1784,
+      Iir_Kind_Generate_Statement_Body => 1795,
+      Iir_Kind_If_Generate_Else_Clause => 1801,
+      Iir_Kind_Simple_Simultaneous_Statement => 1808,
+      Iir_Kind_Simultaneous_Null_Statement => 1812,
+      Iir_Kind_Simultaneous_Procedural_Statement => 1823,
+      Iir_Kind_Simultaneous_Case_Statement => 1832,
+      Iir_Kind_Simultaneous_If_Statement => 1841,
+      Iir_Kind_Simultaneous_Elsif => 1847,
+      Iir_Kind_Simple_Signal_Assignment_Statement => 1858,
+      Iir_Kind_Conditional_Signal_Assignment_Statement => 1869,
+      Iir_Kind_Selected_Waveform_Assignment_Statement => 1881,
+      Iir_Kind_Signal_Force_Assignment_Statement => 1891,
+      Iir_Kind_Signal_Release_Assignment_Statement => 1900,
+      Iir_Kind_Null_Statement => 1904,
+      Iir_Kind_Assertion_Statement => 1911,
+      Iir_Kind_Report_Statement => 1917,
+      Iir_Kind_Wait_Statement => 1925,
+      Iir_Kind_Variable_Assignment_Statement => 1932,
+      Iir_Kind_Conditional_Variable_Assignment_Statement => 1939,
+      Iir_Kind_Return_Statement => 1945,
+      Iir_Kind_For_Loop_Statement => 1956,
+      Iir_Kind_While_Loop_Statement => 1967,
+      Iir_Kind_Next_Statement => 1974,
+      Iir_Kind_Exit_Statement => 1981,
+      Iir_Kind_Case_Statement => 1990,
+      Iir_Kind_Procedure_Call_Statement => 1996,
+      Iir_Kind_Break_Statement => 2003,
+      Iir_Kind_If_Statement => 2013,
+      Iir_Kind_Suspend_State_Statement => 2018,
+      Iir_Kind_Elsif => 2024,
+      Iir_Kind_Character_Literal => 2031,
+      Iir_Kind_Simple_Name => 2038,
+      Iir_Kind_Selected_Name => 2046,
+      Iir_Kind_Operator_Symbol => 2051,
+      Iir_Kind_Reference_Name => 2056,
+      Iir_Kind_External_Constant_Name => 2065,
+      Iir_Kind_External_Signal_Name => 2075,
+      Iir_Kind_External_Variable_Name => 2085,
+      Iir_Kind_Selected_By_All_Name => 2091,
+      Iir_Kind_Parenthesis_Name => 2096,
+      Iir_Kind_Package_Pathname => 2100,
+      Iir_Kind_Absolute_Pathname => 2101,
+      Iir_Kind_Relative_Pathname => 2102,
+      Iir_Kind_Pathname_Element => 2107,
+      Iir_Kind_Base_Attribute => 2109,
+      Iir_Kind_Subtype_Attribute => 2114,
+      Iir_Kind_Element_Attribute => 2119,
+      Iir_Kind_Across_Attribute => 2124,
+      Iir_Kind_Through_Attribute => 2129,
+      Iir_Kind_Nature_Reference_Attribute => 2133,
+      Iir_Kind_Left_Type_Attribute => 2138,
+      Iir_Kind_Right_Type_Attribute => 2143,
+      Iir_Kind_High_Type_Attribute => 2148,
+      Iir_Kind_Low_Type_Attribute => 2153,
+      Iir_Kind_Ascending_Type_Attribute => 2158,
+      Iir_Kind_Image_Attribute => 2164,
+      Iir_Kind_Value_Attribute => 2170,
+      Iir_Kind_Pos_Attribute => 2176,
+      Iir_Kind_Val_Attribute => 2182,
+      Iir_Kind_Succ_Attribute => 2188,
+      Iir_Kind_Pred_Attribute => 2194,
+      Iir_Kind_Leftof_Attribute => 2200,
+      Iir_Kind_Rightof_Attribute => 2206,
+      Iir_Kind_Signal_Slew_Attribute => 2214,
+      Iir_Kind_Quantity_Slew_Attribute => 2222,
+      Iir_Kind_Ramp_Attribute => 2230,
+      Iir_Kind_Zoh_Attribute => 2238,
+      Iir_Kind_Ltf_Attribute => 2246,
+      Iir_Kind_Ztf_Attribute => 2256,
+      Iir_Kind_Dot_Attribute => 2263,
+      Iir_Kind_Integ_Attribute => 2270,
+      Iir_Kind_Quantity_Delayed_Attribute => 2278,
+      Iir_Kind_Above_Attribute => 2286,
+      Iir_Kind_Delayed_Attribute => 2295,
+      Iir_Kind_Stable_Attribute => 2304,
+      Iir_Kind_Quiet_Attribute => 2313,
+      Iir_Kind_Transaction_Attribute => 2322,
+      Iir_Kind_Event_Attribute => 2326,
+      Iir_Kind_Active_Attribute => 2330,
+      Iir_Kind_Last_Event_Attribute => 2334,
+      Iir_Kind_Last_Active_Attribute => 2338,
+      Iir_Kind_Last_Value_Attribute => 2342,
+      Iir_Kind_Driving_Attribute => 2346,
+      Iir_Kind_Driving_Value_Attribute => 2350,
+      Iir_Kind_Behavior_Attribute => 2350,
+      Iir_Kind_Structure_Attribute => 2350,
+      Iir_Kind_Simple_Name_Attribute => 2357,
+      Iir_Kind_Instance_Name_Attribute => 2362,
+      Iir_Kind_Path_Name_Attribute => 2367,
+      Iir_Kind_Left_Array_Attribute => 2374,
+      Iir_Kind_Right_Array_Attribute => 2381,
+      Iir_Kind_High_Array_Attribute => 2388,
+      Iir_Kind_Low_Array_Attribute => 2395,
+      Iir_Kind_Length_Array_Attribute => 2402,
+      Iir_Kind_Ascending_Array_Attribute => 2409,
+      Iir_Kind_Range_Array_Attribute => 2416,
+      Iir_Kind_Reverse_Range_Array_Attribute => 2423,
+      Iir_Kind_Attribute_Name => 2432
      );
 
    function Get_Fields_First (K : Iir_Kind) return Fields_Index is
@@ -7388,8 +7382,6 @@ package body Vhdl.Nodes_Meta is
    begin
       pragma Assert (Fields_Type (F) = Type_Iir_List);
       case F is
-         when Field_File_Dependence_List =>
-            return Get_File_Dependence_List (N);
          when Field_Dependence_List =>
             return Get_Dependence_List (N);
          when Field_Analysis_Checks_List =>
@@ -7414,8 +7406,6 @@ package body Vhdl.Nodes_Meta is
    begin
       pragma Assert (Fields_Type (F) = Type_Iir_List);
       case F is
-         when Field_File_Dependence_List =>
-            Set_File_Dependence_List (N, V);
          when Field_Dependence_List =>
             Set_Dependence_List (N, V);
          when Field_Analysis_Checks_List =>
@@ -7994,11 +7984,6 @@ package body Vhdl.Nodes_Meta is
       return K = Iir_Kind_Design_File;
    end Has_Library;
 
-   function Has_File_Dependence_List (K : Iir_Kind) return Boolean is
-   begin
-      return K = Iir_Kind_Design_File;
-   end Has_File_Dependence_List;
-
    function Has_Design_File_Filename (K : Iir_Kind) return Boolean is
    begin
       return K = Iir_Kind_Design_File;
diff --git a/src/vhdl/vhdl-nodes_meta.ads b/src/vhdl/vhdl-nodes_meta.ads
index dc148e50d..0f0fe9cb9 100644
--- a/src/vhdl/vhdl-nodes_meta.ads
+++ b/src/vhdl/vhdl-nodes_meta.ads
@@ -68,7 +68,6 @@ package Vhdl.Nodes_Meta is
       Field_Analysis_Time_Stamp,
       Field_Design_File_Source,
       Field_Library,
-      Field_File_Dependence_List,
       Field_Design_File_Filename,
       Field_Design_File_Directory,
       Field_Design_File,
@@ -667,7 +666,6 @@ package Vhdl.Nodes_Meta is
    function Has_Analysis_Time_Stamp (K : Iir_Kind) return Boolean;
    function Has_Design_File_Source (K : Iir_Kind) return Boolean;
    function Has_Library (K : Iir_Kind) return Boolean;
-   function Has_File_Dependence_List (K : Iir_Kind) return Boolean;
    function Has_Design_File_Filename (K : Iir_Kind) return Boolean;
    function Has_Design_File_Directory (K : Iir_Kind) return Boolean;
    function Has_Design_File (K : Iir_Kind) return Boolean;