synth: add support for subtype declaration in vunits. Fix #2033

1 files changed, 237 insertions, 231 deletions

diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb
index f08c00504..9fd729275 100644
--- a/src/vhdl/vhdl-nodes_meta.adb
+++ b/src/vhdl/vhdl-nodes_meta.adb
@@ -3254,6 +3254,7 @@ package body Vhdl.Nodes_Meta is
       Field_End_Has_Reserved_Id,
       Field_End_Has_Identifier,
       Field_Parent,
+      Field_Chain,
       Field_Hierarchical_Name,
       Field_Attribute_Value_Chain,
       Field_Vunit_Item_Chain,
@@ -3266,6 +3267,7 @@ package body Vhdl.Nodes_Meta is
       Field_End_Has_Reserved_Id,
       Field_End_Has_Identifier,
       Field_Parent,
+      Field_Chain,
       Field_Hierarchical_Name,
       Field_Attribute_Value_Chain,
       Field_Vunit_Item_Chain,
@@ -3278,6 +3280,7 @@ package body Vhdl.Nodes_Meta is
       Field_End_Has_Reserved_Id,
       Field_End_Has_Identifier,
       Field_Parent,
+      Field_Chain,
       Field_Hierarchical_Name,
       Field_Attribute_Value_Chain,
       Field_Vunit_Item_Chain,
@@ -5348,237 +5351,237 @@ package body Vhdl.Nodes_Meta is
       Iir_Kind_Context_Declaration => 578,
       Iir_Kind_Package_Declaration => 593,
       Iir_Kind_Package_Instantiation_Declaration => 607,
