vhdl: recognize 1164 condition operator, handle in synth.

2 files changed, 118 insertions, 109 deletions

diff --git a/python/libghdl/thin/vhdl/nodes.py b/python/libghdl/thin/vhdl/nodes.py
index 380974b7b..cfe654030 100644
--- a/python/libghdl/thin/vhdl/nodes.py
+++ b/python/libghdl/thin/vhdl/nodes.py
@@ -1058,105 +1058,108 @@ class Iir_Predefined:
     Ieee_1164_Vector_Xor = 183
     Ieee_1164_Vector_Xnor = 184
     Ieee_1164_Vector_Not = 185
-    Ieee_Numeric_Std_Toint_Uns_Nat = 186
-    Ieee_Numeric_Std_Toint_Sgn_Int = 187
-    Ieee_Numeric_Std_Touns_Nat_Nat_Uns = 188
-    Ieee_Numeric_Std_Touns_Nat_Uns_Uns = 189
-    Ieee_Numeric_Std_Tosgn_Int_Nat_Sgn = 190
-    Ieee_Numeric_Std_Tosgn_Int_Sgn_Sgn = 191
-    Ieee_Numeric_Std_Resize_Uns_Nat = 192
-    Ieee_Numeric_Std_Resize_Sgn_Nat = 193
-    Ieee_Numeric_Std_Resize_Uns_Uns = 194
-    Ieee_Numeric_Std_Resize_Sgn_Sgn = 195
-    Ieee_Numeric_Std_Add_Uns_Uns = 196
-    Ieee_Numeric_Std_Add_Uns_Nat = 197
-    Ieee_Numeric_Std_Add_Nat_Uns = 198
-    Ieee_Numeric_Std_Add_Sgn_Sgn = 199
-    Ieee_Numeric_Std_Add_Sgn_Int = 200
-    Ieee_Numeric_Std_Add_Int_Sgn = 201
-    Ieee_Numeric_Std_Sub_Uns_Uns = 202
-    Ieee_Numeric_Std_Sub_Uns_Nat = 203
-    Ieee_Numeric_Std_Sub_Nat_Uns = 204
-    Ieee_Numeric_Std_Sub_Sgn_Sgn = 205
-    Ieee_Numeric_Std_Sub_Sgn_Int = 206
-    Ieee_Numeric_Std_Sub_Int_Sgn = 207
-    Ieee_Numeric_Std_Gt_Uns_Uns = 208
-    Ieee_Numeric_Std_Gt_Uns_Nat = 209
-    Ieee_Numeric_Std_Gt_Nat_Uns = 210
-    Ieee_Numeric_Std_Gt_Sgn_Sgn = 211
-    Ieee_Numeric_Std_Gt_Sgn_Int = 212
-    Ieee_Numeric_Std_Gt_Int_Sgn = 213
-    Ieee_Numeric_Std_Lt_Uns_Uns = 214
-    Ieee_Numeric_Std_Lt_Uns_Nat = 215
-    Ieee_Numeric_Std_Lt_Nat_Uns = 216
-    Ieee_Numeric_Std_Lt_Sgn_Sgn = 217
-    Ieee_Numeric_Std_Lt_Sgn_Int = 218
-    Ieee_Numeric_Std_Lt_Int_Sgn = 219
-    Ieee_Numeric_Std_Le_Uns_Uns = 220
-    Ieee_Numeric_Std_Le_Uns_Nat = 221
-    Ieee_Numeric_Std_Le_Nat_Uns = 222
-    Ieee_Numeric_Std_Le_Sgn_Sgn = 223
-    Ieee_Numeric_Std_Le_Sgn_Int = 224
-    Ieee_Numeric_Std_Le_Int_Sgn = 225
-    Ieee_Numeric_Std_Ge_Uns_Uns = 226
-    Ieee_Numeric_Std_Ge_Uns_Nat = 227
-    Ieee_Numeric_Std_Ge_Nat_Uns = 228
-    Ieee_Numeric_Std_Ge_Sgn_Sgn = 229
-    Ieee_Numeric_Std_Ge_Sgn_Int = 230
-    Ieee_Numeric_Std_Ge_Int_Sgn = 231
-    Ieee_Numeric_Std_Eq_Uns_Uns = 232
-    Ieee_Numeric_Std_Eq_Uns_Nat = 233
-    Ieee_Numeric_Std_Eq_Nat_Uns = 234
-    Ieee_Numeric_Std_Eq_Sgn_Sgn = 235
-    Ieee_Numeric_Std_Eq_Sgn_Int = 236
-    Ieee_Numeric_Std_Eq_Int_Sgn = 237
-    Ieee_Numeric_Std_Ne_Uns_Uns = 238
-    Ieee_Numeric_Std_Ne_Uns_Nat = 239
-    Ieee_Numeric_Std_Ne_Nat_Uns = 240
-    Ieee_Numeric_Std_Ne_Sgn_Sgn = 241
-    Ieee_Numeric_Std_Ne_Sgn_Int = 242
-    Ieee_Numeric_Std_Ne_Int_Sgn = 243
-    Ieee_Numeric_Std_Not_Uns = 244
-    Ieee_Numeric_Std_Not_Sgn = 245
-    Ieee_Numeric_Std_And_Uns_Uns = 246
-    Ieee_Numeric_Std_And_Sgn_Sgn = 247
-    Ieee_Numeric_Std_Or_Uns_Uns = 248
-    Ieee_Numeric_Std_Or_Sgn_Sgn = 249
-    Ieee_Numeric_Std_Nand_Uns_Uns = 250
-    Ieee_Numeric_Std_Nand_Sgn_Sgn = 251
-    Ieee_Numeric_Std_Nor_Uns_Uns = 252
-    Ieee_Numeric_Std_Nor_Sgn_Sgn = 253
-    Ieee_Numeric_Std_Xor_Uns_Uns = 254
-    Ieee_Numeric_Std_Xor_Sgn_Sgn = 255
-    Ieee_Numeric_Std_Xnor_Uns_Uns = 256
-    Ieee_Numeric_Std_Xnor_Sgn_Sgn = 257
-    Ieee_Numeric_Std_Neg_Uns = 258
-    Ieee_Numeric_Std_Neg_Sgn = 259
-    Ieee_Math_Real_Ceil = 260
-    Ieee_Math_Real_Log2 = 261
-    Ieee_Std_Logic_Unsigned_Add_Slv_Slv = 262
-    Ieee_Std_Logic_Unsigned_Add_Slv_Int = 263
-    Ieee_Std_Logic_Unsigned_Add_Int_Slv = 264
-    Ieee_Std_Logic_Unsigned_Add_Slv_Sl = 265
-    Ieee_Std_Logic_Unsigned_Add_Sl_Slv = 266
-    Ieee_Std_Logic_Unsigned_Lt_Slv_Slv = 267
-    Ieee_Std_Logic_Unsigned_Lt_Slv_Int = 268
-    Ieee_Std_Logic_Unsigned_Lt_Int_Slv = 269
-    Ieee_Std_Logic_Unsigned_Le_Slv_Slv = 270
-    Ieee_Std_Logic_Unsigned_Le_Slv_Int = 271
-    Ieee_Std_Logic_Unsigned_Le_Int_Slv = 272
-    Ieee_Std_Logic_Unsigned_Gt_Slv_Slv = 273
-    Ieee_Std_Logic_Unsigned_Gt_Slv_Int = 274
-    Ieee_Std_Logic_Unsigned_Gt_Int_Slv = 275
-    Ieee_Std_Logic_Unsigned_Ge_Slv_Slv = 276
-    Ieee_Std_Logic_Unsigned_Ge_Slv_Int = 277
-    Ieee_Std_Logic_Unsigned_Ge_Int_Slv = 278
-    Ieee_Std_Logic_Unsigned_Eq_Slv_Slv = 279
-    Ieee_Std_Logic_Unsigned_Eq_Slv_Int = 280
-    Ieee_Std_Logic_Unsigned_Eq_Int_Slv = 281
-    Ieee_Std_Logic_Unsigned_Ne_Slv_Slv = 282
-    Ieee_Std_Logic_Unsigned_Ne_Slv_Int = 283
-    Ieee_Std_Logic_Unsigned_Ne_Int_Slv = 284
+    Ieee_1164_Vector_And_Reduce = 186
+    Ieee_1164_Vector_Or_Reduce = 187
+    Ieee_1164_Condition_Operator = 188
+    Ieee_Numeric_Std_Toint_Uns_Nat = 189
+    Ieee_Numeric_Std_Toint_Sgn_Int = 190
+    Ieee_Numeric_Std_Touns_Nat_Nat_Uns = 191
+    Ieee_Numeric_Std_Touns_Nat_Uns_Uns = 192
+    Ieee_Numeric_Std_Tosgn_Int_Nat_Sgn = 193
+    Ieee_Numeric_Std_Tosgn_Int_Sgn_Sgn = 194
+    Ieee_Numeric_Std_Resize_Uns_Nat = 195
+    Ieee_Numeric_Std_Resize_Sgn_Nat = 196
+    Ieee_Numeric_Std_Resize_Uns_Uns = 197
+    Ieee_Numeric_Std_Resize_Sgn_Sgn = 198
+    Ieee_Numeric_Std_Add_Uns_Uns = 199
+    Ieee_Numeric_Std_Add_Uns_Nat = 200
+    Ieee_Numeric_Std_Add_Nat_Uns = 201
+    Ieee_Numeric_Std_Add_Sgn_Sgn = 202
+    Ieee_Numeric_Std_Add_Sgn_Int = 203
+    Ieee_Numeric_Std_Add_Int_Sgn = 204
+    Ieee_Numeric_Std_Sub_Uns_Uns = 205
+    Ieee_Numeric_Std_Sub_Uns_Nat = 206
+    Ieee_Numeric_Std_Sub_Nat_Uns = 207
+    Ieee_Numeric_Std_Sub_Sgn_Sgn = 208
+    Ieee_Numeric_Std_Sub_Sgn_Int = 209
+    Ieee_Numeric_Std_Sub_Int_Sgn = 210
+    Ieee_Numeric_Std_Gt_Uns_Uns = 211
+    Ieee_Numeric_Std_Gt_Uns_Nat = 212
+    Ieee_Numeric_Std_Gt_Nat_Uns = 213
+    Ieee_Numeric_Std_Gt_Sgn_Sgn = 214
+    Ieee_Numeric_Std_Gt_Sgn_Int = 215
+    Ieee_Numeric_Std_Gt_Int_Sgn = 216
+    Ieee_Numeric_Std_Lt_Uns_Uns = 217
+    Ieee_Numeric_Std_Lt_Uns_Nat = 218
+    Ieee_Numeric_Std_Lt_Nat_Uns = 219
+    Ieee_Numeric_Std_Lt_Sgn_Sgn = 220
+    Ieee_Numeric_Std_Lt_Sgn_Int = 221
+    Ieee_Numeric_Std_Lt_Int_Sgn = 222
+    Ieee_Numeric_Std_Le_Uns_Uns = 223
+    Ieee_Numeric_Std_Le_Uns_Nat = 224
+    Ieee_Numeric_Std_Le_Nat_Uns = 225
+    Ieee_Numeric_Std_Le_Sgn_Sgn = 226
+    Ieee_Numeric_Std_Le_Sgn_Int = 227
+    Ieee_Numeric_Std_Le_Int_Sgn = 228
+    Ieee_Numeric_Std_Ge_Uns_Uns = 229
+    Ieee_Numeric_Std_Ge_Uns_Nat = 230
+    Ieee_Numeric_Std_Ge_Nat_Uns = 231
+    Ieee_Numeric_Std_Ge_Sgn_Sgn = 232
+    Ieee_Numeric_Std_Ge_Sgn_Int = 233
+    Ieee_Numeric_Std_Ge_Int_Sgn = 234
+    Ieee_Numeric_Std_Eq_Uns_Uns = 235
+    Ieee_Numeric_Std_Eq_Uns_Nat = 236
+    Ieee_Numeric_Std_Eq_Nat_Uns = 237
+    Ieee_Numeric_Std_Eq_Sgn_Sgn = 238
+    Ieee_Numeric_Std_Eq_Sgn_Int = 239
+    Ieee_Numeric_Std_Eq_Int_Sgn = 240
+    Ieee_Numeric_Std_Ne_Uns_Uns = 241
+    Ieee_Numeric_Std_Ne_Uns_Nat = 242
+    Ieee_Numeric_Std_Ne_Nat_Uns = 243
+    Ieee_Numeric_Std_Ne_Sgn_Sgn = 244
+    Ieee_Numeric_Std_Ne_Sgn_Int = 245
+    Ieee_Numeric_Std_Ne_Int_Sgn = 246
+    Ieee_Numeric_Std_Not_Uns = 247
+    Ieee_Numeric_Std_Not_Sgn = 248
+    Ieee_Numeric_Std_And_Uns_Uns = 249
+    Ieee_Numeric_Std_And_Sgn_Sgn = 250
+    Ieee_Numeric_Std_Or_Uns_Uns = 251
+    Ieee_Numeric_Std_Or_Sgn_Sgn = 252
+    Ieee_Numeric_Std_Nand_Uns_Uns = 253
+    Ieee_Numeric_Std_Nand_Sgn_Sgn = 254
+    Ieee_Numeric_Std_Nor_Uns_Uns = 255
+    Ieee_Numeric_Std_Nor_Sgn_Sgn = 256
+    Ieee_Numeric_Std_Xor_Uns_Uns = 257
+    Ieee_Numeric_Std_Xor_Sgn_Sgn = 258
+    Ieee_Numeric_Std_Xnor_Uns_Uns = 259
+    Ieee_Numeric_Std_Xnor_Sgn_Sgn = 260
+    Ieee_Numeric_Std_Neg_Uns = 261
+    Ieee_Numeric_Std_Neg_Sgn = 262
+    Ieee_Math_Real_Ceil = 263
+    Ieee_Math_Real_Log2 = 264
+    Ieee_Std_Logic_Unsigned_Add_Slv_Slv = 265
+    Ieee_Std_Logic_Unsigned_Add_Slv_Int = 266
+    Ieee_Std_Logic_Unsigned_Add_Int_Slv = 267
+    Ieee_Std_Logic_Unsigned_Add_Slv_Sl = 268
+    Ieee_Std_Logic_Unsigned_Add_Sl_Slv = 269
+    Ieee_Std_Logic_Unsigned_Lt_Slv_Slv = 270
+    Ieee_Std_Logic_Unsigned_Lt_Slv_Int = 271
+    Ieee_Std_Logic_Unsigned_Lt_Int_Slv = 272
+    Ieee_Std_Logic_Unsigned_Le_Slv_Slv = 273
+    Ieee_Std_Logic_Unsigned_Le_Slv_Int = 274
+    Ieee_Std_Logic_Unsigned_Le_Int_Slv = 275
+    Ieee_Std_Logic_Unsigned_Gt_Slv_Slv = 276
+    Ieee_Std_Logic_Unsigned_Gt_Slv_Int = 277
+    Ieee_Std_Logic_Unsigned_Gt_Int_Slv = 278
+    Ieee_Std_Logic_Unsigned_Ge_Slv_Slv = 279
+    Ieee_Std_Logic_Unsigned_Ge_Slv_Int = 280
+    Ieee_Std_Logic_Unsigned_Ge_Int_Slv = 281
+    Ieee_Std_Logic_Unsigned_Eq_Slv_Slv = 282
+    Ieee_Std_Logic_Unsigned_Eq_Slv_Int = 283
+    Ieee_Std_Logic_Unsigned_Eq_Int_Slv = 284
+    Ieee_Std_Logic_Unsigned_Ne_Slv_Slv = 285
+    Ieee_Std_Logic_Unsigned_Ne_Slv_Int = 286
+    Ieee_Std_Logic_Unsigned_Ne_Int_Slv = 287
 
 Get_Kind = libghdl.vhdl__nodes__get_kind
 Get_Location = libghdl.vhdl__nodes__get_location
diff --git a/python/libghdl/thin/vhdl/tokens.py b/python/libghdl/thin/vhdl/tokens.py
index 67bf038e7..db2741d34 100644
--- a/python/libghdl/thin/vhdl/tokens.py
+++ b/python/libghdl/thin/vhdl/tokens.py
@@ -196,14 +196,20 @@ class Tok:
     Before_Em = 192
     Before_Un = 193
     Before_Em_Un = 194
-    Until_Em = 195
-    Until_Un = 196
-    Until_Em_Un = 197
-    Always = 198
-    Never = 199
-    Eventually = 200
-    Next_A = 201
-    Next_E = 202
+    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_A = 204
-    Next_Event_E = 205
+    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