X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicTypeChecker.ml;h=1db82a99fb48eeddcf63adb96c4a31575e2ca5e6;hb=358cefe50cccd4cb7d8e2a9cecb7efcb5780b8a3;hp=be7c4b0d0aeaca45b0dc26704bf92a3dde6032c5;hpb=38633ee024797543bba347addb8f287fd3e5331f;p=helm.git diff --git a/helm/ocaml/cic_proof_checking/cicTypeChecker.ml b/helm/ocaml/cic_proof_checking/cicTypeChecker.ml index be7c4b0d0..1db82a99f 100644 --- a/helm/ocaml/cic_proof_checking/cicTypeChecker.ml +++ b/helm/ocaml/cic_proof_checking/cicTypeChecker.ml @@ -36,13 +36,13 @@ let debug t context = 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 raise (TypeCheckerFailure (List.fold_right debug_aux (t::context) "")) ;; -let debug_print = prerr_endline ;; +let debug_print = fun _ -> () ;; let rec split l n = match (l,n) with @@ -64,7 +64,9 @@ let debrujin_constructor uri number_of_types = List.map (function (uri,t) -> (uri,aux k t)) exp_named_subst in C.Var (uri,exp_named_subst') - | C.Meta _ -> assert false + | C.Meta (i,l) -> + let l' = List.map (function None -> None | Some t -> Some (aux k t)) l in + C.Meta (i,l) | C.Sort _ | C.Implicit _ as t -> t | C.Cast (te,ty) -> C.Cast (aux k te, aux k ty) @@ -118,86 +120,117 @@ let debrujin_constructor uri number_of_types = exception CicEnvironmentError;; -let rec type_of_constant ~logger uri = +let rec type_of_constant ~logger uri ugraph = let module C = Cic in let module R = CicReduction in let module U = UriManager in - let cobj = - match CicEnvironment.is_type_checked ~trust:true uri with - CicEnvironment.CheckedObj cobj -> cobj + let cobj,ugraph = + match CicEnvironment.is_type_checked ~trust:true ugraph uri with + CicEnvironment.CheckedObj (cobj,ugraph') -> cobj,ugraph' | CicEnvironment.UncheckedObj uobj -> logger#log (`Start_type_checking uri) ; - CicUniv.directly_to_env_begin (); (* let's typecheck the uncooked obj *) - (match uobj with - C.Constant (_,Some te,ty,_) -> - let _ = type_of ~logger ty in - let type_of_te = type_of ~logger te in - if not (R.are_convertible [] type_of_te ty) then + +(**************************************************************** + TASSI: FIXME qui e' inutile ricordarselo, + tanto poi lo richiediamo alla cache che da quello su disco +*****************************************************************) + + let ugraph_dust = + (match uobj with + C.Constant (_,Some te,ty,_,_) -> + let _,ugraph = type_of ~logger ty ugraph in + let type_of_te,ugraph' = type_of ~logger te ugraph in + let b',ugraph'' = (R.are_convertible [] type_of_te ty ugraph') in + if not b' then raise (TypeCheckerFailure (sprintf "the constant %s is not well typed because the type %s of the body is not convertible to the declared type %s" (U.string_of_uri uri) (CicPp.ppterm type_of_te) (CicPp.ppterm ty))) - | C.Constant (_,None,ty,_) -> + else + ugraph' + | C.Constant (_,None,ty,_,_) -> (* only to check that ty is well-typed *) - let _ = type_of ty in () - | C.CurrentProof (_,conjs,te,ty,_) -> - let _ = + let _,ugraph' = type_of ~logger ty ugraph in + ugraph' + | C.CurrentProof (_,conjs,te,ty,_,_) -> + let _,ugraph1 = List.fold_left - (fun metasenv ((_,context,ty) as conj) -> - ignore (type_of_aux' ~logger metasenv context ty) ; - metasenv @ [conj] - ) [] conjs + (fun (metasenv,ugraph) ((_,context,ty) as conj) -> + let _,ugraph' = + type_of_aux' ~logger metasenv context ty ugraph + in + (metasenv @ [conj],ugraph') + ) ([],ugraph) conjs in - let _ = type_of_aux' ~logger conjs [] ty in - let type_of_te = type_of_aux' ~logger conjs [] te in - if not (R.are_convertible [] type_of_te ty) then + let _,ugraph2 = type_of_aux' ~logger conjs [] ty ugraph1 in + let type_of_te,ugraph3 = + type_of_aux' ~logger conjs [] te ugraph2 + in + let b,ugraph4 = (R.are_convertible [] type_of_te ty ugraph3) in + if not b then raise (TypeCheckerFailure (sprintf "the current proof %s is not well typed because the type %s of the body is not convertible to the declared type %s" (U.string_of_uri uri) (CicPp.ppterm type_of_te) (CicPp.ppterm ty))) + else + ugraph4 | _ -> - raise (TypeCheckerFailure - ("Unknown constant:" ^ U.string_of_uri uri)) - ); - CicEnvironment.set_type_checking_info uri ; - CicUniv.directly_to_env_end (); - logger#log (`Type_checking_completed uri) ; - match CicEnvironment.is_type_checked ~trust:false uri with - CicEnvironment.CheckedObj cobj -> cobj - | CicEnvironment.UncheckedObj _ -> raise CicEnvironmentError + raise (TypeCheckerFailure + ("Unknown constant:" ^ U.string_of_uri uri))) + in + try + CicEnvironment.set_type_checking_info uri; + logger#log (`Type_checking_completed uri) ; + match CicEnvironment.is_type_checked ~trust:false ugraph uri with + CicEnvironment.CheckedObj (cobj,ugraph') -> cobj,ugraph' + | CicEnvironment.UncheckedObj _ -> raise CicEnvironmentError + with Invalid_argument s -> + (*debug_print s;*) + uobj,ugraph_dust in - match cobj with - C.Constant (_,_,ty,_) -> ty - | C.CurrentProof (_,_,_,ty,_) -> ty + match cobj,ugraph with + (C.Constant (_,_,ty,_,_)),g -> ty,g + | (C.CurrentProof (_,_,_,ty,_,_)),g -> ty,g | _ -> raise (TypeCheckerFailure ("Unknown constant:" ^ U.string_of_uri uri)) -and type_of_variable ~logger uri = +and type_of_variable ~logger uri ugraph = let module C = Cic in let module R = CicReduction in let module U = UriManager in (* 0 because a variable is never cooked => no partial cooking at one level *) - match CicEnvironment.is_type_checked ~trust:true uri with - CicEnvironment.CheckedObj (C.Variable (_,_,ty,_)) -> ty - | CicEnvironment.UncheckedObj (C.Variable (_,bo,ty,_)) -> + match CicEnvironment.is_type_checked ~trust:true ugraph uri with + CicEnvironment.CheckedObj ((C.Variable (_,_,ty,_,_)),ugraph') -> ty,ugraph' + | CicEnvironment.UncheckedObj (C.Variable (_,bo,ty,_,_)) -> logger#log (`Start_type_checking uri) ; - CicUniv.directly_to_env_begin (); (* only to check that ty is well-typed *) - let _ = type_of ty in + let _,ugraph1 = type_of ~logger ty ugraph in + let ugraph2 = (match bo with - None -> () + None -> ugraph | Some bo -> - if not (R.are_convertible [] (type_of ~logger bo) ty) then + let ty_bo,ugraph' = type_of ~logger bo ugraph1 in + let b,ugraph'' = (R.are_convertible [] ty_bo ty ugraph') in + if not b then raise (TypeCheckerFailure ("Unknown variable:" ^ U.string_of_uri uri)) - ) ; - CicEnvironment.set_type_checking_info uri ; - CicUniv.directly_to_env_end (); - logger#log (`Type_checking_completed uri) ; - ty + else + ugraph'') + in + (try + CicEnvironment.set_type_checking_info uri ; + logger#log (`Type_checking_completed uri) ; + match CicEnvironment.is_type_checked ~trust:false ugraph uri with + CicEnvironment.CheckedObj ((C.Variable (_,_,ty,_,_)),ugraph') -> + ty,ugraph' + | CicEnvironment.CheckedObj _ + | CicEnvironment.UncheckedObj _ -> raise CicEnvironmentError + with Invalid_argument s -> + (*debug_print s;*) + ty,ugraph2) | _ -> - raise (TypeCheckerFailure ("Unknown variable:" ^ U.string_of_uri uri)) + raise (TypeCheckerFailure ("Unknown variable:" ^ U.string_of_uri uri)) and does_not_occur context n nn te = let module C = Cic in @@ -373,8 +406,9 @@ and strictly_positive context n nn te = List.fold_right (fun x i -> i && does_not_occur context n nn x) tl true | C.Appl ((C.MutInd (uri,i,exp_named_subst))::tl) -> let (ok,paramsno,ity,cl,name) = - match CicEnvironment.get_obj uri with - C.InductiveDefinition (tl,_,paramsno) -> + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (tl,_,paramsno,_) -> let (name,_,ity,cl) = List.nth tl i in (List.length tl = 1, paramsno, ity, cl, name) | _ -> @@ -462,11 +496,14 @@ and are_all_occurrences_positive context uri indparamsno i n nn te = (* Main function to checks the correctness of a mutual *) (* inductive block definition. This is the function *) (* exported to the proof-engine. *) -and typecheck_mutual_inductive_defs ~logger uri (itl,_,indparamsno) = +and typecheck_mutual_inductive_defs ~logger uri (itl,_,indparamsno) ugraph = let module U = UriManager in (* let's check if the arity of the inductive types are well *) (* formed *) - List.iter (fun (_,_,x,_) -> let _ = type_of ~logger x in ()) itl ; + let ugrap1 = List.fold_left + (fun ugraph (_,_,x,_) -> let _,ugraph' = + type_of ~logger x ugraph in ugraph') + ugraph itl in (* let's check if the types of the inductive constructors *) (* are well formed. *) @@ -474,99 +511,117 @@ and typecheck_mutual_inductive_defs ~logger uri (itl,_,indparamsno) = (* mutual inductive types at the head of the types of the *) (* constructors using Prods *) let len = List.length itl in - let tys = + let tys = List.map (fun (n,_,ty,_) -> Some (Cic.Name n,(Cic.Decl ty))) itl in - let _ = + let _,ugraph2 = List.fold_right - (fun (_,_,_,cl) i -> - List.iter - (fun (name,te) -> - let debrujinedte = debrujin_constructor uri len te in - let augmented_term = - List.fold_right - (fun (name,_,ty,_) i -> Cic.Prod (Cic.Name name, ty, i)) - itl debrujinedte - in - let _ = type_of augmented_term in - (* let's check also the positivity conditions *) - if - not - (are_all_occurrences_positive tys uri indparamsno i 0 len - debrujinedte) - then - raise - (TypeCheckerFailure ("Non positive occurence in " ^ - U.string_of_uri uri)) - ) cl ; - (i + 1) - ) itl 1 - in - () + (fun (_,_,_,cl) (i,ugraph) -> + let ugraph'' = + List.fold_left + (fun ugraph (name,te) -> + let debrujinedte = debrujin_constructor uri len te in + let augmented_term = + List.fold_right + (fun (name,_,ty,_) i -> Cic.Prod (Cic.Name name, ty, i)) + itl debrujinedte + in + let _,ugraph' = type_of ~logger augmented_term ugraph in + (* let's check also the positivity conditions *) + if + not + (are_all_occurrences_positive tys uri indparamsno i 0 len + debrujinedte) + then + raise + (TypeCheckerFailure ("Non positive occurence in " ^ + U.string_of_uri uri)) + else + ugraph' + ) ugraph cl in + (i + 1),ugraph'' + ) itl (1,ugraph) + in + ugraph2 (* Main function to checks the correctness of a mutual *) (* inductive block definition. *) -and check_mutual_inductive_defs uri = - function - Cic.InductiveDefinition (itl, params, indparamsno) -> - typecheck_mutual_inductive_defs uri (itl,params,indparamsno) - | _ -> - raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ - UriManager.string_of_uri uri)) +and check_mutual_inductive_defs uri obj ugraph = + match obj with + Cic.InductiveDefinition (itl, params, indparamsno, _) -> + typecheck_mutual_inductive_defs uri (itl,params,indparamsno) ugraph + | _ -> + raise (TypeCheckerFailure ( + "Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) -and type_of_mutual_inductive_defs ~logger uri i = +and type_of_mutual_inductive_defs ~logger uri i ugraph = let module C = Cic in let module R = CicReduction in let module U = UriManager in - let cobj = - match CicEnvironment.is_type_checked ~trust:true uri with - CicEnvironment.CheckedObj cobj -> cobj - | CicEnvironment.UncheckedObj uobj -> - logger#log (`Start_type_checking uri) ; - CicUniv.directly_to_env_begin (); - check_mutual_inductive_defs ~logger uri uobj ; - CicEnvironment.set_type_checking_info uri ; - CicUniv.directly_to_env_end (); - logger#log (`Type_checking_completed uri) ; - (match CicEnvironment.is_type_checked ~trust:false uri with - CicEnvironment.CheckedObj cobj -> cobj - | CicEnvironment.UncheckedObj _ -> raise CicEnvironmentError - ) + let cobj,ugraph1 = + match CicEnvironment.is_type_checked ~trust:true ugraph uri with + CicEnvironment.CheckedObj (cobj,ugraph') -> cobj,ugraph' + | CicEnvironment.UncheckedObj uobj -> + logger#log (`Start_type_checking uri) ; + let ugraph1_dust = + check_mutual_inductive_defs ~logger uri uobj ugraph + in + (* TASSI: FIXME: check ugraph1 == ugraph ritornato da env *) + try + CicEnvironment.set_type_checking_info uri ; + logger#log (`Type_checking_completed uri) ; + (match CicEnvironment.is_type_checked ~trust:false ugraph uri with + CicEnvironment.CheckedObj (cobj,ugraph') -> (cobj,ugraph') + | CicEnvironment.UncheckedObj _ -> raise CicEnvironmentError + ) + with + Invalid_argument s -> + (*debug_print s;*) + uobj,ugraph1_dust in - match cobj with - C.InductiveDefinition (dl,_,_) -> - let (_,_,arity,_) = List.nth dl i in - arity - | _ -> - raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ - U.string_of_uri uri)) - -and type_of_mutual_inductive_constr ~logger uri i j = + match cobj with + C.InductiveDefinition (dl,_,_,_) -> + let (_,_,arity,_) = List.nth dl i in + arity,ugraph1 + | _ -> + raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ + U.string_of_uri uri)) + +and type_of_mutual_inductive_constr ~logger uri i j ugraph = let module C = Cic in let module R = CicReduction in let module U = UriManager in - let cobj = - match CicEnvironment.is_type_checked ~trust:true uri with - CicEnvironment.CheckedObj cobj -> cobj - | CicEnvironment.UncheckedObj uobj -> - logger#log (`Start_type_checking uri) ; - (*CicUniv.directly_to_env_begin ();*) - check_mutual_inductive_defs ~logger uri uobj ; - CicEnvironment.set_type_checking_info uri ; - (*CicUniv.directly_to_env_end ();*) - logger#log (`Type_checking_completed uri) ; - (match CicEnvironment.is_type_checked ~trust:false uri with - CicEnvironment.CheckedObj cobj -> cobj - | CicEnvironment.UncheckedObj _ -> raise CicEnvironmentError - ) + let cobj,ugraph1 = + match CicEnvironment.is_type_checked ~trust:true ugraph uri with + CicEnvironment.CheckedObj (cobj,ugraph') -> cobj,ugraph' + | CicEnvironment.UncheckedObj uobj -> + logger#log (`Start_type_checking uri) ; + let ugraph1_dust = + check_mutual_inductive_defs ~logger uri uobj ugraph + in + (* check ugraph1 validity ??? == ugraph' *) + try + CicEnvironment.set_type_checking_info uri ; + logger#log (`Type_checking_completed uri) ; + (match + CicEnvironment.is_type_checked ~trust:false ugraph uri + with + CicEnvironment.CheckedObj (cobj,ugraph') -> cobj,ugraph' + | CicEnvironment.UncheckedObj _ -> + raise CicEnvironmentError) + with + Invalid_argument s -> + (*debug_print s;*) + uobj,ugraph1_dust in - match cobj with - C.InductiveDefinition (dl,_,_) -> - let (_,_,_,cl) = List.nth dl i in - let (_,ty) = List.nth cl (j-1) in - ty - | _ -> - raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ - UriManager.string_of_uri uri)) + match cobj with + C.InductiveDefinition (dl,_,_,_) -> + let (_,_,_,cl) = List.nth dl i in + let (_,ty) = List.nth cl (j-1) in + ty,ugraph1 + | _ -> + raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) and recursive_args context n nn te = let module C = Cic in @@ -687,8 +742,9 @@ and check_is_really_smaller_arg ?(subst = []) context n nn kl x safes te = (match term with C.Rel m when List.mem m safes || m = x -> let (tys,len,isinductive,paramsno,cl) = - match CicEnvironment.get_obj uri with - C.InductiveDefinition (tl,_,paramsno) -> + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (tl,_,paramsno,_) -> let tys = List.map (fun (n,_,ty,_) -> Some (Cic.Name n,(Cic.Decl ty))) tl @@ -725,8 +781,9 @@ and check_is_really_smaller_arg ?(subst = []) context n nn kl x safes te = ) (List.combine pl cl) true | C.Appl ((C.Rel m)::tl) when List.mem m safes || m = x -> let (tys,len,isinductive,paramsno,cl) = - match CicEnvironment.get_obj uri with - C.InductiveDefinition (tl,_,paramsno) -> + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (tl,_,paramsno,_) -> let (_,isinductive,_,cl) = List.nth tl i in let tys = List.map (fun (n,_,ty,_) -> @@ -848,11 +905,12 @@ and guarded_by_destructors ?(subst = []) context n nn kl x safes = (fun (_,t) i -> i && guarded_by_destructors context n nn kl x safes t) exp_named_subst true | C.MutCase (uri,i,outtype,term,pl) -> - (match term with + (match CicReduction.whd context term with C.Rel m when List.mem m safes || m = x -> let (tys,len,isinductive,paramsno,cl) = - match CicEnvironment.get_obj uri with - C.InductiveDefinition (tl,_,paramsno) -> + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (tl,_,paramsno,_) -> let len = List.length tl in let (_,isinductive,_,cl) = List.nth tl i in let tys = @@ -895,8 +953,9 @@ and guarded_by_destructors ?(subst = []) context n nn kl x safes = ) (List.combine pl cl) true | C.Appl ((C.Rel m)::tl) when List.mem m safes || m = x -> let (tys,len,isinductive,paramsno,cl) = - match CicEnvironment.get_obj uri with - C.InductiveDefinition (tl,_,paramsno) -> + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (tl,_,paramsno,_) -> let (_,isinductive,_,cl) = List.nth tl i in let tys = List.map @@ -1005,13 +1064,13 @@ and guarded_by_constructors context n nn h te args coInductiveTypeURI = List.fold_right (fun x i -> i && does_not_occur context n nn x) tl true | C.Appl ((C.MutConstruct (uri,i,j,exp_named_subst))::tl) -> let consty = - let obj = - try - CicEnvironment.get_cooked_obj ~trust:false uri - with Not_found -> assert false - in + let obj,_ = + try + CicEnvironment.get_cooked_obj ~trust:false CicUniv.empty_ugraph uri + with Not_found -> assert false + in match obj with - C.InductiveDefinition (itl,_,_) -> + C.InductiveDefinition (itl,_,_,_) -> let (_,_,_,cl) = List.nth itl i in let (_,cons) = List.nth cl (j - 1) in CicSubstitution.subst_vars exp_named_subst cons @@ -1176,103 +1235,125 @@ and guarded_by_constructors context n nn h te args coInductiveTypeURI = args coInductiveTypeURI ) fl true -and check_allowed_sort_elimination ~logger context uri i need_dummy ind arity1 arity2 = +and check_allowed_sort_elimination ~logger context uri i need_dummy ind + arity1 arity2 ugraph = let module C = Cic in let module U = UriManager in match (CicReduction.whd context arity1, CicReduction.whd context arity2) with - (C.Prod (_,so1,de1), C.Prod (_,so2,de2)) - when CicReduction.are_convertible context so1 so2 -> - check_allowed_sort_elimination ~logger context uri i need_dummy - (C.Appl [CicSubstitution.lift 1 ind ; C.Rel 1]) de1 de2 - | (C.Sort C.Prop, C.Sort C.Prop) when need_dummy -> true + (C.Prod (_,so1,de1), C.Prod (_,so2,de2)) -> + let b,ugraph1 = CicReduction.are_convertible context so1 so2 ugraph in + if b then + check_allowed_sort_elimination ~logger context uri i need_dummy + (C.Appl [CicSubstitution.lift 1 ind ; C.Rel 1]) de1 de2 ugraph1 + else + false,ugraph1 + | (C.Sort C.Prop, C.Sort C.Prop) when need_dummy -> true,ugraph | (C.Sort C.Prop, C.Sort C.Set) | (C.Sort C.Prop, C.Sort C.CProp) | (C.Sort C.Prop, C.Sort (C.Type _) ) when need_dummy -> (* TASSI: da verificare *) (*CSC: WRONG. MISSING CONDITIONS ON THE ARGUMENTS OF THE CONSTRUTOR *) - (match CicEnvironment.get_obj uri with - C.InductiveDefinition (itl,_,_) -> - let (_,_,_,cl) = List.nth itl i in - (* is a singleton definition or the empty proposition? *) - List.length cl = 1 || List.length cl = 0 + (let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (itl,_,_,_) -> + let (_,_,_,cl) = List.nth itl i in + (* is a singleton definition or the empty proposition? *) + (List.length cl = 1 || List.length cl = 0) , ugraph | _ -> - raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ - UriManager.string_of_uri uri)) + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) ) - | (C.Sort C.Set, C.Sort C.Prop) when need_dummy -> true - | (C.Sort C.CProp, C.Sort C.Prop) when need_dummy -> true - | (C.Sort C.Set, C.Sort C.Set) when need_dummy -> true - | (C.Sort C.Set, C.Sort C.CProp) when need_dummy -> true - | (C.Sort C.CProp, C.Sort C.Set) when need_dummy -> true - | (C.Sort C.CProp, C.Sort C.CProp) when need_dummy -> true + | (C.Sort C.Set, C.Sort C.Prop) when need_dummy -> true , ugraph + | (C.Sort C.CProp, C.Sort C.Prop) when need_dummy -> true , ugraph + | (C.Sort C.Set, C.Sort C.Set) when need_dummy -> true , ugraph + | (C.Sort C.Set, C.Sort C.CProp) when need_dummy -> true , ugraph + | (C.Sort C.CProp, C.Sort C.Set) when need_dummy -> true , ugraph + | (C.Sort C.CProp, C.Sort C.CProp) when need_dummy -> true , ugraph | ((C.Sort C.Set, C.Sort (C.Type _)) | (C.Sort C.CProp, C.Sort (C.Type _))) (* TASSI: da verificare *) when need_dummy -> - (match CicEnvironment.get_obj uri with - C.InductiveDefinition (itl,_,paramsno) -> + (let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (itl,_,paramsno,_) -> let tys = List.map (fun (n,_,ty,_) -> Some (Cic.Name n,(Cic.Decl ty))) itl in let (_,_,_,cl) = List.nth itl i in - List.fold_right - (fun (_,x) i -> i && is_small ~logger tys paramsno x) cl true - | _ -> + (List.fold_right + (fun (_,x) (i,ugraph) -> + if i then + is_small ~logger tys paramsno x ugraph + else + false,ugraph + ) cl (true,ugraph)) + | _ -> raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ UriManager.string_of_uri uri)) ) - | (C.Sort (C.Type _), C.Sort _) when need_dummy -> true + | (C.Sort (C.Type _), C.Sort _) when need_dummy -> true , ugraph (* TASSI: da verificare *) | (C.Sort C.Prop, C.Prod (name,so,ta)) when not need_dummy -> - let res = CicReduction.are_convertible context so ind - in - res && - (match CicReduction.whd ((Some (name,(C.Decl so)))::context) ta with - C.Sort C.Prop -> true - | (C.Sort C.Set | C.Sort C.CProp) -> - (match CicEnvironment.get_obj uri with - C.InductiveDefinition (itl,_,_) -> - let (_,_,_,cl) = List.nth itl i in + let b,ugraph1 = CicReduction.are_convertible context so ind ugraph in + if not b then + false,ugraph1 + else + (match CicReduction.whd ((Some (name,(C.Decl so)))::context) ta with + C.Sort C.Prop -> true,ugraph1 + | (C.Sort C.Set | C.Sort C.CProp) -> + (let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (itl,_,_,_) -> + let (_,_,_,cl) = List.nth itl i in (* is a singleton definition? *) - List.length cl = 1 - | _ -> - raise (TypeCheckerFailure - ("Unknown mutual inductive definition:" ^ - UriManager.string_of_uri uri)) + List.length cl = 1,ugraph1 + | _ -> + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) ) - | _ -> false - ) - | ((C.Sort C.Set, C.Prod (name,so,ta)) | (C.Sort C.CProp, C.Prod (name,so,ta))) - when not need_dummy -> - let res = CicReduction.are_convertible context so ind - in - res && - (match CicReduction.whd ((Some (name,(C.Decl so)))::context) ta with - C.Sort C.Prop - | C.Sort C.Set -> true - | C.Sort C.CProp -> true - | C.Sort (C.Type _) -> - (* TASSI: da verificare *) - (match CicEnvironment.get_obj uri with - C.InductiveDefinition (itl,_,paramsno) -> - let (_,_,_,cl) = List.nth itl i in - let tys = - List.map + | _ -> false,ugraph1 + ) + | ((C.Sort C.Set, C.Prod (name,so,ta)) + | (C.Sort C.CProp, C.Prod (name,so,ta))) + when not need_dummy -> + let b,ugraph1 = CicReduction.are_convertible context so ind ugraph in + if not b then + false,ugraph1 + else + (match CicReduction.whd ((Some (name,(C.Decl so)))::context) ta with + C.Sort C.Prop + | C.Sort C.Set -> true,ugraph1 + | C.Sort C.CProp -> true,ugraph1 + | C.Sort (C.Type _) -> + (* TASSI: da verificare *) + (let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (itl,_,paramsno,_) -> + let (_,_,_,cl) = List.nth itl i in + let tys = + List.map (fun (n,_,ty,_) -> Some (Cic.Name n,(Cic.Decl ty))) itl - in - List.fold_right - (fun (_,x) i -> i && is_small ~logger tys paramsno x) cl true - | _ -> - raise (TypeCheckerFailure - ("Unknown mutual inductive definition:" ^ - UriManager.string_of_uri uri)) + in + (List.fold_right + (fun (_,x) (i,ugraph) -> + if i then + is_small ~logger tys paramsno x ugraph + else + false,ugraph + ) cl (true,ugraph1)) + | _ -> + raise (TypeCheckerFailure + ("Unknown mutual inductive definition:" ^ + UriManager.string_of_uri uri)) ) - | _ -> raise (AssertFailure "19") - ) + | _ -> raise (AssertFailure "19") + ) | (C.Sort (C.Type _), C.Prod (_,so,_)) when not need_dummy -> - (* TASSI: da verificare *) - CicReduction.are_convertible context so ind - | (_,_) -> false - + (* TASSI: da verificare *) + CicReduction.are_convertible context so ind ugraph + | (_,_) -> false,ugraph + and type_of_branch context argsno need_dummy outtype term constype = let module C = Cic in let module R = CicReduction in @@ -1304,128 +1385,157 @@ and type_of_branch context argsno need_dummy outtype term constype = metavariable is consitent - up to relocation via the relocation list l - with the actual context *) -and check_metasenv_consistency ~logger ?(subst=[]) metasenv context - canonical_context l + +and check_metasenv_consistency ~logger ?(subst=[]) metasenv context + canonical_context l ugraph = let module C = Cic in let module R = CicReduction in let module S = CicSubstitution in - let lifted_canonical_context = + let lifted_canonical_context = let rec aux i = function - [] -> [] - | (Some (n,C.Decl t))::tl -> - (Some (n,C.Decl (S.lift_meta l (S.lift i t))))::(aux (i+1) tl) - | (Some (n,C.Def (t,None)))::tl -> - (Some (n,C.Def ((S.lift_meta l (S.lift i t)),None)))::(aux (i+1) tl) - | None::tl -> None::(aux (i+1) tl) - | (Some (n,C.Def (t,Some ty)))::tl -> - (Some (n,C.Def ((S.lift_meta l (S.lift i t)),Some (S.lift_meta l (S.lift i ty)))))::(aux (i+1) tl) + [] -> [] + | (Some (n,C.Decl t))::tl -> + (Some (n,C.Decl (S.subst_meta l (S.lift i t))))::(aux (i+1) tl) + | (Some (n,C.Def (t,None)))::tl -> + (Some (n,C.Def ((S.subst_meta l (S.lift i t)),None)))::(aux (i+1) tl) + | None::tl -> None::(aux (i+1) tl) + | (Some (n,C.Def (t,Some ty)))::tl -> + (Some (n,C.Def ((S.subst_meta l (S.lift i t)),Some (S.subst_meta l (S.lift i ty)))))::(aux (i+1) tl) in - aux 1 canonical_context + aux 1 canonical_context in - List.iter2 - (fun t ct -> - match (t,ct) with - | _,None -> () - | Some t,Some (_,C.Def (ct,_)) -> - if not (R.are_convertible ~subst ~metasenv context t ct) then - raise (TypeCheckerFailure (sprintf - "Not well typed metavariable local context: expected a term convertible with %s, found %s" - (CicPp.ppterm ct) (CicPp.ppterm t))) - | Some t,Some (_,C.Decl ct) -> - let type_t = type_of_aux' ~logger ~subst metasenv context t in - if not (R.are_convertible ~subst ~metasenv context type_t ct) then - (* debug *) - raise (TypeCheckerFailure (sprintf - "Not well typed metavariable local context: expected a term of type %s, found %s of type %s" - (CicPp.ppterm ct) (CicPp.ppterm t) (CicPp.ppterm type_t))) - | None, _ -> - raise (TypeCheckerFailure - "Not well typed metavariable local context: an hypothesis, that is not hidden, is not instantiated") - ) l lifted_canonical_context + List.fold_left2 + (fun ugraph t ct -> + match (t,ct) with + | _,None -> ugraph + | Some t,Some (_,C.Def (ct,_)) -> + let b,ugraph1 = + R.are_convertible ~subst ~metasenv context t ct ugraph + in + if not b then + raise + (TypeCheckerFailure + (sprintf "Not well typed metavariable local context: expected a term convertible with %s, found %s" (CicPp.ppterm ct) (CicPp.ppterm t))) + else + ugraph1 + | Some t,Some (_,C.Decl ct) -> + let type_t,ugraph1 = + type_of_aux' ~logger ~subst metasenv context t ugraph + in + let b,ugraph2 = + R.are_convertible ~subst ~metasenv context type_t ct ugraph1 + in + if not b then + raise (TypeCheckerFailure + (sprintf "Not well typed metavariable local context: expected a term of type %s, found %s of type %s" + (CicPp.ppterm ct) (CicPp.ppterm t) + (CicPp.ppterm type_t))) + else + ugraph2 + | None, _ -> + raise (TypeCheckerFailure + ("Not well typed metavariable local context: "^ + "an hypothesis, that is not hidden, is not instantiated")) + ) ugraph l lifted_canonical_context + -(* type_of_aux' is just another name (with a different scope) for type_of_aux *) -and type_of_aux' ~logger ?(subst = []) metasenv context t = - let rec type_of_aux ~logger context = +(* + type_of_aux' is just another name (with a different scope) + for type_of_aux +*) + +and type_of_aux' ~logger ?(subst = []) metasenv context t ugraph = + let rec type_of_aux ~logger context t ugraph = let module C = Cic in let module R = CicReduction in let module S = CicSubstitution in let module U = UriManager in - function + match t with C.Rel n -> (try match List.nth context (n - 1) with - Some (_,C.Decl t) -> S.lift n t - | Some (_,C.Def (_,Some ty)) -> S.lift n ty + Some (_,C.Decl t) -> S.lift n t,ugraph + | Some (_,C.Def (_,Some ty)) -> S.lift n ty,ugraph | Some (_,C.Def (bo,None)) -> debug_print "##### CASO DA INVESTIGARE E CAPIRE" ; - type_of_aux ~logger context (S.lift n bo) - | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") + type_of_aux ~logger context (S.lift n bo) ugraph + | None -> raise + (TypeCheckerFailure "Reference to deleted hypothesis") with _ -> raise (TypeCheckerFailure "unbound variable") ) | C.Var (uri,exp_named_subst) -> incr fdebug ; - check_exp_named_subst ~logger ~subst context exp_named_subst ; - let ty = - CicSubstitution.subst_vars exp_named_subst (type_of_variable ~logger uri) - in - decr fdebug ; - ty + let ugraph1 = + check_exp_named_subst ~logger ~subst context exp_named_subst ugraph + in + let ty,ugraph2 = type_of_variable ~logger uri ugraph1 in + let ty1 = CicSubstitution.subst_vars exp_named_subst ty in + decr fdebug ; + ty1,ugraph2 | C.Meta (n,l) -> (try let (canonical_context,term,ty) = CicUtil.lookup_subst n subst in - check_metasenv_consistency ~logger - ~subst metasenv context canonical_context l; - (* assuming subst is well typed !!!!! *) - CicSubstitution.lift_meta l ty - (* type_of_aux context (CicSubstitution.lift_meta l term) *) + let ugraph1 = + check_metasenv_consistency ~logger + ~subst metasenv context canonical_context l ugraph + in + (* assuming subst is well typed !!!!! *) + ((CicSubstitution.subst_meta l ty), ugraph1) + (* type_of_aux context (CicSubstitution.subst_meta l term) *) with CicUtil.Subst_not_found _ -> let (_,canonical_context,ty) = CicUtil.lookup_meta n metasenv in - check_metasenv_consistency ~logger - ~subst metasenv context canonical_context l; - CicSubstitution.lift_meta l ty) + let ugraph1 = + check_metasenv_consistency ~logger + ~subst metasenv context canonical_context l ugraph + in + ((CicSubstitution.subst_meta l ty),ugraph1)) (* TASSI: CONSTRAINTS *) | C.Sort (C.Type t) -> let t' = CicUniv.fresh() in - if not (CicUniv.add_gt t' t ) then - assert false (* t' is fresh! an error in CicUniv *) - else - C.Sort (C.Type t') + let ugraph1 = CicUniv.add_gt t' t ugraph in + (C.Sort (C.Type t')),ugraph1 (* TASSI: CONSTRAINTS *) - | C.Sort s -> C.Sort (C.Type (CicUniv.fresh ())) + | C.Sort s -> (C.Sort (C.Type (CicUniv.fresh ()))),ugraph | C.Implicit _ -> raise (AssertFailure "21") | C.Cast (te,ty) as t -> - let _ = type_of_aux ~logger context ty in - if R.are_convertible ~subst ~metasenv context (type_of_aux ~logger context te) ty then - ty - else - raise (TypeCheckerFailure - (sprintf "Invalid cast %s" (CicPp.ppterm t))) + let _,ugraph1 = type_of_aux ~logger context ty ugraph in + let ty_te,ugraph2 = type_of_aux ~logger context te ugraph1 in + let b,ugraph3 = + R.are_convertible ~subst ~metasenv context ty_te ty ugraph2 + in + if b then + ty,ugraph3 + else + raise (TypeCheckerFailure + (sprintf "Invalid cast %s" (CicPp.ppterm t))) | C.Prod (name,s,t) -> - let sort1 = type_of_aux ~logger context s - and sort2 = type_of_aux ~logger ((Some (name,(C.Decl s)))::context) t in - let res = sort_of_prod ~subst context (name,s) (sort1,sort2) in - res + let sort1,ugraph1 = type_of_aux ~logger context s ugraph in + let sort2,ugraph2 = + type_of_aux ~logger ((Some (name,(C.Decl s)))::context) t ugraph1 + in + sort_of_prod ~subst context (name,s) (sort1,sort2) ugraph2 | C.Lambda (n,s,t) -> - let sort1 = type_of_aux ~logger context s in + let sort1,ugraph1 = type_of_aux ~logger context s ugraph in (match R.whd ~subst context sort1 with C.Meta _ | C.Sort _ -> () | _ -> raise (TypeCheckerFailure (sprintf - "Not well-typed lambda-abstraction: the source %s should be a - type; instead it is a term of type %s" (CicPp.ppterm s) + "Not well-typed lambda-abstraction: the source %s should be a type; instead it is a term of type %s" (CicPp.ppterm s) (CicPp.ppterm sort1))) ) ; - let type2 = type_of_aux ~logger ((Some (n,(C.Decl s)))::context) t in - C.Prod (n,s,type2) + let type2,ugraph2 = + type_of_aux ~logger ((Some (n,(C.Decl s)))::context) t ugraph1 + in + (C.Prod (n,s,type2)),ugraph2 | C.LetIn (n,s,t) -> (* only to check if s is well-typed *) - let ty = type_of_aux ~logger context s in + let ty,ugraph1 = type_of_aux ~logger context s ugraph in (* The type of a LetIn is a LetIn. Extremely slow since the computed LetIn is later reduced and maybe also re-checked. (C.LetIn (n,s, type_of_aux ((Some (n,(C.Def s)))::context) t)) @@ -1438,39 +1548,63 @@ and type_of_aux' ~logger ?(subst = []) metasenv context t = *) (* One-step LetIn reduction. Even faster than the previous solution. Moreover the inferred type is closer to the expected one. *) - (CicSubstitution.subst s - (type_of_aux ~logger ((Some (n,(C.Def (s,Some ty))))::context) t)) + let ty1,ugraph2 = + type_of_aux ~logger + ((Some (n,(C.Def (s,Some ty))))::context) t ugraph1 + in + (CicSubstitution.subst s ty1),ugraph2 | C.Appl (he::tl) when List.length tl > 0 -> - let hetype = type_of_aux ~logger context he in - let tlbody_and_type = List.map (fun x -> (x, type_of_aux ~logger context x)) tl in - eat_prods ~subst context hetype tlbody_and_type + let hetype,ugraph1 = type_of_aux ~logger context he ugraph in + let tlbody_and_type,ugraph2 = + List.fold_right ( + fun x (l,ugraph) -> + let ty,ugraph1 = type_of_aux ~logger context x ugraph in + let _,ugraph1 = type_of_aux ~logger context ty ugraph1 in + ((x,ty)::l,ugraph1)) + tl ([],ugraph1) + in + (* TASSI: questa c'era nel mio... ma non nel CVS... *) + (* let _,ugraph2 = type_of_aux context hetype ugraph2 in *) + eat_prods ~subst context hetype tlbody_and_type ugraph2 | C.Appl _ -> raise (AssertFailure "Appl: no arguments") | C.Const (uri,exp_named_subst) -> - incr fdebug ; - check_exp_named_subst ~logger ~subst context exp_named_subst ; - let cty = - CicSubstitution.subst_vars exp_named_subst (type_of_constant ~logger uri) - in - decr fdebug ; - cty + incr fdebug ; + let ugraph1 = + check_exp_named_subst ~logger ~subst context exp_named_subst ugraph + in + let cty,ugraph2 = type_of_constant ~logger uri ugraph1 in + let cty1 = + CicSubstitution.subst_vars exp_named_subst cty + in + decr fdebug ; + cty1,ugraph2 | C.MutInd (uri,i,exp_named_subst) -> incr fdebug ; - check_exp_named_subst ~logger ~subst context exp_named_subst ; - let cty = - CicSubstitution.subst_vars exp_named_subst - (type_of_mutual_inductive_defs ~logger uri i) - in - decr fdebug ; - cty + let ugraph1 = + check_exp_named_subst ~logger ~subst context exp_named_subst ugraph + in + (* TASSI: da me c'era anche questa, ma in CVS no *) + let mty,ugraph2 = type_of_mutual_inductive_defs ~logger uri i ugraph1 in + (* fine parte dubbia *) + let cty = + CicSubstitution.subst_vars exp_named_subst mty + in + decr fdebug ; + cty,ugraph2 | C.MutConstruct (uri,i,j,exp_named_subst) -> - check_exp_named_subst ~logger ~subst context exp_named_subst ; - let cty = - CicSubstitution.subst_vars exp_named_subst - (type_of_mutual_inductive_constr ~logger uri i j) - in - cty + let ugraph1 = + check_exp_named_subst ~logger ~subst context exp_named_subst ugraph + in + (* TASSI: idem come sopra *) + let mty,ugraph2 = + type_of_mutual_inductive_constr ~logger uri i j ugraph1 + in + let cty = + CicSubstitution.subst_vars exp_named_subst mty + in + cty,ugraph2 | C.MutCase (uri,i,outtype,term,pl) -> - let outsort = type_of_aux ~logger context outtype in + let outsort,ugraph1 = type_of_aux ~logger context outtype ugraph in let (need_dummy, k) = let rec guess_args context t = let outtype = CicReduction.whd ~subst context t in @@ -1498,29 +1632,69 @@ and type_of_aux' ~logger ?(subst = []) metasenv context t = "Malformed case analasys' output type %s" (CicPp.ppterm outtype))) in +(* + let (parameters, arguments, exp_named_subst),ugraph2 = + let ty,ugraph2 = type_of_aux context term ugraph1 in + match R.whd context ty with + (*CSC manca il caso dei CAST *) +(*CSC: ma servono i parametri (uri,i)? Se si', perche' non serve anche il *) +(*CSC: parametro exp_named_subst? Se no, perche' non li togliamo? *) +(*CSC: Hint: nella DTD servono per gli stylesheet. *) + C.MutInd (uri',i',exp_named_subst) as typ -> + if U.eq uri uri' && i = i' then + ([],[],exp_named_subst),ugraph2 + else + raise + (TypeCheckerFailure + (sprintf + ("Case analysys: analysed term type is %s, but is expected to be (an application of) %s#1/%d{_}") + (CicPp.ppterm typ) (U.string_of_uri uri) i)) + | C.Appl + ((C.MutInd (uri',i',exp_named_subst) as typ):: tl) as typ' -> + if U.eq uri uri' && i = i' then + let params,args = + split tl (List.length tl - k) + in (params,args,exp_named_subst),ugraph2 + else + raise + (TypeCheckerFailure + (sprintf + ("Case analysys: analysed term type is %s, "^ + "but is expected to be (an application of) "^ + "%s#1/%d{_}") + (CicPp.ppterm typ') (U.string_of_uri uri) i)) + | _ -> + raise + (TypeCheckerFailure + (sprintf + ("Case analysis: "^ + "analysed term %s is not an inductive one") + (CicPp.ppterm term))) +*) let (b, k) = guess_args context outsort in - if not b then (b, k - 1) else (b, k) in - let (parameters, arguments, exp_named_subst) = - match R.whd ~subst context (type_of_aux ~logger context term) with + if not b then (b, k - 1) else (b, k) in + let (parameters, arguments, exp_named_subst),ugraph2 = + let ty,ugraph2 = type_of_aux ~logger context term ugraph1 in + match R.whd ~subst context ty with C.MutInd (uri',i',exp_named_subst) as typ -> - if U.eq uri uri' && i = i' then ([],[],exp_named_subst) + if U.eq uri uri' && i = i' then + ([],[],exp_named_subst),ugraph2 else raise (TypeCheckerFailure (sprintf - "Case analysys: analysed term type is %s, - but is expected to be (an application of) %s#1/%d{_}" - (CicPp.ppterm typ) (U.string_of_uri uri) i)) - | C.Appl ((C.MutInd (uri',i',exp_named_subst) as typ):: tl) as typ' -> + ("Case analysys: analysed term type is %s (%s#1/%d{_}), but is expected to be (an application of) %s#1/%d{_}") + (CicPp.ppterm typ) (U.string_of_uri uri') i' (U.string_of_uri uri) i)) + | C.Appl + ((C.MutInd (uri',i',exp_named_subst) as typ):: tl) as typ' -> if U.eq uri uri' && i = i' then let params,args = split tl (List.length tl - k) - in params,args,exp_named_subst + in (params,args,exp_named_subst),ugraph2 else raise (TypeCheckerFailure (sprintf - "Case analysys: analysed term type is %s, - but is expected to be (an application of) %s#1/%d{_}" - (CicPp.ppterm typ') (U.string_of_uri uri) i)) + ("Case analysys: analysed term type is %s (%s#1/%d{_}), but is expected to be (an application of) %s#1/%d{_}") + (CicPp.ppterm typ) (U.string_of_uri uri') i' (U.string_of_uri uri) i)) | _ -> raise (TypeCheckerFailure @@ -1528,158 +1702,201 @@ and type_of_aux' ~logger ?(subst = []) metasenv context t = "Case analysis: analysed term %s is not an inductive one" (CicPp.ppterm term))) in - (* let's control if the sort elimination is allowed: [(I q1 ... qr)|B] *) + (* + let's control if the sort elimination is allowed: + [(I q1 ... qr)|B] + *) let sort_of_ind_type = if parameters = [] then C.MutInd (uri,i,exp_named_subst) else - C.Appl ((C.MutInd (uri,i,exp_named_subst))::parameters) in - if not - (check_allowed_sort_elimination ~logger context uri i need_dummy - sort_of_ind_type (type_of_aux ~logger context sort_of_ind_type) outsort) - then + C.Appl ((C.MutInd (uri,i,exp_named_subst))::parameters) + in + let type_of_sort_of_ind_ty,ugraph3 = + type_of_aux ~logger context sort_of_ind_type ugraph2 in + let b,ugraph4 = + check_allowed_sort_elimination ~logger context uri i need_dummy + sort_of_ind_type type_of_sort_of_ind_ty outsort ugraph3 + in + if not b then raise (TypeCheckerFailure ("Case analasys: sort elimination not allowed")); (* let's check if the type of branches are right *) let parsno = - let obj = + let obj,_ = try - CicEnvironment.get_cooked_obj ~trust:false uri + CicEnvironment.get_cooked_obj ~trust:false CicUniv.empty_ugraph uri with Not_found -> assert false in match obj with - C.InductiveDefinition (_,_,parsno) -> parsno + C.InductiveDefinition (_,_,parsno,_) -> parsno | _ -> raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ UriManager.string_of_uri uri)) - in - let (_,branches_ok) = + in + let (_,branches_ok,ugraph5) = List.fold_left - (fun (j,b) p -> - let cons = - if parameters = [] then - (C.MutConstruct (uri,i,j,exp_named_subst)) - else - (C.Appl - (C.MutConstruct (uri,i,j,exp_named_subst)::parameters)) in - (j + 1, - let res = - b && - R.are_convertible - ~subst ~metasenv context (type_of_aux ~logger context p) - (type_of_branch context parsno need_dummy outtype cons - (type_of_aux ~logger context cons)) in - if not res then - debug_print ("#### " ^ CicPp.ppterm (type_of_aux ~logger context p) ^ " <==> " ^ CicPp.ppterm (type_of_branch context parsno need_dummy outtype cons (type_of_aux ~logger context cons))) ; res - ) - ) (1,true) pl - in - if not branches_ok then - raise - (TypeCheckerFailure "Case analysys: wrong branch type"); - if not need_dummy then - C.Appl ((outtype::arguments)@[term]) - else if arguments = [] then - outtype - else - C.Appl (outtype::arguments) + (fun (j,b,ugraph) p -> + if b then + let cons = + if parameters = [] then + (C.MutConstruct (uri,i,j,exp_named_subst)) + else + (C.Appl + (C.MutConstruct (uri,i,j,exp_named_subst)::parameters)) + in + let ty_p,ugraph1 = type_of_aux ~logger context p ugraph in + let ty_cons,ugraph3 = type_of_aux ~logger context cons ugraph1 in + (* 2 is skipped *) + let ty_branch = + type_of_branch context parsno need_dummy outtype cons + ty_cons in + let b1,ugraph4 = + R.are_convertible + ~subst ~metasenv context ty_p ty_branch ugraph3 + in + if not b1 then + debug_print + ("#### " ^ CicPp.ppterm ty_p ^ + " <==> " ^ CicPp.ppterm ty_branch); + (j + 1,b1,ugraph4) + else + (j,false,ugraph) + ) (1,true,ugraph4) pl + in + if not branches_ok then + raise + (TypeCheckerFailure "Case analysys: wrong branch type"); + let arguments = + if not need_dummy then outtype::arguments@[term] + else outtype::arguments in + let outtype = + if arguments = [] then outtype + else CicReduction.head_beta_reduce (C.Appl arguments) + in + outtype,ugraph5 | C.Fix (i,fl) -> - let types_times_kl = - List.rev - (List.map - (fun (n,k,ty,_) -> - let _ = type_of_aux ~logger context ty in - (Some (C.Name n,(C.Decl ty)),k)) fl) + let types_times_kl,ugraph1 = + (* WAS: list rev list map *) + List.fold_left + (fun (l,ugraph) (n,k,ty,_) -> + let _,ugraph1 = type_of_aux ~logger context ty ugraph in + ((Some (C.Name n,(C.Decl ty)),k)::l,ugraph1) + ) ([],ugraph) fl + in + let (types,kl) = List.split types_times_kl in + let len = List.length types in + let ugraph2 = + List.fold_left + (fun ugraph (name,x,ty,bo) -> + let ty_bo,ugraph1 = + type_of_aux ~logger (types@context) bo ugraph + in + let b,ugraph2 = + R.are_convertible ~subst ~metasenv (types@context) + ty_bo (CicSubstitution.lift len ty) ugraph1 in + if b then + begin + let (m, eaten, context') = + eat_lambdas ~subst (types @ context) (x + 1) bo + in + (* + let's control the guarded by + destructors conditions D{f,k,x,M} + *) + if not (guarded_by_destructors context' eaten + (len + eaten) kl 1 [] m) then + raise + (TypeCheckerFailure + ("Fix: not guarded by destructors")) + else + ugraph2 + end + else + raise (TypeCheckerFailure ("Fix: ill-typed bodies")) + ) ugraph1 fl in + (*CSC: controlli mancanti solo su D{f,k,x,M} *) + let (_,_,ty,_) = List.nth fl i in + ty,ugraph2 + | C.CoFix (i,fl) -> + let types,ugraph1 = + List.fold_left + (fun (l,ugraph) (n,ty,_) -> + let _,ugraph1 = + type_of_aux ~logger context ty ugraph in + (Some (C.Name n,(C.Decl ty))::l,ugraph1) + ) ([],ugraph) fl in - let (types,kl) = List.split types_times_kl in let len = List.length types in - List.iter - (fun (name,x,ty,bo) -> - if - (R.are_convertible - ~subst ~metasenv (types@context) (type_of_aux ~logger (types@context) bo) - (CicSubstitution.lift len ty)) - then - begin - let (m, eaten, context') = - eat_lambdas ~subst (types @ context) (x + 1) bo in - (*let's control the guarded by destructors conditions D{f,k,x,M}*) - if - not (guarded_by_destructors context' - eaten (len + eaten) kl 1 [] m) - then + let ugraph2 = + List.fold_left + (fun ugraph (_,ty,bo) -> + let ty_bo,ugraph1 = + type_of_aux ~logger (types @ context) bo ugraph + in + let b,ugraph2 = + R.are_convertible ~subst ~metasenv (types @ context) ty_bo + (CicSubstitution.lift len ty) ugraph1 + in + if b then + begin + (* let's control that the returned type is coinductive *) + match returns_a_coinductive context ty with + None -> + raise + (TypeCheckerFailure + ("CoFix: does not return a coinductive type")) + | Some uri -> + (* + let's control the guarded by constructors + conditions C{f,M} + *) + if not (guarded_by_constructors (types @ context) + 0 len false bo [] uri) then + raise + (TypeCheckerFailure + ("CoFix: not guarded by constructors")) + else + ugraph2 + end + else raise - (TypeCheckerFailure ("Fix: not guarded by destructors")) - end - else - raise (TypeCheckerFailure ("Fix: ill-typed bodies")) - ) fl ; - (*CSC: controlli mancanti solo su D{f,k,x,M} *) - let (_,_,ty,_) = List.nth fl i in - ty - | C.CoFix (i,fl) -> - let types = - List.rev - (List.map - (fun (n,ty,_) -> - let _ = type_of_aux ~logger context ty in Some (C.Name n,(C.Decl ty))) fl) + (TypeCheckerFailure ("CoFix: ill-typed bodies")) + ) ugraph1 fl in - let len = List.length types in - List.iter - (fun (_,ty,bo) -> - if - (R.are_convertible - ~subst ~metasenv (types @ context) - (type_of_aux ~logger (types @ context) bo) (CicSubstitution.lift len ty)) - then - begin - (* let's control that the returned type is coinductive *) - match returns_a_coinductive context ty with - None -> - raise - (TypeCheckerFailure - ("CoFix: does not return a coinductive type")) - | Some uri -> - (*let's control the guarded by constructors conditions C{f,M}*) - if - not - (guarded_by_constructors - (types @ context) 0 len false bo [] uri) - then - raise - (TypeCheckerFailure ("CoFix: not guarded by constructors")) - end - else - raise - (TypeCheckerFailure ("CoFix: ill-typed bodies")) - ) fl ; - let (_,ty,_) = List.nth fl i in - ty + let (_,ty,_) = List.nth fl i in + ty,ugraph2 - and check_exp_named_subst ~logger ?(subst = []) context = - let rec check_exp_named_subst_aux ~logger esubsts = - function - [] -> () - | ((uri,t) as item)::tl -> - let typeofvar = - CicSubstitution.subst_vars esubsts (type_of_variable ~logger uri) in - let typeoft = type_of_aux ~logger context t in - if CicReduction.are_convertible - ~subst ~metasenv context typeoft typeofvar then - check_exp_named_subst_aux ~logger (esubsts@[item]) tl - else - begin - CicReduction.fdebug := 0 ; - ignore (CicReduction.are_convertible ~subst ~metasenv context typeoft typeofvar) ; - fdebug := 0 ; - debug typeoft [typeofvar] ; - raise (TypeCheckerFailure "Wrong Explicit Named Substitution") - end - in - check_exp_named_subst_aux ~logger [] - - and sort_of_prod ?(subst = []) context (name,s) (t1, t2) = + and check_exp_named_subst ~logger ?(subst = []) context ugraph = + let rec check_exp_named_subst_aux ~logger esubsts l ugraph = + match l with + [] -> ugraph + | ((uri,t) as item)::tl -> + let ty_uri,ugraph1 = type_of_variable ~logger uri ugraph in + let typeofvar = + CicSubstitution.subst_vars esubsts ty_uri in + let typeoft,ugraph2 = type_of_aux ~logger context t ugraph1 in + let b,ugraph3 = + CicReduction.are_convertible ~subst ~metasenv + context typeoft typeofvar ugraph2 + in + if b then + check_exp_named_subst_aux ~logger (esubsts@[item]) tl ugraph3 + else + begin + CicReduction.fdebug := 0 ; + ignore + (CicReduction.are_convertible + ~subst ~metasenv context typeoft typeofvar ugraph2) ; + fdebug := 0 ; + debug typeoft [typeofvar] ; + raise (TypeCheckerFailure "Wrong Explicit Named Substitution") + end + in + check_exp_named_subst_aux ~logger [] ugraph + + and sort_of_prod ?(subst = []) context (name,s) (t1, t2) ugraph = let module C = Cic in let t1' = CicReduction.whd ~subst context t1 in let t2' = CicReduction.whd ~subst ((Some (name,C.Decl s))::context) t2 in @@ -1687,63 +1904,73 @@ and type_of_aux' ~logger ?(subst = []) metasenv context t = (C.Sort s1, C.Sort s2) when (s2 = C.Prop or s2 = C.Set or s2 = C.CProp) -> (* different from Coq manual!!! *) - C.Sort s2 + C.Sort s2,ugraph | (C.Sort (C.Type t1), C.Sort (C.Type t2)) -> (* TASSI: CONSRTAINTS: the same in doubletypeinference, cicrefine *) let t' = CicUniv.fresh() in - if not (CicUniv.add_ge t' t1) || not (CicUniv.add_ge t' t2) then - assert false ; (* not possible, error in CicUniv *) - C.Sort (C.Type t') + let ugraph1 = CicUniv.add_ge t' t1 ugraph in + let ugraph2 = CicUniv.add_ge t' t2 ugraph1 in + C.Sort (C.Type t'),ugraph2 | (C.Sort _,C.Sort (C.Type t1)) -> (* TASSI: CONSRTAINTS: the same in doubletypeinference, cicrefine *) - C.Sort (C.Type t1) (* c'e' bisogno di un fresh? *) - | (C.Meta _, C.Sort _) -> t2' + C.Sort (C.Type t1),ugraph (* c'e' bisogno di un fresh? *) + | (C.Meta _, C.Sort _) -> t2',ugraph | (C.Meta _, (C.Meta (_,_) as t)) | (C.Sort _, (C.Meta (_,_) as t)) when CicUtil.is_closed t -> - t2' + t2',ugraph | (_,_) -> raise (TypeCheckerFailure (sprintf "Prod: expected two sorts, found = %s, %s" (CicPp.ppterm t1') (CicPp.ppterm t2'))) - and eat_prods ?(subst = []) context hetype = - (*CSC: siamo sicuri che le are_convertible non lavorino con termini non *) - (*CSC: cucinati *) - function - [] -> hetype - | (hete, hety)::tl -> - (match (CicReduction.whd ~subst context hetype) with - Cic.Prod (n,s,t) -> - if CicReduction.are_convertible ~subst ~metasenv context hety s then - (CicReduction.fdebug := -1 ; - eat_prods ~subst context (CicSubstitution.subst hete t) tl - ) - else - begin - CicReduction.fdebug := 0 ; - ignore (CicReduction.are_convertible ~subst ~metasenv context s hety) ; - fdebug := 0 ; - debug s [hety] ; - raise (TypeCheckerFailure (sprintf - "Appl: wrong parameter-type, expected %s, found %s" - (CicPp.ppterm hetype) (CicPp.ppterm s))) - end - | _ -> - raise (TypeCheckerFailure - "Appl: this is not a function, it cannot be applied") - ) + and eat_prods ?(subst = []) context hetype l ugraph = + (*CSC: siamo sicuri che le are_convertible non lavorino con termini non *) + (*CSC: cucinati *) + match l with + [] -> hetype,ugraph + | (hete, hety)::tl -> + (match (CicReduction.whd ~subst context hetype) with + Cic.Prod (n,s,t) -> + let b,ugraph1 = + CicReduction.are_convertible + ~subst ~metasenv context hety s ugraph + in + if b then + begin + CicReduction.fdebug := -1 ; + eat_prods ~subst context + (CicSubstitution.subst hete t) tl ugraph1 + (*TASSI: not sure *) + end + else + begin + CicReduction.fdebug := 0 ; + ignore (CicReduction.are_convertible + ~subst ~metasenv context s hety ugraph) ; + fdebug := 0 ; + debug s [hety] ; + raise + (TypeCheckerFailure + (sprintf + ("Appl: wrong parameter-type, expected %s, found %s") + (CicPp.ppterm hetype) (CicPp.ppterm s))) + end + | _ -> + raise (TypeCheckerFailure + "Appl: this is not a function, it cannot be applied") + ) and returns_a_coinductive context ty = let module C = Cic in match CicReduction.whd context ty with C.MutInd (uri,i,_) -> (*CSC: definire una funzioncina per questo codice sempre replicato *) - let obj = + let obj,_ = try - CicEnvironment.get_cooked_obj ~trust:false uri + CicEnvironment.get_cooked_obj ~trust:false CicUniv.empty_ugraph uri with Not_found -> assert false in (match obj with - C.InductiveDefinition (itl,_,_) -> + C.InductiveDefinition (itl,_,_,_) -> let (_,is_inductive,_,_) = List.nth itl i in if is_inductive then None else (Some uri) | _ -> @@ -1752,8 +1979,9 @@ and type_of_aux' ~logger ?(subst = []) metasenv context t = UriManager.string_of_uri uri)) ) | C.Appl ((C.MutInd (uri,i,_))::_) -> - (match CicEnvironment.get_obj uri with - C.InductiveDefinition (itl,_,_) -> + (let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + match o with + C.InductiveDefinition (itl,_,_,_) -> let (_,is_inductive,_,_) = List.nth itl i in if is_inductive then None else (Some uri) | _ -> @@ -1770,102 +1998,139 @@ and type_of_aux' ~logger ?(subst = []) metasenv context t = debug_print ("INIZIO TYPE_OF_AUX " ^ CicPp.ppterm t) ; flush stderr ; let res = *) - type_of_aux ~logger context t + type_of_aux ~logger context t ugraph (* in debug_print "FINE TYPE_OF_AUX" ; flush stderr ; res *) (* is a small constructor? *) (*CSC: ottimizzare calcolando staticamente *) -and is_small ~logger context paramsno c = - let rec is_small_aux ~logger context c = +and is_small ~logger context paramsno c ugraph = + let rec is_small_aux ~logger context c ugraph = let module C = Cic in match CicReduction.whd context c with C.Prod (n,so,de) -> (*CSC: [] is an empty metasenv. Is it correct? *) - let s = type_of_aux' ~logger [] context so in - (s = C.Sort C.Prop || s = C.Sort C.Set || s = C.Sort C.CProp) && - is_small_aux ~logger ((Some (n,(C.Decl so)))::context) de - | _ -> true (*CSC: we trust the type-checker *) + let s,ugraph1 = type_of_aux' ~logger [] context so ugraph in + let b = (s = C.Sort C.Prop || s = C.Sort C.Set || s = C.Sort C.CProp) in + if b then + is_small_aux ~logger ((Some (n,(C.Decl so)))::context) de ugraph1 + else + false,ugraph1 + | _ -> true,ugraph (*CSC: we trust the type-checker *) in let (context',dx) = split_prods context paramsno c in - is_small_aux ~logger context' dx + is_small_aux ~logger context' dx ugraph -and type_of ~logger t = +and type_of ~logger t ugraph = (*CSC debug_print ("INIZIO TYPE_OF_AUX' " ^ CicPp.ppterm t) ; flush stderr ; let res = *) - type_of_aux' ~logger [] [] t + type_of_aux' ~logger [] [] t ugraph (*CSC in debug_print "FINE TYPE_OF_AUX'" ; flush stderr ; res *) ;; -(* tassi FIXME: not sure where is this called... no history here... *) +let typecheck_obj0 ~logger uri ugraph = + let module C = Cic in + function + C.Constant (_,Some te,ty,_,_) -> + let _,ugraph = type_of ~logger ty ugraph in + let ty_te,ugraph = type_of ~logger te ugraph in + let b,ugraph = (CicReduction.are_convertible [] ty_te ty ugraph) in + if not b then + raise (TypeCheckerFailure + ("the type of the body is not the one expected")) + else + ugraph + | C.Constant (_,None,ty,_,_) -> + (* only to check that ty is well-typed *) + let _,ugraph = type_of ~logger ty ugraph in + ugraph + | C.CurrentProof (_,conjs,te,ty,_,_) -> + let _,ugraph = + List.fold_left + (fun (metasenv,ugraph) ((_,context,ty) as conj) -> + let _,ugraph = + type_of_aux' ~logger metasenv context ty ugraph + in + metasenv @ [conj],ugraph + ) ([],ugraph) conjs + in + let _,ugraph = type_of_aux' ~logger conjs [] ty ugraph in + let type_of_te,ugraph = + type_of_aux' ~logger conjs [] te ugraph + in + let b,ugraph = CicReduction.are_convertible [] type_of_te ty ugraph in + if not b then + raise (TypeCheckerFailure (sprintf + "the current proof is not well typed because the type %s of the body is not convertible to the declared type %s" + (CicPp.ppterm type_of_te) (CicPp.ppterm ty))) + else + ugraph + | C.Variable (_,bo,ty,_,_) -> + (* only to check that ty is well-typed *) + let _,ugraph = type_of ~logger ty ugraph in + (match bo with + None -> ugraph + | Some bo -> + let ty_bo,ugraph = type_of ~logger bo ugraph in + let b,ugraph = CicReduction.are_convertible [] ty_bo ty ugraph in + if not b then + raise (TypeCheckerFailure + ("the body is not the one expected")) + else + ugraph + ) + | (C.InductiveDefinition _ as obj) -> + check_mutual_inductive_defs ~logger uri obj ugraph + let typecheck uri = let module C = Cic in let module R = CicReduction in let module U = UriManager in let logger = new CicLogger.logger in - (*match CicEnvironment.is_type_checked ~trust:false uri with*) - match CicEnvironment.is_type_checked ~trust:true uri with - CicEnvironment.CheckedObj cobj -> cobj + (* ??? match CicEnvironment.is_type_checked ~trust:true uri with ???? *) + match CicEnvironment.is_type_checked ~trust:false CicUniv.empty_ugraph uri with + CicEnvironment.CheckedObj (cobj,ugraph') -> + (* debug_print ("NON-INIZIO A TYPECHECKARE " ^ U.string_of_uri uri);*) + cobj,ugraph' | CicEnvironment.UncheckedObj uobj -> (* let's typecheck the uncooked object *) logger#log (`Start_type_checking uri) ; - CicUniv.directly_to_env_begin (); - (match uobj with - C.Constant (_,Some te,ty,_) -> - let _ = type_of ~logger ty in - if not (R.are_convertible [] (type_of ~logger te ) ty) then - raise (TypeCheckerFailure - ("Unknown constant:" ^ U.string_of_uri uri)) - | C.Constant (_,None,ty,_) -> - (* only to check that ty is well-typed *) - let _ = type_of ~logger ty in () - | C.CurrentProof (_,conjs,te,ty,_) -> - let _ = - List.fold_left - (fun metasenv ((_,context,ty) as conj) -> - ignore (type_of_aux' ~logger metasenv context ty) ; - metasenv @ [conj] - ) [] conjs - in - let _ = type_of_aux' ~logger conjs [] ty in - let type_of_te = type_of_aux' ~logger conjs [] te in - if not (R.are_convertible [] type_of_te ty) - then - raise (TypeCheckerFailure (sprintf - "the current proof %s is not well typed because the type %s of the body is not convertible to the declared type %s" - (U.string_of_uri uri) (CicPp.ppterm type_of_te) - (CicPp.ppterm ty))) - | C.Variable (_,bo,ty,_) -> - (* only to check that ty is well-typed *) - let _ = type_of ~logger ty in - (match bo with - None -> () - | Some bo -> - if not (R.are_convertible [] (type_of ~logger bo) ty) then - raise (TypeCheckerFailure - ("Unknown variable:" ^ U.string_of_uri uri)) - ) - | C.InductiveDefinition _ -> - check_mutual_inductive_defs ~logger uri uobj - ) ; - CicEnvironment.set_type_checking_info uri ; - CicUniv.directly_to_env_end (); - logger#log (`Type_checking_completed uri); - uobj + (* debug_print ("INIZIO A TYPECHECKARE " ^ U.string_of_uri uri); *) + let ugraph = typecheck_obj0 ~logger uri CicUniv.empty_ugraph uobj in + try + CicEnvironment.set_type_checking_info uri; + logger#log (`Type_checking_completed uri); + match CicEnvironment.is_type_checked ~trust:false ugraph uri with + CicEnvironment.CheckedObj (cobj,ugraph') -> cobj,ugraph' + | _ -> raise CicEnvironmentError + with + (* + this is raised if set_type_checking_info is called on an object + that has no associated universe file. If we are in univ_maker + phase this is OK since univ_maker will properly commit the + object. + *) + Invalid_argument s -> + (*debug_print s;*) + uobj,ugraph ;; -(** wrappers which instantiate fresh loggers *) +let typecheck_obj ~logger uri obj = + let ugraph = typecheck_obj0 ~logger uri CicUniv.empty_ugraph obj in + let ugraph = CicUnivUtils.clean_and_fill uri obj ugraph in + CicEnvironment.add_type_checked_obj uri (obj,ugraph) -let type_of_aux' ?(subst = []) metasenv context t = - let logger = new CicLogger.logger in - type_of_aux' ~logger ~subst metasenv context t +(** wrappers which instantiate fresh loggers *) -let typecheck_mutual_inductive_defs uri (itl, uris, indparamsno) = +let type_of_aux' ?(subst = []) metasenv context t ugraph = let logger = new CicLogger.logger in - typecheck_mutual_inductive_defs ~logger uri (itl, uris, indparamsno) + type_of_aux' ~logger ~subst metasenv context t ugraph +let typecheck_obj uri obj = + let logger = new CicLogger.logger in + typecheck_obj ~logger uri obj