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
| (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
(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
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
+ (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)
let rec convert_machines ((k1,e1,t1,s1 as m1),(k2,e2,t2,s2 as m2),delta) =
(alpha_eq test_eq_only
(R.unwind (k1,e1,t1,[])) (R.unwind (k2,e2,t2,[])) &&
+ let relevance =
+ match t1 with
+ C.Const r -> NCicEnvironment.get_relevance r
+ | _ -> [] in
try
- List.for_all
- (fun (t1,t2) ->
- let t1 = RS.from_stack t1 and t2 = RS.from_stack t2 in
- convert_machines (small_delta_step t1 t2))
- (List.combine s1 s2)
+ HExtlib.list_forall_default3
+ (fun t1 t2 b ->
+ not b ||
+ let t1 = RS.from_stack t1 in
+ let t2 = RS.from_stack t2 in
+ convert_machines (small_delta_step t1 t2)) s1 s2 true relevance
with Invalid_argument _ -> false) ||
(delta > 0 &&
let delta = delta - 1 in