test_equality_only was not used in sort comparison.

It should be implemented only in unification.

diff --git a/helm/ocaml/cic_proof_checking/cicReductionMachine.ml b/helm/ocaml/cic_proof_checking/cicReductionMachine.ml
index 751f96be04576435d472f6f99973fa7bff3ccf52..4ef3ce9401fba300d6c1c366b663808682eec209 100644 (file)
--- a/helm/ocaml/cic_proof_checking/cicReductionMachine.ml
+++ b/helm/ocaml/cic_proof_checking/cicReductionMachine.ml
@@ -802,7 +802,9 @@ let are_convertible =
                   | _,None  -> true
                   | Some t1',Some t2' -> aux test_equality_only context t1' t2'
               ) true l1 l2
-        | (C.Sort s1, C.Sort s2) when s1 = s2 || s2 = C.Type -> true
+        | (C.Sort s1, C.Sort s2) when
+             s1 = s2 || (not test_equality_only) && s2 = C.Type
+           -> true
         | (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
            aux true context s1 s2 &&
             aux test_equality_only ((Some (name1, (C.Decl s1)))::context) t1 t2

diff --git a/helm/ocaml/cic_proof_checking/cicReductionNaif.ml b/helm/ocaml/cic_proof_checking/cicReductionNaif.ml
index ea7fb42298adcc2543dd42e1b786ac05510fe08e..033614eeae21fff6f42227e5020b7452221b61b5 100644 (file)
--- a/helm/ocaml/cic_proof_checking/cicReductionNaif.ml
+++ b/helm/ocaml/cic_proof_checking/cicReductionNaif.ml
@@ -215,7 +215,9 @@ let are_convertible =
                   | _,None  -> true
                   | Some t1',Some t2' -> aux test_equality_only context t1' t2'
               ) true l1 l2
-        | (C.Sort s1, C.Sort s2) when s1 = s2 || s2 = C.Type -> true
+        | (C.Sort s1, C.Sort s2) when
+             s1 = s2 || (not test_equality_only) && s2 = C.Type
+           -> true
         | (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
            aux true context s1 s2 &&
             aux test_equality_only ((Some (name1, (C.Decl s1)))::context) t1 t2