vhdl-nodes: remove unused fields for procedure declarations

1 files changed, 210 insertions, 219 deletions

diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb
index b4ef6910e..410e4b9eb 100644
--- a/src/vhdl/vhdl-nodes_meta.adb
+++ b/src/vhdl/vhdl-nodes_meta.adb
@@ -3521,9 +3521,7 @@ package body Vhdl.Nodes_Meta is
       Field_Chain,
       Field_Interface_Declaration_Chain,
       Field_Generic_Chain,
-      Field_Return_Type_Mark,
       Field_Subprogram_Body,
-      Field_Return_Identifier,
       --  Iir_Kind_Function_Body
       Field_Impure_Depth,
       Field_End_Has_Reserved_Id,
@@ -5385,215 +5383,215 @@ package body Vhdl.Nodes_Meta is
       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_Suspend_State_Declaration => 1232,
-      Iir_Kind_Identity_Operator => 1236,
-      Iir_Kind_Negation_Operator => 1240,
-      Iir_Kind_Absolute_Operator => 1244,
-      Iir_Kind_Not_Operator => 1248,
-      Iir_Kind_Implicit_Condition_Operator => 1252,
-      Iir_Kind_Condition_Operator => 1256,
-      Iir_Kind_Reduction_And_Operator => 1260,
-      Iir_Kind_Reduction_Or_Operator => 1264,
-      Iir_Kind_Reduction_Nand_Operator => 1268,
-      Iir_Kind_Reduction_Nor_Operator => 1272,
-      Iir_Kind_Reduction_Xor_Operator => 1276,
-      Iir_Kind_Reduction_Xnor_Operator => 1280,
-      Iir_Kind_And_Operator => 1285,
-      Iir_Kind_Or_Operator => 1290,
-      Iir_Kind_Nand_Operator => 1295,
-      Iir_Kind_Nor_Operator => 1300,
-      Iir_Kind_Xor_Operator => 1305,
-      Iir_Kind_Xnor_Operator => 1310,
-      Iir_Kind_Equality_Operator => 1315,
-      Iir_Kind_Inequality_Operator => 1320,
-      Iir_Kind_Less_Than_Operator => 1325,
-      Iir_Kind_Less_Than_Or_Equal_Operator => 1330,
-      Iir_Kind_Greater_Than_Operator => 1335,
-      Iir_Kind_Greater_Than_Or_Equal_Operator => 1340,
-      Iir_Kind_Match_Equality_Operator => 1345,
-      Iir_Kind_Match_Inequality_Operator => 1350,
-      Iir_Kind_Match_Less_Than_Operator => 1355,
-      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1360,
-      Iir_Kind_Match_Greater_Than_Operator => 1365,
-      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1370,
-      Iir_Kind_Sll_Operator => 1375,
-      Iir_Kind_Sla_Operator => 1380,
-      Iir_Kind_Srl_Operator => 1385,
-      Iir_Kind_Sra_Operator => 1390,
-      Iir_Kind_Rol_Operator => 1395,
-      Iir_Kind_Ror_Operator => 1400,
-      Iir_Kind_Addition_Operator => 1405,
-      Iir_Kind_Substraction_Operator => 1410,
-      Iir_Kind_Concatenation_Operator => 1415,
-      Iir_Kind_Multiplication_Operator => 1420,
-      Iir_Kind_Division_Operator => 1425,
-      Iir_Kind_Modulus_Operator => 1430,
-      Iir_Kind_Remainder_Operator => 1435,
-      Iir_Kind_Exponentiation_Operator => 1440,
-      Iir_Kind_Function_Call => 1448,
-      Iir_Kind_Aggregate => 1455,
-      Iir_Kind_Parenthesis_Expression => 1458,
-      Iir_Kind_Qualified_Expression => 1462,
-      Iir_Kind_Type_Conversion => 1467,
-      Iir_Kind_Allocator_By_Expression => 1472,
-      Iir_Kind_Allocator_By_Subtype => 1478,
-      Iir_Kind_Selected_Element => 1486,
-      Iir_Kind_Dereference => 1491,
-      Iir_Kind_Implicit_Dereference => 1496,
-      Iir_Kind_Slice_Name => 1503,
-      Iir_Kind_Indexed_Name => 1509,
-      Iir_Kind_Psl_Prev => 1515,
-      Iir_Kind_Psl_Stable => 1520,
-      Iir_Kind_Psl_Rose => 1525,
-      Iir_Kind_Psl_Fell => 1530,
-      Iir_Kind_Psl_Onehot => 1533,
-      Iir_Kind_Psl_Onehot0 => 1536,
-      Iir_Kind_Psl_Expression => 1538,
-      Iir_Kind_Sensitized_Process_Statement => 1559,
-      Iir_Kind_Process_Statement => 1579,
-      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1592,
-      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1605,
-      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1619,
-      Iir_Kind_Concurrent_Assertion_Statement => 1627,
-      Iir_Kind_Concurrent_Procedure_Call_Statement => 1634,
-      Iir_Kind_Concurrent_Break_Statement => 1642,
-      Iir_Kind_Psl_Assert_Directive => 1656,
-      Iir_Kind_Psl_Assume_Directive => 1668,
-      Iir_Kind_Psl_Cover_Directive => 1680,
-      Iir_Kind_Psl_Restrict_Directive => 1691,
-      Iir_Kind_Block_Statement => 1705,
-      Iir_Kind_If_Generate_Statement => 1716,
-      Iir_Kind_Case_Generate_Statement => 1725,
-      Iir_Kind_For_Generate_Statement => 1734,
-      Iir_Kind_Component_Instantiation_Statement => 1745,
-      Iir_Kind_Psl_Default_Clock => 1748,
-      Iir_Kind_Generate_Statement_Body => 1759,
-      Iir_Kind_If_Generate_Else_Clause => 1765,
-      Iir_Kind_Simple_Simultaneous_Statement => 1772,
-      Iir_Kind_Simultaneous_Null_Statement => 1776,
-      Iir_Kind_Simultaneous_Procedural_Statement => 1787,
-      Iir_Kind_Simultaneous_Case_Statement => 1796,
-      Iir_Kind_Simultaneous_If_Statement => 1805,
-      Iir_Kind_Simultaneous_Elsif => 1811,
-      Iir_Kind_Simple_Signal_Assignment_Statement => 1822,
-      Iir_Kind_Conditional_Signal_Assignment_Statement => 1833,
-      Iir_Kind_Selected_Waveform_Assignment_Statement => 1845,
-      Iir_Kind_Signal_Force_Assignment_Statement => 1855,
-      Iir_Kind_Signal_Release_Assignment_Statement => 1864,
-      Iir_Kind_Null_Statement => 1868,
-      Iir_Kind_Assertion_Statement => 1875,
-      Iir_Kind_Report_Statement => 1881,
-      Iir_Kind_Wait_Statement => 1889,
-      Iir_Kind_Variable_Assignment_Statement => 1896,
-      Iir_Kind_Conditional_Variable_Assignment_Statement => 1903,
-      Iir_Kind_Return_Statement => 1909,
-      Iir_Kind_For_Loop_Statement => 1920,
-      Iir_Kind_While_Loop_Statement => 1931,
-      Iir_Kind_Next_Statement => 1938,
-      Iir_Kind_Exit_Statement => 1945,
-      Iir_Kind_Case_Statement => 1954,
-      Iir_Kind_Procedure_Call_Statement => 1960,
-      Iir_Kind_Break_Statement => 1967,
-      Iir_Kind_If_Statement => 1977,
-      Iir_Kind_Elsif => 1983,
-      Iir_Kind_Suspend_State_Statement => 1985,
-      Iir_Kind_Character_Literal => 1992,
-      Iir_Kind_Simple_Name => 1999,
-      Iir_Kind_Selected_Name => 2007,
-      Iir_Kind_Operator_Symbol => 2012,
-      Iir_Kind_Reference_Name => 2017,
-      Iir_Kind_External_Constant_Name => 2026,
-      Iir_Kind_External_Signal_Name => 2035,
-      Iir_Kind_External_Variable_Name => 2045,
-      Iir_Kind_Selected_By_All_Name => 2051,
-      Iir_Kind_Parenthesis_Name => 2056,
-      Iir_Kind_Package_Pathname => 2060,
-      Iir_Kind_Absolute_Pathname => 2061,
-      Iir_Kind_Relative_Pathname => 2062,
-      Iir_Kind_Pathname_Element => 2067,
-      Iir_Kind_Base_Attribute => 2069,
-      Iir_Kind_Subtype_Attribute => 2074,
-      Iir_Kind_Element_Attribute => 2079,
-      Iir_Kind_Across_Attribute => 2084,
-      Iir_Kind_Through_Attribute => 2089,
-      Iir_Kind_Nature_Reference_Attribute => 2093,
-      Iir_Kind_Left_Type_Attribute => 2098,
-      Iir_Kind_Right_Type_Attribute => 2103,
-      Iir_Kind_High_Type_Attribute => 2108,
-      Iir_Kind_Low_Type_Attribute => 2113,
-      Iir_Kind_Ascending_Type_Attribute => 2118,
-      Iir_Kind_Image_Attribute => 2124,
-      Iir_Kind_Value_Attribute => 2130,
-      Iir_Kind_Pos_Attribute => 2136,
-      Iir_Kind_Val_Attribute => 2142,
-      Iir_Kind_Succ_Attribute => 2148,
-      Iir_Kind_Pred_Attribute => 2154,
-      Iir_Kind_Leftof_Attribute => 2160,
-      Iir_Kind_Rightof_Attribute => 2166,
-      Iir_Kind_Signal_Slew_Attribute => 2174,
-      Iir_Kind_Quantity_Slew_Attribute => 2182,
-      Iir_Kind_Ramp_Attribute => 2190,
-      Iir_Kind_Zoh_Attribute => 2198,
-      Iir_Kind_Ltf_Attribute => 2206,
-      Iir_Kind_Ztf_Attribute => 2216,
-      Iir_Kind_Dot_Attribute => 2223,
-      Iir_Kind_Integ_Attribute => 2230,
-      Iir_Kind_Above_Attribute => 2238,
-      Iir_Kind_Quantity_Delayed_Attribute => 2246,
-      Iir_Kind_Delayed_Attribute => 2255,
-      Iir_Kind_Stable_Attribute => 2264,
-      Iir_Kind_Quiet_Attribute => 2273,
-      Iir_Kind_Transaction_Attribute => 2282,
-      Iir_Kind_Event_Attribute => 2286,
-      Iir_Kind_Active_Attribute => 2290,
-      Iir_Kind_Last_Event_Attribute => 2294,
-      Iir_Kind_Last_Active_Attribute => 2298,
-      Iir_Kind_Last_Value_Attribute => 2302,
-      Iir_Kind_Driving_Attribute => 2306,
-      Iir_Kind_Driving_Value_Attribute => 2310,
-      Iir_Kind_Behavior_Attribute => 2310,
-      Iir_Kind_Structure_Attribute => 2310,
-      Iir_Kind_Simple_Name_Attribute => 2317,
-      Iir_Kind_Instance_Name_Attribute => 2322,
-      Iir_Kind_Path_Name_Attribute => 2327,
-      Iir_Kind_Left_Array_Attribute => 2334,
-      Iir_Kind_Right_Array_Attribute => 2341,
-      Iir_Kind_High_Array_Attribute => 2348,
-      Iir_Kind_Low_Array_Attribute => 2355,
-      Iir_Kind_Length_Array_Attribute => 2362,
-      Iir_Kind_Ascending_Array_Attribute => 2369,
-      Iir_Kind_Range_Array_Attribute => 2376,
-      Iir_Kind_Reverse_Range_Array_Attribute => 2383,
-      Iir_Kind_Attribute_Name => 2392
+      Iir_Kind_Procedure_Declaration => 854,
+      Iir_Kind_Function_Body => 864,
+      Iir_Kind_Procedure_Body => 875,
+      Iir_Kind_Function_Instantiation_Declaration => 886,
+      Iir_Kind_Procedure_Instantiation_Declaration => 896,
+      Iir_Kind_Terminal_Declaration => 905,
+      Iir_Kind_Object_Alias_Declaration => 917,
+      Iir_Kind_Free_Quantity_Declaration => 929,
+      Iir_Kind_Spectrum_Quantity_Declaration => 942,
+      Iir_Kind_Noise_Quantity_Declaration => 954,
+      Iir_Kind_Across_Quantity_Declaration => 970,
+      Iir_Kind_Through_Quantity_Declaration => 986,
+      Iir_Kind_File_Declaration => 1001,
+      Iir_Kind_Guard_Signal_Declaration => 1015,
+      Iir_Kind_Signal_Declaration => 1032,
+      Iir_Kind_Variable_Declaration => 1045,
+      Iir_Kind_Constant_Declaration => 1059,
+      Iir_Kind_Iterator_Declaration => 1071,
+      Iir_Kind_Interface_Constant_Declaration => 1088,
+      Iir_Kind_Interface_Variable_Declaration => 1104,
+      Iir_Kind_Interface_Signal_Declaration => 1125,
+      Iir_Kind_Interface_File_Declaration => 1141,
+      Iir_Kind_Interface_Quantity_Declaration => 1157,
+      Iir_Kind_Interface_Terminal_Declaration => 1169,
+      Iir_Kind_Interface_Type_Declaration => 1180,
+      Iir_Kind_Interface_Package_Declaration => 1193,
+      Iir_Kind_Interface_Function_Declaration => 1211,
+      Iir_Kind_Interface_Procedure_Declaration => 1225,
+      Iir_Kind_Signal_Attribute_Declaration => 1228,
+      Iir_Kind_Suspend_State_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_Suspend_State_Statement => 1983,
+      Iir_Kind_Character_Literal => 1990,
+      Iir_Kind_Simple_Name => 1997,
+      Iir_Kind_Selected_Name => 2005,
+      Iir_Kind_Operator_Symbol => 2010,
+      Iir_Kind_Reference_Name => 2015,
+      Iir_Kind_External_Constant_Name => 2024,
+      Iir_Kind_External_Signal_Name => 2033,
+      Iir_Kind_External_Variable_Name => 2043,
+      Iir_Kind_Selected_By_All_Name => 2049,
+      Iir_Kind_Parenthesis_Name => 2054,
+      Iir_Kind_Package_Pathname => 2058,
+      Iir_Kind_Absolute_Pathname => 2059,
+      Iir_Kind_Relative_Pathname => 2060,
+      Iir_Kind_Pathname_Element => 2065,
+      Iir_Kind_Base_Attribute => 2067,
+      Iir_Kind_Subtype_Attribute => 2072,
+      Iir_Kind_Element_Attribute => 2077,
+      Iir_Kind_Across_Attribute => 2082,
+      Iir_Kind_Through_Attribute => 2087,
+      Iir_Kind_Nature_Reference_Attribute => 2091,
+      Iir_Kind_Left_Type_Attribute => 2096,
+      Iir_Kind_Right_Type_Attribute => 2101,
+      Iir_Kind_High_Type_Attribute => 2106,
+      Iir_Kind_Low_Type_Attribute => 2111,
+      Iir_Kind_Ascending_Type_Attribute => 2116,
+      Iir_Kind_Image_Attribute => 2122,
+      Iir_Kind_Value_Attribute => 2128,
+      Iir_Kind_Pos_Attribute => 2134,
+      Iir_Kind_Val_Attribute => 2140,
+      Iir_Kind_Succ_Attribute => 2146,
+      Iir_Kind_Pred_Attribute => 2152,
+      Iir_Kind_Leftof_Attribute => 2158,
+      Iir_Kind_Rightof_Attribute => 2164,
+      Iir_Kind_Signal_Slew_Attribute => 2172,
+      Iir_Kind_Quantity_Slew_Attribute => 2180,
+      Iir_Kind_Ramp_Attribute => 2188,
+      Iir_Kind_Zoh_Attribute => 2196,
+      Iir_Kind_Ltf_Attribute => 2204,
+      Iir_Kind_Ztf_Attribute => 2214,
+      Iir_Kind_Dot_Attribute => 2221,
+      Iir_Kind_Integ_Attribute => 2228,
+      Iir_Kind_Above_Attribute => 2236,
+      Iir_Kind_Quantity_Delayed_Attribute => 2244,
+      Iir_Kind_Delayed_Attribute => 2253,
+      Iir_Kind_Stable_Attribute => 2262,
+      Iir_Kind_Quiet_Attribute => 2271,
+      Iir_Kind_Transaction_Attribute => 2280,
+      Iir_Kind_Event_Attribute => 2284,
+      Iir_Kind_Active_Attribute => 2288,
+      Iir_Kind_Last_Event_Attribute => 2292,
+      Iir_Kind_Last_Active_Attribute => 2296,
+      Iir_Kind_Last_Value_Attribute => 2300,
+      Iir_Kind_Driving_Attribute => 2304,
+      Iir_Kind_Driving_Value_Attribute => 2308,
+      Iir_Kind_Behavior_Attribute => 2308,
+      Iir_Kind_Structure_Attribute => 2308,
+      Iir_Kind_Simple_Name_Attribute => 2315,
+      Iir_Kind_Instance_Name_Attribute => 2320,
+      Iir_Kind_Path_Name_Attribute => 2325,
+      Iir_Kind_Left_Array_Attribute => 2332,
+      Iir_Kind_Right_Array_Attribute => 2339,
+      Iir_Kind_High_Array_Attribute => 2346,
+      Iir_Kind_Low_Array_Attribute => 2353,
+      Iir_Kind_Length_Array_Attribute => 2360,
+      Iir_Kind_Ascending_Array_Attribute => 2367,
+      Iir_Kind_Range_Array_Attribute => 2374,
+      Iir_Kind_Reverse_Range_Array_Attribute => 2381,
+      Iir_Kind_Attribute_Name => 2390
      );
 
    function Get_Fields_First (K : Iir_Kind) return Fields_Index is
@@ -9597,13 +9595,7 @@ package body Vhdl.Nodes_Meta is
 
    function Has_Return_Identifier (K : Iir_Kind) return Boolean is
    begin
-      case K is
-         when Iir_Kind_Function_Declaration
-           | Iir_Kind_Procedure_Declaration =>
-            return True;
-         when others =>
-            return False;
-      end case;
+      return K = Iir_Kind_Function_Declaration;
    end Has_Return_Identifier;
 
    function Has_Visible_Flag (K : Iir_Kind) return Boolean is
@@ -12088,7 +12080,6 @@ package body Vhdl.Nodes_Meta is
       case K is
          when Iir_Kind_Signature
            | Iir_Kind_Function_Declaration
-           | Iir_Kind_Procedure_Declaration
            | Iir_Kind_Interface_Function_Declaration
            | Iir_Kind_Interface_Procedure_Declaration =>
             return True;