vhdl-nodes: make subtype_Definition like the others.

2 files changed, 209 insertions, 201 deletions

diff --git a/src/vhdl/vhdl-nodes.ads b/src/vhdl/vhdl-nodes.ads
index d3efa1814..380a8a599 100644
--- a/src/vhdl/vhdl-nodes.ads
+++ b/src/vhdl/vhdl-nodes.ads
@@ -2691,6 +2691,10 @@ package Vhdl.Nodes is
    --
    --   Get/Set_Subtype_Type_Mark (Field2)
    --
+   --   Get/Set_Type_Declarator (Field3)
+   --
+   --   Get/Set_Base_Type (Field4)
+   --
    --   Get/Set_Resolution_Indication (Field5)
    --
    --   Get/Set_Tolerance (Field7)
diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb
index f30e5bea5..e0b3ea11e 100644
--- a/src/vhdl/vhdl-nodes_meta.adb
+++ b/src/vhdl/vhdl-nodes_meta.adb
@@ -2753,6 +2753,8 @@ package body Vhdl.Nodes_Meta is
       Field_Is_Ref,
       Field_Range_Constraint,
       Field_Subtype_Type_Mark,
+      Field_Type_Declarator,
+      Field_Base_Type,
       Field_Resolution_Indication,
       Field_Tolerance,
       --  Iir_Kind_Scalar_Nature_Definition
@@ -4490,205 +4492,205 @@ package body Vhdl.Nodes_Meta is
       Iir_Kind_Range_Expression => 447,
       Iir_Kind_Protected_Type_Body => 454,
       Iir_Kind_Wildcard_Type_Definition => 459,
