summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
b47c73e)
arguments, since we dont know if reduction eventually moves them in
contravariant position
in
(try
HExtlib.list_forall_default3_var
in
(try
HExtlib.list_forall_default3_var
- (fun t1 t2 b -> not b || aux test_eq_only context t1 t2 )
+ (fun t1 t2 b -> not b || aux true context t1 t2 )
tl1 tl2 true relevance
with Invalid_argument _ -> false
| HExtlib.FailureAt fail ->
tl1 tl2 true relevance
with Invalid_argument _ -> false
| HExtlib.FailureAt fail ->
let _,tl2 = HExtlib.split_nth (fail+1) tl2 in
try
HExtlib.list_forall_default3
let _,tl2 = HExtlib.split_nth (fail+1) tl2 in
try
HExtlib.list_forall_default3
- (fun t1 t2 b -> not b || aux test_eq_only context t1 t2)
+ (fun t1 t2 b -> not b || aux true context t1 t2)
tl1 tl2 true relevance
with Invalid_argument _ -> false
else false)
tl1 tl2 true relevance
with Invalid_argument _ -> false
else false)
let relevance = !get_relevance ~metasenv ~subst context hd1 tl1 in
(try
HExtlib.list_forall_default3
let relevance = !get_relevance ~metasenv ~subst context hd1 tl1 in
(try
HExtlib.list_forall_default3
- (fun t1 t2 b -> not b || aux test_eq_only context t1 t2)
+ (fun t1 t2 b -> not b || aux true context t1 t2)
tl1 tl2 true relevance
with Invalid_argument _ -> false)
tl1 tl2 true relevance
with Invalid_argument _ -> false)
R.reduce ~delta ~subst context m1,
R.reduce ~delta ~subst context m2
in
R.reduce ~delta ~subst context m1,
R.reduce ~delta ~subst context m2
in
- let rec convert_machines
+ let rec convert_machines test_eq_only
((k1,e1,t1,s1),norm1 as m1),((k2,e2,t2,s2), norm2 as m2)
=
(alpha_eq test_eq_only
((k1,e1,t1,s1),norm1 as m1),((k2,e2,t2,s2), norm2 as m2)
=
(alpha_eq test_eq_only
not b ||
let t1 = RS.from_stack t1 in
let t2 = RS.from_stack t2 in
not b ||
let t1 = RS.from_stack t1 in
let t2 = RS.from_stack t2 in
- convert_machines (put_in_whd t1 t2)) s1 s2 true relevance
+ convert_machines true (put_in_whd t1 t2)) s1 s2 true relevance
with Invalid_argument _ -> false) ||
with Invalid_argument _ -> false) ||
- (not (norm1 && norm2) && convert_machines (small_delta_step m1 m2))
+ (not (norm1 && norm2) && convert_machines test_eq_only (small_delta_step m1 m2))
- convert_machines (put_in_whd (0,[],t1,[]) (0,[],t2,[]))
+ convert_machines test_eq_only (put_in_whd (0,[],t1,[]) (0,[],t2,[]))