vhdl: create default configuration for a vunit. Fix #1372

3 files changed, 444 insertions, 435 deletions

diff --git a/python/libghdl/thin/vhdl/nodes.py b/python/libghdl/thin/vhdl/nodes.py
index e25d2ef95..9532fc6fa 100644
--- a/python/libghdl/thin/vhdl/nodes.py
+++ b/python/libghdl/thin/vhdl/nodes.py
@@ -1906,6 +1906,10 @@ Get_Bound_Vunit_Chain = libghdl.vhdl__nodes__get_bound_vunit_chain
 
 Set_Bound_Vunit_Chain = libghdl.vhdl__nodes__set_bound_vunit_chain
 
+Get_Verification_Block_Configuration = libghdl.vhdl__nodes__get_verification_block_configuration
+
+Set_Verification_Block_Configuration = libghdl.vhdl__nodes__set_verification_block_configuration
+
 Get_Block_Configuration = libghdl.vhdl__nodes__get_block_configuration
 
 Set_Block_Configuration = libghdl.vhdl__nodes__set_block_configuration
diff --git a/python/libghdl/thin/vhdl/nodes_meta.py b/python/libghdl/thin/vhdl/nodes_meta.py
index e7d5dd26f..239cd942a 100644
--- a/python/libghdl/thin/vhdl/nodes_meta.py
+++ b/python/libghdl/thin/vhdl/nodes_meta.py
@@ -148,283 +148,284 @@ class fields:
     Inherit_Spec_Chain = 83
     Vunit_Item_Chain = 84
     Bound_Vunit_Chain = 85
