vhdl-nodes: add Get/Set_Reference_Terminal_Flag

4 files changed, 247 insertions, 204 deletions

diff --git a/src/vhdl/vhdl-nodes.adb b/src/vhdl/vhdl-nodes.adb
index da0629d1a..c2d45fe32 100644
--- a/src/vhdl/vhdl-nodes.adb
+++ b/src/vhdl/vhdl-nodes.adb
@@ -3014,6 +3014,22 @@ package body Vhdl.Nodes is
       Set_Field5 (Decl, Sub_Nature);
    end Set_Subnature_Indication;
 
+   function Get_Reference_Terminal_Flag (Decl : Iir) return Boolean is
+   begin
+      pragma Assert (Decl /= Null_Iir);
+      pragma Assert (Has_Reference_Terminal_Flag (Get_Kind (Decl)),
+                     "no field Reference_Terminal_Flag");
+      return Get_Flag1 (Decl);
+   end Get_Reference_Terminal_Flag;
+
+   procedure Set_Reference_Terminal_Flag (Decl : Iir; Flag : Boolean) is
+   begin
+      pragma Assert (Decl /= Null_Iir);
+      pragma Assert (Has_Reference_Terminal_Flag (Get_Kind (Decl)),
+                     "no field Reference_Terminal_Flag");
+      Set_Flag1 (Decl, Flag);
+   end Set_Reference_Terminal_Flag;
+
    type Iir_Mode_Conv is record
       Flag13: Boolean;
       Flag14: Boolean;
diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads
index 6c96fd176..e2882fb7c 100644
--- a/src/vhdl/vhdl-nodes.ads
+++ b/src/vhdl/vhdl-nodes.ads
@@ -2198,6 +2198,10 @@ package Vhdl.Nodes is
    --
    --   Get/Set_Nature (Field1)
    --
+   --  Set if the terminal is a reference terminal, ie created by a nature
+   --  declaration (ie a ground).
+   --   Get/Set_Reference_Terminal_Flag (Flag1)
+   --
    --   Get/Set_Visible_Flag (Flag4)
    --
    --   Get/Set_Use_Flag (Flag6)
@@ -3076,6 +3080,8 @@ package Vhdl.Nodes is
 
    -- Iir_Kind_Scalar_Nature_Definition (Medium)
    --
+   --  Reference terminal (forward ref).
+   --  This is a declaration that is appended after the nature declaration.
    --   Get/Set_Reference (Field2)
    --
    --  The declarator that has created this nature type.
@@ -8153,6 +8159,10 @@ package Vhdl.Nodes is
    function Get_Subnature_Indication (Decl : Iir) return Iir;
    procedure Set_Subnature_Indication (Decl : Iir; Sub_Nature : Iir);
 
+   --  Field: Flag1
+   function Get_Reference_Terminal_Flag (Decl : Iir) return Boolean;
+   procedure Set_Reference_Terminal_Flag (Decl : Iir; Flag : Boolean);
+
    --  Mode of interfaces or file (v87).
    --  Field: Flag13,Flag14,Flag15 (grp)
    function Get_Mode (Target : Iir) return Iir_Mode;
diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb
index cd6f666d8..a4a640296 100644
--- a/src/vhdl/vhdl-nodes_meta.adb
+++ b/src/vhdl/vhdl-nodes_meta.adb
@@ -119,6 +119,7 @@ package body Vhdl.Nodes_Meta is
       Field_Nature_Definition => Type_Iir,
       Field_Nature => Type_Iir,
       Field_Subnature_Indication => Type_Iir,
+      Field_Reference_Terminal_Flag => Type_Boolean,
       Field_Mode => Type_Iir_Mode,
       Field_Guarded_Signal_Flag => Type_Boolean,
       Field_Signal_Kind => Type_Iir_Signal_Kind,
@@ -607,6 +608,8 @@ package body Vhdl.Nodes_Meta is
             return "nature";
          when Field_Subnature_Indication =>
             return "subnature_indication";
+         when Field_Reference_Terminal_Flag =>
+            return "reference_terminal_flag";
          when Field_Mode =>
             return "mode";
          when Field_Guarded_Signal_Flag =>
