X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicTypeChecker.ml;h=efe04de1a7553d3b43d44b7a1c0c069447a33485;hb=dac4721470c5db03f4291adfb4f73e2016040d4b;hp=877c33d23edf73c5c09a5c274afd1cfe60898564;hpb=80f3756848ca8b178255f717794c5c2358d5d585;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicTypeChecker.ml b/helm/software/components/ng_kernel/nCicTypeChecker.ml index 877c33d23..efe04de1a 100644 --- a/helm/software/components/ng_kernel/nCicTypeChecker.ml +++ b/helm/software/components/ng_kernel/nCicTypeChecker.ml @@ -19,14 +19,6 @@ module U = NCicUtils module E = NCicEnvironment module PP = NCicPp -(* web interface stuff *) - -let logger = - ref (function (`Start_type_checking _|`Type_checking_completed _) -> ()) -;; - -let set_logger f = logger := f;; - exception TypeCheckerFailure of string Lazy.t exception AssertFailure of string Lazy.t @@ -119,7 +111,7 @@ let debruijn ?(cb=fun _ _ -> ()) uri number_of_types context = if l1 == l then t else C.Meta (i,(s,C.Ctx l1)) | C.Meta _ -> t | C.Const (Ref.Ref (_,uri1,(Ref.Fix (no,_) | Ref.CoFix no))) - | C.Const (Ref.Ref (_,uri1,Ref.Ind no)) when NUri.eq uri uri1 -> + | C.Const (Ref.Ref (_,uri1,Ref.Ind (_,no))) when NUri.eq uri uri1 -> C.Rel (k + number_of_types - no) | t -> U.map (fun _ k -> k+1) k aux t in @@ -159,7 +151,7 @@ let eat_prods ~subst ~metasenv context he ty_he args_with_ty = prerr_endline (PP.ppterm ~subst ~metasenv ~context (S.subst ~avoid_beta_redexes:true arg t)); *) - if R.are_convertible ~subst ~metasenv context ty_arg s then + if R.are_convertible ~subst context ty_arg s then aux (S.subst ~avoid_beta_redexes:true arg t) tl else raise @@ -198,8 +190,8 @@ let rec instantiate_parameters params c = let specialize_inductive_type_constrs ~subst context ty_term = match R.whd ~subst context ty_term with - | C.Const (Ref.Ref (_,uri,Ref.Ind i) as ref) - | C.Appl (C.Const (Ref.Ref (_,uri,Ref.Ind i) as ref) :: _ ) as ty -> + | C.Const (Ref.Ref (_,uri,Ref.Ind (_,i)) as ref) + | C.Appl (C.Const (Ref.Ref (_,uri,Ref.Ind (_,i)) as ref) :: _ ) as ty -> let args = match ty with C.Appl (_::tl) -> tl | _ -> [] in let is_ind, leftno, itl, attrs, i = E.get_checked_indtys ref in let left_args,_ = HExtlib.split_nth leftno args in @@ -257,8 +249,8 @@ let rec weakly_positive ~subst context n nn uri te = let dummy = C.Sort (C.Type ~-1) in (*CSC: mettere in cicSubstitution *) let rec subst_inductive_type_with_dummy _ = function - | C.Const (Ref.Ref (_,uri',Ref.Ind 0)) when NUri.eq uri' uri -> dummy - | C.Appl ((C.Const (Ref.Ref (_,uri',Ref.Ind 0)))::tl) + | C.Const (Ref.Ref (_,uri',Ref.Ind (true,0))) when NUri.eq uri' uri -> dummy + | C.Appl ((C.Const (Ref.Ref (_,uri',Ref.Ind (true,0))))::tl) when NUri.eq uri' uri -> dummy | t -> U.map (fun _ x->x) () subst_inductive_type_with_dummy t in @@ -290,7 +282,7 @@ and strictly_positive ~subst context n nn te = strictly_positive ~subst ((name,C.Decl so)::context) (n+1) (nn+1) ta | C.Appl ((C.Rel m)::tl) when m > n && m <= nn -> List.for_all (does_not_occur ~subst context n nn) tl - | C.Appl (C.Const (Ref.Ref (_,uri,Ref.Ind i) as r)::tl) -> + | C.Appl (C.Const (Ref.Ref (_,uri,Ref.Ind (_,i)) as r)::tl) -> let _,paramsno,tyl,_,i = E.get_checked_indtys r in let _,name,ity,cl = List.nth tyl i in let ok = List.length tyl = 1 in @@ -401,7 +393,7 @@ let rec typeof ~subst ~metasenv context term = | C.LetIn (n,ty,t,bo) -> let ty_t = typeof_aux context t in let _ = typeof_aux context ty in - if not (R.are_convertible ~subst ~metasenv context ty ty_t) then + if not (R.are_convertible ~subst context ty ty_t) then raise (TypeCheckerFailure (lazy (Printf.sprintf @@ -424,7 +416,7 @@ let rec typeof ~subst ~metasenv context term = *) eat_prods ~subst ~metasenv context he ty_he args_with_ty | C.Appl _ -> raise (AssertFailure (lazy "Appl of length < 2")) - | C.Match (Ref.Ref (_,_,Ref.Ind tyno) as r,outtype,term,pl) -> + | C.Match (Ref.Ref (_,_,Ref.Ind (_,tyno)) as r,outtype,term,pl) -> let outsort = typeof_aux context outtype in let inductive,leftno,itl,_,_ = E.get_checked_indtys r in let constructorsno = @@ -479,7 +471,7 @@ let rec typeof ~subst ~metasenv context term = let ty_branch = type_of_branch ~subst context leftno outtype cons ty_cons 0 in - j+1, R.are_convertible ~subst ~metasenv context ty_p ty_branch, + j+1, R.are_convertible ~subst context ty_p ty_branch, ty_p, ty_branch else j,false,old_p_ty,old_exp_p_ty @@ -541,7 +533,7 @@ let rec typeof ~subst ~metasenv context term = (_,C.Decl t1), (_,C.Decl t2) | (_,C.Def (t1,_)), (_,C.Def (t2,_)) | (_,C.Def (_,t1)), (_,C.Decl t2) -> - if not (R.are_convertible ~subst ~metasenv tl t1 t2) then + if not (R.are_convertible ~subst tl t1 t2) then raise (TypeCheckerFailure (lazy (Printf.sprintf @@ -592,7 +584,7 @@ let rec typeof ~subst ~metasenv context term = with Failure _ -> t) | _ -> t in - if not (R.are_convertible ~subst ~metasenv context optimized_t ct) + if not (R.are_convertible ~subst context optimized_t ct) then raise (TypeCheckerFailure @@ -603,7 +595,7 @@ let rec typeof ~subst ~metasenv context term = (PP.ppterm ~subst ~metasenv ~context t)))) | t, (_,C.Decl ct) -> let type_t = typeof_aux context t in - if not (R.are_convertible ~subst ~metasenv context type_t ct) then + if not (R.are_convertible ~subst context type_t ct) then raise (TypeCheckerFailure (lazy (Printf.sprintf ("Not well typed metavariable local context: "^^ @@ -638,7 +630,7 @@ let rec typeof ~subst ~metasenv context term = let arity2 = R.whd ~subst context arity2 in match arity1,arity2 with | C.Prod (name,so1,de1), C.Prod (_,so2,de2) -> - if not (R.are_convertible ~subst ~metasenv context so1 so2) then + if not (R.are_convertible ~subst context so1 so2) then raise (TypeCheckerFailure (lazy (Printf.sprintf "In outtype: expected %s, found %s" (PP.ppterm ~subst ~metasenv ~context so1) @@ -647,7 +639,7 @@ let rec typeof ~subst ~metasenv context term = aux ((name, C.Decl so1)::context) (mkapp (S.lift 1 ind) (C.Rel 1)) de1 de2 | C.Sort _, C.Prod (name,so,ta) -> - if not (R.are_convertible ~subst ~metasenv context so ind) then + if not (R.are_convertible ~subst context so ind) then raise (TypeCheckerFailure (lazy (Printf.sprintf "In outtype: expected %s, found %s" (PP.ppterm ~subst ~metasenv ~context ind) @@ -813,13 +805,9 @@ and guarded_by_destructors r_uri r_len ~subst ~metasenv context recfuns t = ) bos in List.iter (fun (bo,k) -> aux k bo) bos_and_ks - | C.Match (Ref.Ref (_,uri,_) as ref,outtype,term,pl) as t -> + | C.Match (Ref.Ref (_,uri,Ref.Ind (true,_)),outtype,term,pl) as t -> (match R.whd ~subst context term with | C.Rel m | C.Appl (C.Rel m :: _ ) as t when is_safe m recfuns || m = x -> - (* TODO: add CoInd to references so that this call is useless *) - let isinductive, _, _, _, _ = E.get_checked_indtys ref in - if not isinductive then recursor aux k t - else let ty = typeof ~subst ~metasenv context term in let dc_ctx, dcl, start, stop = specialize_and_abstract_constrs ~subst r_uri r_len context ty in @@ -961,27 +949,17 @@ and is_really_smaller and returns_a_coinductive ~subst context ty = match R.whd ~subst context ty with - | C.Const (Ref.Ref (_,uri,Ref.Ind _) as ref) - | C.Appl (C.Const (Ref.Ref (_,uri,Ref.Ind _) as ref)::_) -> - let isinductive, _, itl, _, _ = E.get_checked_indtys ref in - if isinductive then None else (Some (uri,List.length itl)) + | C.Const (Ref.Ref (_,uri,Ref.Ind (false,_)) as ref) + | C.Appl (C.Const (Ref.Ref (_,uri,Ref.Ind (false,_)) as ref)::_) -> + let _, _, itl, _, _ = E.get_checked_indtys ref in + Some (uri,List.length itl) | C.Prod (n,so,de) -> returns_a_coinductive ~subst ((n,C.Decl so)::context) de | _ -> None and type_of_constant ((Ref.Ref (_,uri,_)) as ref) = - let cobj = - match E.get_obj uri with - | true, cobj -> cobj - | false, uobj -> - !logger (`Start_type_checking uri); - check_obj_well_typed uobj; - E.add_obj uobj; - !logger (`Type_checking_completed uri); - uobj - in - match cobj, ref with - | (_,_,_,_,C.Inductive (_,_,tl,_)), Ref.Ref (_,_,Ref.Ind i) -> + match E.get_checked_obj uri, ref with + | (_,_,_,_,C.Inductive (_,_,tl,_)), Ref.Ref (_,_,Ref.Ind (_,i)) -> let _,_,arity,_ = List.nth tl i in arity | (_,_,_,_,C.Inductive (_,_,tl,_)), Ref.Ref (_,_,Ref.Con (i,j)) -> let _,_,_,cl = List.nth tl i in @@ -992,15 +970,16 @@ and type_of_constant ((Ref.Ref (_,uri,_)) as ref) = arity | (_,_,_,_,C.Constant (_,_,_,ty,_)), Ref.Ref (_,_,(Ref.Def |Ref.Decl)) -> ty | _ -> raise (AssertFailure (lazy "type_of_constant: environment/reference")) +;; -and check_obj_well_typed (uri,height,metasenv,subst,kind) = +let typecheck_obj (uri,height,metasenv,subst,kind) = (* CSC: here we should typecheck the metasenv and the subst *) assert (metasenv = [] && subst = []); match kind with | C.Constant (_,_,Some te,ty,_) -> let _ = typeof ~subst ~metasenv [] ty in let ty_te = typeof ~subst ~metasenv [] te in - if not (R.are_convertible ~subst ~metasenv [] ty_te ty) then + if not (R.are_convertible ~subst [] ty_te ty) then raise (TypeCheckerFailure (lazy (Printf.sprintf ( "the type of the body is not convertible with the declared one.\n"^^ "inferred type:\n%s\nexpected type:\n%s") @@ -1027,7 +1006,7 @@ and check_obj_well_typed (uri,height,metasenv,subst,kind) = in List.iter2 (fun (_,name,x,ty,_) bo -> let ty_bo = typeof ~subst ~metasenv types bo in - if not (R.are_convertible ~subst ~metasenv types ty_bo ty) + if not (R.are_convertible ~subst types ty_bo ty) then raise (TypeCheckerFailure (lazy ("(Co)Fix: ill-typed bodies"))) else if inductive then begin @@ -1062,7 +1041,45 @@ and check_obj_well_typed (uri,height,metasenv,subst,kind) = raise (TypeCheckerFailure (lazy "CoFix: not guarded by constructors")) ) fl dfl +;; -let typecheck_obj = check_obj_well_typed;; +(* trust *) + +let trust = ref (fun _ -> false);; +let set_trust f = trust := f +let trust_obj obj = !trust obj + + +(* web interface stuff *) + +let logger = + ref (function (`Start_type_checking _|`Type_checking_completed _|`Type_checking_interrupted _|`Type_checking_failed _|`Trust_obj _) -> ()) +;; + +let set_logger f = logger := f;; + +let typecheck_obj obj = + let u,_,_,_,_ = obj in + try + !logger (`Start_type_checking u); + typecheck_obj obj; + !logger (`Type_checking_completed u) + with + Sys.Break as e -> + !logger (`Type_checking_interrupted u); + raise e + | e -> + !logger (`Type_checking_failed u); + raise e +;; + +E.set_typecheck_obj + (fun obj -> + if trust_obj obj then + let u,_,_,_,_ = obj in + !logger (`Trust_obj u) + else + typecheck_obj obj) +;; (* EOF *)