synth: handle matching comparisons. Fix #1109

1 files changed, 126 insertions, 90 deletions

diff --git a/python/libghdl/thin/vhdl/nodes.py b/python/libghdl/thin/vhdl/nodes.py
index 5fce2f2e8..ce31bcf20 100644
--- a/python/libghdl/thin/vhdl/nodes.py
+++ b/python/libghdl/thin/vhdl/nodes.py
@@ -1257,96 +1257,132 @@ class Iir_Predefined:
     Ieee_Numeric_Std_Ne_Sgn_Sgn = 274
     Ieee_Numeric_Std_Ne_Sgn_Int = 275
     Ieee_Numeric_Std_Ne_Int_Sgn = 276
-    Ieee_Numeric_Std_Shl_Uns_Nat = 277
-    Ieee_Numeric_Std_Shr_Uns_Nat = 278
-    Ieee_Numeric_Std_Shl_Sgn_Nat = 279
-    Ieee_Numeric_Std_Shr_Sgn_Nat = 280
-    Ieee_Numeric_Std_Sll_Uns_Int = 281
-    Ieee_Numeric_Std_Sll_Sgn_Int = 282
-    Ieee_Numeric_Std_Srl_Uns_Int = 283
-    Ieee_Numeric_Std_Srl_Sgn_Int = 284
-    Ieee_Numeric_Std_Sla_Uns_Int = 285
-    Ieee_Numeric_Std_Sla_Sgn_Int = 286
-    Ieee_Numeric_Std_Sra_Uns_Int = 287
-    Ieee_Numeric_Std_Sra_Sgn_Int = 288
-    Ieee_Numeric_Std_Rol_Uns_Nat = 289
-    Ieee_Numeric_Std_Ror_Uns_Nat = 290
-    Ieee_Numeric_Std_Rol_Sgn_Nat = 291
-    Ieee_Numeric_Std_Ror_Sgn_Nat = 292
-    Ieee_Numeric_Std_Not_Uns = 293
-    Ieee_Numeric_Std_Not_Sgn = 294
-    Ieee_Numeric_Std_Abs_Sgn = 295
-    Ieee_Numeric_Std_And_Uns_Uns = 296
-    Ieee_Numeric_Std_And_Sgn_Sgn = 297
-    Ieee_Numeric_Std_Or_Uns_Uns = 298
-    Ieee_Numeric_Std_Or_Sgn_Sgn = 299
-    Ieee_Numeric_Std_Nand_Uns_Uns = 300
-    Ieee_Numeric_Std_Nand_Sgn_Sgn = 301
-    Ieee_Numeric_Std_Nor_Uns_Uns = 302
-    Ieee_Numeric_Std_Nor_Sgn_Sgn = 303
-    Ieee_Numeric_Std_Xor_Uns_Uns = 304
-    Ieee_Numeric_Std_Xor_Sgn_Sgn = 305
-    Ieee_Numeric_Std_Xnor_Uns_Uns = 306
-    Ieee_Numeric_Std_Xnor_Sgn_Sgn = 307
-    Ieee_Numeric_Std_Neg_Uns = 308
-    Ieee_Numeric_Std_Neg_Sgn = 309
-    Ieee_Numeric_Std_Match_Log = 310
-    Ieee_Numeric_Std_Match_Uns = 311
-    Ieee_Numeric_Std_Match_Sgn = 312
-    Ieee_Numeric_Std_Match_Slv = 313
-    Ieee_Numeric_Std_Match_Suv = 314
-    Ieee_Math_Real_Ceil = 315
-    Ieee_Math_Real_Round = 316
-    Ieee_Math_Real_Log2 = 317
-    Ieee_Math_Real_Sin = 318
-    Ieee_Math_Real_Cos = 319
-    Ieee_Std_Logic_Unsigned_Add_Slv_Slv = 320
-    Ieee_Std_Logic_Unsigned_Add_Slv_Int = 321
-    Ieee_Std_Logic_Unsigned_Add_Int_Slv = 322
-    Ieee_Std_Logic_Unsigned_Add_Slv_Sl = 323
-    Ieee_Std_Logic_Unsigned_Add_Sl_Slv = 324
-    Ieee_Std_Logic_Unsigned_Sub_Slv_Slv = 325
-    Ieee_Std_Logic_Unsigned_Sub_Slv_Int = 326
-    Ieee_Std_Logic_Unsigned_Sub_Int_Slv = 327
-    Ieee_Std_Logic_Unsigned_Sub_Slv_Sl = 328
-    Ieee_Std_Logic_Unsigned_Sub_Sl_Slv = 329
-    Ieee_Std_Logic_Unsigned_Lt_Slv_Slv = 330
-    Ieee_Std_Logic_Unsigned_Lt_Slv_Int = 331
-    Ieee_Std_Logic_Unsigned_Lt_Int_Slv = 332
-    Ieee_Std_Logic_Unsigned_Le_Slv_Slv = 333
-    Ieee_Std_Logic_Unsigned_Le_Slv_Int = 334
-    Ieee_Std_Logic_Unsigned_Le_Int_Slv = 335
-    Ieee_Std_Logic_Unsigned_Gt_Slv_Slv = 336
-    Ieee_Std_Logic_Unsigned_Gt_Slv_Int = 337
-    Ieee_Std_Logic_Unsigned_Gt_Int_Slv = 338
-    Ieee_Std_Logic_Unsigned_Ge_Slv_Slv = 339
-    Ieee_Std_Logic_Unsigned_Ge_Slv_Int = 340
-    Ieee_Std_Logic_Unsigned_Ge_Int_Slv = 341
-    Ieee_Std_Logic_Unsigned_Eq_Slv_Slv = 342
-    Ieee_Std_Logic_Unsigned_Eq_Slv_Int = 343
-    Ieee_Std_Logic_Unsigned_Eq_Int_Slv = 344
-    Ieee_Std_Logic_Unsigned_Ne_Slv_Slv = 345
-    Ieee_Std_Logic_Unsigned_Ne_Slv_Int = 346
-    Ieee_Std_Logic_Unsigned_Ne_Int_Slv = 347
-    Ieee_Std_Logic_Unsigned_Conv_Integer = 348
-    Ieee_Std_Logic_Signed_Add_Slv_Slv = 349
-    Ieee_Std_Logic_Signed_Add_Slv_Int = 350
-    Ieee_Std_Logic_Signed_Add_Int_Slv = 351
-    Ieee_Std_Logic_Signed_Add_Slv_Sl = 352
-    Ieee_Std_Logic_Signed_Add_Sl_Slv = 353
-    Ieee_Std_Logic_Signed_Sub_Slv_Slv = 354
-    Ieee_Std_Logic_Signed_Sub_Slv_Int = 355
-    Ieee_Std_Logic_Signed_Sub_Int_Slv = 356
-    Ieee_Std_Logic_Signed_Sub_Slv_Sl = 357
-    Ieee_Std_Logic_Signed_Sub_Sl_Slv = 358
-    Ieee_Std_Logic_Arith_Conv_Unsigned_Int = 359
-    Ieee_Std_Logic_Arith_Conv_Unsigned_Uns = 360
-    Ieee_Std_Logic_Arith_Conv_Unsigned_Sgn = 361
-    Ieee_Std_Logic_Arith_Conv_Unsigned_Log = 362
-    Ieee_Std_Logic_Arith_Conv_Integer_Int = 363
-    Ieee_Std_Logic_Arith_Conv_Integer_Uns = 364
-    Ieee_Std_Logic_Arith_Conv_Integer_Sgn = 365
-    Ieee_Std_Logic_Arith_Conv_Integer_Log = 366
+    Ieee_Numeric_Std_Match_Gt_Uns_Uns = 277
+    Ieee_Numeric_Std_Match_Gt_Uns_Nat = 278
+    Ieee_Numeric_Std_Match_Gt_Nat_Uns = 279
+    Ieee_Numeric_Std_Match_Gt_Sgn_Sgn = 280
+    Ieee_Numeric_Std_Match_Gt_Sgn_Int = 281
+    Ieee_Numeric_Std_Match_Gt_Int_Sgn = 282
+    Ieee_Numeric_Std_Match_Lt_Uns_Uns = 283
+    Ieee_Numeric_Std_Match_Lt_Uns_Nat = 284
+    Ieee_Numeric_Std_Match_Lt_Nat_Uns = 285
+    Ieee_Numeric_Std_Match_Lt_Sgn_Sgn = 286
+    Ieee_Numeric_Std_Match_Lt_Sgn_Int = 287
+    Ieee_Numeric_Std_Match_Lt_Int_Sgn = 288
+    Ieee_Numeric_Std_Match_Le_Uns_Uns = 289
+    Ieee_Numeric_Std_Match_Le_Uns_Nat = 290
+    Ieee_Numeric_Std_Match_Le_Nat_Uns = 291
+    Ieee_Numeric_Std_Match_Le_Sgn_Sgn = 292
+    Ieee_Numeric_Std_Match_Le_Sgn_Int = 293
+    Ieee_Numeric_Std_Match_Le_Int_Sgn = 294
+    Ieee_Numeric_Std_Match_Ge_Uns_Uns = 295
+    Ieee_Numeric_Std_Match_Ge_Uns_Nat = 296
+    Ieee_Numeric_Std_Match_Ge_Nat_Uns = 297
+    Ieee_Numeric_Std_Match_Ge_Sgn_Sgn = 298
+    Ieee_Numeric_Std_Match_Ge_Sgn_Int = 299
+    Ieee_Numeric_Std_Match_Ge_Int_Sgn = 300
+    Ieee_Numeric_Std_Match_Eq_Uns_Uns = 301
+    Ieee_Numeric_Std_Match_Eq_Uns_Nat = 302
+    Ieee_Numeric_Std_Match_Eq_Nat_Uns = 303
+    Ieee_Numeric_Std_Match_Eq_Sgn_Sgn = 304
+    Ieee_Numeric_Std_Match_Eq_Sgn_Int = 305
+    Ieee_Numeric_Std_Match_Eq_Int_Sgn = 306
+    Ieee_Numeric_Std_Match_Ne_Uns_Uns = 307
+    Ieee_Numeric_Std_Match_Ne_Uns_Nat = 308
+    Ieee_Numeric_Std_Match_Ne_Nat_Uns = 309
+    Ieee_Numeric_Std_Match_Ne_Sgn_Sgn = 310
+    Ieee_Numeric_Std_Match_Ne_Sgn_Int = 311
+    Ieee_Numeric_Std_Match_Ne_Int_Sgn = 312
+    Ieee_Numeric_Std_Shl_Uns_Nat = 313
+    Ieee_Numeric_Std_Shr_Uns_Nat = 314
+    Ieee_Numeric_Std_Shl_Sgn_Nat = 315
+    Ieee_Numeric_Std_Shr_Sgn_Nat = 316
+    Ieee_Numeric_Std_Sll_Uns_Int = 317
+    Ieee_Numeric_Std_Sll_Sgn_Int = 318
+    Ieee_Numeric_Std_Srl_Uns_Int = 319
+    Ieee_Numeric_Std_Srl_Sgn_Int = 320
+    Ieee_Numeric_Std_Sla_Uns_Int = 321
+    Ieee_Numeric_Std_Sla_Sgn_Int = 322
+    Ieee_Numeric_Std_Sra_Uns_Int = 323
+    Ieee_Numeric_Std_Sra_Sgn_Int = 324
+    Ieee_Numeric_Std_Rol_Uns_Nat = 325
+    Ieee_Numeric_Std_Ror_Uns_Nat = 326
+    Ieee_Numeric_Std_Rol_Sgn_Nat = 327
+    Ieee_Numeric_Std_Ror_Sgn_Nat = 328
+    Ieee_Numeric_Std_Not_Uns = 329
+    Ieee_Numeric_Std_Not_Sgn = 330
+    Ieee_Numeric_Std_Abs_Sgn = 331
+    Ieee_Numeric_Std_And_Uns_Uns = 332
+    Ieee_Numeric_Std_And_Sgn_Sgn = 333
+    Ieee_Numeric_Std_Or_Uns_Uns = 334
+    Ieee_Numeric_Std_Or_Sgn_Sgn = 335
+    Ieee_Numeric_Std_Nand_Uns_Uns = 336
+    Ieee_Numeric_Std_Nand_Sgn_Sgn = 337
+    Ieee_Numeric_Std_Nor_Uns_Uns = 338
+    Ieee_Numeric_Std_Nor_Sgn_Sgn = 339
+    Ieee_Numeric_Std_Xor_Uns_Uns = 340
+    Ieee_Numeric_Std_Xor_Sgn_Sgn = 341
+    Ieee_Numeric_Std_Xnor_Uns_Uns = 342
+    Ieee_Numeric_Std_Xnor_Sgn_Sgn = 343
+    Ieee_Numeric_Std_Neg_Uns = 344
+    Ieee_Numeric_Std_Neg_Sgn = 345
+    Ieee_Numeric_Std_Match_Log = 346
+    Ieee_Numeric_Std_Match_Uns = 347
+    Ieee_Numeric_Std_Match_Sgn = 348
+    Ieee_Numeric_Std_Match_Slv = 349
+    Ieee_Numeric_Std_Match_Suv = 350
+    Ieee_Math_Real_Ceil = 351
+    Ieee_Math_Real_Round = 352
+    Ieee_Math_Real_Log2 = 353
+    Ieee_Math_Real_Sin = 354
+    Ieee_Math_Real_Cos = 355
+    Ieee_Std_Logic_Unsigned_Add_Slv_Slv = 356
+    Ieee_Std_Logic_Unsigned_Add_Slv_Int = 357
+    Ieee_Std_Logic_Unsigned_Add_Int_Slv = 358
+    Ieee_Std_Logic_Unsigned_Add_Slv_Sl = 359
+    Ieee_Std_Logic_Unsigned_Add_Sl_Slv = 360
+    Ieee_Std_Logic_Unsigned_Sub_Slv_Slv = 361
+    Ieee_Std_Logic_Unsigned_Sub_Slv_Int = 362
+    Ieee_Std_Logic_Unsigned_Sub_Int_Slv = 363
+    Ieee_Std_Logic_Unsigned_Sub_Slv_Sl = 364
+    Ieee_Std_Logic_Unsigned_Sub_Sl_Slv = 365
+    Ieee_Std_Logic_Unsigned_Lt_Slv_Slv = 366
+    Ieee_Std_Logic_Unsigned_Lt_Slv_Int = 367
+    Ieee_Std_Logic_Unsigned_Lt_Int_Slv = 368
+    Ieee_Std_Logic_Unsigned_Le_Slv_Slv = 369
+    Ieee_Std_Logic_Unsigned_Le_Slv_Int = 370
+    Ieee_Std_Logic_Unsigned_Le_Int_Slv = 371
+    Ieee_Std_Logic_Unsigned_Gt_Slv_Slv = 372
+    Ieee_Std_Logic_Unsigned_Gt_Slv_Int = 373
+    Ieee_Std_Logic_Unsigned_Gt_Int_Slv = 374
+    Ieee_Std_Logic_Unsigned_Ge_Slv_Slv = 375
+    Ieee_Std_Logic_Unsigned_Ge_Slv_Int = 376
+    Ieee_Std_Logic_Unsigned_Ge_Int_Slv = 377
+    Ieee_Std_Logic_Unsigned_Eq_Slv_Slv = 378
+    Ieee_Std_Logic_Unsigned_Eq_Slv_Int = 379
+    Ieee_Std_Logic_Unsigned_Eq_Int_Slv = 380
+    Ieee_Std_Logic_Unsigned_Ne_Slv_Slv = 381
+    Ieee_Std_Logic_Unsigned_Ne_Slv_Int = 382
+    Ieee_Std_Logic_Unsigned_Ne_Int_Slv = 383
+    Ieee_Std_Logic_Unsigned_Conv_Integer = 384
+    Ieee_Std_Logic_Signed_Add_Slv_Slv = 385
+    Ieee_Std_Logic_Signed_Add_Slv_Int = 386
+    Ieee_Std_Logic_Signed_Add_Int_Slv = 387
+    Ieee_Std_Logic_Signed_Add_Slv_Sl = 388
+    Ieee_Std_Logic_Signed_Add_Sl_Slv = 389
+    Ieee_Std_Logic_Signed_Sub_Slv_Slv = 390
+    Ieee_Std_Logic_Signed_Sub_Slv_Int = 391
+    Ieee_Std_Logic_Signed_Sub_Int_Slv = 392
+    Ieee_Std_Logic_Signed_Sub_Slv_Sl = 393
+    Ieee_Std_Logic_Signed_Sub_Sl_Slv = 394
+    Ieee_Std_Logic_Arith_Conv_Unsigned_Int = 395
+    Ieee_Std_Logic_Arith_Conv_Unsigned_Uns = 396
+    Ieee_Std_Logic_Arith_Conv_Unsigned_Sgn = 397
+    Ieee_Std_Logic_Arith_Conv_Unsigned_Log = 398
+    Ieee_Std_Logic_Arith_Conv_Integer_Int = 399
+    Ieee_Std_Logic_Arith_Conv_Integer_Uns = 400
+    Ieee_Std_Logic_Arith_Conv_Integer_Sgn = 401
+    Ieee_Std_Logic_Arith_Conv_Integer_Log = 402
 
 Get_Kind = libghdl.vhdl__nodes__get_kind
 Get_Location = libghdl.vhdl__nodes__get_location