C.Rel n as t ->
(match List.nth context (n-1) with
Some (_, C.Decl _) -> if l = [] then t else C.Appl (t::l)
C.Rel n as t ->
(match List.nth context (n-1) with
Some (_, C.Decl _) -> if l = [] then t else C.Appl (t::l)
- | Some (_, C.Def bo) -> whdaux l (S.lift n bo)
- | None -> raise RelToHiddenHypothesis
+ | Some (_, C.Def (bo,_)) -> whdaux l (S.lift n bo)
+ | None -> raise RelToHiddenHypothesis
)
| C.Var (uri,exp_named_subst) as t ->
(match CicEnvironment.get_cooked_obj ~trust:false uri with
)
| C.Var (uri,exp_named_subst) as t ->
(match CicEnvironment.get_cooked_obj ~trust:false uri with
| C.Cast (te,ty) -> whdaux l te (*CSC E' GIUSTO BUTTARE IL CAST? *)
| C.Prod _ as t -> t (* l should be empty *)
| C.Lambda (name,s,t) as t' ->
| C.Cast (te,ty) -> whdaux l te (*CSC E' GIUSTO BUTTARE IL CAST? *)
| C.Prod _ as t -> t (* l should be empty *)
| C.Lambda (name,s,t) as t' ->
(* t1, t2 must be well-typed *)
let are_convertible =
let module U = UriManager in
(* t1, t2 must be well-typed *)
let are_convertible =
let module U = UriManager in
(* this trivial euristic cuts down the total time of about five times ;-) *)
(* this because most of the time t1 and t2 are "sintactically" the same *)
if t1 = t2 then
(* this trivial euristic cuts down the total time of about five times ;-) *)
(* this because most of the time t1 and t2 are "sintactically" the same *)
if t1 = t2 then
| (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
| (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
| (C.Lambda (name1,s1,t1), C.Lambda(_,s2,t2)) ->
| (C.Lambda (name1,s1,t1), C.Lambda(_,s2,t2)) ->
| (C.LetIn (name1,s1,t1), C.LetIn(_,s2,t2)) ->
| (C.LetIn (name1,s1,t1), C.LetIn(_,s2,t2)) ->
- aux context s1 s2 && aux ((Some (name1, (C.Def s1)))::context) t1 t2
+ aux test_equality_only context s1 s2 &&
+ aux test_equality_only
+ ((Some (name1, (C.Def (s1,None))))::context) t1 t2
) exp_named_subst1 exp_named_subst2 true
with
Invalid_argument _ -> false
)
| (C.MutCase (uri1,i1,outtype1,term1,pl1),
C.MutCase (uri2,i2,outtype2,term2,pl2)) ->
) exp_named_subst1 exp_named_subst2 true
with
Invalid_argument _ -> false
)
| (C.MutCase (uri1,i1,outtype1,term1,pl1),
C.MutCase (uri2,i2,outtype2,term2,pl2)) ->
- U.eq uri1 uri2 && i1 = i2 && aux context outtype1 outtype2 &&
- aux context term1 term2 &&
- List.fold_right2 (fun x y b -> b && aux context x y) pl1 pl2 true
+ U.eq uri1 uri2 && i1 = i2 &&
+ aux test_equality_only context outtype1 outtype2 &&
+ aux test_equality_only context term1 term2 &&
+ List.fold_right2
+ (fun x y b -> b && aux test_equality_only context x y)
+ pl1 pl2 true
| (C.Fix (i1,fl1), C.Fix (i2,fl2)) ->
let tys =
List.map (function (n,_,ty,_) -> Some (C.Name n,(C.Decl ty))) fl1
| (C.Fix (i1,fl1), C.Fix (i2,fl2)) ->
let tys =
List.map (function (n,_,ty,_) -> Some (C.Name n,(C.Decl ty))) fl1
i1 = i2 &&
List.fold_right2
(fun (_,recindex1,ty1,bo1) (_,recindex2,ty2,bo2) b ->
i1 = i2 &&
List.fold_right2
(fun (_,recindex1,ty1,bo1) (_,recindex2,ty2,bo2) b ->
- b && recindex1 = recindex2 && aux context ty1 ty2 &&
- aux (tys@context) bo1 bo2)
+ b && recindex1 = recindex2 &&
+ aux test_equality_only context ty1 ty2 &&
+ aux test_equality_only (tys@context) bo1 bo2)
fl1 fl2 true
| (C.CoFix (i1,fl1), C.CoFix (i2,fl2)) ->
let tys =
fl1 fl2 true
| (C.CoFix (i1,fl1), C.CoFix (i2,fl2)) ->
let tys =
i1 = i2 &&
List.fold_right2
(fun (_,ty1,bo1) (_,ty2,bo2) b ->
i1 = i2 &&
List.fold_right2
(fun (_,ty1,bo1) (_,ty2,bo2) b ->
- | (C.Implicit, _) | (_, C.Implicit) ->
- raise (Impossible 3) (* we don't trust our whd ;-) *)
+ | (C.Implicit _, _) | (_, C.Implicit _) ->
+ assert false