@@ -2015,6 +2018,8 @@ package body Vhdl.Nodes_Meta is
             return Attr_Ref;
          when Field_Subnature_Indication =>
             return Attr_None;
+         when Field_Reference_Terminal_Flag =>
+            return Attr_None;
          when Field_Mode =>
             return Attr_None;
          when Field_Guarded_Signal_Flag =>
@@ -3589,6 +3594,7 @@ package body Vhdl.Nodes_Meta is
       Field_Generic_Map_Aspect_Chain,
       --  Iir_Kind_Terminal_Declaration
       Field_Identifier,
+      Field_Reference_Terminal_Flag,
       Field_Has_Identifier_List,
       Field_Visible_Flag,
       Field_Use_Flag,
@@ -5410,210 +5416,210 @@ package body Vhdl.Nodes_Meta is
       Iir_Kind_Procedure_Body => 879,
       Iir_Kind_Function_Instantiation_Declaration => 890,
       Iir_Kind_Procedure_Instantiation_Declaration => 900,
-      Iir_Kind_Terminal_Declaration => 909,
-      Iir_Kind_Object_Alias_Declaration => 921,
-      Iir_Kind_Free_Quantity_Declaration => 933,
-      Iir_Kind_Spectrum_Quantity_Declaration => 946,
-      Iir_Kind_Noise_Quantity_Declaration => 958,
-      Iir_Kind_Across_Quantity_Declaration => 974,
-      Iir_Kind_Through_Quantity_Declaration => 990,
-      Iir_Kind_File_Declaration => 1005,
-      Iir_Kind_Guard_Signal_Declaration => 1019,
-      Iir_Kind_Signal_Declaration => 1036,
-      Iir_Kind_Variable_Declaration => 1049,
-      Iir_Kind_Constant_Declaration => 1063,
-      Iir_Kind_Iterator_Declaration => 1075,
-      Iir_Kind_Interface_Constant_Declaration => 1092,
-      Iir_Kind_Interface_Variable_Declaration => 1108,
-      Iir_Kind_Interface_Signal_Declaration => 1129,
-      Iir_Kind_Interface_File_Declaration => 1145,
-      Iir_Kind_Interface_Quantity_Declaration => 1161,
-      Iir_Kind_Interface_Terminal_Declaration => 1173,
-      Iir_Kind_Interface_Type_Declaration => 1184,
-      Iir_Kind_Interface_Package_Declaration => 1197,
-      Iir_Kind_Interface_Function_Declaration => 1215,
-      Iir_Kind_Interface_Procedure_Declaration => 1229,
-      Iir_Kind_Attribute_Implicit_Declaration => 1232,
-      Iir_Kind_Suspend_State_Declaration => 1235,
-      Iir_Kind_Identity_Operator => 1239,
-      Iir_Kind_Negation_Operator => 1243,
-      Iir_Kind_Absolute_Operator => 1247,
-      Iir_Kind_Not_Operator => 1251,
-      Iir_Kind_Implicit_Condition_Operator => 1255,
-      Iir_Kind_Condition_Operator => 1259,
-      Iir_Kind_Reduction_And_Operator => 1263,
-      Iir_Kind_Reduction_Or_Operator => 1267,
-      Iir_Kind_Reduction_Nand_Operator => 1271,
-      Iir_Kind_Reduction_Nor_Operator => 1275,
-      Iir_Kind_Reduction_Xor_Operator => 1279,
-      Iir_Kind_Reduction_Xnor_Operator => 1283,
-      Iir_Kind_And_Operator => 1288,
-      Iir_Kind_Or_Operator => 1293,
-      Iir_Kind_Nand_Operator => 1298,
-      Iir_Kind_Nor_Operator => 1303,
-      Iir_Kind_Xor_Operator => 1308,
-      Iir_Kind_Xnor_Operator => 1313,
-      Iir_Kind_Equality_Operator => 1318,
-      Iir_Kind_Inequality_Operator => 1323,
-      Iir_Kind_Less_Than_Operator => 1328,
-      Iir_Kind_Less_Than_Or_Equal_Operator => 1333,
-      Iir_Kind_Greater_Than_Operator => 1338,
-      Iir_Kind_Greater_Than_Or_Equal_Operator => 1343,
-      Iir_Kind_Match_Equality_Operator => 1348,
-      Iir_Kind_Match_Inequality_Operator => 1353,
-      Iir_Kind_Match_Less_Than_Operator => 1358,
-      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1363,
-      Iir_Kind_Match_Greater_Than_Operator => 1368,
-      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1373,
-      Iir_Kind_Sll_Operator => 1378,
-      Iir_Kind_Sla_Operator => 1383,
-      Iir_Kind_Srl_Operator => 1388,
-      Iir_Kind_Sra_Operator => 1393,
-      Iir_Kind_Rol_Operator => 1398,
-      Iir_Kind_Ror_Operator => 1403,
-      Iir_Kind_Addition_Operator => 1408,
-      Iir_Kind_Substraction_Operator => 1413,
-      Iir_Kind_Concatenation_Operator => 1418,
-      Iir_Kind_Multiplication_Operator => 1423,
-      Iir_Kind_Division_Operator => 1428,
-      Iir_Kind_Modulus_Operator => 1433,
-      Iir_Kind_Remainder_Operator => 1438,
-      Iir_Kind_Exponentiation_Operator => 1443,
-      Iir_Kind_Function_Call => 1451,
-      Iir_Kind_Aggregate => 1458,
-      Iir_Kind_Parenthesis_Expression => 1461,
-      Iir_Kind_Qualified_Expression => 1465,
-      Iir_Kind_Type_Conversion => 1470,
-      Iir_Kind_Allocator_By_Expression => 1475,
-      Iir_Kind_Allocator_By_Subtype => 1481,
-      Iir_Kind_Selected_Element => 1489,
-      Iir_Kind_Dereference => 1494,
-      Iir_Kind_Implicit_Dereference => 1499,
-      Iir_Kind_Slice_Name => 1506,
-      Iir_Kind_Indexed_Name => 1512,
-      Iir_Kind_Psl_Prev => 1518,
-      Iir_Kind_Psl_Stable => 1523,
-      Iir_Kind_Psl_Rose => 1528,
-      Iir_Kind_Psl_Fell => 1533,
-      Iir_Kind_Psl_Onehot => 1536,
-      Iir_Kind_Psl_Onehot0 => 1539,
-      Iir_Kind_Psl_Expression => 1541,
-      Iir_Kind_Sensitized_Process_Statement => 1562,
-      Iir_Kind_Process_Statement => 1582,
-      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1595,
-      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1608,
-      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1622,
-      Iir_Kind_Concurrent_Assertion_Statement => 1630,
-      Iir_Kind_Concurrent_Procedure_Call_Statement => 1637,
-      Iir_Kind_Concurrent_Break_Statement => 1645,
-      Iir_Kind_Psl_Assert_Directive => 1659,
-      Iir_Kind_Psl_Assume_Directive => 1671,
-      Iir_Kind_Psl_Cover_Directive => 1683,
-      Iir_Kind_Psl_Restrict_Directive => 1694,
-      Iir_Kind_Block_Statement => 1708,
-      Iir_Kind_If_Generate_Statement => 1719,
-      Iir_Kind_Case_Generate_Statement => 1728,
-      Iir_Kind_For_Generate_Statement => 1737,
-      Iir_Kind_Component_Instantiation_Statement => 1748,
-      Iir_Kind_Psl_Default_Clock => 1751,
-      Iir_Kind_Generate_Statement_Body => 1762,
-      Iir_Kind_If_Generate_Else_Clause => 1768,
-      Iir_Kind_Simple_Simultaneous_Statement => 1775,
-      Iir_Kind_Simultaneous_Null_Statement => 1779,
-      Iir_Kind_Simultaneous_Procedural_Statement => 1790,
-      Iir_Kind_Simultaneous_Case_Statement => 1799,
-      Iir_Kind_Simultaneous_If_Statement => 1808,
-      Iir_Kind_Simultaneous_Elsif => 1814,
-      Iir_Kind_Simple_Signal_Assignment_Statement => 1825,
-      Iir_Kind_Conditional_Signal_Assignment_Statement => 1836,
-      Iir_Kind_Selected_Waveform_Assignment_Statement => 1848,
-      Iir_Kind_Signal_Force_Assignment_Statement => 1858,
-      Iir_Kind_Signal_Release_Assignment_Statement => 1867,
-      Iir_Kind_Null_Statement => 1871,
-      Iir_Kind_Assertion_Statement => 1878,
-      Iir_Kind_Report_Statement => 1884,
-      Iir_Kind_Wait_Statement => 1892,
-      Iir_Kind_Variable_Assignment_Statement => 1899,
-      Iir_Kind_Conditional_Variable_Assignment_Statement => 1906,
-      Iir_Kind_Return_Statement => 1912,
-      Iir_Kind_For_Loop_Statement => 1923,
-      Iir_Kind_While_Loop_Statement => 1934,
-      Iir_Kind_Next_Statement => 1941,
-      Iir_Kind_Exit_Statement => 1948,
-      Iir_Kind_Case_Statement => 1957,
-      Iir_Kind_Procedure_Call_Statement => 1963,
-      Iir_Kind_Break_Statement => 1970,
-      Iir_Kind_If_Statement => 1980,
-      Iir_Kind_Suspend_State_Statement => 1984,
-      Iir_Kind_Elsif => 1990,
-      Iir_Kind_Character_Literal => 1997,
-      Iir_Kind_Simple_Name => 2004,
-      Iir_Kind_Selected_Name => 2012,
-      Iir_Kind_Operator_Symbol => 2017,
-      Iir_Kind_Reference_Name => 2022,
-      Iir_Kind_External_Constant_Name => 2031,
-      Iir_Kind_External_Signal_Name => 2040,
-      Iir_Kind_External_Variable_Name => 2050,
-      Iir_Kind_Selected_By_All_Name => 2056,
-      Iir_Kind_Parenthesis_Name => 2061,
-      Iir_Kind_Package_Pathname => 2065,
-      Iir_Kind_Absolute_Pathname => 2066,
-      Iir_Kind_Relative_Pathname => 2067,
-      Iir_Kind_Pathname_Element => 2072,
-      Iir_Kind_Base_Attribute => 2074,
-      Iir_Kind_Subtype_Attribute => 2079,
-      Iir_Kind_Element_Attribute => 2084,
-      Iir_Kind_Across_Attribute => 2089,
-      Iir_Kind_Through_Attribute => 2094,
-      Iir_Kind_Nature_Reference_Attribute => 2098,
-      Iir_Kind_Left_Type_Attribute => 2103,
-      Iir_Kind_Right_Type_Attribute => 2108,
-      Iir_Kind_High_Type_Attribute => 2113,
-      Iir_Kind_Low_Type_Attribute => 2118,
-      Iir_Kind_Ascending_Type_Attribute => 2123,
-      Iir_Kind_Image_Attribute => 2129,
-      Iir_Kind_Value_Attribute => 2135,
-      Iir_Kind_Pos_Attribute => 2141,
-      Iir_Kind_Val_Attribute => 2147,
-      Iir_Kind_Succ_Attribute => 2153,
-      Iir_Kind_Pred_Attribute => 2159,
-      Iir_Kind_Leftof_Attribute => 2165,
-      Iir_Kind_Rightof_Attribute => 2171,
-      Iir_Kind_Signal_Slew_Attribute => 2179,
-      Iir_Kind_Quantity_Slew_Attribute => 2187,
-      Iir_Kind_Ramp_Attribute => 2195,
-      Iir_Kind_Zoh_Attribute => 2203,
-      Iir_Kind_Ltf_Attribute => 2211,
-      Iir_Kind_Ztf_Attribute => 2221,
-      Iir_Kind_Dot_Attribute => 2228,
-      Iir_Kind_Integ_Attribute => 2235,
-      Iir_Kind_Quantity_Delayed_Attribute => 2243,
-      Iir_Kind_Above_Attribute => 2251,
-      Iir_Kind_Delayed_Attribute => 2260,
-      Iir_Kind_Stable_Attribute => 2269,
-      Iir_Kind_Quiet_Attribute => 2278,
-      Iir_Kind_Transaction_Attribute => 2287,
-      Iir_Kind_Event_Attribute => 2291,
-      Iir_Kind_Active_Attribute => 2295,
-      Iir_Kind_Last_Event_Attribute => 2299,
-      Iir_Kind_Last_Active_Attribute => 2303,
-      Iir_Kind_Last_Value_Attribute => 2307,
-      Iir_Kind_Driving_Attribute => 2311,
-      Iir_Kind_Driving_Value_Attribute => 2315,
-      Iir_Kind_Behavior_Attribute => 2315,
-      Iir_Kind_Structure_Attribute => 2315,
-      Iir_Kind_Simple_Name_Attribute => 2322,
-      Iir_Kind_Instance_Name_Attribute => 2327,
-      Iir_Kind_Path_Name_Attribute => 2332,
-      Iir_Kind_Left_Array_Attribute => 2339,
-      Iir_Kind_Right_Array_Attribute => 2346,
-      Iir_Kind_High_Array_Attribute => 2353,
-      Iir_Kind_Low_Array_Attribute => 2360,
-      Iir_Kind_Length_Array_Attribute => 2367,
-      Iir_Kind_Ascending_Array_Attribute => 2374,
-      Iir_Kind_Range_Array_Attribute => 2381,
-      Iir_Kind_Reverse_Range_Array_Attribute => 2388,
-      Iir_Kind_Attribute_Name => 2397
+      Iir_Kind_Terminal_Declaration => 910,
+      Iir_Kind_Object_Alias_Declaration => 922,
+      Iir_Kind_Free_Quantity_Declaration => 934,
+      Iir_Kind_Spectrum_Quantity_Declaration => 947,
+      Iir_Kind_Noise_Quantity_Declaration => 959,
+      Iir_Kind_Across_Quantity_Declaration => 975,
+      Iir_Kind_Through_Quantity_Declaration => 991,
+      Iir_Kind_File_Declaration => 1006,
+      Iir_Kind_Guard_Signal_Declaration => 1020,
+      Iir_Kind_Signal_Declaration => 1037,
+      Iir_Kind_Variable_Declaration => 1050,
+      Iir_Kind_Constant_Declaration => 1064,
+      Iir_Kind_Iterator_Declaration => 1076,
+      Iir_Kind_Interface_Constant_Declaration => 1093,
+      Iir_Kind_Interface_Variable_Declaration => 1109,
+      Iir_Kind_Interface_Signal_Declaration => 1130,
+      Iir_Kind_Interface_File_Declaration => 1146,
+      Iir_Kind_Interface_Quantity_Declaration => 1162,
+      Iir_Kind_Interface_Terminal_Declaration => 1174,
+      Iir_Kind_Interface_Type_Declaration => 1185,
+      Iir_Kind_Interface_Package_Declaration => 1198,
+      Iir_Kind_Interface_Function_Declaration => 1216,
+      Iir_Kind_Interface_Procedure_Declaration => 1230,
+      Iir_Kind_Attribute_Implicit_Declaration => 1233,
+      Iir_Kind_Suspend_State_Declaration => 1236,
+      Iir_Kind_Identity_Operator => 1240,
+      Iir_Kind_Negation_Operator => 1244,
+      Iir_Kind_Absolute_Operator => 1248,
+      Iir_Kind_Not_Operator => 1252,
+      Iir_Kind_Implicit_Condition_Operator => 1256,
+      Iir_Kind_Condition_Operator => 1260,
+      Iir_Kind_Reduction_And_Operator => 1264,
+      Iir_Kind_Reduction_Or_Operator => 1268,
+      Iir_Kind_Reduction_Nand_Operator => 1272,
+      Iir_Kind_Reduction_Nor_Operator => 1276,
+      Iir_Kind_Reduction_Xor_Operator => 1280,
+      Iir_Kind_Reduction_Xnor_Operator => 1284,
+      Iir_Kind_And_Operator => 1289,
+      Iir_Kind_Or_Operator => 1294,
+      Iir_Kind_Nand_Operator => 1299,
+      Iir_Kind_Nor_Operator => 1304,
+      Iir_Kind_Xor_Operator => 1309,
+      Iir_Kind_Xnor_Operator => 1314,
+      Iir_Kind_Equality_Operator => 1319,
+      Iir_Kind_Inequality_Operator => 1324,
+      Iir_Kind_Less_Than_Operator => 1329,
+      Iir_Kind_Less_Than_Or_Equal_Operator => 1334,
+      Iir_Kind_Greater_Than_Operator => 1339,
+      Iir_Kind_Greater_Than_Or_Equal_Operator => 1344,
+      Iir_Kind_Match_Equality_Operator => 1349,
+      Iir_Kind_Match_Inequality_Operator => 1354,
+      Iir_Kind_Match_Less_Than_Operator => 1359,
+      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1364,
+      Iir_Kind_Match_Greater_Than_Operator => 1369,
+      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1374,
+      Iir_Kind_Sll_Operator => 1379,
+      Iir_Kind_Sla_Operator => 1384,
+      Iir_Kind_Srl_Operator => 1389,
+      Iir_Kind_Sra_Operator => 1394,
+      Iir_Kind_Rol_Operator => 1399,
+      Iir_Kind_Ror_Operator => 1404,
+      Iir_Kind_Addition_Operator => 1409,
+      Iir_Kind_Substraction_Operator => 1414,
+      Iir_Kind_Concatenation_Operator => 1419,
+      Iir_Kind_Multiplication_Operator => 1424,
+      Iir_Kind_Division_Operator => 1429,
+      Iir_Kind_Modulus_Operator => 1434,
+      Iir_Kind_Remainder_Operator => 1439,
+      Iir_Kind_Exponentiation_Operator => 1444,
+      Iir_Kind_Function_Call => 1452,
+      Iir_Kind_Aggregate => 1459,
+      Iir_Kind_Parenthesis_Expression => 1462,
+      Iir_Kind_Qualified_Expression => 1466,
+      Iir_Kind_Type_Conversion => 1471,
+      Iir_Kind_Allocator_By_Expression => 1476,
+      Iir_Kind_Allocator_By_Subtype => 1482,
+      Iir_Kind_Selected_Element => 1490,
+      Iir_Kind_Dereference => 1495,
+      Iir_Kind_Implicit_Dereference => 1500,
+      Iir_Kind_Slice_Name => 1507,
+      Iir_Kind_Indexed_Name => 1513,
+      Iir_Kind_Psl_Prev => 1519,
+      Iir_Kind_Psl_Stable => 1524,
+      Iir_Kind_Psl_Rose => 1529,
+      Iir_Kind_Psl_Fell => 1534,
+      Iir_Kind_Psl_Onehot => 1537,
+      Iir_Kind_Psl_Onehot0 => 1540,
+      Iir_Kind_Psl_Expression => 1542,
+      Iir_Kind_Sensitized_Process_Statement => 1563,
+      Iir_Kind_Process_Statement => 1583,
+      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1596,
+      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1609,
+      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1623,
+      Iir_Kind_Concurrent_Assertion_Statement => 1631,
+      Iir_Kind_Concurrent_Procedure_Call_Statement => 1638,
+      Iir_Kind_Concurrent_Break_Statement => 1646,
+      Iir_Kind_Psl_Assert_Directive => 1660,
+      Iir_Kind_Psl_Assume_Directive => 1672,
+      Iir_Kind_Psl_Cover_Directive => 1684,
+      Iir_Kind_Psl_Restrict_Directive => 1695,
+      Iir_Kind_Block_Statement => 1709,
+      Iir_Kind_If_Generate_Statement => 1720,
+      Iir_Kind_Case_Generate_Statement => 1729,
+      Iir_Kind_For_Generate_Statement => 1738,
+      Iir_Kind_Component_Instantiation_Statement => 1749,
+      Iir_Kind_Psl_Default_Clock => 1752,
+      Iir_Kind_Generate_Statement_Body => 1763,
+      Iir_Kind_If_Generate_Else_Clause => 1769,
+      Iir_Kind_Simple_Simultaneous_Statement => 1776,
+      Iir_Kind_Simultaneous_Null_Statement => 1780,
+      Iir_Kind_Simultaneous_Procedural_Statement => 1791,
+      Iir_Kind_Simultaneous_Case_Statement => 1800,
+      Iir_Kind_Simultaneous_If_Statement => 1809,
+      Iir_Kind_Simultaneous_Elsif => 1815,
+      Iir_Kind_Simple_Signal_Assignment_Statement => 1826,
+      Iir_Kind_Conditional_Signal_Assignment_Statement => 1837,
+      Iir_Kind_Selected_Waveform_Assignment_Statement => 1849,
+      Iir_Kind_Signal_Force_Assignment_Statement => 1859,
+      Iir_Kind_Signal_Release_Assignment_Statement => 1868,
+      Iir_Kind_Null_Statement => 1872,
+      Iir_Kind_Assertion_Statement => 1879,
+      Iir_Kind_Report_Statement => 1885,
+      Iir_Kind_Wait_Statement => 1893,
+      Iir_Kind_Variable_Assignment_Statement => 1900,
+      Iir_Kind_Conditional_Variable_Assignment_Statement => 1907,
+      Iir_Kind_Return_Statement => 1913,
+      Iir_Kind_For_Loop_Statement => 1924,
+      Iir_Kind_While_Loop_Statement => 1935,
+      Iir_Kind_Next_Statement => 1942,
+      Iir_Kind_Exit_Statement => 1949,
+      Iir_Kind_Case_Statement => 1958,
+      Iir_Kind_Procedure_Call_Statement => 1964,
+      Iir_Kind_Break_Statement => 1971,
+      Iir_Kind_If_Statement => 1981,
+      Iir_Kind_Suspend_State_Statement => 1985,
+      Iir_Kind_Elsif => 1991,
+      Iir_Kind_Character_Literal => 1998,
+      Iir_Kind_Simple_Name => 2005,
+      Iir_Kind_Selected_Name => 2013,
+      Iir_Kind_Operator_Symbol => 2018,
+      Iir_Kind_Reference_Name => 2023,
+      Iir_Kind_External_Constant_Name => 2032,
+      Iir_Kind_External_Signal_Name => 2041,
+      Iir_Kind_External_Variable_Name => 2051,
+      Iir_Kind_Selected_By_All_Name => 2057,
+      Iir_Kind_Parenthesis_Name => 2062,
+      Iir_Kind_Package_Pathname => 2066,
+      Iir_Kind_Absolute_Pathname => 2067,
+      Iir_Kind_Relative_Pathname => 2068,
+      Iir_Kind_Pathname_Element => 2073,
+      Iir_Kind_Base_Attribute => 2075,
+      Iir_Kind_Subtype_Attribute => 2080,
+      Iir_Kind_Element_Attribute => 2085,
+      Iir_Kind_Across_Attribute => 2090,
+      Iir_Kind_Through_Attribute => 2095,
+      Iir_Kind_Nature_Reference_Attribute => 2099,
+      Iir_Kind_Left_Type_Attribute => 2104,
+      Iir_Kind_Right_Type_Attribute => 2109,
+      Iir_Kind_High_Type_Attribute => 2114,
+      Iir_Kind_Low_Type_Attribute => 2119,
+      Iir_Kind_Ascending_Type_Attribute => 2124,
+      Iir_Kind_Image_Attribute => 2130,
+      Iir_Kind_Value_Attribute => 2136,
+      Iir_Kind_Pos_Attribute => 2142,
+      Iir_Kind_Val_Attribute => 2148,
+      Iir_Kind_Succ_Attribute => 2154,
+      Iir_Kind_Pred_Attribute => 2160,
+      Iir_Kind_Leftof_Attribute => 2166,
+      Iir_Kind_Rightof_Attribute => 2172,
+      Iir_Kind_Signal_Slew_Attribute => 2180,
+      Iir_Kind_Quantity_Slew_Attribute => 2188,
+      Iir_Kind_Ramp_Attribute => 2196,
+      Iir_Kind_Zoh_Attribute => 2204,
+      Iir_Kind_Ltf_Attribute => 2212,
+      Iir_Kind_Ztf_Attribute => 2222,
+      Iir_Kind_Dot_Attribute => 2229,
+      Iir_Kind_Integ_Attribute => 2236,
+      Iir_Kind_Quantity_Delayed_Attribute => 2244,
+      Iir_Kind_Above_Attribute => 2252,
+      Iir_Kind_Delayed_Attribute => 2261,
+      Iir_Kind_Stable_Attribute => 2270,
+      Iir_Kind_Quiet_Attribute => 2279,
+      Iir_Kind_Transaction_Attribute => 2288,
+      Iir_Kind_Event_Attribute => 2292,
+      Iir_Kind_Active_Attribute => 2296,
+      Iir_Kind_Last_Event_Attribute => 2300,
+      Iir_Kind_Last_Active_Attribute => 2304,
+      Iir_Kind_Last_Value_Attribute => 2308,
+      Iir_Kind_Driving_Attribute => 2312,
+      Iir_Kind_Driving_Value_Attribute => 2316,
+      Iir_Kind_Behavior_Attribute => 2316,
+      Iir_Kind_Structure_Attribute => 2316,
+      Iir_Kind_Simple_Name_Attribute => 2323,
+      Iir_Kind_Instance_Name_Attribute => 2328,
+      Iir_Kind_Path_Name_Attribute => 2333,
+      Iir_Kind_Left_Array_Attribute => 2340,
+      Iir_Kind_Right_Array_Attribute => 2347,
+      Iir_Kind_High_Array_Attribute => 2354,
+      Iir_Kind_Low_Array_Attribute => 2361,
+      Iir_Kind_Length_Array_Attribute => 2368,
+      Iir_Kind_Ascending_Array_Attribute => 2375,
+      Iir_Kind_Range_Array_Attribute => 2382,
+      Iir_Kind_Reverse_Range_Array_Attribute => 2389,
+      Iir_Kind_Attribute_Name => 2398
      );
 
    function Get_Fields_First (K : Iir_Kind) return Fields_Index is
