More simplifications

Julien LepillerThu Apr 09 23:35:20+0200 2020

a5ece22

More simplifications

rdf/rdf.scm

477477 
       ('none (simplify-constraints e2 equivalences))
478478 
       (('equiv a b)
479479 
        (list 'and (list 'equiv a b) (simplify-constraints e2 (cons (cons a b) equivalences))))
480-
       (e1 (list 'and e1 (simplify-constraints e2 equivalences)))))
480+
       (e1
481+
         (match (simplify-constraints e2 equivalences)
482+
           ('bot 'bot)
483+
           ('none e1)
484+
           (('equiv a b)
485+
            (list 'and (list 'equiv a b) (simplify-constraints e1 (cons (cons a b) equivalences))))
486+
           (e2
487+
             (list 'and e1 e2))))))
481488 
    (('or e1 e2)
482489 
     (let ((e1 (simplify-constraints e1 equivalences))
483490 
           (e2 (simplify-constraints e2 equivalences)))