X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_proof_checking%2FcicTypeChecker.ml;h=5715778fb07cd91ba54ce9cc1ca5b180374fb4fc;hb=a864255e782859e2b3b7da08297f5d3fe2ee710d;hp=8403f5f0c082e295da72e48c1764cd27adc24ea2;hpb=e626927b4c1c77bdcd6b545203a0a9c17a9ff136;p=helm.git diff --git a/helm/ocaml/cic_proof_checking/cicTypeChecker.ml b/helm/ocaml/cic_proof_checking/cicTypeChecker.ml index 8403f5f0c..5715778fb 100644 --- a/helm/ocaml/cic_proof_checking/cicTypeChecker.ml +++ b/helm/ocaml/cic_proof_checking/cicTypeChecker.ml @@ -127,6 +127,7 @@ let rec type_of_constant uri = CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> CicLogger.log (`Start_type_checking uri) ; + CicUniv.directly_to_env_begin (); (* let's typecheck the uncooked obj *) (match uobj with C.Constant (_,Some te,ty,_) -> @@ -160,6 +161,7 @@ let rec type_of_constant uri = ("Unknown constant:" ^ U.string_of_uri uri)) ); CicEnvironment.set_type_checking_info uri ; + CicUniv.directly_to_env_end (); CicLogger.log (`Type_checking_completed uri) ; match CicEnvironment.is_type_checked ~trust:false uri with CicEnvironment.CheckedObj cobj -> cobj @@ -180,6 +182,7 @@ and type_of_variable uri = CicEnvironment.CheckedObj (C.Variable (_,_,ty,_)) -> ty | CicEnvironment.UncheckedObj (C.Variable (_,bo,ty,_)) -> CicLogger.log (`Start_type_checking uri) ; + CicUniv.directly_to_env_begin (); (* only to check that ty is well-typed *) let _ = type_of ty in (match bo with @@ -190,6 +193,7 @@ and type_of_variable uri = ("Unknown variable:" ^ U.string_of_uri uri)) ) ; CicEnvironment.set_type_checking_info uri ; + CicUniv.directly_to_env_end (); CicLogger.log (`Type_checking_completed uri) ; ty | _ -> @@ -203,7 +207,7 @@ and does_not_occur context n nn te = match CicReduction.whd context te with C.Rel m when m > n && m <= nn -> false | C.Rel _ - | C.Meta _ + | C.Meta _ (* CSC: Are we sure? No recursion?*) | C.Sort _ | C.Implicit _ -> true | C.Cast (te,ty) -> @@ -265,7 +269,7 @@ and weakly_positive context n nn uri te = let module C = Cic in (*CSC: Che schifo! Bisogna capire meglio e trovare una soluzione ragionevole!*) let dummy_mutind = - C.MutInd (UriManager.uri_of_string "cic:/Coq/Init/Datatypes/nat.ind",0,[]) + C.MutInd (HelmLibraryObjects.Datatypes.nat_URI,0,[]) in (*CSC mettere in cicSubstitution *) let rec subst_inductive_type_with_dummy_mutind = @@ -518,8 +522,10 @@ and type_of_mutual_inductive_defs uri i = CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> CicLogger.log (`Start_type_checking uri) ; + CicUniv.directly_to_env_begin (); check_mutual_inductive_defs uri uobj ; CicEnvironment.set_type_checking_info uri ; + CicUniv.directly_to_env_end (); CicLogger.log (`Type_checking_completed uri) ; (match CicEnvironment.is_type_checked ~trust:false uri with CicEnvironment.CheckedObj cobj -> cobj @@ -543,8 +549,10 @@ and type_of_mutual_inductive_constr uri i j = CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> CicLogger.log (`Start_type_checking uri) ; + (*CicUniv.directly_to_env_begin ();*) check_mutual_inductive_defs uri uobj ; CicEnvironment.set_type_checking_info uri ; + (*CicUniv.directly_to_env_end ();*) CicLogger.log (`Type_checking_completed uri) ; (match CicEnvironment.is_type_checked ~trust:false uri with CicEnvironment.CheckedObj cobj -> cobj @@ -584,11 +592,11 @@ and recursive_args context n nn te = | C.Fix _ | C.CoFix _ -> raise (AssertFailure "6") (* due to type-checking *) -and get_new_safes context p c rl safes n nn x = +and get_new_safes ?(subst = []) context p c rl safes n nn x = let module C = Cic in let module U = UriManager in let module R = CicReduction in - match (R.whd context c, R.whd context p, rl) with + match (R.whd ~subst context c, R.whd ~subst context p, rl) with (C.Prod (_,so,ta1), C.Lambda (name,_,ta2), b::tl) -> (* we are sure that the two sources are convertible because we *) (* have just checked this. So let's go along ... *) @@ -598,44 +606,47 @@ and get_new_safes context p c rl safes n nn x = let safes'' = if b then 1::safes' else safes' in - get_new_safes ((Some (name,(C.Decl so)))::context) + get_new_safes ~subst ((Some (name,(C.Decl so)))::context) ta2 ta1 tl safes'' (n+1) (nn+1) (x+1) | (C.Prod _, (C.MutConstruct _ as e), _) | (C.Prod _, (C.Rel _ as e), _) | (C.MutInd _, e, []) | (C.Appl _, e, []) -> (e,safes,n,nn,x,context) - | (_,_,_) -> + | (c,p,l) -> (* CSC: If the next exception is raised, it just means that *) (* CSC: the proof-assistant allows to use very strange things *) (* CSC: as a branch of a case whose type is a Prod. In *) (* CSC: particular, this means that a new (C.Prod, x,_) case *) (* CSC: must be considered in this match. (e.g. x = MutCase) *) - raise (AssertFailure "7") + raise + (AssertFailure + (Printf.sprintf "Get New Safes: c=%s ; p=%s" + (CicPp.ppterm c) (CicPp.ppterm p))) -and split_prods context n te = +and split_prods ?(subst = []) context n te = let module C = Cic in let module R = CicReduction in match (n, R.whd context te) with (0, _) -> context,te | (n, C.Prod (name,so,ta)) when n > 0 -> - split_prods ((Some (name,(C.Decl so)))::context) (n - 1) ta + split_prods ~subst ((Some (name,(C.Decl so)))::context) (n - 1) ta | (_, _) -> raise (AssertFailure "8") -and eat_lambdas context n te = +and eat_lambdas ?(subst = []) context n te = let module C = Cic in let module R = CicReduction in - match (n, R.whd context te) with + match (n, R.whd ~subst context te) with (0, _) -> (te, 0, context) | (n, C.Lambda (name,so,ta)) when n > 0 -> let (te, k, context') = - eat_lambdas ((Some (name,(C.Decl so)))::context) (n - 1) ta + eat_lambdas ~subst ((Some (name,(C.Decl so)))::context) (n - 1) ta in (te, k + 1, context') | (n, te) -> raise (AssertFailure (sprintf "9 (%d, %s)" n (CicPp.ppterm te))) -(*CSC: Tutto quello che segue e' l'intuzione di luca ;-) *) -and check_is_really_smaller_arg context n nn kl x safes te = +(*CSC: Tutto quello che segue e' l'intuzione di luca ;-) *) +and check_is_really_smaller_arg ?(subst = []) context n nn kl x safes te = (*CSC: forse la whd si puo' fare solo quando serve veramente. *) (*CSC: cfr guarded_by_destructors *) let module C = Cic in @@ -649,25 +660,25 @@ and check_is_really_smaller_arg context n nn kl x safes te = | C.Implicit _ | C.Cast _ (* | C.Cast (te,ty) -> - check_is_really_smaller_arg n nn kl x safes te && - check_is_really_smaller_arg n nn kl x safes ty*) + check_is_really_smaller_arg ~subst n nn kl x safes te && + check_is_really_smaller_arg ~subst n nn kl x safes ty*) (* | C.Prod (_,so,ta) -> - check_is_really_smaller_arg n nn kl x safes so && - check_is_really_smaller_arg (n+1) (nn+1) kl (x+1) + check_is_really_smaller_arg ~subst n nn kl x safes so && + check_is_really_smaller_arg ~subst (n+1) (nn+1) kl (x+1) (List.map (fun x -> x + 1) safes) ta*) | C.Prod _ -> raise (AssertFailure "10") | C.Lambda (name,so,ta) -> - check_is_really_smaller_arg context n nn kl x safes so && - check_is_really_smaller_arg ((Some (name,(C.Decl so)))::context) + check_is_really_smaller_arg ~subst context n nn kl x safes so && + check_is_really_smaller_arg ~subst ((Some (name,(C.Decl so)))::context) (n+1) (nn+1) kl (x+1) (List.map (fun x -> x + 1) safes) ta | C.LetIn (name,so,ta) -> - check_is_really_smaller_arg context n nn kl x safes so && - check_is_really_smaller_arg ((Some (name,(C.Def (so,None))))::context) + check_is_really_smaller_arg ~subst context n nn kl x safes so && + check_is_really_smaller_arg ~subst ((Some (name,(C.Def (so,None))))::context) (n+1) (nn+1) kl (x+1) (List.map (fun x -> x + 1) safes) ta | C.Appl (he::_) -> (*CSC: sulla coda ci vogliono dei controlli? secondo noi no, ma *) (*CSC: solo perche' non abbiamo trovato controesempi *) - check_is_really_smaller_arg context n nn kl x safes he + check_is_really_smaller_arg ~subst context n nn kl x safes he | C.Appl [] -> raise (AssertFailure "11") | C.Const _ | C.MutInd _ -> raise (AssertFailure "12") @@ -686,7 +697,7 @@ and check_is_really_smaller_arg context n nn kl x safes te = let cl' = List.map (fun (id,ty) -> - (id, snd (split_prods tys paramsno ty))) cl + (id, snd (split_prods ~subst tys paramsno ty))) cl in (tys,List.length tl,isinductive,paramsno,cl') | _ -> @@ -697,7 +708,7 @@ and check_is_really_smaller_arg context n nn kl x safes te = if not isinductive then List.fold_right (fun p i -> - i && check_is_really_smaller_arg context n nn kl x safes p) + i && check_is_really_smaller_arg ~subst context n nn kl x safes p) pl true else List.fold_right @@ -707,10 +718,10 @@ and check_is_really_smaller_arg context n nn kl x safes te = recursive_args tys 0 len debrujinedte in let (e,safes',n',nn',x',context') = - get_new_safes context p c rl' safes n nn x + get_new_safes ~subst context p c rl' safes n nn x in i && - check_is_really_smaller_arg context' n' nn' kl x' safes' e + check_is_really_smaller_arg ~subst context' n' nn' kl x' safes' e ) (List.combine pl cl) true | C.Appl ((C.Rel m)::tl) when List.mem m safes || m = x -> let (tys,len,isinductive,paramsno,cl) = @@ -724,7 +735,7 @@ and check_is_really_smaller_arg context n nn kl x safes te = let cl' = List.map (fun (id,ty) -> - (id, snd (split_prods tys paramsno ty))) cl + (id, snd (split_prods ~subst tys paramsno ty))) cl in (tys,List.length tl,isinductive,paramsno,cl') | _ -> @@ -735,7 +746,7 @@ and check_is_really_smaller_arg context n nn kl x safes te = if not isinductive then List.fold_right (fun p i -> - i && check_is_really_smaller_arg context n nn kl x safes p) + i && check_is_really_smaller_arg ~subst context n nn kl x safes p) pl true else (*CSC: supponiamo come prima che nessun controllo sia necessario*) @@ -750,12 +761,12 @@ and check_is_really_smaller_arg context n nn kl x safes te = get_new_safes context p c rl' safes n nn x in i && - check_is_really_smaller_arg context' n' nn' kl x' safes' e + check_is_really_smaller_arg ~subst context' n' nn' kl x' safes' e ) (List.combine pl cl) true | _ -> List.fold_right (fun p i -> - i && check_is_really_smaller_arg context n nn kl x safes p + i && check_is_really_smaller_arg ~subst context n nn kl x safes p ) pl true ) | C.Fix (_, fl) -> @@ -768,7 +779,7 @@ and check_is_really_smaller_arg context n nn kl x safes te = List.fold_right (fun (_,_,ty,bo) i -> i && - check_is_really_smaller_arg (tys@context) n_plus_len nn_plus_len kl + check_is_really_smaller_arg ~subst (tys@context) n_plus_len nn_plus_len kl x_plus_len safes' bo ) fl true | C.CoFix (_, fl) -> @@ -781,21 +792,22 @@ and check_is_really_smaller_arg context n nn kl x safes te = List.fold_right (fun (_,ty,bo) i -> i && - check_is_really_smaller_arg (tys@context) n_plus_len nn_plus_len kl + check_is_really_smaller_arg ~subst (tys@context) n_plus_len nn_plus_len kl x_plus_len safes' bo ) fl true -and guarded_by_destructors context n nn kl x safes = +and guarded_by_destructors ?(subst = []) context n nn kl x safes = let module C = Cic in let module U = UriManager in function C.Rel m when m > n && m <= nn -> false - | C.Rel n -> + | C.Rel m -> (match List.nth context (n-1) with Some (_,C.Decl _) -> true | Some (_,C.Def (bo,_)) -> - guarded_by_destructors context n nn kl x safes bo - | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") + guarded_by_destructors context m nn kl x safes + (CicSubstitution.lift m bo) + | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") ) | C.Meta _ | C.Sort _ @@ -823,7 +835,7 @@ and guarded_by_destructors context n nn kl x safes = (fun param i -> i && guarded_by_destructors context n nn kl x safes param ) tl true && - check_is_really_smaller_arg context n nn kl x safes (List.nth tl k) + check_is_really_smaller_arg ~subst context n nn kl x safes (List.nth tl k) | C.Appl tl -> List.fold_right (fun t i -> i && guarded_by_destructors context n nn kl x safes t) @@ -841,17 +853,21 @@ and guarded_by_destructors context n nn kl x safes = let (tys,len,isinductive,paramsno,cl) = match CicEnvironment.get_obj uri with C.InductiveDefinition (tl,_,paramsno) -> - let (_,isinductive,_,cl) = List.nth tl i in - let tys = - List.map (fun (n,_,ty,_) -> - Some(Cic.Name n,(Cic.Decl ty))) tl - in - let cl' = - List.map - (fun (id,ty) -> - (id, snd (split_prods tys paramsno ty))) cl + let len = List.length tl in + let (_,isinductive,_,cl) = List.nth tl i in + let tys = + List.map (fun (n,_,ty,_) -> + Some(Cic.Name n,(Cic.Decl ty))) tl in - (tys,List.length tl,isinductive,paramsno,cl') + let cl' = + List.map + (fun (id,ty) -> + let debrujinedty = debrujin_constructor uri len ty in + (id, snd (split_prods ~subst tys paramsno ty), + snd (split_prods ~subst tys paramsno debrujinedty) + )) cl + in + (tys,len,isinductive,paramsno,cl') | _ -> raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ @@ -869,11 +885,8 @@ and guarded_by_destructors context n nn kl x safes = guarded_by_destructors context n nn kl x safes outtype && (*CSC: manca ??? il controllo sul tipo di term? *) List.fold_right - (fun (p,(_,c)) i -> - let rl' = - let debrujinedte = debrujin_constructor uri len c in - recursive_args tys 0 len debrujinedte - in + (fun (p,(_,c,brujinedc)) i -> + let rl' = recursive_args tys 0 len brujinedc in let (e,safes',n',nn',x',context') = get_new_safes context p c rl' safes n nn x in @@ -892,7 +905,7 @@ and guarded_by_destructors context n nn kl x safes = let cl' = List.map (fun (id,ty) -> - (id, snd (split_prods tys paramsno ty))) cl + (id, snd (split_prods ~subst tys paramsno ty))) cl in (tys,List.length tl,isinductive,paramsno,cl') | _ -> @@ -1169,7 +1182,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = | (C.Sort C.Prop, C.Sort C.Prop) when need_dummy -> true | (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 -> + | (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,_,_) -> @@ -1186,7 +1200,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = | (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.Type) | (C.Sort C.CProp, C.Sort C.Type)) + | ((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) -> @@ -1200,7 +1215,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = 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 + (* 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 @@ -1228,8 +1244,9 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = (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 -> + | 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 @@ -1246,7 +1263,8 @@ and check_allowed_sort_elimination context uri i need_dummy ind arity1 arity2 = ) | _ -> raise (AssertFailure "19") ) - | (C.Sort C.Type, C.Prod (_,so,_)) when not need_dummy -> + | (C.Sort (C.Type _), C.Prod (_,so,_)) when not need_dummy -> + (* TASSI: da verificare *) CicReduction.are_convertible context so ind | (_,_) -> false @@ -1281,11 +1299,11 @@ 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 metasenv context canonical_context l = +and check_metasenv_consistency ?(subst=[]) metasenv context canonical_context l = 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 [] -> [] @@ -1294,32 +1312,44 @@ and check_metasenv_consistency metasenv context canonical_context l = | (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 (_,Some _)))::_ -> assert false + | (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) 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 context t ct) then + 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' metasenv context t in - if not (R.are_convertible context type_t ct) then + let type_t = type_of_aux' ~subst metasenv context t in + if not (R.are_convertible ~subst ~metasenv context type_t ct) then + (* debug *) + ( + (* + (match type_t with + Cic.Meta (n,l) -> + try + let (cc, ecco) = CicUtil.lookup_subst n subst in + prerr_endline (CicPp.ppterm ecco) + with CicUtil.Subst_not_found _ -> + prerr_endline "Non lo trovo" + | _ -> ()); *) 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))) + (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 (* type_of_aux' is just another name (with a different scope) for type_of_aux *) -and type_of_aux' metasenv context t = +and type_of_aux' ?(subst = []) metasenv context t = let rec type_of_aux context = let module C = Cic in let module R = CicReduction in @@ -1334,29 +1364,43 @@ and type_of_aux' metasenv context t = | Some (_,C.Def (bo,None)) -> debug_print "##### CASO DA INVESTIGARE E CAPIRE" ; type_of_aux context (S.lift n bo) - | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") + | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis") with _ -> - raise (TypeCheckerFailure - "unbound variable found in constructor type") + raise (TypeCheckerFailure "unbound variable") ) | C.Var (uri,exp_named_subst) -> incr fdebug ; - check_exp_named_subst context exp_named_subst ; + check_exp_named_subst ~subst context exp_named_subst ; let ty = CicSubstitution.subst_vars exp_named_subst (type_of_variable uri) in decr fdebug ; ty | C.Meta (n,l) -> - let (_,canonical_context,ty) = CicUtil.lookup_meta n metasenv in - check_metasenv_consistency metasenv context canonical_context l; - CicSubstitution.lift_meta l ty - | C.Sort s -> C.Sort C.Type (*CSC manca la gestione degli universi!!! *) + (try + let (canonical_context, term) = CicUtil.lookup_subst n subst in + check_metasenv_consistency + ~subst metasenv context canonical_context l; + type_of_aux context (CicSubstitution.lift_meta l term) + with CicUtil.Subst_not_found _ -> + let (_,canonical_context,ty) = CicUtil.lookup_meta n metasenv in + check_metasenv_consistency + ~subst metasenv context canonical_context l; + CicSubstitution.lift_meta l ty) + (* 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') + (* TASSI: CONSTRAINTS *) + | C.Sort s -> C.Sort (C.Type (CicUniv.fresh ())) | C.Implicit _ -> raise (AssertFailure "21") | C.Cast (te,ty) as t -> let _ = type_of_aux context ty in - if R.are_convertible context (type_of_aux context te) ty then + if R.are_convertible ~subst ~metasenv context (type_of_aux context te) ty then ty else raise (TypeCheckerFailure @@ -1364,14 +1408,22 @@ and type_of_aux' metasenv context t = | C.Prod (name,s,t) -> let sort1 = type_of_aux context s and sort2 = type_of_aux ((Some (name,(C.Decl s)))::context) t in - sort_of_prod context (name,s) (sort1,sort2) + let res = sort_of_prod ~subst context (name,s) (sort1,sort2) in + res | C.Lambda (n,s,t) -> - let sort1 = type_of_aux context s - and type2 = type_of_aux ((Some (n,(C.Decl s)))::context) t in - let sort2 = type_of_aux ((Some (n,(C.Decl s)))::context) type2 in - (* only to check if the product is well-typed *) - let _ = sort_of_prod context (n,s) (sort1,sort2) in - C.Prod (n,s,type2) + let sort1 = type_of_aux context s 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) + (CicPp.ppterm sort1))) + ) ; + let type2 = type_of_aux ((Some (n,(C.Decl s)))::context) t in + C.Prod (n,s,type2) | C.LetIn (n,s,t) -> (* only to check if s is well-typed *) let ty = type_of_aux context s in @@ -1390,13 +1442,13 @@ and type_of_aux' metasenv context t = (CicSubstitution.subst s (type_of_aux ((Some (n,(C.Def (s,Some ty))))::context) t)) | C.Appl (he::tl) when List.length tl > 0 -> - let hetype = type_of_aux context he - and tlbody_and_type = List.map (fun x -> (x, type_of_aux context x)) tl in - eat_prods context hetype tlbody_and_type + let hetype = type_of_aux context he in + let tlbody_and_type = List.map (fun x -> (x, type_of_aux context x)) tl in + eat_prods ~subst context hetype tlbody_and_type | C.Appl _ -> raise (AssertFailure "Appl: no arguments") | C.Const (uri,exp_named_subst) -> incr fdebug ; - check_exp_named_subst context exp_named_subst ; + check_exp_named_subst ~subst context exp_named_subst ; let cty = CicSubstitution.subst_vars exp_named_subst (type_of_constant uri) in @@ -1404,7 +1456,7 @@ and type_of_aux' metasenv context t = cty | C.MutInd (uri,i,exp_named_subst) -> incr fdebug ; - check_exp_named_subst context exp_named_subst ; + check_exp_named_subst ~subst context exp_named_subst ; let cty = CicSubstitution.subst_vars exp_named_subst (type_of_mutual_inductive_defs uri i) @@ -1412,7 +1464,7 @@ and type_of_aux' metasenv context t = decr fdebug ; cty | C.MutConstruct (uri,i,j,exp_named_subst) -> - check_exp_named_subst context exp_named_subst ; + check_exp_named_subst ~subst context exp_named_subst ; let cty = CicSubstitution.subst_vars exp_named_subst (type_of_mutual_inductive_constr uri i j) @@ -1421,245 +1473,250 @@ and type_of_aux' metasenv context t = | C.MutCase (uri,i,outtype,term,pl) -> let outsort = type_of_aux context outtype in let (need_dummy, k) = - let rec guess_args context t = - let outtype = CicReduction.whd context t in - match outtype with - C.Sort _ -> (true, 0) - | C.Prod (name, s, t) -> - let (b, n) = guess_args ((Some (name,(C.Decl s)))::context) t in - if n = 0 then - (* last prod before sort *) - match CicReduction.whd context s with + let rec guess_args context t = + let outtype = CicReduction.whd ~subst context t in + match outtype with + C.Sort _ -> (true, 0) + | C.Prod (name, s, t) -> + let (b, n) = + guess_args ((Some (name,(C.Decl s)))::context) t in + if n = 0 then + (* last prod before sort *) + match CicReduction.whd ~subst context s with (*CSC: for _ see comment below about the missing named_exp_subst ?????????? *) - C.MutInd (uri',i',_) when U.eq uri' uri && i' = i -> - (false, 1) + C.MutInd (uri',i',_) when U.eq uri' uri && i' = i -> + (false, 1) (*CSC: for _ see comment below about the missing named_exp_subst ?????????? *) - | C.Appl ((C.MutInd (uri',i',_)) :: _) - when U.eq uri' uri && i' = i -> (false, 1) - | _ -> (true, 1) - else - (b, n + 1) - | _ -> - raise (TypeCheckerFailure (sprintf - "Malformed case analasys' output type %s" (CicPp.ppterm outtype))) - in - (*CSC whd non serve dopo type_of_aux ? *) - let (b, k) = guess_args context outsort in - if not b then (b, k - 1) else (b, k) + | C.Appl ((C.MutInd (uri',i',_)) :: _) + when U.eq uri' uri && i' = i -> (false, 1) + | _ -> (true, 1) + else + (b, n + 1) + | _ -> + raise + (TypeCheckerFailure + (sprintf + "Malformed case analasys' output type %s" + (CicPp.ppterm outtype))) in + 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 context (type_of_aux context term) 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) - 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 - 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))) + match R.whd ~subst context (type_of_aux context term) with + C.MutInd (uri',i',exp_named_subst) as typ -> + if U.eq uri uri' && i = i' then ([],[],exp_named_subst) + 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 + 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))) in - (* let's control if the sort elimination is allowed: [(I q1 ... qr)|B] *) - let sort_of_ind_type = + (* 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) + 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 context uri i need_dummy - sort_of_ind_type (type_of_aux context sort_of_ind_type) outsort) - then - raise + C.Appl ((C.MutInd (uri,i,exp_named_subst))::parameters) in + if not + (check_allowed_sort_elimination context uri i need_dummy + sort_of_ind_type (type_of_aux context sort_of_ind_type) outsort) + then + raise (TypeCheckerFailure ("Case analasys: sort elimination not allowed")); (* let's check if the type of branches are right *) - let parsno = - match CicEnvironment.get_cooked_obj ~trust:false uri with + let parsno = + match CicEnvironment.get_cooked_obj ~trust:false uri with C.InductiveDefinition (_,_,parsno) -> parsno | _ -> raise (TypeCheckerFailure ("Unknown mutual inductive definition:" ^ - UriManager.string_of_uri uri)) - in - let (_,branches_ok) = - List.fold_left - (fun (j,b) p -> + UriManager.string_of_uri uri)) + in + let (_,branches_ok) = + 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, b && -*) - (j + 1, -let res = b && - R.are_convertible context (type_of_aux context p) - (type_of_branch context parsno need_dummy outtype cons - (type_of_aux context cons)) -in if not res then debug_print ("#### " ^ CicPp.ppterm (type_of_aux context p) ^ " <==> " ^ CicPp.ppterm (type_of_branch context parsno need_dummy outtype cons (type_of_aux 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) + 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 context p) + (type_of_branch context parsno need_dummy outtype cons + (type_of_aux context cons)) in + if not res then + debug_print ("#### " ^ CicPp.ppterm (type_of_aux context p) ^ " <==> " ^ CicPp.ppterm (type_of_branch context parsno need_dummy outtype cons (type_of_aux 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) | C.Fix (i,fl) -> - let types_times_kl = + let types_times_kl = List.rev - (List.map - (fun (n,k,ty,_) -> - let _ = type_of_aux context ty in - (Some (C.Name n,(C.Decl ty)),k)) fl) - in - let (types,kl) = List.split types_times_kl in + (List.map + (fun (n,k,ty,_) -> + let _ = type_of_aux context ty in + (Some (C.Name n,(C.Decl ty)),k)) 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 (types@context) (type_of_aux (types@context) bo) - (CicSubstitution.lift len ty)) - then - begin - let (m, eaten, context') = - eat_lambdas (types @ context) (x + 1) bo - in - (*let's control the guarded by destructors conditions D{f,k,x,M}*) + List.iter + (fun (name,x,ty,bo) -> if - not - (guarded_by_destructors context' eaten (len + eaten) kl 1 [] m) + (R.are_convertible + ~subst ~metasenv (types@context) (type_of_aux (types@context) bo) + (CicSubstitution.lift len ty)) then - raise - (TypeCheckerFailure ("Fix: not guarded by destructors")) - end - else - raise (TypeCheckerFailure ("Fix: ill-typed bodies")) - ) fl ; - + 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")) + 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 + let (_,_,ty,_) = List.nth fl i in + ty | C.CoFix (i,fl) -> - let types = + let types = List.rev (List.map (fun (n,ty,_) -> - let _ = type_of_aux context ty in Some (C.Name n,(C.Decl ty))) fl) - in + let _ = type_of_aux context ty in Some (C.Name n,(C.Decl ty))) fl) + in let len = List.length types in - List.iter + List.iter (fun (_,ty,bo) -> - if - (R.are_convertible (types @ context) - (type_of_aux (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")) + if + (R.are_convertible + ~subst ~metasenv (types @ context) + (type_of_aux (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 + let (_,ty,_) = List.nth fl i in ty - and check_exp_named_subst context = - let rec check_exp_named_subst_aux substs = + and check_exp_named_subst ?(subst = []) context = + let rec check_exp_named_subst_aux esubsts = function [] -> () - | ((uri,t) as subst)::tl -> + | ((uri,t) as item)::tl -> let typeofvar = - CicSubstitution.subst_vars substs (type_of_variable uri) in - (match CicEnvironment.get_cooked_obj ~trust:false uri with - Cic.Variable (_,Some bo,_,_) -> - raise - (TypeCheckerFailure - ("A variable with a body can not be explicit substituted")) - | Cic.Variable (_,None,_,_) -> () - | _ -> - raise (TypeCheckerFailure - ("Unknown mutual inductive definition:" ^ - UriManager.string_of_uri uri)) - ) ; + CicSubstitution.subst_vars esubsts (type_of_variable uri) in let typeoft = type_of_aux context t in - if CicReduction.are_convertible context typeoft typeofvar then - check_exp_named_subst_aux (substs@[subst]) tl - else + if CicReduction.are_convertible + ~subst ~metasenv context typeoft typeofvar then + check_exp_named_subst_aux (esubsts@[item]) tl + else begin - CicReduction.fdebug := 0 ; - ignore (CicReduction.are_convertible context typeoft typeofvar) ; - fdebug := 0 ; - debug typeoft [typeofvar] ; - raise (TypeCheckerFailure "Wrong Explicit Named Substitution") + 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 [] - and sort_of_prod context (name,s) (t1, t2) = + and sort_of_prod ?(subst = []) context (name,s) (t1, t2) = let module C = Cic in - let t1' = CicReduction.whd context t1 in - let t2' = CicReduction.whd ((Some (name,C.Decl s))::context) t2 in + let t1' = CicReduction.whd ~subst context t1 in + let t2' = CicReduction.whd ~subst ((Some (name,C.Decl s))::context) t2 in match (t1', t2') with (C.Sort s1, C.Sort s2) - when (s2 = C.Prop or s2 = C.Set or s2 = C.CProp) -> (* different from Coq manual!!! *) + when (s2 = C.Prop or s2 = C.Set or s2 = C.CProp) -> + (* different from Coq manual!!! *) C.Sort s2 - | (C.Sort s1, C.Sort s2) -> C.Sort C.Type (*CSC manca la gestione degli universi!!! *) + | (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') + | (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.Meta _, C.Meta (_,[])) - | (C.Sort _, C.Meta (_,[])) -> t2' + | (C.Meta _, (C.Meta (_,_) as t)) + | (C.Sort _, (C.Meta (_,_) as t)) when CicUtil.is_closed t -> + t2' | (_,_) -> raise (TypeCheckerFailure (sprintf "Prod: expected two sorts, found = %s, %s" (CicPp.ppterm t1') (CicPp.ppterm t2'))) - and eat_prods context hetype = + 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 context hetype) with + (match (CicReduction.whd ~subst context hetype) with Cic.Prod (n,s,t) -> - if CicReduction.are_convertible context s hety then + if CicReduction.are_convertible ~subst ~metasenv context hety s then (CicReduction.fdebug := -1 ; - eat_prods context (CicSubstitution.subst hete t) tl + eat_prods ~subst context (CicSubstitution.subst hete t) tl ) else begin CicReduction.fdebug := 0 ; - ignore (CicReduction.are_convertible context s hety) ; + ignore (CicReduction.are_convertible ~subst ~metasenv context s hety) ; fdebug := 0 ; debug s [hety] ; raise (TypeCheckerFailure (sprintf @@ -1736,15 +1793,18 @@ in debug_print "FINE TYPE_OF_AUX'" ; flush stderr ; res *) ;; +(* tassi FIXME: not sure where is this called... no history here... *) let typecheck uri = let module C = Cic in let module R = CicReduction in let module U = UriManager in - match CicEnvironment.is_type_checked ~trust:false uri with - CicEnvironment.CheckedObj _ -> () + (*match CicEnvironment.is_type_checked ~trust:false uri with*) + match CicEnvironment.is_type_checked ~trust:true uri with + CicEnvironment.CheckedObj cobj -> cobj | CicEnvironment.UncheckedObj uobj -> (* let's typecheck the uncooked object *) CicLogger.log (`Start_type_checking uri) ; + CicUniv.directly_to_env_begin (); (match uobj with C.Constant (_,Some te,ty,_) -> let _ = type_of ty in @@ -1784,5 +1844,7 @@ let typecheck uri = check_mutual_inductive_defs uri uobj ) ; CicEnvironment.set_type_checking_info uri ; - CicLogger.log (`Type_checking_completed uri) + CicUniv.directly_to_env_end (); + CicLogger.log (`Type_checking_completed uri); + uobj ;;