2 files changed, 115 insertions, 95 deletions
diff --git a/python/libghdl/thin/vhdl/nodes.py b/python/libghdl/thin/vhdl/nodes.py
index 8dbc7a092..335ebb240 100644
--- a/python/libghdl/thin/vhdl/nodes.py
+++ b/python/libghdl/thin/vhdl/nodes.py
@@ -681,6 +681,10 @@ class Iir_Kinds:
         Iir_Kind.Anonymous_Type_Declaration,
         Iir_Kind.Subtype_Declaration]
 
+    Next_Exit_Statement = [
+        Iir_Kind.Next_Statement,
+        Iir_Kind.Exit_Statement]
+
     Association_Element = [
         Iir_Kind.Association_Element_By_Expression,
         Iir_Kind.Association_Element_By_Individual,
@@ -2123,6 +2127,14 @@ Get_Loop_Label = libghdl.vhdl__nodes__get_loop_label
 
 Set_Loop_Label = libghdl.vhdl__nodes__set_loop_label
 
+Get_Exit_Flag = libghdl.vhdl__nodes__get_exit_flag
+
+Set_Exit_Flag = libghdl.vhdl__nodes__set_exit_flag
+
+Get_Next_Flag = libghdl.vhdl__nodes__get_next_flag
+
+Set_Next_Flag = libghdl.vhdl__nodes__set_next_flag
+
 Get_Component_Name = libghdl.vhdl__nodes__get_component_name
 
 Set_Component_Name = libghdl.vhdl__nodes__set_component_name
diff --git a/python/libghdl/thin/vhdl/nodes_meta.py b/python/libghdl/thin/vhdl/nodes_meta.py
index ec2cf03a8..e11dc5b78 100644
--- a/python/libghdl/thin/vhdl/nodes_meta.py
+++ b/python/libghdl/thin/vhdl/nodes_meta.py
@@ -296,101 +296,103 @@ class fields:
     Parameter_Specification = 232
     Parent = 233
     Loop_Label = 234
-    Component_Name = 235
-    Instantiation_List = 236
-    Entity_Aspect = 237
-    Default_Entity_Aspect = 238
-    Binding_Indication = 239
-    Named_Entity = 240
-    Alias_Declaration = 241
-    Referenced_Name = 242
-    Expr_Staticness = 243
-    Error_Origin = 244
-    Operand = 245
-    Left = 246
-    Right = 247
-    Unit_Name = 248
-    Name = 249
-    Group_Template_Name = 250
-    Name_Staticness = 251
-    Prefix = 252
-    Signature_Prefix = 253
-    External_Pathname = 254
-    Pathname_Suffix = 255
-    Pathname_Expression = 256
-    In_Formal_Flag = 257
-    Slice_Subtype = 258
-    Suffix = 259
-    Index_Subtype = 260
-    Parameter = 261
-    Attr_Chain = 262
-    Signal_Attribute_Declaration = 263
-    Actual_Type = 264
-    Actual_Type_Definition = 265
-    Association_Chain = 266
-    Individual_Association_Chain = 267
-    Subprogram_Association_Chain = 268
-    Aggregate_Info = 269
-    Sub_Aggregate_Info = 270
-    Aggr_Dynamic_Flag = 271
-    Aggr_Min_Length = 272
-    Aggr_Low_Limit = 273
-    Aggr_High_Limit = 274
-    Aggr_Others_Flag = 275
-    Aggr_Named_Flag = 276
-    Aggregate_Expand_Flag = 277
-    Association_Choices_Chain = 278
-    Case_Statement_Alternative_Chain = 279
-    Choice_Staticness = 280
-    Procedure_Call = 281
-    Implementation = 282
-    Parameter_Association_Chain = 283
-    Method_Object = 284
-    Subtype_Type_Mark = 285
-    Type_Conversion_Subtype = 286
-    Type_Mark = 287
-    File_Type_Mark = 288
-    Return_Type_Mark = 289
-    Has_Disconnect_Flag = 290
-    Has_Active_Flag = 291
-    Is_Within_Flag = 292
-    Type_Marks_List = 293
-    Implicit_Alias_Flag = 294
-    Alias_Signature = 295
-    Attribute_Signature = 296
-    Overload_List = 297
-    Simple_Name_Identifier = 298
-    Simple_Name_Subtype = 299
-    Protected_Type_Body = 300
-    Protected_Type_Declaration = 301
-    Use_Flag = 302
-    End_Has_Reserved_Id = 303
-    End_Has_Identifier = 304
-    End_Has_Postponed = 305
-    Has_Label = 306
-    Has_Begin = 307
-    Has_End = 308
-    Has_Is = 309
-    Has_Pure = 310
-    Has_Body = 311
-    Has_Parameter = 312
-    Has_Component = 313
-    Has_Identifier_List = 314
-    Has_Mode = 315
-    Has_Class = 316
-    Suspend_Flag = 317
-    Is_Ref = 318
-    Is_Forward_Ref = 319
-    Psl_Property = 320
-    Psl_Sequence = 321
-    Psl_Declaration = 322
-    Psl_Expression = 323
-    Psl_Boolean = 324
-    PSL_Clock = 325
-    PSL_NFA = 326
-    PSL_Nbr_States = 327
-    PSL_Clock_Sensitivity = 328
-    PSL_EOS_Flag = 329
+    Exit_Flag = 235
+    Next_Flag = 236
+    Component_Name = 237
+    Instantiation_List = 238
+    Entity_Aspect = 239
+    Default_Entity_Aspect = 240
+    Binding_Indication = 241
+    Named_Entity = 242
+    Alias_Declaration = 243
+    Referenced_Name = 244
+    Expr_Staticness = 245
+    Error_Origin = 246
+    Operand = 247
+    Left = 248
+    Right = 249
+    Unit_Name = 250
+    Name = 251
+    Group_Template_Name = 252
+    Name_Staticness = 253
+    Prefix = 254
+    Signature_Prefix = 255
+    External_Pathname = 256
+    Pathname_Suffix = 257
+    Pathname_Expression = 258
+    In_Formal_Flag = 259
+    Slice_Subtype = 260
+    Suffix = 261
+    Index_Subtype = 262
+    Parameter = 263
+    Attr_Chain = 264
+    Signal_Attribute_Declaration = 265
+    Actual_Type = 266
+    Actual_Type_Definition = 267
+    Association_Chain = 268
+    Individual_Association_Chain = 269
+    Subprogram_Association_Chain = 270
+    Aggregate_Info = 271
+    Sub_Aggregate_Info = 272
+    Aggr_Dynamic_Flag = 273
+    Aggr_Min_Length = 274
+    Aggr_Low_Limit = 275
+    Aggr_High_Limit = 276
+    Aggr_Others_Flag = 277
+    Aggr_Named_Flag = 278
+    Aggregate_Expand_Flag = 279
+    Association_Choices_Chain = 280
+    Case_Statement_Alternative_Chain = 281
+    Choice_Staticness = 282
+    Procedure_Call = 283
+    Implementation = 284
+    Parameter_Association_Chain = 285
+    Method_Object = 286
+    Subtype_Type_Mark = 287
+    Type_Conversion_Subtype = 288
+    Type_Mark = 289
+    File_Type_Mark = 290
+    Return_Type_Mark = 291
+    Has_Disconnect_Flag = 292
+    Has_Active_Flag = 293
+    Is_Within_Flag = 294
+    Type_Marks_List = 295
+    Implicit_Alias_Flag = 296
+    Alias_Signature = 297
+    Attribute_Signature = 298
+    Overload_List = 299
+    Simple_Name_Identifier = 300
+    Simple_Name_Subtype = 301
+    Protected_Type_Body = 302
+    Protected_Type_Declaration = 303
+    Use_Flag = 304
+    End_Has_Reserved_Id = 305
+    End_Has_Identifier = 306
+    End_Has_Postponed = 307
+    Has_Label = 308
+    Has_Begin = 309
+    Has_End = 310
+    Has_Is = 311
+    Has_Pure = 312
+    Has_Body = 313
+    Has_Parameter = 314
+    Has_Component = 315
+    Has_Identifier_List = 316
+    Has_Mode = 317
+    Has_Class = 318
+    Suspend_Flag = 319
+    Is_Ref = 320
+    Is_Forward_Ref = 321
+    Psl_Property = 322
+    Psl_Sequence = 323
+    Psl_Declaration = 324
+    Psl_Expression = 325
+    Psl_Boolean = 326
+    PSL_Clock = 327
+    PSL_NFA = 328
+    PSL_Nbr_States = 329
+    PSL_Clock_Sensitivity = 330
+    PSL_EOS_Flag = 331
 
 
 Get_Boolean = libghdl.vhdl__nodes_meta__get_boolean
@@ -1161,6 +1163,12 @@ Has_Parent =\
 Has_Loop_Label =\
     libghdl.vhdl__nodes_meta__has_loop_label
 
+Has_Exit_Flag =\
+    libghdl.vhdl__nodes_meta__has_exit_flag
+
+Has_Next_Flag =\
+    libghdl.vhdl__nodes_meta__has_next_flag
+
 Has_Component_Name =\
     libghdl.vhdl__nodes_meta__has_component_name