-    Block_Configuration = 86
-    Concurrent_Statement_Chain = 87
-    Chain = 88
-    Port_Chain = 89
-    Generic_Chain = 90
-    Type = 91
-    Subtype_Indication = 92
-    Discrete_Range = 93
-    Type_Definition = 94
-    Subtype_Definition = 95
-    Incomplete_Type_Declaration = 96
-    Interface_Type_Subprograms = 97
-    Nature_Definition = 98
-    Nature = 99
-    Subnature_Indication = 100
-    Mode = 101
-    Guarded_Signal_Flag = 102
-    Signal_Kind = 103
-    Base_Name = 104
-    Interface_Declaration_Chain = 105
-    Subprogram_Specification = 106
-    Sequential_Statement_Chain = 107
-    Simultaneous_Statement_Chain = 108
-    Subprogram_Body = 109
-    Overload_Number = 110
-    Subprogram_Depth = 111
-    Subprogram_Hash = 112
-    Impure_Depth = 113
-    Return_Type = 114
-    Implicit_Definition = 115
-    Default_Value = 116
-    Deferred_Declaration = 117
-    Deferred_Declaration_Flag = 118
-    Shared_Flag = 119
-    Design_Unit = 120
-    Block_Statement = 121
-    Signal_Driver = 122
-    Declaration_Chain = 123
-    File_Logical_Name = 124
-    File_Open_Kind = 125
-    Element_Position = 126
-    Use_Clause_Chain = 127
-    Context_Reference_Chain = 128
-    Selected_Name = 129
-    Type_Declarator = 130
-    Complete_Type_Definition = 131
-    Incomplete_Type_Ref_Chain = 132
-    Associated_Type = 133
-    Enumeration_Literal_List = 134
-    Entity_Class_Entry_Chain = 135
-    Group_Constituent_List = 136
-    Unit_Chain = 137
-    Primary_Unit = 138
-    Identifier = 139
-    Label = 140
-    Visible_Flag = 141
-    Range_Constraint = 142
-    Direction = 143
-    Left_Limit = 144
-    Right_Limit = 145
-    Left_Limit_Expr = 146
-    Right_Limit_Expr = 147
-    Base_Type = 148
-    Simple_Nature = 149
-    Base_Nature = 150
-    Resolution_Indication = 151
-    Record_Element_Resolution_Chain = 152
-    Tolerance = 153
-    Plus_Terminal_Name = 154
-    Minus_Terminal_Name = 155
-    Plus_Terminal = 156
-    Minus_Terminal = 157
-    Magnitude_Expression = 158
-    Phase_Expression = 159
-    Power_Expression = 160
-    Simultaneous_Left = 161
-    Simultaneous_Right = 162
-    Text_File_Flag = 163
-    Only_Characters_Flag = 164
-    Is_Character_Type = 165
-    Nature_Staticness = 166
-    Type_Staticness = 167
-    Constraint_State = 168
-    Index_Subtype_List = 169
-    Index_Subtype_Definition_List = 170
-    Element_Subtype_Indication = 171
-    Element_Subtype = 172
-    Element_Subnature_Indication = 173
-    Element_Subnature = 174
-    Index_Constraint_List = 175
-    Array_Element_Constraint = 176
-    Elements_Declaration_List = 177
-    Owned_Elements_Chain = 178
-    Designated_Type = 179
-    Designated_Subtype_Indication = 180
-    Index_List = 181
-    Reference = 182
-    Nature_Declarator = 183
-    Across_Type_Mark = 184
-    Through_Type_Mark = 185
-    Across_Type_Definition = 186
-    Through_Type_Definition = 187
-    Across_Type = 188
-    Through_Type = 189
-    Target = 190
-    Waveform_Chain = 191
-    Guard = 192
-    Delay_Mechanism = 193
-    Reject_Time_Expression = 194
-    Sensitivity_List = 195
-    Process_Origin = 196
-    Package_Origin = 197
-    Condition_Clause = 198
-    Break_Element = 199
-    Selector_Quantity = 200
-    Break_Quantity = 201
-    Timeout_Clause = 202
-    Postponed_Flag = 203
-    Callees_List = 204
-    Passive_Flag = 205
-    Resolution_Function_Flag = 206
-    Wait_State = 207
-    All_Sensitized_State = 208
-    Seen_Flag = 209
-    Pure_Flag = 210
-    Foreign_Flag = 211
-    Resolved_Flag = 212
-    Signal_Type_Flag = 213
-    Has_Signal_Flag = 214
-    Purity_State = 215
-    Elab_Flag = 216
-    Vendor_Library_Flag = 217
-    Configuration_Mark_Flag = 218
-    Configuration_Done_Flag = 219
-    Index_Constraint_Flag = 220
-    Hide_Implicit_Flag = 221
-    Assertion_Condition = 222
-    Report_Expression = 223
-    Severity_Expression = 224
-    Instantiated_Unit = 225
-    Generic_Map_Aspect_Chain = 226
-    Port_Map_Aspect_Chain = 227
-    Configuration_Name = 228
-    Component_Configuration = 229
-    Configuration_Specification = 230
-    Default_Binding_Indication = 231
-    Default_Configuration_Declaration = 232
-    Expression = 233
-    Conditional_Expression_Chain = 234
-    Allocator_Designated_Type = 235
-    Selected_Waveform_Chain = 236
-    Conditional_Waveform_Chain = 237
-    Guard_Expression = 238
-    Guard_Decl = 239
-    Guard_Sensitivity_List = 240
-    Signal_Attribute_Chain = 241
-    Block_Block_Configuration = 242
-    Package_Header = 243
-    Block_Header = 244
-    Uninstantiated_Package_Name = 245
-    Uninstantiated_Package_Decl = 246
-    Instance_Source_File = 247
-    Generate_Block_Configuration = 248
-    Generate_Statement_Body = 249
-    Alternative_Label = 250
-    Generate_Else_Clause = 251
-    Condition = 252
-    Else_Clause = 253
-    Parameter_Specification = 254
-    Parent = 255
-    Loop_Label = 256
-    Exit_Flag = 257
-    Next_Flag = 258
-    Component_Name = 259
-    Instantiation_List = 260
-    Entity_Aspect = 261
-    Default_Entity_Aspect = 262
-    Binding_Indication = 263
-    Named_Entity = 264
-    Alias_Declaration = 265
-    Referenced_Name = 266
-    Expr_Staticness = 267
-    Scalar_Size = 268
-    Error_Origin = 269
-    Operand = 270
-    Left = 271
-    Right = 272
-    Unit_Name = 273
-    Name = 274
-    Group_Template_Name = 275
-    Name_Staticness = 276
-    Prefix = 277
-    Signature_Prefix = 278
-    External_Pathname = 279
-    Pathname_Suffix = 280
-    Pathname_Expression = 281
-    In_Formal_Flag = 282
-    Slice_Subtype = 283
-    Suffix = 284
-    Index_Subtype = 285
-    Parameter = 286
-    Parameter_2 = 287
-    Parameter_3 = 288
-    Parameter_4 = 289
-    Attr_Chain = 290
-    Signal_Attribute_Declaration = 291
-    Actual_Type = 292
-    Actual_Type_Definition = 293
-    Association_Chain = 294
-    Individual_Association_Chain = 295
-    Subprogram_Association_Chain = 296
-    Aggregate_Info = 297
-    Sub_Aggregate_Info = 298
-    Aggr_Dynamic_Flag = 299
-    Aggr_Min_Length = 300
-    Aggr_Low_Limit = 301
-    Aggr_High_Limit = 302
-    Aggr_Others_Flag = 303
-    Aggr_Named_Flag = 304
-    Aggregate_Expand_Flag = 305
-    Association_Choices_Chain = 306
-    Case_Statement_Alternative_Chain = 307
-    Choice_Staticness = 308
-    Procedure_Call = 309
-    Implementation = 310
-    Parameter_Association_Chain = 311
-    Method_Object = 312
-    Subtype_Type_Mark = 313
-    Subnature_Nature_Mark = 314
-    Type_Conversion_Subtype = 315
-    Type_Mark = 316
-    File_Type_Mark = 317
-    Return_Type_Mark = 318
-    Has_Disconnect_Flag = 319
-    Has_Active_Flag = 320
-    Is_Within_Flag = 321
-    Type_Marks_List = 322
-    Implicit_Alias_Flag = 323
-    Alias_Signature = 324
-    Attribute_Signature = 325
-    Overload_List = 326
-    Simple_Name_Identifier = 327
-    Simple_Name_Subtype = 328
-    Protected_Type_Body = 329
-    Protected_Type_Declaration = 330
-    Use_Flag = 331
-    End_Has_Reserved_Id = 332
-    End_Has_Identifier = 333
-    End_Has_Postponed = 334
-    Has_Label = 335
-    Has_Begin = 336
-    Has_End = 337
-    Has_Is = 338
-    Has_Pure = 339
-    Has_Body = 340
-    Has_Parameter = 341
-    Has_Component = 342
-    Has_Identifier_List = 343
-    Has_Mode = 344
-    Has_Class = 345
-    Has_Delay_Mechanism = 346
-    Suspend_Flag = 347
-    Is_Ref = 348
-    Is_Forward_Ref = 349
-    Psl_Property = 350
-    Psl_Sequence = 351
-    Psl_Declaration = 352
-    Psl_Expression = 353
-    Psl_Boolean = 354
-    PSL_Clock = 355
-    PSL_NFA = 356
-    PSL_Nbr_States = 357
-    PSL_Clock_Sensitivity = 358
-    PSL_EOS_Flag = 359
-    Count_Expression = 360
-    Clock_Expression = 361
-    Default_Clock = 362
+    Verification_Block_Configuration = 86
+    Block_Configuration = 87
+    Concurrent_Statement_Chain = 88
+    Chain = 89
+    Port_Chain = 90
+    Generic_Chain = 91
+    Type = 92
+    Subtype_Indication = 93
+    Discrete_Range = 94
+    Type_Definition = 95
+    Subtype_Definition = 96
+    Incomplete_Type_Declaration = 97
+    Interface_Type_Subprograms = 98
+    Nature_Definition = 99
+    Nature = 100
+    Subnature_Indication = 101
+    Mode = 102
+    Guarded_Signal_Flag = 103
+    Signal_Kind = 104
+    Base_Name = 105
+    Interface_Declaration_Chain = 106
+    Subprogram_Specification = 107
+    Sequential_Statement_Chain = 108
+    Simultaneous_Statement_Chain = 109
+    Subprogram_Body = 110
+    Overload_Number = 111
+    Subprogram_Depth = 112
+    Subprogram_Hash = 113
+    Impure_Depth = 114
+    Return_Type = 115
+    Implicit_Definition = 116
+    Default_Value = 117
+    Deferred_Declaration = 118
+    Deferred_Declaration_Flag = 119
+    Shared_Flag = 120
+    Design_Unit = 121
+    Block_Statement = 122
+    Signal_Driver = 123
+    Declaration_Chain = 124
+    File_Logical_Name = 125
+    File_Open_Kind = 126
+    Element_Position = 127
+    Use_Clause_Chain = 128
+    Context_Reference_Chain = 129
+    Selected_Name = 130
+    Type_Declarator = 131
+    Complete_Type_Definition = 132
+    Incomplete_Type_Ref_Chain = 133
+    Associated_Type = 134
+    Enumeration_Literal_List = 135
+    Entity_Class_Entry_Chain = 136
+    Group_Constituent_List = 137
+    Unit_Chain = 138
+    Primary_Unit = 139
+    Identifier = 140
+    Label = 141
+    Visible_Flag = 142
+    Range_Constraint = 143
+    Direction = 144
+    Left_Limit = 145
+    Right_Limit = 146
+    Left_Limit_Expr = 147
+    Right_Limit_Expr = 148
+    Base_Type = 149
+    Simple_Nature = 150
+    Base_Nature = 151
+    Resolution_Indication = 152
+    Record_Element_Resolution_Chain = 153
+    Tolerance = 154
+    Plus_Terminal_Name = 155
+    Minus_Terminal_Name = 156
+    Plus_Terminal = 157
+    Minus_Terminal = 158
+    Magnitude_Expression = 159
+    Phase_Expression = 160
+    Power_Expression = 161
+    Simultaneous_Left = 162
+    Simultaneous_Right = 163
+    Text_File_Flag = 164
+    Only_Characters_Flag = 165
+    Is_Character_Type = 166
+    Nature_Staticness = 167
+    Type_Staticness = 168
+    Constraint_State = 169
+    Index_Subtype_List = 170
+    Index_Subtype_Definition_List = 171
+    Element_Subtype_Indication = 172
+    Element_Subtype = 173
+    Element_Subnature_Indication = 174
+    Element_Subnature = 175
+    Index_Constraint_List = 176
+    Array_Element_Constraint = 177
+    Elements_Declaration_List = 178
+    Owned_Elements_Chain = 179
+    Designated_Type = 180
+    Designated_Subtype_Indication = 181
+    Index_List = 182
+    Reference = 183
+    Nature_Declarator = 184
+    Across_Type_Mark = 185
+    Through_Type_Mark = 186
+    Across_Type_Definition = 187
+    Through_Type_Definition = 188
+    Across_Type = 189
+    Through_Type = 190
+    Target = 191
+    Waveform_Chain = 192
+    Guard = 193
+    Delay_Mechanism = 194
+    Reject_Time_Expression = 195
+    Sensitivity_List = 196
+    Process_Origin = 197
+    Package_Origin = 198
+    Condition_Clause = 199
+    Break_Element = 200
+    Selector_Quantity = 201
+    Break_Quantity = 202
+    Timeout_Clause = 203
+    Postponed_Flag = 204
+    Callees_List = 205
+    Passive_Flag = 206
+    Resolution_Function_Flag = 207
+    Wait_State = 208
+    All_Sensitized_State = 209
+    Seen_Flag = 210
+    Pure_Flag = 211
+    Foreign_Flag = 212
+    Resolved_Flag = 213
+    Signal_Type_Flag = 214
+    Has_Signal_Flag = 215
+    Purity_State = 216
+    Elab_Flag = 217
+    Vendor_Library_Flag = 218
+    Configuration_Mark_Flag = 219
+    Configuration_Done_Flag = 220
+    Index_Constraint_Flag = 221
+    Hide_Implicit_Flag = 222
+    Assertion_Condition = 223
+    Report_Expression = 224
+    Severity_Expression = 225
+    Instantiated_Unit = 226
+    Generic_Map_Aspect_Chain = 227
+    Port_Map_Aspect_Chain = 228
+    Configuration_Name = 229
+    Component_Configuration = 230
+    Configuration_Specification = 231
+    Default_Binding_Indication = 232
+    Default_Configuration_Declaration = 233
+    Expression = 234
+    Conditional_Expression_Chain = 235
+    Allocator_Designated_Type = 236
+    Selected_Waveform_Chain = 237
+    Conditional_Waveform_Chain = 238
+    Guard_Expression = 239
+    Guard_Decl = 240
+    Guard_Sensitivity_List = 241
+    Signal_Attribute_Chain = 242
+    Block_Block_Configuration = 243
+    Package_Header = 244
+    Block_Header = 245
+    Uninstantiated_Package_Name = 246
+    Uninstantiated_Package_Decl = 247
+    Instance_Source_File = 248
+    Generate_Block_Configuration = 249
+    Generate_Statement_Body = 250
+    Alternative_Label = 251
+    Generate_Else_Clause = 252
+    Condition = 253
+    Else_Clause = 254
+    Parameter_Specification = 255
+    Parent = 256
+    Loop_Label = 257
+    Exit_Flag = 258
+    Next_Flag = 259
+    Component_Name = 260
+    Instantiation_List = 261
+    Entity_Aspect = 262
+    Default_Entity_Aspect = 263
+    Binding_Indication = 264
+    Named_Entity = 265
+    Alias_Declaration = 266
+    Referenced_Name = 267
+    Expr_Staticness = 268
+    Scalar_Size = 269
+    Error_Origin = 270
+    Operand = 271
+    Left = 272
+    Right = 273
+    Unit_Name = 274
+    Name = 275
+    Group_Template_Name = 276
+    Name_Staticness = 277
+    Prefix = 278
+    Signature_Prefix = 279
+    External_Pathname = 280
+    Pathname_Suffix = 281
+    Pathname_Expression = 282
+    In_Formal_Flag = 283
+    Slice_Subtype = 284
+    Suffix = 285
+    Index_Subtype = 286
+    Parameter = 287
+    Parameter_2 = 288
+    Parameter_3 = 289
+    Parameter_4 = 290
+    Attr_Chain = 291
+    Signal_Attribute_Declaration = 292
+    Actual_Type = 293
+    Actual_Type_Definition = 294
+    Association_Chain = 295
+    Individual_Association_Chain = 296
+    Subprogram_Association_Chain = 297
+    Aggregate_Info = 298
+    Sub_Aggregate_Info = 299
+    Aggr_Dynamic_Flag = 300
+    Aggr_Min_Length = 301
+    Aggr_Low_Limit = 302
+    Aggr_High_Limit = 303
+    Aggr_Others_Flag = 304
+    Aggr_Named_Flag = 305
+    Aggregate_Expand_Flag = 306
+    Association_Choices_Chain = 307
+    Case_Statement_Alternative_Chain = 308
+    Choice_Staticness = 309
+    Procedure_Call = 310
+    Implementation = 311
+    Parameter_Association_Chain = 312
+    Method_Object = 313
+    Subtype_Type_Mark = 314
+    Subnature_Nature_Mark = 315
+    Type_Conversion_Subtype = 316
+    Type_Mark = 317
+    File_Type_Mark = 318
+    Return_Type_Mark = 319
+    Has_Disconnect_Flag = 320
+    Has_Active_Flag = 321
+    Is_Within_Flag = 322
+    Type_Marks_List = 323
+    Implicit_Alias_Flag = 324
+    Alias_Signature = 325
+    Attribute_Signature = 326
+    Overload_List = 327
+    Simple_Name_Identifier = 328
+    Simple_Name_Subtype = 329
+    Protected_Type_Body = 330
+    Protected_Type_Declaration = 331
+    Use_Flag = 332
+    End_Has_Reserved_Id = 333
+    End_Has_Identifier = 334
+    End_Has_Postponed = 335
+    Has_Label = 336
+    Has_Begin = 337
+    Has_End = 338
+    Has_Is = 339
+    Has_Pure = 340
+    Has_Body = 341
+    Has_Parameter = 342
+    Has_Component = 343
+    Has_Identifier_List = 344
+    Has_Mode = 345
+    Has_Class = 346
+    Has_Delay_Mechanism = 347
+    Suspend_Flag = 348
+    Is_Ref = 349
+    Is_Forward_Ref = 350
+    Psl_Property = 351
+    Psl_Sequence = 352
+    Psl_Declaration = 353
+    Psl_Expression = 354
+    Psl_Boolean = 355
+    PSL_Clock = 356
+    PSL_NFA = 357
+    PSL_Nbr_States = 358
+    PSL_Clock_Sensitivity = 359
+    PSL_EOS_Flag = 360
+    Count_Expression = 361
+    Clock_Expression = 362
+    Default_Clock = 363
 
 
 Get_Boolean = libghdl.vhdl__nodes_meta__get_boolean
