vhdl: fix reprint of vhdl08 array element constraints.

1 files changed, 285 insertions, 255 deletions

diff --git a/src/vhdl/vhdl-nodes_meta.adb b/src/vhdl/vhdl-nodes_meta.adb
index 6989c840a..336551b42 100644
--- a/src/vhdl/vhdl-nodes_meta.adb
+++ b/src/vhdl/vhdl-nodes_meta.adb
@@ -199,6 +199,8 @@ package body Vhdl.Nodes_Meta is
       Field_Element_Subnature => Type_Iir,
       Field_Index_Constraint_List => Type_Iir_Flist,
       Field_Array_Element_Constraint => Type_Iir,
+      Field_Has_Array_Constraint_Flag => Type_Boolean,
+      Field_Has_Element_Constraint_Flag => Type_Boolean,
       Field_Elements_Declaration_List => Type_Iir_Flist,
       Field_Owned_Elements_Chain => Type_Iir,
       Field_Designated_Type => Type_Iir,
@@ -757,6 +759,10 @@ package body Vhdl.Nodes_Meta is
             return "index_constraint_list";
          when Field_Array_Element_Constraint =>
             return "array_element_constraint";
+         when Field_Has_Array_Constraint_Flag =>
+            return "has_array_constraint_flag";
+         when Field_Has_Element_Constraint_Flag =>
+            return "has_element_constraint_flag";
          when Field_Elements_Declaration_List =>
             return "elements_declaration_list";
          when Field_Owned_Elements_Chain =>
@@ -2135,6 +2141,10 @@ package body Vhdl.Nodes_Meta is
             return Attr_None;
          when Field_Array_Element_Constraint =>
             return Attr_None;
+         when Field_Has_Array_Constraint_Flag =>
+            return Attr_None;
+         when Field_Has_Element_Constraint_Flag =>
+            return Attr_None;
          when Field_Elements_Declaration_List =>
             return Attr_Of_Maybe_Ref;
          when Field_Owned_Elements_Chain =>
@@ -2918,6 +2928,8 @@ package body Vhdl.Nodes_Meta is
       Field_Signal_Type_Flag,
       Field_Has_Signal_Flag,
       Field_Index_Constraint_Flag,
+      Field_Has_Array_Constraint_Flag,
+      Field_Has_Element_Constraint_Flag,
       Field_Type_Staticness,
       Field_Constraint_State,
       Field_Subtype_Type_Mark,
@@ -5266,261 +5278,261 @@ package body Vhdl.Nodes_Meta is
       Iir_Kind_Protected_Type_Declaration => 315,
       Iir_Kind_Record_Type_Definition => 325,
       Iir_Kind_Array_Type_Definition => 336,
