X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicTypeChecker.ml;h=de633357c9b1692a2964e74e824dba2b7efcc683;hb=dace8da2fbdb8208953d3392ff187f7e8616b83f;hp=ae145a9c6acaa1de15fc2afa14e00ddf26232c26;hpb=f4d71b463ae8510e80a40cf4df475d19fab3df2c;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicTypeChecker.ml b/helm/software/components/ng_kernel/nCicTypeChecker.ml index ae145a9c6..de633357c 100644 --- a/helm/software/components/ng_kernel/nCicTypeChecker.ml +++ b/helm/software/components/ng_kernel/nCicTypeChecker.ml @@ -84,7 +84,7 @@ let fixed_args bos j n nn = match l1,l2 with [],[] -> [] | he1::tl1, he2::tl2 -> (he1,he2)::combine tl1 tl2 - | he::tl, [] -> (false,C.Rel ~-1)::combine tl [] (* dummy term *) + | _::tl, [] -> (false,C.Rel ~-1)::combine tl [] (* dummy term *) | [],_::_ -> assert false in let lefts, _ = HExtlib.split_nth (min j (List.length args)) args in @@ -125,11 +125,9 @@ let sort_of_prod ~metasenv ~subst context (name,s) (t1, t2) = let t1 = R.whd ~subst context t1 in let t2 = R.whd ~subst ((name,C.Decl s)::context) t2 in match t1, t2 with - | C.Sort s1, C.Sort C.Prop -> t2 + | 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.Sort (C.Type _) -> t2 - | C.Sort (C.Type _) , C.Sort C.CProp -> t1 - | C.Sort _, C.Sort C.CProp + | 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 @@ -145,13 +143,7 @@ let eat_prods ~subst ~metasenv context he ty_he args_with_ty = | [] -> ty_he | (arg, ty_arg)::tl -> match R.whd ~subst context ty_he with - | C.Prod (n,s,t) -> -(* - prerr_endline (PP.ppterm ~subst ~metasenv ~context s ^ " - Vs - " - ^ PP.ppterm ~subst ~metasenv ~context ty_arg); - prerr_endline (PP.ppterm ~subst ~metasenv ~context - (S.subst ~avoid_beta_redexes:true arg t)); -*) + | C.Prod (_,s,t) -> if R.are_convertible ~subst context ty_arg s then aux (S.subst ~avoid_beta_redexes:true arg t) tl else @@ -186,15 +178,15 @@ let rec instantiate_parameters params c = match c, params with | c,[] -> c | C.Prod (_,_,ta), he::tl -> instantiate_parameters tl (S.subst he ta) - | t,l -> raise (AssertFailure (lazy "1")) + | _,_ -> raise (AssertFailure (lazy "1")) ;; 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 (_,Ref.Ind _) as ref) + | C.Appl (C.Const (Ref.Ref (_,Ref.Ind _) 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 _, leftno, itl, _, i = E.get_checked_indtys ref in let left_args,_ = HExtlib.split_nth leftno args in let _,_,_,cl = List.nth itl i in List.map @@ -253,14 +245,14 @@ let rec eat_lambdas ~subst ~metasenv context n te = (PP.ppterm ~subst ~metasenv ~context te)))) ;; -let rec eat_or_subst_lambdas ~subst ~metasenv n te to_be_subst args - (context, recfuns, x as k) +let rec eat_or_subst_lambdas + ~subst ~metasenv n te to_be_subst args (context,_,_ as k) = match n, R.whd ~subst context te, to_be_subst, args with - | (n, C.Lambda (name,so,ta),true::to_be_subst,arg::args) when n > 0 -> + | (n, C.Lambda (_,_,ta),true::to_be_subst,arg::args) when n > 0 -> eat_or_subst_lambdas ~subst ~metasenv (n - 1) (S.subst arg ta) to_be_subst args k - | (n, C.Lambda (name,so,ta),false::to_be_subst,arg::args) when n > 0 -> + | (n, C.Lambda (name,so,ta),false::to_be_subst,_::args) when n > 0 -> eat_or_subst_lambdas ~subst ~metasenv (n - 1) ta to_be_subst args (shift_k (name,(C.Decl so)) k) | (_, te, _, _) -> te, k @@ -278,7 +270,7 @@ let rec weakly_positive ~subst context n nn uri te = (*CSC: mettere in cicSubstitution *) let rec subst_inductive_type_with_dummy _ = function | 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) + | C.Appl ((C.Const (Ref.Ref (uri',Ref.Ind (true,0,_))))::_) when NUri.eq uri' uri -> dummy | t -> U.map (fun _ x->x) () subst_inductive_type_with_dummy t in @@ -310,7 +302,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 _) 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 @@ -335,8 +327,8 @@ and are_all_occurrences_positive ~subst context uri indparamsno i n nn te = if k = 0 then 0 else match R.whd context x with - | C.Rel m when m = n - (indparamsno - k) -> k - 1 - | y -> raise (TypeCheckerFailure (lazy + | C.Rel m when m = n - (indparamsno - k) -> k - 1 + | _ -> raise (TypeCheckerFailure (lazy ("Argument "^string_of_int (indparamsno - k + 1) ^ " (of " ^ string_of_int indparamsno ^ " fixed) is not homogeneous in "^ "appl:\n"^ PP.ppterm ~context ~subst ~metasenv:[] reduct)))) @@ -439,18 +431,11 @@ let rec typeof ~subst ~metasenv context term = | C.Appl (he::(_::_ as args)) -> let ty_he = typeof_aux context he in let args_with_ty = List.map (fun t -> t, typeof_aux context t) args in -(* - prerr_endline ("HEAD: " ^ PP.ppterm ~subst ~metasenv ~context ty_he); - prerr_endline ("TARGS: " ^ String.concat " | " (List.map (PP.ppterm - ~subst ~metasenv ~context) (List.map snd args_with_ty))); - prerr_endline ("ARGS: " ^ String.concat " | " (List.map (PP.ppterm - ~subst ~metasenv ~context) (List.map fst args_with_ty))); -*) 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) -> let outsort = typeof_aux context outtype in - let inductive,leftno,itl,_,_ = E.get_checked_indtys r in + let _,leftno,itl,_,_ = E.get_checked_indtys r in let constructorsno = let _,_,_,cl = List.nth itl tyno in List.length cl in @@ -642,16 +627,6 @@ let rec typeof ~subst ~metasenv context term = "Local and canonical context %s have different lengths" (PP.ppterm ~subst ~metasenv ~context term)))) - and is_non_informative context paramsno c = - let rec aux context c = - match R.whd context c with - | C.Prod (n,so,de) -> - let s = typeof_aux context so in - s = C.Sort C.Prop && aux ((n,(C.Decl so))::context) de - | _ -> true in - let context',dx = split_prods ~subst:[] context paramsno c in - aux context' dx - and check_allowed_sort_elimination ~subst ~metasenv r = let mkapp he arg = match he with @@ -678,22 +653,22 @@ let rec typeof ~subst ~metasenv context term = (PP.ppterm ~subst ~metasenv ~context so) ))); (match arity1, R.whd ~subst ((name,C.Decl so)::context) ta with - | (C.Sort (C.CProp | C.Type _), C.Sort _) + | (C.Sort C.Type _, C.Sort _) | (C.Sort C.Prop, C.Sort C.Prop) -> () - | (C.Sort C.Prop, C.Sort (C.CProp | C.Type _)) -> + | (C.Sort C.Prop, C.Sort C.Type _) -> (* TODO: we should pass all these parameters since we * have them already *) - let inductive,leftno,itl,_,i = E.get_checked_indtys r in + let _,leftno,itl,_,i = E.get_checked_indtys r in let itl_len = List.length itl in - let _,name,ty,cl = List.nth itl i in + let _,_,_,cl = List.nth itl i in let cl_len = List.length cl in (* is it a singleton or empty non recursive and non informative definition? *) if not (cl_len = 0 || (itl_len = 1 && cl_len = 1 && - is_non_informative [name,C.Decl ty] leftno - (let _,_,x = List.nth cl 0 in x))) + is_non_informative leftno + (let _,_,x = List.hd cl in x))) then raise (TypeCheckerFailure (lazy ("Sort elimination not allowed"))); @@ -705,7 +680,18 @@ let rec typeof ~subst ~metasenv context term = in typeof_aux context term -and check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl = +and is_non_informative paramsno c = + let rec aux context c = + match R.whd context c with + | C.Prod (n,so,de) -> + 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 + aux context' dx + + +and check_mutual_inductive_defs uri ~metasenv ~subst leftno tyl = (* let's check if the arity of the inductive types are well formed *) List.iter (fun (_,_,x,_) -> ignore (typeof ~subst ~metasenv [] x)) tyl; (* let's check if the types of the inductive constructors are well formed. *) @@ -717,7 +703,7 @@ and check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl = let context,ty_sort = split_prods ~subst [] ~-1 ty in let sx_context_ty_rev,_ = HExtlib.split_nth leftno (List.rev context) in List.iter - (fun (_,name,te) -> + (fun (_,_,te) -> let te = debruijn uri len [] te in let context,te = split_prods ~subst tys leftno te in let _,chopped_context_rev = @@ -755,7 +741,6 @@ and check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl = " of the constructor is not included in the inductive" ^ " type sort " ^ PP.ppterm ~metasenv ~subst ~context s2))) | C.Sort _, C.Sort C.Prop - | C.Sort C.CProp, C.Sort C.CProp | C.Sort _, C.Sort C.Type _ -> () | _, _ -> raise @@ -861,7 +846,7 @@ 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,Ref.Ind (true,_,_)),outtype,term,pl) as t -> + | C.Match (Ref.Ref (_,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 -> let ty = typeof ~subst ~metasenv context term in @@ -903,7 +888,7 @@ and guarded_by_constructors ~subst ~metasenv context t indURI indlen nn = | C.Appl ((C.Rel m)::tl) when m > n && m <= nn -> h && List.for_all (does_not_occur ~subst context n nn) tl | C.Const (Ref.Ref (_,Ref.Con _)) -> true - | C.Appl (C.Const (Ref.Ref (uri, Ref.Con (_,j,paramsno))) :: tl) as t -> + | C.Appl (C.Const (Ref.Ref (_, Ref.Con (_,j,paramsno))) :: tl) as t -> let ty_t = typeof ~subst ~metasenv context t in let dc_ctx, dcl, start, stop = specialize_and_abstract_constrs ~subst indURI indlen context ty_t in @@ -982,7 +967,7 @@ and is_really_smaller | C.Appl [] | C.Const (Ref.Ref (_,Ref.Fix _)) -> assert false | C.Meta _ -> true - | C.Match (Ref.Ref (uri,Ref.Ind (isinductive,_,_)),outtype,term,pl) -> + | C.Match (Ref.Ref (_,Ref.Ind (isinductive,_,_)),_,term,pl) -> (match term with | C.Rel m | C.Appl (C.Rel m :: _ ) when is_safe m recfuns || m = x -> if not isinductive then @@ -1016,18 +1001,17 @@ and type_of_constant ((Ref.Ref (uri,_)) as ref) = in match E.get_checked_obj uri, ref with | (_,_,_,_,C.Inductive(isind1,lno1,tl,_)),Ref.Ref(_,Ref.Ind (isind2,i,lno2))-> - if isind1 <> isind2 then error (); - if lno1 <> lno2 then error (); + if isind1 <> isind2 || lno1 <> lno2 then error (); let _,_,arity,_ = List.nth tl i in arity | (_,_,_,_,C.Inductive (_,lno1,tl,_)), Ref.Ref (_,Ref.Con (i,j,lno2)) -> if lno1 <> lno2 then error (); let _,_,_,cl = List.nth tl i in let _,_,arity = List.nth cl (j-1) in arity - | (_,_,_,_,C.Fixpoint (_,fl,_)), Ref.Ref (_,Ref.CoFix i) -> + | (_,_,_,_,C.Fixpoint (false,fl,_)), Ref.Ref (_,Ref.CoFix i) -> let _,_,_,arity,_ = List.nth fl i in arity - | (_,h1,_,_,C.Fixpoint (_,fl,_)), Ref.Ref (_,Ref.Fix (i,recno2,h2)) -> + | (_,h1,_,_,C.Fixpoint (true,fl,_)), Ref.Ref (_,Ref.Fix (i,recno2,h2)) -> let _,_,recno1,arity,_ = List.nth fl i in if h1 <> h2 || recno1 <> recno2 then error (); arity @@ -1098,11 +1082,106 @@ let typecheck_subst ~metasenv subst = ) [] subst) ;; -let typecheck_obj (uri,height,metasenv,subst,kind) = +let check_rel1_irrelevant ~metasenv ~subst context = fun _ -> () +(* + let shift e (k, context) = k+1,e::context in + let rec aux (evil, context as k) () t = + match R.whd ~subst context t with + | C.Rel i when i = evil -> (* + raise (TypeCheckerFailure (lazy (Printf.sprintf + "Argument %s declared as irrelevante is used in a relevant position" + (PP.ppterm ~subst ~metasenv ~context (C.Rel i))))) *) () + | C.Meta _ -> () + | C.Lambda (name,so,tgt) -> + (* checking so is not needed since the implicit version of CC + * has untyped lambdas (curry style), see Barras and Bernardo *) + aux (shift (name,C.Decl so) k) () tgt + | C.Appl (C.Const ref::args) -> + let relevance = NCicEnvironment.get_relevance ref in + HExtlib.list_iter_default2 + (fun t -> function false -> () | _ -> aux k () t) + args true relevance + | C.Match (_, _, _, []) -> () + | C.Match (ref, _, t, [p]) -> + aux k () p; + let _,lno,itl,_,_ = E.get_checked_indtys ref in + let _,_,_,cl = List.hd itl in + let _,_,c = List.hd cl in + if not (is_non_informative lno c) then aux k () t + | C.Match (_, _, t, pl) -> List.iter (aux k ()) (t::pl) + | t -> U.fold shift k aux () t + in + aux (1, context) () +*) + +let check_relevance ~metasenv ~subst ~in_type relevance = fun _ -> () +(* + let shift e (in_type, context, relevance) = + assert (relevance = []); in_type, e::context, relevance + in + let rec aux2 (_,context,relevance as k) t = + let error () = () (* + raise (TypeCheckerFailure + (lazy ("Wrong relevance declaration: " ^ + String.concat "," (List.map string_of_bool relevance)^ + "\nfor: "^PP.ppterm ~metasenv ~subst ~context t))) *) + in + let rec aux (in_type, context, relevance as k) () t = + match relevance, R.whd ~subst context t, in_type with + | _,C.Meta _,_ -> () + | true::tl,C.Lambda (name,so,t), false + | true::tl,C.Prod (name,so,t), true -> + aux (in_type, (name, C.Decl so)::context, tl) () t + | false::tl,C.Lambda (name,so,t), false + | false::tl,C.Prod (name,so,t), true -> + let context = (name, C.Decl so)::context in + check_rel1_irrelevant ~metasenv ~subst context t; + aux (in_type, context, tl) () t + | [], C.Match (ref,oty,t,pl), _ -> + aux k () t; + let _,lno,itl,_,i = E.get_checked_indtys ref in + let rel,_,_,cl = List.nth itl i in + let _, rel = + try HExtlib.split_nth lno rel + with Failure _ -> [],[] + in + aux2 (false, context, rel) oty; + List.iter2 + (fun p (rel,_,_) -> + let _,rel = + try HExtlib.split_nth lno rel + with Failure _ -> [],[] + in + aux2 (false, context, rel) p) + pl cl + | [],t,_ -> U.fold shift k aux () t + | rel1,C.Appl (C.Const ref :: args),_ -> + let relevance = E.get_relevance ref in + let _, relevance = + try HExtlib.split_nth (List.length args) relevance + with Failure _ -> [],[] + in + prerr_endline ("rimane: "^String.concat "," (List.map string_of_bool relevance)^ " contro "^ String.concat "," (List.map string_of_bool rel1) ); + HExtlib.list_iter_default2 (fun r1 r2 -> if not r1 && r2 then error ()) + rel1 true relevance + | rel1,C.Const ref,_ -> + let relevance = E.get_relevance ref in + HExtlib.list_iter_default2 (fun r1 r2 -> if not r1 && r2 then error ()) + rel1 true relevance + | _,_,_ -> error () + in + aux k () t + in + aux2 (in_type, [], relevance) +*) +;; + +let typecheck_obj (uri,_height,metasenv,subst,kind) = + (* height is not checked since it is only used to implement an optimization *) typecheck_metasenv metasenv; typecheck_subst ~metasenv subst; match kind with - | C.Constant (_,_,Some te,ty,_) -> + | 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 @@ -1110,14 +1189,18 @@ let typecheck_obj (uri,height,metasenv,subst,kind) = "the type of the body is not convertible with the declared one.\n"^^ "inferred type:\n%s\nexpected type:\n%s") (PP.ppterm ~subst ~metasenv ~context:[] ty_te) - (PP.ppterm ~subst ~metasenv ~context:[] ty)))) - | C.Constant (_,_,None,ty,_) -> ignore (typeof ~subst ~metasenv [] ty) - | C.Inductive (is_ind, leftno, tyl, _) -> - check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl + (PP.ppterm ~subst ~metasenv ~context:[] ty)))); + check_relevance ~in_type:true ~subst ~metasenv relevance ty; + check_relevance ~in_type:false ~subst ~metasenv relevance te + | C.Constant (relevance,_,None,ty,_) -> + ignore (typeof ~subst ~metasenv [] ty); + check_relevance ~in_type:true ~subst ~metasenv relevance ty + | C.Inductive (_, leftno, tyl, _) -> + check_mutual_inductive_defs uri ~metasenv ~subst leftno tyl | C.Fixpoint (inductive,fl,_) -> let types, kl = List.fold_left - (fun (types,kl) (_,name,k,ty,_) -> + (fun (types,kl) (relevance,name,k,ty,_) -> let _ = typeof ~subst ~metasenv [] ty in ((name,C.Decl ty)::types, k::kl) ) ([],[]) fl @@ -1130,7 +1213,7 @@ let typecheck_obj (uri,height,metasenv,subst,kind) = dbo, Evil rno) fl kl) in - List.iter2 (fun (_,name,x,ty,_) bo -> + 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) then raise (TypeCheckerFailure (lazy ("(Co)Fix: ill-typed bodies")))