X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicTypeChecker.ml;h=ce16af7d213dc5fbb33f315fdeef49b526689d50;hb=bd3680d6b90f6c8bdda4eb4a915a86a0e806de63;hp=d9e6120d94d7cda03d172600d5699cc801cccbd1;hpb=5c7b30c4b1033352578c6e38e4fcff4eb0930c44;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicTypeChecker.ml b/helm/software/components/ng_kernel/nCicTypeChecker.ml index d9e6120d9..ce16af7d2 100644 --- a/helm/software/components/ng_kernel/nCicTypeChecker.ml +++ b/helm/software/components/ng_kernel/nCicTypeChecker.ml @@ -96,16 +96,6 @@ let fixed_args bos j n nn = (let rec f = function 0 -> [] | n -> true :: f (n-1) in f j) bos ;; -(* if n < 0, then splits all prods from an arity, returning a sort *) -let rec split_prods ~subst context n te = - match (n, R.whd ~subst context te) with - | (0, _) -> context,te - | (n, C.Sort _) when n <= 0 -> context,te - | (n, C.Prod (name,so,ta)) -> - split_prods ~subst ((name,(C.Decl so))::context) (n - 1) ta - | (_, _) -> raise (AssertFailure (lazy "split_prods")) -;; - let debruijn uri number_of_types context = let rec aux k t = match t with @@ -126,11 +116,13 @@ let sort_of_prod ~metasenv ~subst context (name,s) t (t1, t2) = let t2 = R.whd ~subst ((name,C.Decl s)::context) t2 in match t1, t2 with | C.Sort _, C.Sort C.Prop -> t2 - | C.Sort (C.Type u1), C.Sort (C.Type u2) -> C.Sort (C.Type (u1@u2)) + | C.Sort (C.Type u1), C.Sort (C.Type u2) -> + C.Sort (C.Type (NCicEnvironment.max u1 u2)) | C.Sort C.Prop,C.Sort (C.Type _) -> t2 - | C.Meta (_,(_,(C.Irl 0 | C.Ctx []))), C.Sort _ - | C.Meta (_,(_,(C.Irl 0 | C.Ctx []))), C.Meta (_,(_,(C.Irl 0 | C.Ctx []))) - | C.Sort _, C.Meta (_,(_,(C.Irl 0 | C.Ctx []))) -> t2 + | C.Meta (_,(_,(C.Irl 0 | C.Ctx []))), C.Sort _ -> t2 + | C.Meta (_,(_,(C.Irl 0 | C.Ctx []))), C.Meta (i,(_,(C.Irl 0 | C.Ctx []))) + | C.Sort _, C.Meta (i,(_,(C.Irl 0 | C.Ctx []))) -> + NCic.Meta (i,(0, C.Irl 0)) | x, (C.Sort _ | C.Meta (_,(_,(C.Irl 0 | C.Ctx [])))) | _, x -> let y, context = @@ -234,7 +226,7 @@ let check_homogeneous_call ~subst context indparamsno n uri reduct tl = (fun k x -> if k = 0 then 0 else - match R.whd context x with + match R.whd ~subst context x with | C.Rel m when m = n - (indparamsno - k) -> k - 1 | _ -> raise (TypeCheckerFailure (lazy ("Argument "^string_of_int (indparamsno - k + 1) ^ " (of " ^ @@ -267,7 +259,7 @@ let rec weakly_positive ~subst context n nn uri indparamsno posuri te = are skipped because we already know that are_all_occurrences_positive of uri in te. *) let rec aux context n nn te = - match R.whd context te with + match R.whd ~subst context te with | t when t = dummy -> true | C.Appl (te::rargs) when te = dummy -> List.for_all (does_not_occur ~subst context n nn) rargs @@ -285,7 +277,7 @@ let rec weakly_positive ~subst context n nn uri indparamsno posuri te = aux context n nn (subst_inductive_type_with_dummy () te) and strictly_positive ~subst context n nn indparamsno posuri te = - match R.whd context te with + match R.whd ~subst context te with | t when does_not_occur ~subst context n nn t -> true | C.Rel _ when indparamsno = 0 -> true | C.Appl ((C.Rel m)::tl) as reduct when m > n && m <= nn -> @@ -313,7 +305,7 @@ and strictly_positive ~subst context n nn indparamsno posuri te = (* the inductive type indexes are s.t. n < x <= nn *) and are_all_occurrences_positive ~subst context uri indparamsno i n nn te = - match R.whd context te with + match R.whd ~subst context te with | C.Appl ((C.Rel m)::tl) as reduct when m = i -> check_homogeneous_call ~subst context indparamsno n uri reduct tl; List.for_all (does_not_occur ~subst context n nn) tl @@ -358,7 +350,9 @@ let type_of_branch ~subst context leftno outty cons tycons = | t -> C.Appl [t ; C.Rel 1] in C.Prod (name,so, aux (liftno+1) ((name,(C.Decl so))::context) cons de) - | _ -> raise (AssertFailure (lazy "type_of_branch")) + | t -> raise (AssertFailure + (lazy ("type_of_branch, the contructor has type: " ^ NCicPp.ppterm + ~metasenv:[] ~context:[] ~subst:[] t))) in aux 0 context cons tycons ;; @@ -373,7 +367,9 @@ let rec typeof ~subst ~metasenv context term = match List.nth context (n - 1) with | (_,C.Decl ty) -> S.lift n ty | (_,C.Def (_,ty)) -> S.lift n ty - with Failure _ -> raise (TypeCheckerFailure (lazy "unbound variable"))) + with Failure _ -> + raise (TypeCheckerFailure (lazy ("unbound variable " ^ string_of_int n + ^" under: " ^ NCicPp.ppcontext ~metasenv ~subst context)))) | C.Sort (C.Type [false,u]) -> C.Sort (C.Type [true, u]) | C.Sort (C.Type _) -> raise (AssertFailure (lazy ("Cannot type an inferred type: "^ @@ -389,7 +385,9 @@ let rec typeof ~subst ~metasenv context term = (* match ty with C.Implicit _ -> assert false | _ -> c,ty *) with U.Meta_not_found _ -> raise (AssertFailure (lazy (Printf.sprintf - "%s not found" (PP.ppterm ~subst ~metasenv ~context t)))) + "%s not found in:\n%s" (PP.ppterm ~subst ~metasenv ~context t) + (PP.ppmetasenv ~subst metasenv) + ))) in check_metasenv_consistency t ~subst ~metasenv context canonical_ctx l; S.subst_meta l ty @@ -414,7 +412,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 context ty_t ty) then + if not (R.are_convertible ~metasenv ~subst context ty_t ty) then raise (TypeCheckerFailure (lazy (Printf.sprintf @@ -485,7 +483,7 @@ let rec typeof ~subst ~metasenv context term = let ty_branch = type_of_branch ~subst context leftno outtype cons ty_cons in - j+1, R.are_convertible ~subst context ty_p ty_branch, + j+1, R.are_convertible ~metasenv ~subst context ty_p ty_branch, ty_p, ty_branch else j,false,old_p_ty,old_exp_p_ty @@ -519,7 +517,7 @@ let rec typeof ~subst ~metasenv context term = | 0,_,_::_ | _,_,[] -> raise (AssertFailure (lazy (Printf.sprintf - "Local and canonical context %s have different lengths" + "(2) Local and canonical context %s have different lengths" (PP.ppterm ~subst ~context ~metasenv term)))) | m,[],_::_ -> raise (TypeCheckerFailure (lazy (Printf.sprintf @@ -530,7 +528,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 tl t1 t2) then + if not (R.are_convertible ~metasenv ~subst tl t1 t2) then raise (TypeCheckerFailure (lazy (Printf.sprintf @@ -581,7 +579,7 @@ let rec typeof ~subst ~metasenv context term = with Failure _ -> t) | _ -> t in - if not (R.are_convertible ~subst context optimized_t ct) + if not (R.are_convertible ~metasenv ~subst context optimized_t ct) then raise (TypeCheckerFailure @@ -592,7 +590,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 context type_t ct) then + if not (R.are_convertible ~metasenv ~subst context type_t ct) then raise (TypeCheckerFailure (lazy (Printf.sprintf ("Not well typed metavariable local context: "^^ @@ -602,9 +600,9 @@ let rec typeof ~subst ~metasenv context term = (PP.ppterm ~subst ~metasenv ~context type_t)))) ) l lifted_canonical_context with - Invalid_argument _ -> + | Invalid_argument "List.iter2" -> raise (AssertFailure (lazy (Printf.sprintf - "Local and canonical context %s have different lengths" + "(1) Local and canonical context %s have different lengths" (PP.ppterm ~subst ~metasenv ~context term)))) in @@ -620,7 +618,7 @@ and check_allowed_sort_elimination ~subst ~metasenv r = 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 context so1 so2) then + if not (R.are_convertible ~metasenv ~subst context so1 so2) then raise (TypeCheckerFailure (lazy (Printf.sprintf "In outtype: expected %s, found %s" (PP.ppterm ~subst ~metasenv ~context so1) @@ -629,7 +627,7 @@ and check_allowed_sort_elimination ~subst ~metasenv r = 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 context so ind) then + if not (R.are_convertible ~metasenv ~subst context so ind) then raise (TypeCheckerFailure (lazy (Printf.sprintf "In outtype: expected %s, found %s" (PP.ppterm ~subst ~metasenv ~context ind) @@ -651,8 +649,9 @@ and check_allowed_sort_elimination ~subst ~metasenv r = (cl_len = 0 || (itl_len = 1 && cl_len = 1 && let _,_,constrty = List.hd cl in - is_non_recursive_singleton r itname ittype constrty && - is_non_informative leftno constrty)) + is_non_recursive_singleton + ~subst r itname ittype constrty && + is_non_informative ~metasenv ~subst leftno constrty)) then raise (TypeCheckerFailure (lazy ("Sort elimination not allowed"))); @@ -667,13 +666,13 @@ and eat_prods ~subst ~metasenv context he ty_he args_with_ty = | (arg, ty_arg)::tl -> match R.whd ~subst context ty_he with | C.Prod (_,s,t) -> - if R.are_convertible ~subst context ty_arg s then + if R.are_convertible ~metasenv ~subst context ty_arg s then aux (S.subst ~avoid_beta_redexes:true arg t) tl else raise (TypeCheckerFailure (lazy (Printf.sprintf - ("Appl: wrong application of %s: the parameter %s has type"^^ + ("Appl: wrong application of %s: the argument %s has type"^^ "\n%s\nbut it should have type \n%s\nContext:\n%s\n") (PP.ppterm ~subst ~metasenv ~context he) (PP.ppterm ~subst ~metasenv ~context arg) @@ -694,28 +693,28 @@ and eat_prods ~subst ~metasenv context he ty_he args_with_ty = in aux ty_he args_with_ty -and is_non_recursive_singleton (Ref.Ref (uri,_)) iname ity cty = +and is_non_recursive_singleton ~subst (Ref.Ref (uri,_)) iname ity cty = let ctx = [iname, C.Decl ity] in let cty = debruijn uri 1 [] cty in let len = List.length ctx in let rec aux ctx n nn t = - match R.whd ctx t with + match R.whd ~subst ctx t with | C.Prod (name, src, tgt) -> - does_not_occur ~subst:[] ctx n nn src && + does_not_occur ~subst ctx n nn src && aux ((name, C.Decl src) :: ctx) (n+1) (nn+1) tgt | C.Rel k | C.Appl (C.Rel k :: _) when k = nn -> true | _ -> assert false in aux ctx (len-1) len cty -and is_non_informative paramsno c = +and is_non_informative ~metasenv ~subst paramsno c = let rec aux context c = - match R.whd context c with + match R.whd ~subst context c with | C.Prod (n,so,de) -> - let s = typeof ~metasenv:[] ~subst:[] context so in + let s = typeof ~metasenv ~subst context so in s = C.Sort C.Prop && aux ((n,(C.Decl so))::context) de | _ -> true in - let context',dx = split_prods ~subst:[] [] paramsno c in + let context',dx = NCicReduction.split_prods ~subst [] paramsno c in aux context' dx and check_mutual_inductive_defs uri ~metasenv ~subst leftno tyl = @@ -727,13 +726,15 @@ and check_mutual_inductive_defs uri ~metasenv ~subst leftno tyl = ignore (List.fold_right (fun (it_relev,_,ty,cl) i -> - let context,ty_sort = split_prods ~subst [] ~-1 ty in + let context,ty_sort = NCicReduction.split_prods ~subst [] ~-1 ty in let sx_context_ty_rev,_ = HExtlib.split_nth leftno (List.rev context) in List.iter (fun (k_relev,_,te) -> - let _,k_relev = HExtlib.split_nth leftno k_relev in + let k_relev = + try snd (HExtlib.split_nth leftno k_relev) + with Failure _ -> k_relev in let te = debruijn uri len [] te in - let context,te = split_prods ~subst tys leftno te in + let context,te = NCicReduction.split_prods ~subst tys leftno te in let _,chopped_context_rev = HExtlib.split_nth (List.length tys) (List.rev context) in let sx_context_te_rev,_ = @@ -743,12 +744,11 @@ and check_mutual_inductive_defs uri ~metasenv ~subst leftno tyl = (fun context item1 item2 -> let convertible = match item1,item2 with - (n1,C.Decl ty1),(n2,C.Decl ty2) -> - n1 = n2 && R.are_convertible ~subst context ty1 ty2 - | (n1,C.Def (bo1,ty1)),(n2,C.Def (bo2,ty2)) -> - n1 = n2 - && R.are_convertible ~subst context ty1 ty2 - && R.are_convertible ~subst context bo1 bo2 + (_,C.Decl ty1),(_,C.Decl ty2) -> + R.are_convertible ~metasenv ~subst context ty1 ty2 + | (_,C.Def (bo1,ty1)),(_,C.Def (bo2,ty2)) -> + R.are_convertible ~metasenv ~subst context ty1 ty2 && + R.are_convertible ~metasenv ~subst context bo1 bo2 | _,_ -> false in if not convertible then @@ -758,7 +758,7 @@ and check_mutual_inductive_defs uri ~metasenv ~subst leftno tyl = else item1::context ) [] sx_context_ty_rev sx_context_te_rev) - with Invalid_argument _ -> assert false); + with Invalid_argument "List.fold_left2" -> assert false); let con_sort = typeof ~subst ~metasenv context te in (match R.whd ~subst context con_sort, R.whd ~subst [] ty_sort with (C.Sort (C.Type u1) as s1), (C.Sort (C.Type u2) as s2) -> @@ -996,7 +996,7 @@ and guarded_by_constructors ~subst ~metasenv context t indURI indlen nn = aux context 0 nn false t and recursive_args ~subst ~metasenv context n nn te = - match R.whd context te with + match R.whd ~subst context te with | C.Rel _ | C.Appl _ | C.Const _ -> [] | C.Prod (name,so,de) -> (not (does_not_occur ~subst context n nn so)) :: @@ -1077,19 +1077,22 @@ and type_of_constant ((Ref.Ref (uri,_)) as ref) = let _,_,recno1,arity,_ = List.nth fl i in if h1 <> h2 || recno1 <> recno2 then error (); arity - | (_,_,_,_,C.Constant (_,_,_,ty,_)), Ref.Ref (_,Ref.Decl) -> ty - | (_,h1,_,_,C.Constant (_,_,_,ty,_)), Ref.Ref (_,Ref.Def h2) -> + | (_,_,_,_,C.Constant (_,_,None,ty,_)), Ref.Ref (_,Ref.Decl) -> ty + | (_,h1,_,_,C.Constant (_,_,Some _,ty,_)), Ref.Ref (_,Ref.Def h2) -> if h1 <> h2 then error (); ty - | _ -> raise (AssertFailure (lazy "type_of_constant: environment/reference")) + | _ -> + raise (AssertFailure + (lazy ("type_of_constant: environment/reference: " ^ + Ref.string_of_reference ref))) -and get_relevance ~subst context t args = - let ty = typeof ~subst ~metasenv:[] context t in +and get_relevance ~metasenv ~subst context t args = + let ty = typeof ~subst ~metasenv context t in let rec aux context ty = function | [] -> [] | arg::tl -> match R.whd ~subst context ty with | C.Prod (_,so,de) -> - let sort = typeof ~subst ~metasenv:[] context so in + let sort = typeof ~subst ~metasenv context so in let new_ty = S.subst ~avoid_beta_redexes:true arg de in (*prerr_endline ("so: " ^ PP.ppterm ~subst ~metasenv:[] ~context so); @@ -1102,14 +1105,14 @@ and get_relevance ~subst context t args = | C.Meta _ -> true::(aux context new_ty tl) | _ -> raise (TypeCheckerFailure (lazy (Printf.sprintf "Prod: the type %s of the source of %s is not a sort" - (PP.ppterm ~subst ~metasenv:[] ~context sort) - (PP.ppterm ~subst ~metasenv:[] ~context so))))) + (PP.ppterm ~subst ~metasenv ~context sort) + (PP.ppterm ~subst ~metasenv ~context so))))) | _ -> raise (TypeCheckerFailure (lazy (Printf.sprintf "Appl: %s is not a function, it cannot be applied" - (PP.ppterm ~subst ~metasenv:[] ~context + (PP.ppterm ~subst ~metasenv ~context (let res = List.length tl in let eaten = List.length args - res in (C.Appl @@ -1128,7 +1131,7 @@ let typecheck_context ~metasenv ~subst context = | name,C.Def (te,ty) -> ignore (typeof ~metasenv ~subst:[] context ty); let ty' = typeof ~metasenv ~subst:[] context te in - if not (R.are_convertible ~subst context ty' ty) then + if not (R.are_convertible ~metasenv ~subst context ty' ty) then raise (AssertFailure (lazy (Printf.sprintf ( "the type of the definiens for %s in the context is not "^^ "convertible with the declared one.\n"^^ @@ -1166,7 +1169,7 @@ let typecheck_subst ~metasenv subst = typecheck_context ~metasenv ~subst context; ignore (typeof ~metasenv ~subst context ty); let ty' = typeof ~metasenv ~subst context bo in - if not (R.are_convertible ~subst context ty' ty) then + if not (R.are_convertible ~metasenv ~subst context ty' ty) then raise (AssertFailure (lazy (Printf.sprintf ( "the type of the definiens for %d in the substitution is not "^^ "convertible with the declared one.\n"^^ @@ -1178,16 +1181,59 @@ let typecheck_subst ~metasenv subst = ) [] subst) ;; +let height_of_term tl = + let h = ref 0 in + let get_height (NReference.Ref (uri,_)) = + let _,height,_,_,_ = NCicEnvironment.get_checked_obj uri in + height in + let rec aux = + function + NCic.Meta (_,(_,NCic.Ctx l)) -> List.iter aux l + | NCic.Meta _ -> () + | NCic.Rel _ + | NCic.Sort _ -> () + | NCic.Implicit _ -> assert false + | NCic.Const nref -> h := max !h (get_height nref) + | NCic.Prod (_,t1,t2) + | NCic.Lambda (_,t1,t2) -> aux t1; aux t2 + | NCic.LetIn (_,s,ty,t) -> aux s; aux ty; aux t + | NCic.Appl l -> List.iter aux l + | NCic.Match (_,outty,t,pl) -> aux outty; aux t; List.iter aux pl + in + List.iter aux tl; + 1 + !h +;; + +let height_of_obj_kind uri = + function + NCic.Inductive _ + | NCic.Constant (_,_,None,_,_) + | NCic.Fixpoint (false,_,_) -> 0 + | NCic.Fixpoint (true,ifl,_) -> + let iflno = List.length ifl in + height_of_term + (List.fold_left + (fun l (_,_,_,ty,bo) -> + let bo = debruijn uri iflno [] bo in + ty::bo::l + ) [] ifl) + | NCic.Constant (_,_,Some bo,ty,_) -> height_of_term [bo;ty] +;; -let typecheck_obj (uri,_height,metasenv,subst,kind) = - (* height is not checked since it is only used to implement an optimization *) +let typecheck_obj (uri,height,metasenv,subst,kind) = +(*height must be checked since it is not only an optimization during reduction*) + let iheight = height_of_obj_kind uri kind in + if height <> iheight then + raise (TypeCheckerFailure (lazy (Printf.sprintf + "the declared object height (%d) is not the inferred one (%d)" + height iheight))); typecheck_metasenv metasenv; typecheck_subst ~metasenv subst; match kind with | C.Constant (relevance,_,Some te,ty,_) -> let _ = typeof ~subst ~metasenv [] ty in let ty_te = typeof ~subst ~metasenv [] te in - if not (R.are_convertible ~subst [] ty_te ty) then + if not (R.are_convertible ~metasenv ~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") @@ -1219,7 +1265,7 @@ let typecheck_obj (uri,_height,metasenv,subst,kind) = in List.iter2 (fun (_,_,x,ty,_) bo -> let ty_bo = typeof ~subst ~metasenv types bo in - if not (R.are_convertible ~subst types ty_bo ty) + if not (R.are_convertible ~metasenv ~subst types ty_bo ty) then raise (TypeCheckerFailure (lazy ("(Co)Fix: ill-typed bodies"))) else if inductive then begin @@ -1297,4 +1343,31 @@ E.set_typecheck_obj let _ = NCicReduction.set_get_relevance get_relevance;; + +let indent = ref 0;; +let debug = true;; +let logger = + let do_indent () = String.make !indent ' ' in + (function + | `Start_type_checking s -> + if debug then + prerr_endline (do_indent () ^ "Start: " ^ NUri.string_of_uri s); + incr indent + | `Type_checking_completed s -> + decr indent; + if debug then + prerr_endline (do_indent () ^ "End: " ^ NUri.string_of_uri s) + | `Type_checking_interrupted s -> + decr indent; + if debug then + prerr_endline (do_indent () ^ "Break: " ^ NUri.string_of_uri s) + | `Type_checking_failed s -> + decr indent; + if debug then + prerr_endline (do_indent () ^ "Fail: " ^ NUri.string_of_uri s) + | `Trust_obj s -> + if debug then + prerr_endline (do_indent () ^ "Trust: " ^ NUri.string_of_uri s)) +;; +(* let _ = set_logger logger ;; *) (* EOF *)