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.Meta _ as t -> if l = [] then t else C.Appl (t::l)
| C.Sort _ as t -> t (* l should be empty *)
- | C.Implicit as t -> t
+ | C.Implicit _ as t -> 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' ->
eat_first (r,tl)
in
whdaux (ts@l) (List.nth pl (j-1))
- | C.Cast _ | C.Implicit ->
+ | C.Cast _ | C.Implicit _ ->
raise (Impossible 2) (* we don't trust our whd ;-) *)
| _ -> if l = [] then t else C.Appl (t::l)
)
(* t1, t2 must be well-typed *)
let are_convertible =
let module U = UriManager in
- let rec aux context t1 t2 =
- let aux2 t1 t2 =
+ let rec aux test_equality_only context t1 t2 =
+ let aux2 test_equality_only t1 t2 =
(* 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
(try
List.fold_right2
(fun (uri1,x) (uri2,y) b ->
- U.eq uri1 uri2 && aux context x y && b
+ U.eq uri1 uri2 && aux test_equality_only context x y && b
) exp_named_subst1 exp_named_subst2 true
with
Invalid_argument _ -> false
match t1,t2 with
None,_
| _,None -> true
- | Some t1',Some t2' -> aux context t1' t2'
+ | Some t1',Some t2' -> aux test_equality_only context t1' t2'
) true l1 l2
- | (C.Sort s1, C.Sort s2) -> true (*CSC da finire con gli universi *)
+ (* TASSI: CONSTRAINTS *)
+ | (C.Sort (C.Type t1), C.Sort (C.Type t2)) when test_equality_only ->
+ CicUniv.add_eq t2 t1
+ (* TASSI: CONSTRAINTS *)
+ | (C.Sort (C.Type t1), C.Sort (C.Type t2)) ->
+ CicUniv.add_ge t2 t1
+ (* TASSI: CONSTRAINTS *)
+ | (C.Sort s1, C.Sort (C.Type _)) -> not test_equality_only
+ (* TASSI: CONSTRAINTS *)
+ | (C.Sort s1, C.Sort s2) -> s1 = s2
| (C.Prod (name1,s1,t1), C.Prod(_,s2,t2)) ->
- aux context s1 s2 && aux ((Some (name1, (C.Decl s1)))::context) t1 t2
+ aux true context s1 s2 &&
+ aux test_equality_only ((Some (name1, (C.Decl s1)))::context) t1 t2
| (C.Lambda (name1,s1,t1), C.Lambda(_,s2,t2)) ->
- aux context s1 s2 && aux ((Some (name1, (C.Decl s1)))::context) t1 t2
+ aux test_equality_only context s1 s2 &&
+ aux test_equality_only ((Some (name1, (C.Decl s1)))::context) t1 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
| (C.Appl l1, C.Appl l2) ->
(try
- List.fold_right2 (fun x y b -> aux context x y && b) l1 l2 true
+ List.fold_right2
+ (fun x y b -> aux test_equality_only context x y && b) l1 l2 true
with
Invalid_argument _ -> false
)
(try
List.fold_right2
(fun (uri1,x) (uri2,y) b ->
- U.eq uri1 uri2 && aux context x y && b
+ U.eq uri1 uri2 && aux test_equality_only context x y && b
) exp_named_subst1 exp_named_subst2 true
with
Invalid_argument _ -> false
(try
List.fold_right2
(fun (uri1,x) (uri2,y) b ->
- U.eq uri1 uri2 && aux context x y && b
+ U.eq uri1 uri2 && aux test_equality_only context x y && b
) exp_named_subst1 exp_named_subst2 true
with
Invalid_argument _ -> false
(try
List.fold_right2
(fun (uri1,x) (uri2,y) b ->
- U.eq uri1 uri2 && aux context x y && b
+ U.eq uri1 uri2 && aux test_equality_only context x y && b
) 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
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 =
i1 = i2 &&
List.fold_right2
(fun (_,ty1,bo1) (_,ty2,bo2) b ->
- b && aux context ty1 ty2 && aux (tys@context) bo1 bo2)
+ b && aux test_equality_only context ty1 ty2 &&
+ aux test_equality_only (tys@context) bo1 bo2)
fl1 fl2 true
| (C.Cast _, _) | (_, C.Cast _)
- | (C.Implicit, _) | (_, C.Implicit) ->
- raise (Impossible 3) (* we don't trust our whd ;-) *)
+ | (C.Implicit _, _) | (_, C.Implicit _) ->
+ assert false
| (_,_) -> false
end
in
- if aux2 t1 t2 then true
+ if aux2 test_equality_only t1 t2 then true
else
begin
debug t1 [t2] "PREWHD";
- let t1' = whd context t1
- and t2' = whd context t2 in
+ let t1' = whd context t1 in
+ let t2' = whd context t2 in
debug t1' [t2'] "POSTWHD";
- aux2 t1' t2'
+ aux2 test_equality_only t1' t2'
end
in
- aux
+ aux false
;;
projects / helm.git / blobdiff