X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicReduction.ml;h=47c8ea74d3fa51068f9d32acfc85764b83f6d3a7;hb=24787f3d652537ec233f78bfa41a9230e7fa2f85;hp=18e9f92cbc1ffbb229d89823b52f5b5351b80647;hpb=5ae174c1243ae83ceeda6f2641d12565842d250f;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicReduction.ml b/helm/software/components/ng_kernel/nCicReduction.ml index 18e9f92cb..47c8ea74d 100644 --- a/helm/software/components/ng_kernel/nCicReduction.ml +++ b/helm/software/components/ng_kernel/nCicReduction.ml @@ -495,7 +495,7 @@ let are_convertible whd ?(subst=[]) = true else match (t1,t2) with - | (C.Sort (C.Type a), C.Sort (C.Type b)) -> a <= b + | (C.Sort (C.Type a), C.Sort (C.Type b)) when not test_eq_only -> a <= b | (C.Sort s1,C.Sort (C.Type _)) -> (not test_eq_only) | (C.Sort s1, C.Sort s2) -> s1 = s2 @@ -512,7 +512,7 @@ let are_convertible whd ?(subst=[]) = | (C.Meta (n1,(s1, C.Irl i1)), C.Meta (n2,(s2, C.Irl i2))) when n1 = n2 && s1 = s2 -> true - | (C.Meta (n1,(s1, l1)), C.Meta (n2,(s2, l2))) when n1 = n2 -> + | (C.Meta (n1,(s1, l1)), C.Meta (n2,(s2, l2))) when n1 = n2 && let l1 = NCicUtils.expand_local_context l1 in let l2 = NCicUtils.expand_local_context l2 in (try List.for_all2 @@ -520,7 +520,7 @@ let are_convertible whd ?(subst=[]) = (NCicSubstitution.lift s1 t1) (NCicSubstitution.lift s2 t2)) l1 l2 - with Invalid_argument _ -> assert false) + with Invalid_argument _ -> assert false) -> true | C.Meta (n1,l1), _ -> (try