-      Iir_Kind_Array_Subtype_Definition => 351,
-      Iir_Kind_Record_Subtype_Definition => 364,
-      Iir_Kind_Access_Subtype_Definition => 372,
-      Iir_Kind_Physical_Subtype_Definition => 382,
-      Iir_Kind_Floating_Subtype_Definition => 393,
-      Iir_Kind_Integer_Subtype_Definition => 403,
-      Iir_Kind_Enumeration_Subtype_Definition => 413,
-      Iir_Kind_Enumeration_Type_Definition => 424,
-      Iir_Kind_Integer_Type_Definition => 432,
-      Iir_Kind_Floating_Type_Definition => 440,
-      Iir_Kind_Physical_Type_Definition => 451,
-      Iir_Kind_Range_Expression => 459,
-      Iir_Kind_Protected_Type_Body => 467,
-      Iir_Kind_Wildcard_Type_Definition => 471,
-      Iir_Kind_Subtype_Definition => 478,
-      Iir_Kind_Scalar_Nature_Definition => 486,
-      Iir_Kind_Record_Nature_Definition => 499,
-      Iir_Kind_Array_Nature_Definition => 513,
-      Iir_Kind_Array_Subnature_Definition => 528,
-      Iir_Kind_Overload_List => 529,
-      Iir_Kind_Entity_Declaration => 542,
-      Iir_Kind_Configuration_Declaration => 552,
-      Iir_Kind_Context_Declaration => 558,
-      Iir_Kind_Package_Declaration => 573,
-      Iir_Kind_Package_Instantiation_Declaration => 587,
-      Iir_Kind_Vmode_Declaration => 599,
-      Iir_Kind_Vprop_Declaration => 611,
-      Iir_Kind_Vunit_Declaration => 624,
-      Iir_Kind_Package_Body => 632,
-      Iir_Kind_Architecture_Body => 645,
-      Iir_Kind_Type_Declaration => 652,
-      Iir_Kind_Anonymous_Type_Declaration => 658,
-      Iir_Kind_Subtype_Declaration => 666,
-      Iir_Kind_Nature_Declaration => 672,
-      Iir_Kind_Subnature_Declaration => 679,
-      Iir_Kind_Package_Header => 681,
-      Iir_Kind_Unit_Declaration => 690,
-      Iir_Kind_Library_Declaration => 698,
-      Iir_Kind_Component_Declaration => 708,
-      Iir_Kind_Attribute_Declaration => 715,
-      Iir_Kind_Group_Template_Declaration => 721,
-      Iir_Kind_Group_Declaration => 728,
-      Iir_Kind_Element_Declaration => 736,
-      Iir_Kind_Nature_Element_Declaration => 743,
-      Iir_Kind_Non_Object_Alias_Declaration => 751,
-      Iir_Kind_Psl_Declaration => 759,
-      Iir_Kind_Psl_Endpoint_Declaration => 773,
-      Iir_Kind_Enumeration_Literal => 784,
-      Iir_Kind_Function_Declaration => 809,
-      Iir_Kind_Procedure_Declaration => 833,
-      Iir_Kind_Function_Body => 843,
-      Iir_Kind_Procedure_Body => 854,
-      Iir_Kind_Function_Instantiation_Declaration => 865,
-      Iir_Kind_Procedure_Instantiation_Declaration => 875,
-      Iir_Kind_Terminal_Declaration => 884,
-      Iir_Kind_Object_Alias_Declaration => 896,
-      Iir_Kind_Free_Quantity_Declaration => 908,
-      Iir_Kind_Spectrum_Quantity_Declaration => 921,
-      Iir_Kind_Noise_Quantity_Declaration => 933,
-      Iir_Kind_Across_Quantity_Declaration => 949,
-      Iir_Kind_Through_Quantity_Declaration => 965,
-      Iir_Kind_File_Declaration => 980,
-      Iir_Kind_Guard_Signal_Declaration => 994,
-      Iir_Kind_Signal_Declaration => 1011,
-      Iir_Kind_Variable_Declaration => 1024,
-      Iir_Kind_Constant_Declaration => 1038,
-      Iir_Kind_Iterator_Declaration => 1050,
-      Iir_Kind_Interface_Constant_Declaration => 1067,
-      Iir_Kind_Interface_Variable_Declaration => 1083,
-      Iir_Kind_Interface_Signal_Declaration => 1104,
-      Iir_Kind_Interface_File_Declaration => 1120,
-      Iir_Kind_Interface_Quantity_Declaration => 1136,
-      Iir_Kind_Interface_Terminal_Declaration => 1148,
-      Iir_Kind_Interface_Type_Declaration => 1159,
-      Iir_Kind_Interface_Package_Declaration => 1172,
-      Iir_Kind_Interface_Function_Declaration => 1190,
-      Iir_Kind_Interface_Procedure_Declaration => 1204,
-      Iir_Kind_Anonymous_Signal_Declaration => 1213,
-      Iir_Kind_Signal_Attribute_Declaration => 1216,
-      Iir_Kind_Identity_Operator => 1220,
-      Iir_Kind_Negation_Operator => 1224,
-      Iir_Kind_Absolute_Operator => 1228,
-      Iir_Kind_Not_Operator => 1232,
-      Iir_Kind_Implicit_Condition_Operator => 1236,
-      Iir_Kind_Condition_Operator => 1240,
-      Iir_Kind_Reduction_And_Operator => 1244,
-      Iir_Kind_Reduction_Or_Operator => 1248,
-      Iir_Kind_Reduction_Nand_Operator => 1252,
-      Iir_Kind_Reduction_Nor_Operator => 1256,
-      Iir_Kind_Reduction_Xor_Operator => 1260,
-      Iir_Kind_Reduction_Xnor_Operator => 1264,
-      Iir_Kind_And_Operator => 1269,
-      Iir_Kind_Or_Operator => 1274,
-      Iir_Kind_Nand_Operator => 1279,
-      Iir_Kind_Nor_Operator => 1284,
-      Iir_Kind_Xor_Operator => 1289,
-      Iir_Kind_Xnor_Operator => 1294,
-      Iir_Kind_Equality_Operator => 1299,
-      Iir_Kind_Inequality_Operator => 1304,
-      Iir_Kind_Less_Than_Operator => 1309,
-      Iir_Kind_Less_Than_Or_Equal_Operator => 1314,
-      Iir_Kind_Greater_Than_Operator => 1319,
-      Iir_Kind_Greater_Than_Or_Equal_Operator => 1324,
-      Iir_Kind_Match_Equality_Operator => 1329,
-      Iir_Kind_Match_Inequality_Operator => 1334,
-      Iir_Kind_Match_Less_Than_Operator => 1339,
-      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1344,
-      Iir_Kind_Match_Greater_Than_Operator => 1349,
-      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1354,
-      Iir_Kind_Sll_Operator => 1359,
-      Iir_Kind_Sla_Operator => 1364,
-      Iir_Kind_Srl_Operator => 1369,
-      Iir_Kind_Sra_Operator => 1374,
-      Iir_Kind_Rol_Operator => 1379,
-      Iir_Kind_Ror_Operator => 1384,
-      Iir_Kind_Addition_Operator => 1389,
-      Iir_Kind_Substraction_Operator => 1394,
-      Iir_Kind_Concatenation_Operator => 1399,
-      Iir_Kind_Multiplication_Operator => 1404,
-      Iir_Kind_Division_Operator => 1409,
-      Iir_Kind_Modulus_Operator => 1414,
-      Iir_Kind_Remainder_Operator => 1419,
-      Iir_Kind_Exponentiation_Operator => 1424,
-      Iir_Kind_Function_Call => 1432,
-      Iir_Kind_Aggregate => 1439,
-      Iir_Kind_Parenthesis_Expression => 1442,
-      Iir_Kind_Qualified_Expression => 1446,
-      Iir_Kind_Type_Conversion => 1451,
-      Iir_Kind_Allocator_By_Expression => 1456,
-      Iir_Kind_Allocator_By_Subtype => 1462,
-      Iir_Kind_Selected_Element => 1470,
-      Iir_Kind_Dereference => 1475,
-      Iir_Kind_Implicit_Dereference => 1480,
-      Iir_Kind_Slice_Name => 1487,
-      Iir_Kind_Indexed_Name => 1493,
-      Iir_Kind_Psl_Prev => 1499,
-      Iir_Kind_Psl_Stable => 1504,
-      Iir_Kind_Psl_Rose => 1509,
-      Iir_Kind_Psl_Fell => 1514,
-      Iir_Kind_Psl_Expression => 1516,
-      Iir_Kind_Sensitized_Process_Statement => 1537,
-      Iir_Kind_Process_Statement => 1557,
-      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1570,
-      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1583,
-      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1597,
-      Iir_Kind_Concurrent_Assertion_Statement => 1605,
-      Iir_Kind_Concurrent_Procedure_Call_Statement => 1612,
-      Iir_Kind_Concurrent_Break_Statement => 1620,
-      Iir_Kind_Psl_Assert_Directive => 1633,
-      Iir_Kind_Psl_Assume_Directive => 1644,
-      Iir_Kind_Psl_Cover_Directive => 1656,
-      Iir_Kind_Psl_Restrict_Directive => 1667,
-      Iir_Kind_Block_Statement => 1681,
-      Iir_Kind_If_Generate_Statement => 1692,
-      Iir_Kind_Case_Generate_Statement => 1701,
-      Iir_Kind_For_Generate_Statement => 1710,
-      Iir_Kind_Component_Instantiation_Statement => 1721,
-      Iir_Kind_Psl_Default_Clock => 1725,
-      Iir_Kind_Generate_Statement_Body => 1736,
-      Iir_Kind_If_Generate_Else_Clause => 1742,
-      Iir_Kind_Simple_Simultaneous_Statement => 1749,
-      Iir_Kind_Simultaneous_Null_Statement => 1753,
-      Iir_Kind_Simultaneous_Procedural_Statement => 1764,
-      Iir_Kind_Simultaneous_Case_Statement => 1773,
-      Iir_Kind_Simultaneous_If_Statement => 1782,
-      Iir_Kind_Simultaneous_Elsif => 1788,
-      Iir_Kind_Simple_Signal_Assignment_Statement => 1799,
-      Iir_Kind_Conditional_Signal_Assignment_Statement => 1810,
-      Iir_Kind_Selected_Waveform_Assignment_Statement => 1822,
-      Iir_Kind_Signal_Force_Assignment_Statement => 1832,
-      Iir_Kind_Signal_Release_Assignment_Statement => 1841,
-      Iir_Kind_Null_Statement => 1845,
-      Iir_Kind_Assertion_Statement => 1852,
-      Iir_Kind_Report_Statement => 1858,
-      Iir_Kind_Wait_Statement => 1866,
-      Iir_Kind_Variable_Assignment_Statement => 1873,
-      Iir_Kind_Conditional_Variable_Assignment_Statement => 1880,
-      Iir_Kind_Return_Statement => 1886,
-      Iir_Kind_For_Loop_Statement => 1897,
-      Iir_Kind_While_Loop_Statement => 1908,
-      Iir_Kind_Next_Statement => 1915,
-      Iir_Kind_Exit_Statement => 1922,
-      Iir_Kind_Case_Statement => 1930,
-      Iir_Kind_Procedure_Call_Statement => 1936,
-      Iir_Kind_Break_Statement => 1943,
-      Iir_Kind_If_Statement => 1953,
-      Iir_Kind_Elsif => 1959,
-      Iir_Kind_Character_Literal => 1967,
-      Iir_Kind_Simple_Name => 1975,
-      Iir_Kind_Selected_Name => 1984,
-      Iir_Kind_Operator_Symbol => 1990,
-      Iir_Kind_Reference_Name => 1995,
-      Iir_Kind_External_Constant_Name => 2004,
-      Iir_Kind_External_Signal_Name => 2013,
-      Iir_Kind_External_Variable_Name => 2023,
-      Iir_Kind_Selected_By_All_Name => 2029,
-      Iir_Kind_Parenthesis_Name => 2034,
-      Iir_Kind_Package_Pathname => 2038,
-      Iir_Kind_Absolute_Pathname => 2039,
-      Iir_Kind_Relative_Pathname => 2040,
-      Iir_Kind_Pathname_Element => 2045,
-      Iir_Kind_Base_Attribute => 2047,
-      Iir_Kind_Subtype_Attribute => 2052,
-      Iir_Kind_Element_Attribute => 2057,
-      Iir_Kind_Across_Attribute => 2062,
-      Iir_Kind_Through_Attribute => 2067,
-      Iir_Kind_Nature_Reference_Attribute => 2071,
-      Iir_Kind_Left_Type_Attribute => 2076,
-      Iir_Kind_Right_Type_Attribute => 2081,
-      Iir_Kind_High_Type_Attribute => 2086,
-      Iir_Kind_Low_Type_Attribute => 2091,
-      Iir_Kind_Ascending_Type_Attribute => 2096,
-      Iir_Kind_Image_Attribute => 2102,
-      Iir_Kind_Value_Attribute => 2108,
-      Iir_Kind_Pos_Attribute => 2114,
-      Iir_Kind_Val_Attribute => 2120,
-      Iir_Kind_Succ_Attribute => 2126,
-      Iir_Kind_Pred_Attribute => 2132,
-      Iir_Kind_Leftof_Attribute => 2138,
-      Iir_Kind_Rightof_Attribute => 2144,
-      Iir_Kind_Signal_Slew_Attribute => 2152,
-      Iir_Kind_Quantity_Slew_Attribute => 2160,
-      Iir_Kind_Ramp_Attribute => 2168,
-      Iir_Kind_Zoh_Attribute => 2176,
-      Iir_Kind_Ltf_Attribute => 2184,
-      Iir_Kind_Ztf_Attribute => 2194,
-      Iir_Kind_Dot_Attribute => 2201,
-      Iir_Kind_Integ_Attribute => 2208,
-      Iir_Kind_Above_Attribute => 2216,
-      Iir_Kind_Quantity_Delayed_Attribute => 2224,
-      Iir_Kind_Delayed_Attribute => 2233,
-      Iir_Kind_Stable_Attribute => 2242,
-      Iir_Kind_Quiet_Attribute => 2251,
-      Iir_Kind_Transaction_Attribute => 2260,
-      Iir_Kind_Event_Attribute => 2264,
-      Iir_Kind_Active_Attribute => 2268,
-      Iir_Kind_Last_Event_Attribute => 2272,
-      Iir_Kind_Last_Active_Attribute => 2276,
-      Iir_Kind_Last_Value_Attribute => 2280,
-      Iir_Kind_Driving_Attribute => 2284,
-      Iir_Kind_Driving_Value_Attribute => 2288,
-      Iir_Kind_Behavior_Attribute => 2288,
-      Iir_Kind_Structure_Attribute => 2288,
-      Iir_Kind_Simple_Name_Attribute => 2295,
-      Iir_Kind_Instance_Name_Attribute => 2300,
-      Iir_Kind_Path_Name_Attribute => 2305,
-      Iir_Kind_Left_Array_Attribute => 2312,
-      Iir_Kind_Right_Array_Attribute => 2319,
-      Iir_Kind_High_Array_Attribute => 2326,
-      Iir_Kind_Low_Array_Attribute => 2333,
-      Iir_Kind_Length_Array_Attribute => 2340,
-      Iir_Kind_Ascending_Array_Attribute => 2347,
-      Iir_Kind_Range_Array_Attribute => 2354,
-      Iir_Kind_Reverse_Range_Array_Attribute => 2361,
-      Iir_Kind_Attribute_Name => 2370
+      Iir_Kind_Array_Subtype_Definition => 353,
+      Iir_Kind_Record_Subtype_Definition => 366,
+      Iir_Kind_Access_Subtype_Definition => 374,
+      Iir_Kind_Physical_Subtype_Definition => 384,
+      Iir_Kind_Floating_Subtype_Definition => 395,
+      Iir_Kind_Integer_Subtype_Definition => 405,
+      Iir_Kind_Enumeration_Subtype_Definition => 415,
+      Iir_Kind_Enumeration_Type_Definition => 426,
+      Iir_Kind_Integer_Type_Definition => 434,
+      Iir_Kind_Floating_Type_Definition => 442,
+      Iir_Kind_Physical_Type_Definition => 453,
+      Iir_Kind_Range_Expression => 461,
+      Iir_Kind_Protected_Type_Body => 469,
+      Iir_Kind_Wildcard_Type_Definition => 473,
+      Iir_Kind_Subtype_Definition => 480,
+      Iir_Kind_Scalar_Nature_Definition => 488,
+      Iir_Kind_Record_Nature_Definition => 501,
+      Iir_Kind_Array_Nature_Definition => 515,
+      Iir_Kind_Array_Subnature_Definition => 530,
+      Iir_Kind_Overload_List => 531,
+      Iir_Kind_Entity_Declaration => 544,
+      Iir_Kind_Configuration_Declaration => 554,
+      Iir_Kind_Context_Declaration => 560,
+      Iir_Kind_Package_Declaration => 575,
+      Iir_Kind_Package_Instantiation_Declaration => 589,
+      Iir_Kind_Vmode_Declaration => 601,
+      Iir_Kind_Vprop_Declaration => 613,
+      Iir_Kind_Vunit_Declaration => 626,
+      Iir_Kind_Package_Body => 634,
+      Iir_Kind_Architecture_Body => 647,
+      Iir_Kind_Type_Declaration => 654,
+      Iir_Kind_Anonymous_Type_Declaration => 660,
+      Iir_Kind_Subtype_Declaration => 668,
+      Iir_Kind_Nature_Declaration => 674,
+      Iir_Kind_Subnature_Declaration => 681,
+      Iir_Kind_Package_Header => 683,
+      Iir_Kind_Unit_Declaration => 692,
+      Iir_Kind_Library_Declaration => 700,
+      Iir_Kind_Component_Declaration => 710,
+      Iir_Kind_Attribute_Declaration => 717,
+      Iir_Kind_Group_Template_Declaration => 723,
+      Iir_Kind_Group_Declaration => 730,
+      Iir_Kind_Element_Declaration => 738,
+      Iir_Kind_Nature_Element_Declaration => 745,
+      Iir_Kind_Non_Object_Alias_Declaration => 753,
+      Iir_Kind_Psl_Declaration => 761,
+      Iir_Kind_Psl_Endpoint_Declaration => 775,
+      Iir_Kind_Enumeration_Literal => 786,
+      Iir_Kind_Function_Declaration => 811,
+      Iir_Kind_Procedure_Declaration => 835,
+      Iir_Kind_Function_Body => 845,
+      Iir_Kind_Procedure_Body => 856,
+      Iir_Kind_Function_Instantiation_Declaration => 867,
+      Iir_Kind_Procedure_Instantiation_Declaration => 877,
+      Iir_Kind_Terminal_Declaration => 886,
+      Iir_Kind_Object_Alias_Declaration => 898,
+      Iir_Kind_Free_Quantity_Declaration => 910,
+      Iir_Kind_Spectrum_Quantity_Declaration => 923,
+      Iir_Kind_Noise_Quantity_Declaration => 935,
+      Iir_Kind_Across_Quantity_Declaration => 951,
+      Iir_Kind_Through_Quantity_Declaration => 967,
+      Iir_Kind_File_Declaration => 982,
+      Iir_Kind_Guard_Signal_Declaration => 996,
+      Iir_Kind_Signal_Declaration => 1013,
+      Iir_Kind_Variable_Declaration => 1026,
+      Iir_Kind_Constant_Declaration => 1040,
+      Iir_Kind_Iterator_Declaration => 1052,
+      Iir_Kind_Interface_Constant_Declaration => 1069,
+      Iir_Kind_Interface_Variable_Declaration => 1085,
+      Iir_Kind_Interface_Signal_Declaration => 1106,
+      Iir_Kind_Interface_File_Declaration => 1122,
+      Iir_Kind_Interface_Quantity_Declaration => 1138,
+      Iir_Kind_Interface_Terminal_Declaration => 1150,
+      Iir_Kind_Interface_Type_Declaration => 1161,
+      Iir_Kind_Interface_Package_Declaration => 1174,
+      Iir_Kind_Interface_Function_Declaration => 1192,
+      Iir_Kind_Interface_Procedure_Declaration => 1206,
+      Iir_Kind_Anonymous_Signal_Declaration => 1215,
+      Iir_Kind_Signal_Attribute_Declaration => 1218,
+      Iir_Kind_Identity_Operator => 1222,
+      Iir_Kind_Negation_Operator => 1226,
+      Iir_Kind_Absolute_Operator => 1230,
+      Iir_Kind_Not_Operator => 1234,
+      Iir_Kind_Implicit_Condition_Operator => 1238,
+      Iir_Kind_Condition_Operator => 1242,
+      Iir_Kind_Reduction_And_Operator => 1246,
+      Iir_Kind_Reduction_Or_Operator => 1250,
+      Iir_Kind_Reduction_Nand_Operator => 1254,
+      Iir_Kind_Reduction_Nor_Operator => 1258,
+      Iir_Kind_Reduction_Xor_Operator => 1262,
+      Iir_Kind_Reduction_Xnor_Operator => 1266,
+      Iir_Kind_And_Operator => 1271,
+      Iir_Kind_Or_Operator => 1276,
+      Iir_Kind_Nand_Operator => 1281,
+      Iir_Kind_Nor_Operator => 1286,
+      Iir_Kind_Xor_Operator => 1291,
+      Iir_Kind_Xnor_Operator => 1296,
+      Iir_Kind_Equality_Operator => 1301,
+      Iir_Kind_Inequality_Operator => 1306,
+      Iir_Kind_Less_Than_Operator => 1311,
+      Iir_Kind_Less_Than_Or_Equal_Operator => 1316,
+      Iir_Kind_Greater_Than_Operator => 1321,
+      Iir_Kind_Greater_Than_Or_Equal_Operator => 1326,
+      Iir_Kind_Match_Equality_Operator => 1331,
+      Iir_Kind_Match_Inequality_Operator => 1336,
+      Iir_Kind_Match_Less_Than_Operator => 1341,
+      Iir_Kind_Match_Less_Than_Or_Equal_Operator => 1346,
+      Iir_Kind_Match_Greater_Than_Operator => 1351,
+      Iir_Kind_Match_Greater_Than_Or_Equal_Operator => 1356,
+      Iir_Kind_Sll_Operator => 1361,
+      Iir_Kind_Sla_Operator => 1366,
+      Iir_Kind_Srl_Operator => 1371,
+      Iir_Kind_Sra_Operator => 1376,
+      Iir_Kind_Rol_Operator => 1381,
+      Iir_Kind_Ror_Operator => 1386,
+      Iir_Kind_Addition_Operator => 1391,
+      Iir_Kind_Substraction_Operator => 1396,
+      Iir_Kind_Concatenation_Operator => 1401,
+      Iir_Kind_Multiplication_Operator => 1406,
+      Iir_Kind_Division_Operator => 1411,
+      Iir_Kind_Modulus_Operator => 1416,
+      Iir_Kind_Remainder_Operator => 1421,
+      Iir_Kind_Exponentiation_Operator => 1426,
+      Iir_Kind_Function_Call => 1434,
+      Iir_Kind_Aggregate => 1441,
+      Iir_Kind_Parenthesis_Expression => 1444,
+      Iir_Kind_Qualified_Expression => 1448,
+      Iir_Kind_Type_Conversion => 1453,
+      Iir_Kind_Allocator_By_Expression => 1458,
+      Iir_Kind_Allocator_By_Subtype => 1464,
+      Iir_Kind_Selected_Element => 1472,
+      Iir_Kind_Dereference => 1477,
+      Iir_Kind_Implicit_Dereference => 1482,
+      Iir_Kind_Slice_Name => 1489,
+      Iir_Kind_Indexed_Name => 1495,
+      Iir_Kind_Psl_Prev => 1501,
+      Iir_Kind_Psl_Stable => 1506,
+      Iir_Kind_Psl_Rose => 1511,
+      Iir_Kind_Psl_Fell => 1516,
+      Iir_Kind_Psl_Expression => 1518,
+      Iir_Kind_Sensitized_Process_Statement => 1539,
+      Iir_Kind_Process_Statement => 1559,
+      Iir_Kind_Concurrent_Simple_Signal_Assignment => 1572,
+      Iir_Kind_Concurrent_Conditional_Signal_Assignment => 1585,
+      Iir_Kind_Concurrent_Selected_Signal_Assignment => 1599,
+      Iir_Kind_Concurrent_Assertion_Statement => 1607,
+      Iir_Kind_Concurrent_Procedure_Call_Statement => 1614,
+      Iir_Kind_Concurrent_Break_Statement => 1622,
+      Iir_Kind_Psl_Assert_Directive => 1635,
+      Iir_Kind_Psl_Assume_Directive => 1646,
+      Iir_Kind_Psl_Cover_Directive => 1658,
+      Iir_Kind_Psl_Restrict_Directive => 1669,
+      Iir_Kind_Block_Statement => 1683,
+      Iir_Kind_If_Generate_Statement => 1694,
+      Iir_Kind_Case_Generate_Statement => 1703,
+      Iir_Kind_For_Generate_Statement => 1712,
+      Iir_Kind_Component_Instantiation_Statement => 1723,
+      Iir_Kind_Psl_Default_Clock => 1727,
+      Iir_Kind_Generate_Statement_Body => 1738,
+      Iir_Kind_If_Generate_Else_Clause => 1744,
+      Iir_Kind_Simple_Simultaneous_Statement => 1751,
+      Iir_Kind_Simultaneous_Null_Statement => 1755,
+      Iir_Kind_Simultaneous_Procedural_Statement => 1766,
+      Iir_Kind_Simultaneous_Case_Statement => 1775,
+      Iir_Kind_Simultaneous_If_Statement => 1784,
+      Iir_Kind_Simultaneous_Elsif => 1790,
+      Iir_Kind_Simple_Signal_Assignment_Statement => 1801,
+      Iir_Kind_Conditional_Signal_Assignment_Statement => 1812,
+      Iir_Kind_Selected_Waveform_Assignment_Statement => 1824,
+      Iir_Kind_Signal_Force_Assignment_Statement => 1834,
+      Iir_Kind_Signal_Release_Assignment_Statement => 1843,
+      Iir_Kind_Null_Statement => 1847,
+      Iir_Kind_Assertion_Statement => 1854,
+      Iir_Kind_Report_Statement => 1860,
+      Iir_Kind_Wait_Statement => 1868,
+      Iir_Kind_Variable_Assignment_Statement => 1875,
+      Iir_Kind_Conditional_Variable_Assignment_Statement => 1882,
+      Iir_Kind_Return_Statement => 1888,
+      Iir_Kind_For_Loop_Statement => 1899,
+      Iir_Kind_While_Loop_Statement => 1910,
+      Iir_Kind_Next_Statement => 1917,
+      Iir_Kind_Exit_Statement => 1924,
+      Iir_Kind_Case_Statement => 1932,
+      Iir_Kind_Procedure_Call_Statement => 1938,
+      Iir_Kind_Break_Statement => 1945,
+      Iir_Kind_If_Statement => 1955,
+      Iir_Kind_Elsif => 1961,
+      Iir_Kind_Character_Literal => 1969,
+      Iir_Kind_Simple_Name => 1977,
+      Iir_Kind_Selected_Name => 1986,
+      Iir_Kind_Operator_Symbol => 1992,
+      Iir_Kind_Reference_Name => 1997,
+      Iir_Kind_External_Constant_Name => 2006,
+      Iir_Kind_External_Signal_Name => 2015,
+      Iir_Kind_External_Variable_Name => 2025,
+      Iir_Kind_Selected_By_All_Name => 2031,
+      Iir_Kind_Parenthesis_Name => 2036,
+      Iir_Kind_Package_Pathname => 2040,
+      Iir_Kind_Absolute_Pathname => 2041,
+      Iir_Kind_Relative_Pathname => 2042,
+      Iir_Kind_Pathname_Element => 2047,
+      Iir_Kind_Base_Attribute => 2049,
+      Iir_Kind_Subtype_Attribute => 2054,
+      Iir_Kind_Element_Attribute => 2059,
+      Iir_Kind_Across_Attribute => 2064,
+      Iir_Kind_Through_Attribute => 2069,
+      Iir_Kind_Nature_Reference_Attribute => 2073,
+      Iir_Kind_Left_Type_Attribute => 2078,
+      Iir_Kind_Right_Type_Attribute => 2083,
+      Iir_Kind_High_Type_Attribute => 2088,
+      Iir_Kind_Low_Type_Attribute => 2093,
+      Iir_Kind_Ascending_Type_Attribute => 2098,
+      Iir_Kind_Image_Attribute => 2104,
+      Iir_Kind_Value_Attribute => 2110,
+      Iir_Kind_Pos_Attribute => 2116,
+      Iir_Kind_Val_Attribute => 2122,
+      Iir_Kind_Succ_Attribute => 2128,
+      Iir_Kind_Pred_Attribute => 2134,
+      Iir_Kind_Leftof_Attribute => 2140,
+      Iir_Kind_Rightof_Attribute => 2146,
+      Iir_Kind_Signal_Slew_Attribute => 2154,
+      Iir_Kind_Quantity_Slew_Attribute => 2162,
+      Iir_Kind_Ramp_Attribute => 2170,
+      Iir_Kind_Zoh_Attribute => 2178,
+      Iir_Kind_Ltf_Attribute => 2186,
+      Iir_Kind_Ztf_Attribute => 2196,
+      Iir_Kind_Dot_Attribute => 2203,
+      Iir_Kind_Integ_Attribute => 2210,
+      Iir_Kind_Above_Attribute => 2218,
+      Iir_Kind_Quantity_Delayed_Attribute => 2226,
+      Iir_Kind_Delayed_Attribute => 2235,
+      Iir_Kind_Stable_Attribute => 2244,
+      Iir_Kind_Quiet_Attribute => 2253,
+      Iir_Kind_Transaction_Attribute => 2262,
+      Iir_Kind_Event_Attribute => 2266,
+      Iir_Kind_Active_Attribute => 2270,
+      Iir_Kind_Last_Event_Attribute => 2274,
+      Iir_Kind_Last_Active_Attribute => 2278,
+      Iir_Kind_Last_Value_Attribute => 2282,
+      Iir_Kind_Driving_Attribute => 2286,
+      Iir_Kind_Driving_Value_Attribute => 2290,
+      Iir_Kind_Behavior_Attribute => 2290,
+      Iir_Kind_Structure_Attribute => 2290,
+      Iir_Kind_Simple_Name_Attribute => 2297,
+      Iir_Kind_Instance_Name_Attribute => 2302,
+      Iir_Kind_Path_Name_Attribute => 2307,
+      Iir_Kind_Left_Array_Attribute => 2314,
+      Iir_Kind_Right_Array_Attribute => 2321,
+      Iir_Kind_High_Array_Attribute => 2328,
+      Iir_Kind_Low_Array_Attribute => 2335,
+      Iir_Kind_Length_Array_Attribute => 2342,
+      Iir_Kind_Ascending_Array_Attribute => 2349,
+      Iir_Kind_Range_Array_Attribute => 2356,
+      Iir_Kind_Reverse_Range_Array_Attribute => 2363,
+      Iir_Kind_Attribute_Name => 2372
      );
 
    function Get_Fields_First (K : Iir_Kind) return Fields_Index is
