let rec debug_aux t i =
let module C = Cic in
let module U = UriManager in
- CicPp.ppobj (C.Variable ("DEBUG", None, t)) ^ "\n" ^ i
+ CicPp.ppobj (C.Variable ("DEBUG", None, t, [])) ^ "\n" ^ i
in
if !fdebug = 0 then
- begin
- print_endline (s ^ "\n" ^ List.fold_right debug_aux (t::env) "") ;
- flush stdout
- end
+ prerr_endline (s ^ "\n" ^ List.fold_right debug_aux (t::env) "")
;;
exception Impossible of int;;
-exception ReferenceToDefinition;;
-exception ReferenceToAxiom;;
+exception ReferenceToConstant;;
exception ReferenceToVariable;;
exception ReferenceToCurrentProof;;
exception ReferenceToInductiveDefinition;;
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 as t ->
- (match CicEnvironment.get_cooked_obj uri 0 with
- C.Definition _ -> raise ReferenceToDefinition
- | C.Axiom _ -> raise ReferenceToAxiom
+ | C.Var (uri,exp_named_subst) as t ->
+ (match CicEnvironment.get_cooked_obj ~trust:false uri with
+ C.Constant _ -> raise ReferenceToConstant
| C.CurrentProof _ -> raise ReferenceToCurrentProof
| C.InductiveDefinition _ -> raise ReferenceToInductiveDefinition
- | C.Variable (_,None,_) -> if l = [] then t else C.Appl (t::l)
- | C.Variable (_,Some body,_) -> whdaux l body
+ | C.Variable (_,None,_,_) -> if l = [] then t else C.Appl (t::l)
+ | C.Variable (_,Some body,_,_) ->
+ whdaux l (CicSubstitution.subst_vars exp_named_subst body)
)
| 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' ->
| C.LetIn (n,s,t) -> whdaux l (S.subst (whdaux [] s) t)
| C.Appl (he::tl) -> whdaux (tl@l) he
| C.Appl [] -> raise (Impossible 1)
- | C.Const (uri,cookingsno) as t ->
- (match CicEnvironment.get_cooked_obj uri cookingsno with
- C.Definition (_,body,_,_) -> whdaux l body
- | C.Axiom _ -> if l = [] then t else C.Appl (t::l)
+ | C.Const (uri,exp_named_subst) as t ->
+ (match CicEnvironment.get_cooked_obj ~trust:false uri with
+ C.Constant (_,Some body,_,_) ->
+ whdaux l (CicSubstitution.subst_vars exp_named_subst body)
+ | C.Constant _ -> if l = [] then t else C.Appl (t::l)
| C.Variable _ -> raise ReferenceToVariable
- | C.CurrentProof (_,_,body,_) -> whdaux l body
+ | C.CurrentProof (_,_,body,_,_) ->
+ whdaux l (CicSubstitution.subst_vars exp_named_subst body)
| C.InductiveDefinition _ -> raise ReferenceToInductiveDefinition
)
- | C.MutInd (uri,_,_) as t -> if l = [] then t else C.Appl (t::l)
- | C.MutConstruct (uri,_,_,_) as t -> if l = [] then t else C.Appl (t::l)
- | C.MutCase (mutind,cookingsno,i,_,term,pl) as t->
+ | C.MutInd _ as t -> if l = [] then t else C.Appl (t::l)
+ | C.MutConstruct _ as t -> if l = [] then t else C.Appl (t::l)
+ | C.MutCase (mutind,i,_,term,pl) as t->
let decofix =
function
C.CoFix (i,fl) as t ->
| t -> t
in
(match decofix (whdaux [] term) with
- C.MutConstruct (_,_,_,j) -> whdaux l (List.nth pl (j-1))
- | C.Appl (C.MutConstruct (_,_,_,j) :: tl) ->
- let (arity, r, num_ingredients) =
+ C.MutConstruct (_,_,j,_) -> whdaux l (List.nth pl (j-1))
+ | C.Appl (C.MutConstruct (_,_,j,_) :: tl) ->
+ let (arity, r) =
match CicEnvironment.get_obj mutind with
C.InductiveDefinition (tl,ingredients,r) ->
- let (_,_,arity,_) = List.nth tl i
- and num_ingredients =
- List.fold_right
- (fun (k,l) i ->
- if k < cookingsno then i + List.length l else i
- ) ingredients 0
- in
- (arity,r,num_ingredients)
+ let (_,_,arity,_) = List.nth tl i in
+ (arity,r)
| _ -> raise WrongUriToInductiveDefinition
in
let ts =
- let num_to_eat = r + num_ingredients in
- let rec eat_first =
- function
- (0,l) -> l
- | (n,he::tl) when n > 0 -> eat_first (n - 1, tl)
- | _ -> raise (Impossible 5)
- in
- eat_first (num_to_eat,tl)
+ let rec eat_first =
+ function
+ (0,l) -> l
+ | (n,he::tl) when n > 0 -> eat_first (n - 1, tl)
+ | _ -> raise (Impossible 5)
+ in
+ eat_first (r,tl)
in
whdaux (ts@l) (List.nth pl (j-1))
- | C.Cast _ | C.Implicit ->
- raise (Impossible 2) (* we don't trust our whd ;-) *)
- | _ -> if l = [] then t else C.Appl (t::l)
+ | C.Cast _ | C.Implicit _ ->
+ raise (Impossible 2) (* we don't trust our whd ;-) *)
+ | _ -> if l = [] then t else C.Appl (t::l)
)
| C.Fix (i,fl) as t ->
let (_,recindex,_,body) = List.nth fl i in
(* 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
let module C = Cic in
match (t1,t2) with
(C.Rel n1, C.Rel n2) -> n1 = n2
- | (C.Var uri1, C.Var uri2) -> U.eq uri1 uri2
+ | (C.Var (uri1,exp_named_subst1), C.Var (uri2,exp_named_subst2)) ->
+ U.eq uri1 uri2 &&
+ (try
+ List.fold_right2
+ (fun (uri1,x) (uri2,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.Meta (n1,l1), C.Meta (n2,l2)) ->
n1 = n2 &&
List.fold_left2
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
)
- | (C.Const (uri1,_), C.Const (uri2,_)) ->
- (*CSC: questo commento e' chiaro o delirante? Io lo sto scrivendo *)
- (*CSC: mentre sono delirante, quindi ... *)
- (* WARNING: it is really important that the two cookingsno are not*)
- (* checked for equality. This allows not to cook an object with no*)
- (* ingredients only to update the cookingsno. E.g: if a term t has*)
- (* a reference to a term t1 which does not depend on any variable *)
- (* and t1 depends on a term t2 (that can't depend on any variable *)
- (* because of t1), then t1 cooked at every level could be the same*)
- (* as t1 cooked at level 0. Doing so, t2 will be extended in t *)
- (* with cookingsno 0 and not 2. But this will not cause any *)
- (* trouble if here we don't check that the two cookingsno are *)
- (* equal. *)
- U.eq uri1 uri2
- | (C.MutInd (uri1,k1,i1), C.MutInd (uri2,k2,i2)) ->
- (* WARNIG: see the previous warning *)
- U.eq uri1 uri2 && i1 = i2
- | (C.MutConstruct (uri1,_,i1,j1), C.MutConstruct (uri2,_,i2,j2)) ->
- (* WARNIG: see the previous warning *)
- U.eq uri1 uri2 && i1 = i2 && j1 = j2
- | (C.MutCase (uri1,_,i1,outtype1,term1,pl1),
- C.MutCase (uri2,_,i2,outtype2,term2,pl2)) ->
- (* WARNIG: see the previous warning *)
- (* aux context outtype1 outtype2 should be true if *)
- (* aux context pl1 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
+ | (C.Const (uri1,exp_named_subst1), C.Const (uri2,exp_named_subst2)) ->
+ U.eq uri1 uri2 &&
+ (try
+ List.fold_right2
+ (fun (uri1,x) (uri2,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.MutInd (uri1,i1,exp_named_subst1),
+ C.MutInd (uri2,i2,exp_named_subst2)
+ ) ->
+ U.eq uri1 uri2 && i1 = i2 &&
+ (try
+ List.fold_right2
+ (fun (uri1,x) (uri2,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.MutConstruct (uri1,i1,j1,exp_named_subst1),
+ C.MutConstruct (uri2,i2,j2,exp_named_subst2)
+ ) ->
+ U.eq uri1 uri2 && i1 = i2 && j1 = j2 &&
+ (try
+ List.fold_right2
+ (fun (uri1,x) (uri2,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 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