let (===) x y = Pervasives.compare x y = 0 ;;
(* t1, t2 must be well-typed *)
-let are_convertible ?(subst=[]) =
+let are_convertible ?(subst=[]) get_relevance =
let rec aux test_eq_only context t1 t2 =
let rec alpha_eq test_eq_only t1 t2 =
if t1 === t2 then
aux test_eq_only context t1 term
with NCicUtils.Subst_not_found _ -> false)
- | (C.Appl (C.Const r1::tl1), C.Appl (C.Const r2::tl2)) ->
- r1 = r2 &&
- let relevance = NCicEnvironment.get_relevance r1 in
- let relevance =
- match r1 with
- | Ref.Ref (_,Ref.Con (_,_,lno)) ->
- let _,relevance = HExtlib.split_nth lno relevance in
- HExtlib.mk_list false lno @ relevance
- | _ -> relevance
- in
+ | (C.Appl (hd1::tl1), C.Appl (hd2::tl2)) ->
+ aux test_eq_only context hd1 hd2 &&
+ let relevance = get_relevance ~subst context hd1 in
(try
HExtlib.list_forall_default3
(fun t1 t2 b -> not b || aux test_eq_only context t1 t2)
tl1 tl2 true relevance
with Invalid_argument _ -> false)
- | (C.Appl l1, C.Appl l2) ->
- (try List.for_all2 (aux test_eq_only context) l1 l2
- with Invalid_argument _ -> false)
-
| (C.Match (ref1,outtype1,term1,pl1),
C.Match (ref2,outtype2,term2,pl2)) ->
Ref.eq ref1 ref2 &&