@@ -5597,6 +5609,10 @@ package body Vhdl.Nodes_Meta is
             return Get_Only_Characters_Flag (N);
          when Field_Is_Character_Type =>
             return Get_Is_Character_Type (N);
+         when Field_Has_Array_Constraint_Flag =>
+            return Get_Has_Array_Constraint_Flag (N);
+         when Field_Has_Element_Constraint_Flag =>
+            return Get_Has_Element_Constraint_Flag (N);
          when Field_Has_Force_Mode =>
             return Get_Has_Force_Mode (N);
          when Field_Postponed_Flag =>
@@ -5743,6 +5759,10 @@ package body Vhdl.Nodes_Meta is
             Set_Only_Characters_Flag (N, V);
          when Field_Is_Character_Type =>
             Set_Is_Character_Type (N, V);
+         when Field_Has_Array_Constraint_Flag =>
+            Set_Has_Array_Constraint_Flag (N, V);
+         when Field_Has_Element_Constraint_Flag =>
+            Set_Has_Element_Constraint_Flag (N, V);
          when Field_Has_Force_Mode =>
             Set_Has_Force_Mode (N, V);
          when Field_Postponed_Flag =>
@@ -9947,6 +9967,16 @@ package body Vhdl.Nodes_Meta is
       end case;
    end Has_Array_Element_Constraint;
 
+   function Has_Has_Array_Constraint_Flag (K : Iir_Kind) return Boolean is
+   begin
+      return K = Iir_Kind_Array_Subtype_Definition;
+   end Has_Has_Array_Constraint_Flag;
+
+   function Has_Has_Element_Constraint_Flag (K : Iir_Kind) return Boolean is
+   begin
+      return K = Iir_Kind_Array_Subtype_Definition;
+   end Has_Has_Element_Constraint_Flag;
+
    function Has_Elements_Declaration_List (K : Iir_Kind) return Boolean is
    begin
       case K is