-      Iir_Kind_Subtype_Definition => 464,
-      Iir_Kind_Scalar_Nature_Definition => 468,
-      Iir_Kind_Overload_List => 469,
-      Iir_Kind_Type_Declaration => 476,
-      Iir_Kind_Anonymous_Type_Declaration => 482,
-      Iir_Kind_Subtype_Declaration => 489,
-      Iir_Kind_Nature_Declaration => 495,
-      Iir_Kind_Subnature_Declaration => 501,
-      Iir_Kind_Entity_Declaration => 513,
-      Iir_Kind_Configuration_Declaration => 522,
-      Iir_Kind_Context_Declaration => 528,
-      Iir_Kind_Package_Declaration => 543,
-      Iir_Kind_Package_Instantiation_Declaration => 557,
-      Iir_Kind_Package_Body => 565,
-      Iir_Kind_Architecture_Body => 577,
-      Iir_Kind_Package_Header => 579,
-      Iir_Kind_Unit_Declaration => 588,
-      Iir_Kind_Library_Declaration => 595,
-      Iir_Kind_Component_Declaration => 605,
-      Iir_Kind_Attribute_Declaration => 612,
-      Iir_Kind_Group_Template_Declaration => 618,
-      Iir_Kind_Group_Declaration => 625,
-      Iir_Kind_Element_Declaration => 632,
-      Iir_Kind_Non_Object_Alias_Declaration => 640,
-      Iir_Kind_Psl_Declaration => 648,
-      Iir_Kind_Psl_Endpoint_Declaration => 662,
-      Iir_Kind_Terminal_Declaration => 669,
-      Iir_Kind_Free_Quantity_Declaration => 678,
-      Iir_Kind_Across_Quantity_Declaration => 690,
-      Iir_Kind_Through_Quantity_Declaration => 702,
-      Iir_Kind_Enumeration_Literal => 713,
-      Iir_Kind_Function_Declaration => 738,
-      Iir_Kind_Procedure_Declaration => 762,
-      Iir_Kind_Function_Body => 772,
-      Iir_Kind_Procedure_Body => 783,
-      Iir_Kind_Object_Alias_Declaration => 794,
-      Iir_Kind_File_Declaration => 808,
-      Iir_Kind_Guard_Signal_Declaration => 821,
-      Iir_Kind_Signal_Declaration => 838,
-      Iir_Kind_Variable_Declaration => 851,
-      Iir_Kind_Constant_Declaration => 865,
-      Iir_Kind_Iterator_Declaration => 876,
-      Iir_Kind_Interface_Constant_Declaration => 892,
-      Iir_Kind_Interface_Variable_Declaration => 908,
-      Iir_Kind_Interface_Signal_Declaration => 929,
-      Iir_Kind_Interface_File_Declaration => 945,
-      Iir_Kind_Interface_Type_Declaration => 955,
-      Iir_Kind_Interface_Package_Declaration => 967,
-      Iir_Kind_Interface_Function_Declaration => 984,
-      Iir_Kind_Interface_Procedure_Declaration => 997,
-      Iir_Kind_Signal_Attribute_Declaration => 1000,
-      Iir_Kind_Identity_Operator => 1004,
-      Iir_Kind_Negation_Operator => 1008,
-      Iir_Kind_Absolute_Operator => 1012,
-      Iir_Kind_Not_Operator => 1016,
-      Iir_Kind_Implicit_Condition_Operator => 1020,
-      Iir_Kind_Condition_Operator => 1024,
-      Iir_Kind_Reduction_And_Operator => 1028,
-      Iir_Kind_Reduction_Or_Operator => 1032,
-      Iir_Kind_Reduction_Nand_Operator => 1036,
-      Iir_Kind_Reduction_Nor_Operator => 1040,
-      Iir_Kind_Reduction_Xor_Operator => 1044,
-      Iir_Kind_Reduction_Xnor_Operator => 1048,
-      Iir_Kind_And_Operator => 1053,
-      Iir_Kind_Or_Operator => 1058,
-      Iir_Kind_Nand_Operator => 1063,
-      Iir_Kind_Nor_Operator => 1068,
-      Iir_Kind_Xor_Operator => 1073,
-      Iir_Kind_Xnor_Operator => 1078,
-      Iir_Kind_Equality_Operator => 1083,
-      Iir_Kind_Inequality_Operator => 1088,
-      Iir_Kind_Less_Than_Operator => 1093,
-      Iir_Kind_Less_Than_Or_Equal_Operator => 1098,
-      Iir_Kind_Greater_Than_Operator => 1103,
-      Iir_Kind_Greater_Than_Or_Equal_Operator => 1108,
-      Iir_Kind_Match_Equality_Operator => 1113,
-      Iir_Kind_Match_Inequality_Operator => 1118,
-      Iir_Kind_Match_Less_Than_Operator => 1123,
-      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1128,
-      Iir_Kind_Match_Greater_Than_Operator => 1133,
-      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1138,
-      Iir_Kind_Sll_Operator => 1143,
-      Iir_Kind_Sla_Operator => 1148,
-      Iir_Kind_Srl_Operator => 1153,
-      Iir_Kind_Sra_Operator => 1158,
-      Iir_Kind_Rol_Operator => 1163,
-      Iir_Kind_Ror_Operator => 1168,
-      Iir_Kind_Addition_Operator => 1173,
-      Iir_Kind_Substraction_Operator => 1178,
-      Iir_Kind_Concatenation_Operator => 1183,
-      Iir_Kind_Multiplication_Operator => 1188,
-      Iir_Kind_Division_Operator => 1193,
-      Iir_Kind_Modulus_Operator => 1198,
-      Iir_Kind_Remainder_Operator => 1203,
-      Iir_Kind_Exponentiation_Operator => 1208,
-      Iir_Kind_Function_Call => 1216,
-      Iir_Kind_Aggregate => 1223,
-      Iir_Kind_Parenthesis_Expression => 1226,
-      Iir_Kind_Qualified_Expression => 1230,
-      Iir_Kind_Type_Conversion => 1235,
-      Iir_Kind_Allocator_By_Expression => 1239,
-      Iir_Kind_Allocator_By_Subtype => 1244,
-      Iir_Kind_Selected_Element => 1252,
-      Iir_Kind_Dereference => 1257,
-      Iir_Kind_Implicit_Dereference => 1262,
-      Iir_Kind_Slice_Name => 1269,
-      Iir_Kind_Indexed_Name => 1275,
-      Iir_Kind_Psl_Expression => 1277,
-      Iir_Kind_Sensitized_Process_Statement => 1298,
-      Iir_Kind_Process_Statement => 1318,
-      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1330,
-      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1342,
-      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1355,
-      Iir_Kind_Concurrent_Assertion_Statement => 1363,
-      Iir_Kind_Concurrent_Procedure_Call_Statement => 1370,
-      Iir_Kind_Psl_Assert_Statement => 1383,
-      Iir_Kind_Psl_Cover_Statement => 1396,
-      Iir_Kind_Block_Statement => 1409,
-      Iir_Kind_If_Generate_Statement => 1420,
-      Iir_Kind_Case_Generate_Statement => 1429,
-      Iir_Kind_For_Generate_Statement => 1438,
-      Iir_Kind_Component_Instantiation_Statement => 1449,
-      Iir_Kind_Psl_Default_Clock => 1453,
-      Iir_Kind_Simple_Simultaneous_Statement => 1460,
-      Iir_Kind_Generate_Statement_Body => 1471,
-      Iir_Kind_If_Generate_Else_Clause => 1477,
-      Iir_Kind_Simple_Signal_Assignment_Statement => 1487,
-      Iir_Kind_Conditional_Signal_Assignment_Statement => 1497,
-      Iir_Kind_Selected_Waveform_Assignment_Statement => 1508,
-      Iir_Kind_Null_Statement => 1512,
-      Iir_Kind_Assertion_Statement => 1519,
-      Iir_Kind_Report_Statement => 1525,
-      Iir_Kind_Wait_Statement => 1533,
-      Iir_Kind_Variable_Assignment_Statement => 1540,
-      Iir_Kind_Conditional_Variable_Assignment_Statement => 1547,
-      Iir_Kind_Return_Statement => 1553,
-      Iir_Kind_For_Loop_Statement => 1562,
-      Iir_Kind_While_Loop_Statement => 1571,
-      Iir_Kind_Next_Statement => 1578,
-      Iir_Kind_Exit_Statement => 1585,
-      Iir_Kind_Case_Statement => 1593,
-      Iir_Kind_Procedure_Call_Statement => 1599,
-      Iir_Kind_If_Statement => 1609,
-      Iir_Kind_Elsif => 1615,
-      Iir_Kind_Character_Literal => 1623,
-      Iir_Kind_Simple_Name => 1631,
-      Iir_Kind_Selected_Name => 1640,
-      Iir_Kind_Operator_Symbol => 1646,
-      Iir_Kind_Reference_Name => 1649,
-      Iir_Kind_External_Constant_Name => 1657,
-      Iir_Kind_External_Signal_Name => 1665,
-      Iir_Kind_External_Variable_Name => 1674,
-      Iir_Kind_Selected_By_All_Name => 1680,
-      Iir_Kind_Parenthesis_Name => 1685,
-      Iir_Kind_Package_Pathname => 1689,
-      Iir_Kind_Absolute_Pathname => 1690,
-      Iir_Kind_Relative_Pathname => 1691,
-      Iir_Kind_Pathname_Element => 1696,
-      Iir_Kind_Base_Attribute => 1698,
-      Iir_Kind_Subtype_Attribute => 1703,
-      Iir_Kind_Element_Attribute => 1708,
-      Iir_Kind_Left_Type_Attribute => 1713,
-      Iir_Kind_Right_Type_Attribute => 1718,
-      Iir_Kind_High_Type_Attribute => 1723,
-      Iir_Kind_Low_Type_Attribute => 1728,
-      Iir_Kind_Ascending_Type_Attribute => 1733,
-      Iir_Kind_Image_Attribute => 1739,
-      Iir_Kind_Value_Attribute => 1745,
-      Iir_Kind_Pos_Attribute => 1751,
-      Iir_Kind_Val_Attribute => 1757,
-      Iir_Kind_Succ_Attribute => 1763,
-      Iir_Kind_Pred_Attribute => 1769,
-      Iir_Kind_Leftof_Attribute => 1775,
-      Iir_Kind_Rightof_Attribute => 1781,
-      Iir_Kind_Delayed_Attribute => 1790,
-      Iir_Kind_Stable_Attribute => 1799,
-      Iir_Kind_Quiet_Attribute => 1808,
-      Iir_Kind_Transaction_Attribute => 1817,
-      Iir_Kind_Event_Attribute => 1821,
-      Iir_Kind_Active_Attribute => 1825,
-      Iir_Kind_Last_Event_Attribute => 1829,
-      Iir_Kind_Last_Active_Attribute => 1833,
-      Iir_Kind_Last_Value_Attribute => 1837,
-      Iir_Kind_Driving_Attribute => 1841,
-      Iir_Kind_Driving_Value_Attribute => 1845,
-      Iir_Kind_Behavior_Attribute => 1845,
-      Iir_Kind_Structure_Attribute => 1845,
-      Iir_Kind_Simple_Name_Attribute => 1852,
-      Iir_Kind_Instance_Name_Attribute => 1857,
-      Iir_Kind_Path_Name_Attribute => 1862,
-      Iir_Kind_Left_Array_Attribute => 1869,
-      Iir_Kind_Right_Array_Attribute => 1876,
-      Iir_Kind_High_Array_Attribute => 1883,
-      Iir_Kind_Low_Array_Attribute => 1890,
-      Iir_Kind_Length_Array_Attribute => 1897,
-      Iir_Kind_Ascending_Array_Attribute => 1904,
-      Iir_Kind_Range_Array_Attribute => 1911,
-      Iir_Kind_Reverse_Range_Array_Attribute => 1918,
-      Iir_Kind_Attribute_Name => 1927
+      Iir_Kind_Subtype_Definition => 466,
+      Iir_Kind_Scalar_Nature_Definition => 470,
+      Iir_Kind_Overload_List => 471,
+      Iir_Kind_Type_Declaration => 478,
+      Iir_Kind_Anonymous_Type_Declaration => 484,
+      Iir_Kind_Subtype_Declaration => 491,
+      Iir_Kind_Nature_Declaration => 497,
+      Iir_Kind_Subnature_Declaration => 503,
+      Iir_Kind_Entity_Declaration => 515,
+      Iir_Kind_Configuration_Declaration => 524,
+      Iir_Kind_Context_Declaration => 530,
+      Iir_Kind_Package_Declaration => 545,
+      Iir_Kind_Package_Instantiation_Declaration => 559,
+      Iir_Kind_Package_Body => 567,
+      Iir_Kind_Architecture_Body => 579,
+      Iir_Kind_Package_Header => 581,
+      Iir_Kind_Unit_Declaration => 590,
+      Iir_Kind_Library_Declaration => 597,
+      Iir_Kind_Component_Declaration => 607,
+      Iir_Kind_Attribute_Declaration => 614,
+      Iir_Kind_Group_Template_Declaration => 620,
+      Iir_Kind_Group_Declaration => 627,
+      Iir_Kind_Element_Declaration => 634,
+      Iir_Kind_Non_Object_Alias_Declaration => 642,
+      Iir_Kind_Psl_Declaration => 650,
+      Iir_Kind_Psl_Endpoint_Declaration => 664,
+      Iir_Kind_Terminal_Declaration => 671,
+      Iir_Kind_Free_Quantity_Declaration => 680,
+      Iir_Kind_Across_Quantity_Declaration => 692,
+      Iir_Kind_Through_Quantity_Declaration => 704,
+      Iir_Kind_Enumeration_Literal => 715,
+      Iir_Kind_Function_Declaration => 740,
+      Iir_Kind_Procedure_Declaration => 764,
+      Iir_Kind_Function_Body => 774,
+      Iir_Kind_Procedure_Body => 785,
+      Iir_Kind_Object_Alias_Declaration => 796,
+      Iir_Kind_File_Declaration => 810,
+      Iir_Kind_Guard_Signal_Declaration => 823,
+      Iir_Kind_Signal_Declaration => 840,
+      Iir_Kind_Variable_Declaration => 853,
+      Iir_Kind_Constant_Declaration => 867,
+      Iir_Kind_Iterator_Declaration => 878,
+      Iir_Kind_Interface_Constant_Declaration => 894,
+      Iir_Kind_Interface_Variable_Declaration => 910,
+      Iir_Kind_Interface_Signal_Declaration => 931,
+      Iir_Kind_Interface_File_Declaration => 947,
+      Iir_Kind_Interface_Type_Declaration => 957,
+      Iir_Kind_Interface_Package_Declaration => 969,
+      Iir_Kind_Interface_Function_Declaration => 986,
+      Iir_Kind_Interface_Procedure_Declaration => 999,
+      Iir_Kind_Signal_Attribute_Declaration => 1002,
+      Iir_Kind_Identity_Operator => 1006,
+      Iir_Kind_Negation_Operator => 1010,
+      Iir_Kind_Absolute_Operator => 1014,
+      Iir_Kind_Not_Operator => 1018,
+      Iir_Kind_Implicit_Condition_Operator => 1022,
+      Iir_Kind_Condition_Operator => 1026,
+      Iir_Kind_Reduction_And_Operator => 1030,
+      Iir_Kind_Reduction_Or_Operator => 1034,
+      Iir_Kind_Reduction_Nand_Operator => 1038,
+      Iir_Kind_Reduction_Nor_Operator => 1042,
+      Iir_Kind_Reduction_Xor_Operator => 1046,
+      Iir_Kind_Reduction_Xnor_Operator => 1050,
+      Iir_Kind_And_Operator => 1055,
+      Iir_Kind_Or_Operator => 1060,
+      Iir_Kind_Nand_Operator => 1065,
+      Iir_Kind_Nor_Operator => 1070,
+      Iir_Kind_Xor_Operator => 1075,
+      Iir_Kind_Xnor_Operator => 1080,
+      Iir_Kind_Equality_Operator => 1085,
+      Iir_Kind_Inequality_Operator => 1090,
+      Iir_Kind_Less_Than_Operator => 1095,
+      Iir_Kind_Less_Than_Or_Equal_Operator => 1100,
+      Iir_Kind_Greater_Than_Operator => 1105,
+      Iir_Kind_Greater_Than_Or_Equal_Operator => 1110,
+      Iir_Kind_Match_Equality_Operator => 1115,
+      Iir_Kind_Match_Inequality_Operator => 1120,
+      Iir_Kind_Match_Less_Than_Operator => 1125,
+      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1130,
+      Iir_Kind_Match_Greater_Than_Operator => 1135,
+      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1140,
+      Iir_Kind_Sll_Operator => 1145,
+      Iir_Kind_Sla_Operator => 1150,
+      Iir_Kind_Srl_Operator => 1155,
+      Iir_Kind_Sra_Operator => 1160,
+      Iir_Kind_Rol_Operator => 1165,
+      Iir_Kind_Ror_Operator => 1170,
+      Iir_Kind_Addition_Operator => 1175,
+      Iir_Kind_Substraction_Operator => 1180,
+      Iir_Kind_Concatenation_Operator => 1185,
+      Iir_Kind_Multiplication_Operator => 1190,
+      Iir_Kind_Division_Operator => 1195,
+      Iir_Kind_Modulus_Operator => 1200,
+      Iir_Kind_Remainder_Operator => 1205,
+      Iir_Kind_Exponentiation_Operator => 1210,
+      Iir_Kind_Function_Call => 1218,
+      Iir_Kind_Aggregate => 1225,
+      Iir_Kind_Parenthesis_Expression => 1228,
+      Iir_Kind_Qualified_Expression => 1232,
+      Iir_Kind_Type_Conversion => 1237,
+      Iir_Kind_Allocator_By_Expression => 1241,
+      Iir_Kind_Allocator_By_Subtype => 1246,
+      Iir_Kind_Selected_Element => 1254,
+      Iir_Kind_Dereference => 1259,
+      Iir_Kind_Implicit_Dereference => 1264,
+      Iir_Kind_Slice_Name => 1271,
+      Iir_Kind_Indexed_Name => 1277,
+      Iir_Kind_Psl_Expression => 1279,
+      Iir_Kind_Sensitized_Process_Statement => 1300,
+      Iir_Kind_Process_Statement => 1320,
+      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1332,
+      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1344,
+      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1357,
+      Iir_Kind_Concurrent_Assertion_Statement => 1365,
+      Iir_Kind_Concurrent_Procedure_Call_Statement => 1372,
+      Iir_Kind_Psl_Assert_Statement => 1385,
+      Iir_Kind_Psl_Cover_Statement => 1398,
+      Iir_Kind_Block_Statement => 1411,
+      Iir_Kind_If_Generate_Statement => 1422,
+      Iir_Kind_Case_Generate_Statement => 1431,
+      Iir_Kind_For_Generate_Statement => 1440,
+      Iir_Kind_Component_Instantiation_Statement => 1451,
+      Iir_Kind_Psl_Default_Clock => 1455,
+      Iir_Kind_Simple_Simultaneous_Statement => 1462,
+      Iir_Kind_Generate_Statement_Body => 1473,
+      Iir_Kind_If_Generate_Else_Clause => 1479,
+      Iir_Kind_Simple_Signal_Assignment_Statement => 1489,
+      Iir_Kind_Conditional_Signal_Assignment_Statement => 1499,
+      Iir_Kind_Selected_Waveform_Assignment_Statement => 1510,
+      Iir_Kind_Null_Statement => 1514,
+      Iir_Kind_Assertion_Statement => 1521,
+      Iir_Kind_Report_Statement => 1527,
+      Iir_Kind_Wait_Statement => 1535,
+      Iir_Kind_Variable_Assignment_Statement => 1542,
+      Iir_Kind_Conditional_Variable_Assignment_Statement => 1549,
+      Iir_Kind_Return_Statement => 1555,
+      Iir_Kind_For_Loop_Statement => 1564,
+      Iir_Kind_While_Loop_Statement => 1573,
+      Iir_Kind_Next_Statement => 1580,
+      Iir_Kind_Exit_Statement => 1587,
+      Iir_Kind_Case_Statement => 1595,
+      Iir_Kind_Procedure_Call_Statement => 1601,
+      Iir_Kind_If_Statement => 1611,
+      Iir_Kind_Elsif => 1617,
+      Iir_Kind_Character_Literal => 1625,
+      Iir_Kind_Simple_Name => 1633,
+      Iir_Kind_Selected_Name => 1642,
+      Iir_Kind_Operator_Symbol => 1648,
+      Iir_Kind_Reference_Name => 1651,
+      Iir_Kind_External_Constant_Name => 1659,
+      Iir_Kind_External_Signal_Name => 1667,
+      Iir_Kind_External_Variable_Name => 1676,
+      Iir_Kind_Selected_By_All_Name => 1682,
+      Iir_Kind_Parenthesis_Name => 1687,
+      Iir_Kind_Package_Pathname => 1691,
+      Iir_Kind_Absolute_Pathname => 1692,
+      Iir_Kind_Relative_Pathname => 1693,
+      Iir_Kind_Pathname_Element => 1698,
+      Iir_Kind_Base_Attribute => 1700,
+      Iir_Kind_Subtype_Attribute => 1705,
+      Iir_Kind_Element_Attribute => 1710,
+      Iir_Kind_Left_Type_Attribute => 1715,
+      Iir_Kind_Right_Type_Attribute => 1720,
+      Iir_Kind_High_Type_Attribute => 1725,
+      Iir_Kind_Low_Type_Attribute => 1730,
+      Iir_Kind_Ascending_Type_Attribute => 1735,
+      Iir_Kind_Image_Attribute => 1741,
+      Iir_Kind_Value_Attribute => 1747,
+      Iir_Kind_Pos_Attribute => 1753,
+      Iir_Kind_Val_Attribute => 1759,
+      Iir_Kind_Succ_Attribute => 1765,
+      Iir_Kind_Pred_Attribute => 1771,
+      Iir_Kind_Leftof_Attribute => 1777,
+      Iir_Kind_Rightof_Attribute => 1783,
+      Iir_Kind_Delayed_Attribute => 1792,
+      Iir_Kind_Stable_Attribute => 1801,
+      Iir_Kind_Quiet_Attribute => 1810,
+      Iir_Kind_Transaction_Attribute => 1819,
+      Iir_Kind_Event_Attribute => 1823,
+      Iir_Kind_Active_Attribute => 1827,
+      Iir_Kind_Last_Event_Attribute => 1831,
+      Iir_Kind_Last_Active_Attribute => 1835,
+      Iir_Kind_Last_Value_Attribute => 1839,
+      Iir_Kind_Driving_Attribute => 1843,
+      Iir_Kind_Driving_Value_Attribute => 1847,
+      Iir_Kind_Behavior_Attribute => 1847,
+      Iir_Kind_Structure_Attribute => 1847,
+      Iir_Kind_Simple_Name_Attribute => 1854,
+      Iir_Kind_Instance_Name_Attribute => 1859,
+      Iir_Kind_Path_Name_Attribute => 1864,
+      Iir_Kind_Left_Array_Attribute => 1871,
+      Iir_Kind_Right_Array_Attribute => 1878,
+      Iir_Kind_High_Array_Attribute => 1885,
+      Iir_Kind_Low_Array_Attribute => 1892,
+      Iir_Kind_Length_Array_Attribute => 1899,
+      Iir_Kind_Ascending_Array_Attribute => 1906,
+      Iir_Kind_Range_Array_Attribute => 1913,
+      Iir_Kind_Reverse_Range_Array_Attribute => 1920,
+      Iir_Kind_Attribute_Name => 1929
      );
 
    function Get_Fields_First (K : Iir_Kind) return Fields_Index is
@@ -8000,7 +8002,8 @@ package body Vhdl.Nodes_Meta is
            | Iir_Kind_Integer_Type_Definition
            | Iir_Kind_Floating_Type_Definition
            | Iir_Kind_Physical_Type_Definition
-           | Iir_Kind_Wildcard_Type_Definition =>
+           | Iir_Kind_Wildcard_Type_Definition
+           | Iir_Kind_Subtype_Definition =>
             return True;
          when others =>
             return False;
@@ -8345,7 +8348,8 @@ package body Vhdl.Nodes_Meta is
            | Iir_Kind_Integer_Type_Definition
            | Iir_Kind_Floating_Type_Definition
            | Iir_Kind_Physical_Type_Definition
-           | Iir_Kind_Wildcard_Type_Definition =>
+           | Iir_Kind_Wildcard_Type_Definition
+           | Iir_Kind_Subtype_Definition =>
             return True;
          when others =>
             return False;