-      Iir_Kind_Vmode_Declaration => 618,
-      Iir_Kind_Vprop_Declaration => 629,
-      Iir_Kind_Vunit_Declaration => 641,
-      Iir_Kind_Package_Body => 649,
-      Iir_Kind_Architecture_Body => 662,
-      Iir_Kind_Type_Declaration => 669,
-      Iir_Kind_Anonymous_Type_Declaration => 675,
-      Iir_Kind_Subtype_Declaration => 683,
-      Iir_Kind_Nature_Declaration => 689,
-      Iir_Kind_Subnature_Declaration => 696,
-      Iir_Kind_Package_Header => 698,
-      Iir_Kind_Unit_Declaration => 707,
-      Iir_Kind_Library_Declaration => 715,
-      Iir_Kind_Component_Declaration => 725,
-      Iir_Kind_Attribute_Declaration => 732,
-      Iir_Kind_Group_Template_Declaration => 738,
-      Iir_Kind_Group_Declaration => 745,
-      Iir_Kind_Element_Declaration => 753,
-      Iir_Kind_Nature_Element_Declaration => 760,
-      Iir_Kind_Non_Object_Alias_Declaration => 768,
-      Iir_Kind_Psl_Declaration => 776,
-      Iir_Kind_Psl_Endpoint_Declaration => 790,
-      Iir_Kind_Enumeration_Literal => 802,
-      Iir_Kind_Function_Declaration => 828,
-      Iir_Kind_Procedure_Declaration => 853,
-      Iir_Kind_Function_Body => 863,
-      Iir_Kind_Procedure_Body => 874,
-      Iir_Kind_Function_Instantiation_Declaration => 885,
-      Iir_Kind_Procedure_Instantiation_Declaration => 895,
-      Iir_Kind_Terminal_Declaration => 904,
-      Iir_Kind_Object_Alias_Declaration => 916,
-      Iir_Kind_Free_Quantity_Declaration => 928,
-      Iir_Kind_Spectrum_Quantity_Declaration => 941,
-      Iir_Kind_Noise_Quantity_Declaration => 953,
-      Iir_Kind_Across_Quantity_Declaration => 969,
-      Iir_Kind_Through_Quantity_Declaration => 985,
-      Iir_Kind_File_Declaration => 1000,
-      Iir_Kind_Guard_Signal_Declaration => 1014,
-      Iir_Kind_Signal_Declaration => 1031,
-      Iir_Kind_Variable_Declaration => 1044,
-      Iir_Kind_Constant_Declaration => 1058,
-      Iir_Kind_Iterator_Declaration => 1070,
-      Iir_Kind_Interface_Constant_Declaration => 1087,
-      Iir_Kind_Interface_Variable_Declaration => 1103,
-      Iir_Kind_Interface_Signal_Declaration => 1124,
-      Iir_Kind_Interface_File_Declaration => 1140,
-      Iir_Kind_Interface_Quantity_Declaration => 1156,
-      Iir_Kind_Interface_Terminal_Declaration => 1168,
-      Iir_Kind_Interface_Type_Declaration => 1179,
-      Iir_Kind_Interface_Package_Declaration => 1192,
-      Iir_Kind_Interface_Function_Declaration => 1210,
-      Iir_Kind_Interface_Procedure_Declaration => 1224,
-      Iir_Kind_Signal_Attribute_Declaration => 1227,
-      Iir_Kind_Identity_Operator => 1231,
-      Iir_Kind_Negation_Operator => 1235,
-      Iir_Kind_Absolute_Operator => 1239,
-      Iir_Kind_Not_Operator => 1243,
-      Iir_Kind_Implicit_Condition_Operator => 1247,
-      Iir_Kind_Condition_Operator => 1251,
-      Iir_Kind_Reduction_And_Operator => 1255,
-      Iir_Kind_Reduction_Or_Operator => 1259,
-      Iir_Kind_Reduction_Nand_Operator => 1263,
-      Iir_Kind_Reduction_Nor_Operator => 1267,
-      Iir_Kind_Reduction_Xor_Operator => 1271,
-      Iir_Kind_Reduction_Xnor_Operator => 1275,
-      Iir_Kind_And_Operator => 1280,
-      Iir_Kind_Or_Operator => 1285,
-      Iir_Kind_Nand_Operator => 1290,
-      Iir_Kind_Nor_Operator => 1295,
-      Iir_Kind_Xor_Operator => 1300,
-      Iir_Kind_Xnor_Operator => 1305,
-      Iir_Kind_Equality_Operator => 1310,
-      Iir_Kind_Inequality_Operator => 1315,
-      Iir_Kind_Less_Than_Operator => 1320,
-      Iir_Kind_Less_Than_Or_Equal_Operator => 1325,
-      Iir_Kind_Greater_Than_Operator => 1330,
-      Iir_Kind_Greater_Than_Or_Equal_Operator => 1335,
-      Iir_Kind_Match_Equality_Operator => 1340,
-      Iir_Kind_Match_Inequality_Operator => 1345,
-      Iir_Kind_Match_Less_Than_Operator => 1350,
-      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1355,
-      Iir_Kind_Match_Greater_Than_Operator => 1360,
-      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1365,
-      Iir_Kind_Sll_Operator => 1370,
-      Iir_Kind_Sla_Operator => 1375,
-      Iir_Kind_Srl_Operator => 1380,
-      Iir_Kind_Sra_Operator => 1385,
-      Iir_Kind_Rol_Operator => 1390,
-      Iir_Kind_Ror_Operator => 1395,
-      Iir_Kind_Addition_Operator => 1400,
-      Iir_Kind_Substraction_Operator => 1405,
-      Iir_Kind_Concatenation_Operator => 1410,
-      Iir_Kind_Multiplication_Operator => 1415,
-      Iir_Kind_Division_Operator => 1420,
-      Iir_Kind_Modulus_Operator => 1425,
-      Iir_Kind_Remainder_Operator => 1430,
-      Iir_Kind_Exponentiation_Operator => 1435,
-      Iir_Kind_Function_Call => 1443,
-      Iir_Kind_Aggregate => 1450,
-      Iir_Kind_Parenthesis_Expression => 1453,
-      Iir_Kind_Qualified_Expression => 1457,
-      Iir_Kind_Type_Conversion => 1462,
-      Iir_Kind_Allocator_By_Expression => 1467,
-      Iir_Kind_Allocator_By_Subtype => 1473,
-      Iir_Kind_Selected_Element => 1481,
-      Iir_Kind_Dereference => 1486,
-      Iir_Kind_Implicit_Dereference => 1491,
-      Iir_Kind_Slice_Name => 1498,
-      Iir_Kind_Indexed_Name => 1504,
-      Iir_Kind_Psl_Prev => 1510,
-      Iir_Kind_Psl_Stable => 1515,
-      Iir_Kind_Psl_Rose => 1520,
-      Iir_Kind_Psl_Fell => 1525,
-      Iir_Kind_Psl_Onehot => 1528,
-      Iir_Kind_Psl_Onehot0 => 1531,
-      Iir_Kind_Psl_Expression => 1533,
-      Iir_Kind_Sensitized_Process_Statement => 1554,
-      Iir_Kind_Process_Statement => 1574,
-      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1587,
-      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1600,
-      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1614,
-      Iir_Kind_Concurrent_Assertion_Statement => 1622,
-      Iir_Kind_Concurrent_Procedure_Call_Statement => 1629,
-      Iir_Kind_Concurrent_Break_Statement => 1637,
-      Iir_Kind_Psl_Assert_Directive => 1651,
-      Iir_Kind_Psl_Assume_Directive => 1663,
-      Iir_Kind_Psl_Cover_Directive => 1675,
-      Iir_Kind_Psl_Restrict_Directive => 1686,
-      Iir_Kind_Block_Statement => 1700,
-      Iir_Kind_If_Generate_Statement => 1711,
-      Iir_Kind_Case_Generate_Statement => 1720,
-      Iir_Kind_For_Generate_Statement => 1729,
-      Iir_Kind_Component_Instantiation_Statement => 1740,
-      Iir_Kind_Psl_Default_Clock => 1743,
-      Iir_Kind_Generate_Statement_Body => 1754,
-      Iir_Kind_If_Generate_Else_Clause => 1760,
-      Iir_Kind_Simple_Simultaneous_Statement => 1767,
-      Iir_Kind_Simultaneous_Null_Statement => 1771,
-      Iir_Kind_Simultaneous_Procedural_Statement => 1782,
-      Iir_Kind_Simultaneous_Case_Statement => 1791,
-      Iir_Kind_Simultaneous_If_Statement => 1800,
-      Iir_Kind_Simultaneous_Elsif => 1806,
-      Iir_Kind_Simple_Signal_Assignment_Statement => 1817,
-      Iir_Kind_Conditional_Signal_Assignment_Statement => 1828,
-      Iir_Kind_Selected_Waveform_Assignment_Statement => 1840,
-      Iir_Kind_Signal_Force_Assignment_Statement => 1850,
-      Iir_Kind_Signal_Release_Assignment_Statement => 1859,
-      Iir_Kind_Null_Statement => 1863,
-      Iir_Kind_Assertion_Statement => 1870,
-      Iir_Kind_Report_Statement => 1876,
-      Iir_Kind_Wait_Statement => 1884,
-      Iir_Kind_Variable_Assignment_Statement => 1891,
-      Iir_Kind_Conditional_Variable_Assignment_Statement => 1898,
-      Iir_Kind_Return_Statement => 1904,
-      Iir_Kind_For_Loop_Statement => 1915,
-      Iir_Kind_While_Loop_Statement => 1926,
-      Iir_Kind_Next_Statement => 1933,
-      Iir_Kind_Exit_Statement => 1940,
-      Iir_Kind_Case_Statement => 1949,
-      Iir_Kind_Procedure_Call_Statement => 1955,
-      Iir_Kind_Break_Statement => 1962,
-      Iir_Kind_If_Statement => 1972,
-      Iir_Kind_Elsif => 1978,
-      Iir_Kind_Character_Literal => 1985,
-      Iir_Kind_Simple_Name => 1992,
-      Iir_Kind_Selected_Name => 2000,
-      Iir_Kind_Operator_Symbol => 2005,
-      Iir_Kind_Reference_Name => 2010,
-      Iir_Kind_External_Constant_Name => 2019,
-      Iir_Kind_External_Signal_Name => 2028,
-      Iir_Kind_External_Variable_Name => 2038,
-      Iir_Kind_Selected_By_All_Name => 2044,
-      Iir_Kind_Parenthesis_Name => 2049,
-      Iir_Kind_Package_Pathname => 2053,
-      Iir_Kind_Absolute_Pathname => 2054,
-      Iir_Kind_Relative_Pathname => 2055,
-      Iir_Kind_Pathname_Element => 2060,
-      Iir_Kind_Base_Attribute => 2062,
-      Iir_Kind_Subtype_Attribute => 2067,
-      Iir_Kind_Element_Attribute => 2072,
-      Iir_Kind_Across_Attribute => 2077,
-      Iir_Kind_Through_Attribute => 2082,
-      Iir_Kind_Nature_Reference_Attribute => 2086,
-      Iir_Kind_Left_Type_Attribute => 2091,
-      Iir_Kind_Right_Type_Attribute => 2096,
-      Iir_Kind_High_Type_Attribute => 2101,
-      Iir_Kind_Low_Type_Attribute => 2106,
-      Iir_Kind_Ascending_Type_Attribute => 2111,
-      Iir_Kind_Image_Attribute => 2117,
-      Iir_Kind_Value_Attribute => 2123,
-      Iir_Kind_Pos_Attribute => 2129,
-      Iir_Kind_Val_Attribute => 2135,
-      Iir_Kind_Succ_Attribute => 2141,
-      Iir_Kind_Pred_Attribute => 2147,
-      Iir_Kind_Leftof_Attribute => 2153,
-      Iir_Kind_Rightof_Attribute => 2159,
-      Iir_Kind_Signal_Slew_Attribute => 2167,
-      Iir_Kind_Quantity_Slew_Attribute => 2175,
-      Iir_Kind_Ramp_Attribute => 2183,
-      Iir_Kind_Zoh_Attribute => 2191,
-      Iir_Kind_Ltf_Attribute => 2199,
-      Iir_Kind_Ztf_Attribute => 2209,
-      Iir_Kind_Dot_Attribute => 2216,
-      Iir_Kind_Integ_Attribute => 2223,
-      Iir_Kind_Above_Attribute => 2231,
-      Iir_Kind_Quantity_Delayed_Attribute => 2239,
-      Iir_Kind_Delayed_Attribute => 2248,
-      Iir_Kind_Stable_Attribute => 2257,
-      Iir_Kind_Quiet_Attribute => 2266,
-      Iir_Kind_Transaction_Attribute => 2275,
-      Iir_Kind_Event_Attribute => 2279,
-      Iir_Kind_Active_Attribute => 2283,
-      Iir_Kind_Last_Event_Attribute => 2287,
-      Iir_Kind_Last_Active_Attribute => 2291,
-      Iir_Kind_Last_Value_Attribute => 2295,
-      Iir_Kind_Driving_Attribute => 2299,
-      Iir_Kind_Driving_Value_Attribute => 2303,
-      Iir_Kind_Behavior_Attribute => 2303,
-      Iir_Kind_Structure_Attribute => 2303,
-      Iir_Kind_Simple_Name_Attribute => 2310,
-      Iir_Kind_Instance_Name_Attribute => 2315,
-      Iir_Kind_Path_Name_Attribute => 2320,
-      Iir_Kind_Left_Array_Attribute => 2327,
-      Iir_Kind_Right_Array_Attribute => 2334,
-      Iir_Kind_High_Array_Attribute => 2341,
-      Iir_Kind_Low_Array_Attribute => 2348,
-      Iir_Kind_Length_Array_Attribute => 2355,
-      Iir_Kind_Ascending_Array_Attribute => 2362,
-      Iir_Kind_Range_Array_Attribute => 2369,
-      Iir_Kind_Reverse_Range_Array_Attribute => 2376,
-      Iir_Kind_Attribute_Name => 2385
+      Iir_Kind_Vmode_Declaration => 619,
+      Iir_Kind_Vprop_Declaration => 631,
+      Iir_Kind_Vunit_Declaration => 644,
+      Iir_Kind_Package_Body => 652,
+      Iir_Kind_Architecture_Body => 665,
+      Iir_Kind_Type_Declaration => 672,
+      Iir_Kind_Anonymous_Type_Declaration => 678,
+      Iir_Kind_Subtype_Declaration => 686,
+      Iir_Kind_Nature_Declaration => 692,
+      Iir_Kind_Subnature_Declaration => 699,
+      Iir_Kind_Package_Header => 701,
+      Iir_Kind_Unit_Declaration => 710,
+      Iir_Kind_Library_Declaration => 718,
+      Iir_Kind_Component_Declaration => 728,
+      Iir_Kind_Attribute_Declaration => 735,
+      Iir_Kind_Group_Template_Declaration => 741,
+      Iir_Kind_Group_Declaration => 748,
+      Iir_Kind_Element_Declaration => 756,
+      Iir_Kind_Nature_Element_Declaration => 763,
+      Iir_Kind_Non_Object_Alias_Declaration => 771,
+      Iir_Kind_Psl_Declaration => 779,
+      Iir_Kind_Psl_Endpoint_Declaration => 793,
+      Iir_Kind_Enumeration_Literal => 805,
+      Iir_Kind_Function_Declaration => 831,
+      Iir_Kind_Procedure_Declaration => 856,
+      Iir_Kind_Function_Body => 866,
+      Iir_Kind_Procedure_Body => 877,
+      Iir_Kind_Function_Instantiation_Declaration => 888,
+      Iir_Kind_Procedure_Instantiation_Declaration => 898,
+      Iir_Kind_Terminal_Declaration => 907,
+      Iir_Kind_Object_Alias_Declaration => 919,
+      Iir_Kind_Free_Quantity_Declaration => 931,
+      Iir_Kind_Spectrum_Quantity_Declaration => 944,
+      Iir_Kind_Noise_Quantity_Declaration => 956,
+      Iir_Kind_Across_Quantity_Declaration => 972,
+      Iir_Kind_Through_Quantity_Declaration => 988,
+      Iir_Kind_File_Declaration => 1003,
+      Iir_Kind_Guard_Signal_Declaration => 1017,
+      Iir_Kind_Signal_Declaration => 1034,
+      Iir_Kind_Variable_Declaration => 1047,
+      Iir_Kind_Constant_Declaration => 1061,
+      Iir_Kind_Iterator_Declaration => 1073,
+      Iir_Kind_Interface_Constant_Declaration => 1090,
+      Iir_Kind_Interface_Variable_Declaration => 1106,
+      Iir_Kind_Interface_Signal_Declaration => 1127,
+      Iir_Kind_Interface_File_Declaration => 1143,
+      Iir_Kind_Interface_Quantity_Declaration => 1159,
+      Iir_Kind_Interface_Terminal_Declaration => 1171,
+      Iir_Kind_Interface_Type_Declaration => 1182,
+      Iir_Kind_Interface_Package_Declaration => 1195,
+      Iir_Kind_Interface_Function_Declaration => 1213,
+      Iir_Kind_Interface_Procedure_Declaration => 1227,
+      Iir_Kind_Signal_Attribute_Declaration => 1230,
+      Iir_Kind_Identity_Operator => 1234,
+      Iir_Kind_Negation_Operator => 1238,
+      Iir_Kind_Absolute_Operator => 1242,
+      Iir_Kind_Not_Operator => 1246,
+      Iir_Kind_Implicit_Condition_Operator => 1250,
+      Iir_Kind_Condition_Operator => 1254,
+      Iir_Kind_Reduction_And_Operator => 1258,
+      Iir_Kind_Reduction_Or_Operator => 1262,
+      Iir_Kind_Reduction_Nand_Operator => 1266,
+      Iir_Kind_Reduction_Nor_Operator => 1270,
+      Iir_Kind_Reduction_Xor_Operator => 1274,
+      Iir_Kind_Reduction_Xnor_Operator => 1278,
+      Iir_Kind_And_Operator => 1283,
+      Iir_Kind_Or_Operator => 1288,
+      Iir_Kind_Nand_Operator => 1293,
+      Iir_Kind_Nor_Operator => 1298,
+      Iir_Kind_Xor_Operator => 1303,
+      Iir_Kind_Xnor_Operator => 1308,
+      Iir_Kind_Equality_Operator => 1313,
+      Iir_Kind_Inequality_Operator => 1318,
+      Iir_Kind_Less_Than_Operator => 1323,
+      Iir_Kind_Less_Than_Or_Equal_Operator => 1328,
+      Iir_Kind_Greater_Than_Operator => 1333,
+      Iir_Kind_Greater_Than_Or_Equal_Operator => 1338,
+      Iir_Kind_Match_Equality_Operator => 1343,
+      Iir_Kind_Match_Inequality_Operator => 1348,
+      Iir_Kind_Match_Less_Than_Operator => 1353,
+      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1358,
+      Iir_Kind_Match_Greater_Than_Operator => 1363,
+      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1368,
+      Iir_Kind_Sll_Operator => 1373,
+      Iir_Kind_Sla_Operator => 1378,
+      Iir_Kind_Srl_Operator => 1383,
+      Iir_Kind_Sra_Operator => 1388,
+      Iir_Kind_Rol_Operator => 1393,
+      Iir_Kind_Ror_Operator => 1398,
+      Iir_Kind_Addition_Operator => 1403,
+      Iir_Kind_Substraction_Operator => 1408,
+      Iir_Kind_Concatenation_Operator => 1413,
+      Iir_Kind_Multiplication_Operator => 1418,
+      Iir_Kind_Division_Operator => 1423,
+      Iir_Kind_Modulus_Operator => 1428,
+      Iir_Kind_Remainder_Operator => 1433,
+      Iir_Kind_Exponentiation_Operator => 1438,
+      Iir_Kind_Function_Call => 1446,
+      Iir_Kind_Aggregate => 1453,
+      Iir_Kind_Parenthesis_Expression => 1456,
+      Iir_Kind_Qualified_Expression => 1460,
+      Iir_Kind_Type_Conversion => 1465,
+      Iir_Kind_Allocator_By_Expression => 1470,
+      Iir_Kind_Allocator_By_Subtype => 1476,
+      Iir_Kind_Selected_Element => 1484,
+      Iir_Kind_Dereference => 1489,
+      Iir_Kind_Implicit_Dereference => 1494,
+      Iir_Kind_Slice_Name => 1501,
+      Iir_Kind_Indexed_Name => 1507,
+      Iir_Kind_Psl_Prev => 1513,
+      Iir_Kind_Psl_Stable => 1518,
+      Iir_Kind_Psl_Rose => 1523,
+      Iir_Kind_Psl_Fell => 1528,
+      Iir_Kind_Psl_Onehot => 1531,
+      Iir_Kind_Psl_Onehot0 => 1534,
+      Iir_Kind_Psl_Expression => 1536,
+      Iir_Kind_Sensitized_Process_Statement => 1557,
+      Iir_Kind_Process_Statement => 1577,
+      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1590,
+      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1603,
+      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1617,
+      Iir_Kind_Concurrent_Assertion_Statement => 1625,
+      Iir_Kind_Concurrent_Procedure_Call_Statement => 1632,
+      Iir_Kind_Concurrent_Break_Statement => 1640,
+      Iir_Kind_Psl_Assert_Directive => 1654,
+      Iir_Kind_Psl_Assume_Directive => 1666,
+      Iir_Kind_Psl_Cover_Directive => 1678,
+      Iir_Kind_Psl_Restrict_Directive => 1689,
+      Iir_Kind_Block_Statement => 1703,
+      Iir_Kind_If_Generate_Statement => 1714,
+      Iir_Kind_Case_Generate_Statement => 1723,
+      Iir_Kind_For_Generate_Statement => 1732,
+      Iir_Kind_Component_Instantiation_Statement => 1743,
+      Iir_Kind_Psl_Default_Clock => 1746,
+      Iir_Kind_Generate_Statement_Body => 1757,
+      Iir_Kind_If_Generate_Else_Clause => 1763,
+      Iir_Kind_Simple_Simultaneous_Statement => 1770,
+      Iir_Kind_Simultaneous_Null_Statement => 1774,
+      Iir_Kind_Simultaneous_Procedural_Statement => 1785,
+      Iir_Kind_Simultaneous_Case_Statement => 1794,
+      Iir_Kind_Simultaneous_If_Statement => 1803,
+      Iir_Kind_Simultaneous_Elsif => 1809,
+      Iir_Kind_Simple_Signal_Assignment_Statement => 1820,
+      Iir_Kind_Conditional_Signal_Assignment_Statement => 1831,
+      Iir_Kind_Selected_Waveform_Assignment_Statement => 1843,
+      Iir_Kind_Signal_Force_Assignment_Statement => 1853,
+      Iir_Kind_Signal_Release_Assignment_Statement => 1862,
+      Iir_Kind_Null_Statement => 1866,
+      Iir_Kind_Assertion_Statement => 1873,
+      Iir_Kind_Report_Statement => 1879,
+      Iir_Kind_Wait_Statement => 1887,
+      Iir_Kind_Variable_Assignment_Statement => 1894,
+      Iir_Kind_Conditional_Variable_Assignment_Statement => 1901,
+      Iir_Kind_Return_Statement => 1907,
+      Iir_Kind_For_Loop_Statement => 1918,
+      Iir_Kind_While_Loop_Statement => 1929,
+      Iir_Kind_Next_Statement => 1936,
+      Iir_Kind_Exit_Statement => 1943,
+      Iir_Kind_Case_Statement => 1952,
+      Iir_Kind_Procedure_Call_Statement => 1958,
+      Iir_Kind_Break_Statement => 1965,
+      Iir_Kind_If_Statement => 1975,
+      Iir_Kind_Elsif => 1981,
+      Iir_Kind_Character_Literal => 1988,
+      Iir_Kind_Simple_Name => 1995,
+      Iir_Kind_Selected_Name => 2003,
+      Iir_Kind_Operator_Symbol => 2008,
+      Iir_Kind_Reference_Name => 2013,
+      Iir_Kind_External_Constant_Name => 2022,
+      Iir_Kind_External_Signal_Name => 2031,
+      Iir_Kind_External_Variable_Name => 2041,
+      Iir_Kind_Selected_By_All_Name => 2047,
+      Iir_Kind_Parenthesis_Name => 2052,
+      Iir_Kind_Package_Pathname => 2056,
+      Iir_Kind_Absolute_Pathname => 2057,
+      Iir_Kind_Relative_Pathname => 2058,
+      Iir_Kind_Pathname_Element => 2063,
+      Iir_Kind_Base_Attribute => 2065,
+      Iir_Kind_Subtype_Attribute => 2070,
+      Iir_Kind_Element_Attribute => 2075,
+      Iir_Kind_Across_Attribute => 2080,
+      Iir_Kind_Through_Attribute => 2085,
+      Iir_Kind_Nature_Reference_Attribute => 2089,
+      Iir_Kind_Left_Type_Attribute => 2094,
+      Iir_Kind_Right_Type_Attribute => 2099,
+      Iir_Kind_High_Type_Attribute => 2104,
+      Iir_Kind_Low_Type_Attribute => 2109,
+      Iir_Kind_Ascending_Type_Attribute => 2114,
+      Iir_Kind_Image_Attribute => 2120,
+      Iir_Kind_Value_Attribute => 2126,
+      Iir_Kind_Pos_Attribute => 2132,
+      Iir_Kind_Val_Attribute => 2138,
+      Iir_Kind_Succ_Attribute => 2144,
+      Iir_Kind_Pred_Attribute => 2150,
+      Iir_Kind_Leftof_Attribute => 2156,
+      Iir_Kind_Rightof_Attribute => 2162,
+      Iir_Kind_Signal_Slew_Attribute => 2170,
+      Iir_Kind_Quantity_Slew_Attribute => 2178,
+      Iir_Kind_Ramp_Attribute => 2186,
+      Iir_Kind_Zoh_Attribute => 2194,
+      Iir_Kind_Ltf_Attribute => 2202,
+      Iir_Kind_Ztf_Attribute => 2212,
+      Iir_Kind_Dot_Attribute => 2219,
+      Iir_Kind_Integ_Attribute => 2226,
+      Iir_Kind_Above_Attribute => 2234,
+      Iir_Kind_Quantity_Delayed_Attribute => 2242,
+      Iir_Kind_Delayed_Attribute => 2251,
+      Iir_Kind_Stable_Attribute => 2260,
+      Iir_Kind_Quiet_Attribute => 2269,
+      Iir_Kind_Transaction_Attribute => 2278,
+      Iir_Kind_Event_Attribute => 2282,
+      Iir_Kind_Active_Attribute => 2286,
+      Iir_Kind_Last_Event_Attribute => 2290,
+      Iir_Kind_Last_Active_Attribute => 2294,
+      Iir_Kind_Last_Value_Attribute => 2298,
+      Iir_Kind_Driving_Attribute => 2302,
+      Iir_Kind_Driving_Value_Attribute => 2306,
+      Iir_Kind_Behavior_Attribute => 2306,
+      Iir_Kind_Structure_Attribute => 2306,
+      Iir_Kind_Simple_Name_Attribute => 2313,
+      Iir_Kind_Instance_Name_Attribute => 2318,
+      Iir_Kind_Path_Name_Attribute => 2323,
+      Iir_Kind_Left_Array_Attribute => 2330,
+      Iir_Kind_Right_Array_Attribute => 2337,
+      Iir_Kind_High_Array_Attribute => 2344,
+      Iir_Kind_Low_Array_Attribute => 2351,
+      Iir_Kind_Length_Array_Attribute => 2358,
+      Iir_Kind_Ascending_Array_Attribute => 2365,
+      Iir_Kind_Range_Array_Attribute => 2372,
+      Iir_Kind_Reverse_Range_Array_Attribute => 2379,
+      Iir_Kind_Attribute_Name => 2388
      );
 
    function Get_Fields_First (K : Iir_Kind) return Fields_Index is
@@ -8520,6 +8523,9 @@ package body Vhdl.Nodes_Meta is
            | Iir_Kind_Protected_Type_Body
            | Iir_Kind_Package_Declaration
            | Iir_Kind_Package_Instantiation_Declaration
+           | Iir_Kind_Vmode_Declaration
+           | Iir_Kind_Vprop_Declaration
+           | Iir_Kind_Vunit_Declaration
            | Iir_Kind_Package_Body
            | Iir_Kind_Type_Declaration
            | Iir_Kind_Anonymous_Type_Declaration