@@ -5676,6 +5682,8 @@ package body Vhdl.Nodes_Meta is
             return Get_Macro_Expanded_Flag (N);
          when Field_Need_Instance_Bodies =>
             return Get_Need_Instance_Bodies (N);
+         when Field_Reference_Terminal_Flag =>
+            return Get_Reference_Terminal_Flag (N);
          when Field_Guarded_Signal_Flag =>
             return Get_Guarded_Signal_Flag (N);
          when Field_Deferred_Declaration_Flag =>
@@ -5832,6 +5840,8 @@ package body Vhdl.Nodes_Meta is
             Set_Macro_Expanded_Flag (N, V);
          when Field_Need_Instance_Bodies =>
             Set_Need_Instance_Bodies (N, V);
+         when Field_Reference_Terminal_Flag =>
+            Set_Reference_Terminal_Flag (N, V);
          when Field_Guarded_Signal_Flag =>
             Set_Guarded_Signal_Flag (N, V);
          when Field_Deferred_Declaration_Flag =>
@@ -8976,6 +8986,11 @@ package body Vhdl.Nodes_Meta is
       end case;
    end Has_Subnature_Indication;
 
+   function Has_Reference_Terminal_Flag (K : Iir_Kind) return Boolean is
+   begin
+      return K = Iir_Kind_Terminal_Declaration;
+   end Has_Reference_Terminal_Flag;
+
    function Has_Mode (K : Iir_Kind) return Boolean is
    begin
       case K is
diff --git a/src/vhdl/vhdl-nodes_meta.ads b/src/vhdl/vhdl-nodes_meta.ads
index 51e9531aa..9ec914f54 100644
--- a/src/vhdl/vhdl-nodes_meta.ads
+++ b/src/vhdl/vhdl-nodes_meta.ads
@@ -163,6 +163,7 @@ package Vhdl.Nodes_Meta is
       Field_Nature_Definition,
       Field_Nature,
       Field_Subnature_Indication,
+      Field_Reference_Terminal_Flag,
       Field_Mode,
       Field_Guarded_Signal_Flag,
       Field_Signal_Kind,
@@ -752,6 +753,7 @@ package Vhdl.Nodes_Meta is
    function Has_Nature_Definition (K : Iir_Kind) return Boolean;
    function Has_Nature (K : Iir_Kind) return Boolean;
    function Has_Subnature_Indication (K : Iir_Kind) return Boolean;
+   function Has_Reference_Terminal_Flag (K : Iir_Kind) return Boolean;
    function Has_Mode (K : Iir_Kind) return Boolean;
    function Has_Guarded_Signal_Flag (K : Iir_Kind) return Boolean;
    function Has_Signal_Kind (K : Iir_Kind) return Boolean;