@@ -750,6 +751,9 @@ Has_Vunit_Item_Chain =\
 Has_Bound_Vunit_Chain =\
     libghdl.vhdl__nodes_meta__has_bound_vunit_chain
 
+Has_Verification_Block_Configuration =\
+    libghdl.vhdl__nodes_meta__has_verification_block_configuration
+
 Has_Block_Configuration =\
     libghdl.vhdl__nodes_meta__has_block_configuration
 
diff --git a/python/libghdl/thin/vhdl/tokens.py b/python/libghdl/thin/vhdl/tokens.py
index 819f805ff..b38554d23 100644
--- a/python/libghdl/thin/vhdl/tokens.py
+++ b/python/libghdl/thin/vhdl/tokens.py
@@ -59,161 +59,162 @@ class Tok:
     Bar_Arrow = 55
     Bar_Double_Arrow = 56
     Minus_Greater = 57
-    Arobase = 58
-    Star = 59
-    Slash = 60
-    Mod = 61
-    Rem = 62
-    Abs = 63
-    Not = 64
-    Access = 65
-    After = 66
-    Alias = 67
-    All = 68
-    Architecture = 69
-    Array = 70
-    Assert = 71
-    Attribute = 72
-    Begin = 73
-    Block = 74
-    Body = 75
-    Buffer = 76
-    Bus = 77
-    Case = 78
-    Component = 79
-    Configuration = 80
-    Constant = 81
-    Disconnect = 82
-    Downto = 83
-    Else = 84
-    Elsif = 85
-    End = 86
-    Entity = 87
-    Exit = 88
-    File = 89
-    For = 90
-    Function = 91
-    Generate = 92
-    Generic = 93
-    Guarded = 94
-    If = 95
-    In = 96
-    Inout = 97
-    Is = 98
-    Label = 99
-    Library = 100
-    Linkage = 101
-    Loop = 102
-    Map = 103
-    New = 104
-    Next = 105
-    Null = 106
-    Of = 107
-    On = 108
-    Open = 109
-    Others = 110
-    Out = 111
-    Package = 112
-    Port = 113
-    Procedure = 114
-    Process = 115
-    Range = 116
-    Record = 117
-    Register = 118
-    Report = 119
-    Return = 120
-    Select = 121
-    Severity = 122
-    Signal = 123
-    Subtype = 124
-    Then = 125
-    To = 126
-    Transport = 127
-    Type = 128
-    Units = 129
-    Until = 130
-    Use = 131
-    Variable = 132
-    Wait = 133
-    When = 134
-    While = 135
-    With = 136
-    And = 137
-    Or = 138
-    Xor = 139
-    Nand = 140
-    Nor = 141
-    Xnor = 142
-    Group = 143
-    Impure = 144
-    Inertial = 145
-    Literal = 146
-    Postponed = 147
-    Pure = 148
-    Reject = 149
-    Shared = 150
-    Unaffected = 151
-    Sll = 152
-    Sla = 153
-    Sra = 154
-    Srl = 155
-    Rol = 156
-    Ror = 157
-    Protected = 158
-    Assume = 159
-    Context = 160
-    Cover = 161
-    Default = 162
-    Parameter = 163
-    Property = 164
-    Restrict = 165
-    Restrict_Guarantee = 166
-    Sequence = 167
-    Vmode = 168
-    Vprop = 169
-    Vunit = 170
-    Across = 171
-    Break = 172
-    Limit = 173
-    Nature = 174
-    Noise = 175
-    Procedural = 176
-    Quantity = 177
-    Reference = 178
-    Spectrum = 179
-    Subnature = 180
-    Terminal = 181
-    Through = 182
-    Tolerance = 183
-    Psl_Clock = 184
-    Psl_Endpoint = 185
-    Psl_Const = 186
-    Psl_Boolean = 187
-    Inf = 188
-    Within = 189
-    Abort = 190
-    Before = 191
-    Before_Em = 192
-    Before_Un = 193
-    Before_Em_Un = 194
-    Always = 195
-    Never = 196
-    Eventually_Em = 197
-    Next_Em = 198
-    Next_A = 199
-    Next_A_Em = 200
-    Next_E = 201
-    Next_E_Em = 202
-    Next_Event = 203
-    Next_Event_Em = 204
-    Next_Event_A = 205
-    Next_Event_A_Em = 206
-    Next_Event_E = 207
-    Next_Event_E_Em = 208
-    Until_Em = 209
-    Until_Un = 210
-    Until_Em_Un = 211
-    Prev = 212
-    Stable = 213
-    Fell = 214
-    Rose = 215
+    Equiv_Arrow = 58
+    Arobase = 59
+    Star = 60
+    Slash = 61
+    Mod = 62
+    Rem = 63
+    Abs = 64
+    Not = 65
+    Access = 66
+    After = 67
+    Alias = 68
+    All = 69
+    Architecture = 70
+    Array = 71
+    Assert = 72
+    Attribute = 73
+    Begin = 74
+    Block = 75
+    Body = 76
+    Buffer = 77
+    Bus = 78
+    Case = 79
+    Component = 80
+    Configuration = 81
+    Constant = 82
+    Disconnect = 83
+    Downto = 84
+    Else = 85
+    Elsif = 86
+    End = 87
+    Entity = 88
+    Exit = 89
+    File = 90
+    For = 91
+    Function = 92
+    Generate = 93
+    Generic = 94
+    Guarded = 95
+    If = 96
+    In = 97
+    Inout = 98
+    Is = 99
+    Label = 100
+    Library = 101
+    Linkage = 102
+    Loop = 103
+    Map = 104
+    New = 105
+    Next = 106
+    Null = 107
+    Of = 108
+    On = 109
+    Open = 110
+    Others = 111
+    Out = 112
+    Package = 113
+    Port = 114
+    Procedure = 115
+    Process = 116
+    Range = 117
+    Record = 118
+    Register = 119
+    Report = 120
+    Return = 121
+    Select = 122
+    Severity = 123
+    Signal = 124
+    Subtype = 125
+    Then = 126
+    To = 127
+    Transport = 128
+    Type = 129
+    Units = 130
+    Until = 131
+    Use = 132
+    Variable = 133
+    Wait = 134
+    When = 135
+    While = 136
+    With = 137
+    And = 138
+    Or = 139
+    Xor = 140
+    Nand = 141
+    Nor = 142
+    Xnor = 143
+    Group = 144
+    Impure = 145
+    Inertial = 146
+    Literal = 147
+    Postponed = 148
+    Pure = 149
+    Reject = 150
+    Shared = 151
+    Unaffected = 152
+    Sll = 153
+    Sla = 154
+    Sra = 155
+    Srl = 156
+    Rol = 157
+    Ror = 158
+    Protected = 159
+    Assume = 160
+    Context = 161
+    Cover = 162
+    Default = 163
+    Parameter = 164
+    Property = 165
+    Restrict = 166
+    Restrict_Guarantee = 167
+    Sequence = 168
+    Vmode = 169
+    Vprop = 170
+    Vunit = 171
+    Across = 172
+    Break = 173
+    Limit = 174
+    Nature = 175
+    Noise = 176
+    Procedural = 177
+    Quantity = 178
+    Reference = 179
+    Spectrum = 180
+    Subnature = 181
+    Terminal = 182
+    Through = 183
+    Tolerance = 184
+    Psl_Clock = 185
+    Psl_Endpoint = 186
+    Psl_Const = 187
+    Psl_Boolean = 188
+    Inf = 189
+    Within = 190
+    Abort = 191
+    Before = 192
+    Before_Em = 193
+    Before_Un = 194
+    Before_Em_Un = 195
+    Always = 196
+    Never = 197
+    Eventually_Em = 198
+    Next_Em = 199
+    Next_A = 200
+    Next_A_Em = 201
+    Next_E = 202
+    Next_E_Em = 203
+    Next_Event = 204
+    Next_Event_Em = 205
+    Next_Event_A = 206
+    Next_Event_A_Em = 207
+    Next_Event_E = 208
+    Next_Event_E_Em = 209
+    Until_Em = 210
+    Until_Un = 211
+    Until_Em_Un = 212
+    Prev = 213
+    Stable = 214
+    Fell = 215
+    Rose = 216