X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCicTypeChecker.ml;h=bd660903cc86fa682b74fbff028694f46c2e2e0f;hb=800eb6af3e6743a66168e7003e1081b108a78df0;hp=fc6d04a038dfa2c91ee102100d82d83bf7151d93;hpb=8ff8cc51c76a444cc124c314155a33af51917e6d;p=helm.git diff --git a/helm/software/components/ng_kernel/nCicTypeChecker.ml b/helm/software/components/ng_kernel/nCicTypeChecker.ml index fc6d04a03..bd660903c 100644 --- a/helm/software/components/ng_kernel/nCicTypeChecker.ml +++ b/helm/software/components/ng_kernel/nCicTypeChecker.ml @@ -22,6 +22,11 @@ module PP = NCicPp exception TypeCheckerFailure of string Lazy.t exception AssertFailure of string Lazy.t +let raise = function + | TypeCheckerFailure s as e -> prerr_endline (Lazy.force s); raise e + | e -> raise e +;; + type recf_entry = | Evil of int (* rno *) | UnfFix of bool list (* fixed arguments *) @@ -52,6 +57,7 @@ let get_fixed_args i l = let shift_k e (c,rf,x) = e::c,List.map (fun (k,v) -> k+1,v) rf,x+1;; +(* for debugging only let string_of_recfuns ~subst ~metasenv ~context l = let pp = PP.ppterm ~subst ~metasenv ~context in let safe, rest = List.partition (function (_,Safe) -> true | _ -> false) l in @@ -67,6 +73,7 @@ let string_of_recfuns ~subst ~metasenv ~context l = (function (i,Evil rno)->pp(C.Rel i)^"/"^string_of_int rno | _ -> assert false) dang) ;; +*) let fixed_args bos j n nn = let rec aux k acc = function @@ -87,35 +94,27 @@ let fixed_args bos j n nn = (let rec f = function 0 -> [] | n -> true :: f (n-1) in f j) bos ;; -let rec list_iter_default2 f l1 def l2 = - match l1,l2 with - | [], _ -> () - | a::ta, b::tb -> f a b; list_iter_default2 f ta def tb - | a::ta, [] -> f a def; list_iter_default2 f ta def [] -;; - +(* 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.Prod (name,so,ta)) when n > 0 -> + | (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 ?(cb=fun _ _ -> ()) uri number_of_types context = +let debruijn uri number_of_types context = let rec aux k t = - let res = - match t with - | C.Meta (i,(s,C.Ctx l)) -> - let l1 = HExtlib.sharing_map (aux (k-s)) l in - 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.Rel (k + number_of_types - no) - | t -> U.map (fun _ k -> k+1) k aux t - in - cb t res; res + match t with + | C.Meta (i,(s,C.Ctx l)) -> + let l1 = HExtlib.sharing_map (aux (k-s)) l in + 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.Rel (k + number_of_types - no) + | t -> U.map (fun _ k -> k+1) k aux t in aux (List.length context) ;; @@ -125,7 +124,7 @@ let sort_of_prod ~metasenv ~subst context (name,s) (t1, t2) = 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.Type u1), C.Sort (C.Type u2) -> C.Sort (C.Type (max u1 u2)) + | 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 @@ -190,8 +189,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 @@ -242,6 +241,30 @@ let does_not_occur ~subst context n nn t = with DoesOccur -> false ;; +let rec eat_lambdas ~subst ~metasenv context n te = + match (n, R.whd ~subst context te) with + | (0, _) -> (te, context) + | (n, C.Lambda (name,so,ta)) when n > 0 -> + eat_lambdas ~subst ~metasenv ((name,(C.Decl so))::context) (n - 1) ta + | (n, te) -> + raise (AssertFailure (lazy (Printf.sprintf "eat_lambdas (%d, %s)" n + (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) += + 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 -> + 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 -> + eat_or_subst_lambdas ~subst ~metasenv (n - 1) ta to_be_subst args + (shift_k (name,(C.Decl so)) k) + | (_, te, _, _) -> te, k +;; + + (*CSC l'indice x dei tipi induttivi e' t.c. n < x <= nn *) (*CSC questa funzione e' simile alla are_all_occurrences_positive, ma fa *) (*CSC dei controlli leggermente diversi. Viene invocata solamente dalla *) @@ -249,17 +272,17 @@ let does_not_occur ~subst context n nn t = (*CSC definizione (giusta???) tratta dalla mail di Hugo ;-) *) let rec weakly_positive ~subst context n nn uri te = (*CSC: Che schifo! Bisogna capire meglio e trovare una soluzione ragionevole!*) - let dummy = C.Sort (C.Type ~-1) in + let dummy = C.Sort C.Prop in (*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.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 match R.whd context te with - | C.Const (Ref.Ref (_,uri',Ref.Ind _)) - | C.Appl ((C.Const (Ref.Ref (_,uri',Ref.Ind _)))::_) + | C.Const (Ref.Ref (uri',Ref.Ind _)) + | C.Appl ((C.Const (Ref.Ref (uri',Ref.Ind _)))::_) when NUri.eq uri' uri -> true | C.Prod (name,source,dest) when does_not_occur ~subst ((name,C.Decl source)::context) 0 1 dest -> @@ -285,7 +308,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 @@ -343,6 +366,7 @@ and are_all_occurrences_positive ~subst context uri indparamsno i n nn te = are_all_occurrences_positive ~subst ((name,C.Decl source)::context) uri indparamsno (i+1) (n + 1) (nn + 1) dest | _ -> +prerr_endline ("MM: " ^ NCicPp.ppterm ~subst ~metasenv:[] ~context te); raise (TypeCheckerFailure (lazy ("Malformed inductive constructor type " ^ (NUri.string_of_uri uri)))) @@ -360,8 +384,11 @@ let rec typeof ~subst ~metasenv context term = | (_,C.Decl ty) -> S.lift n ty | (_,C.Def (_,ty)) -> S.lift n ty with Failure _ -> raise (TypeCheckerFailure (lazy "unbound variable"))) - | C.Sort (C.Type i) -> C.Sort (C.Type (i+1)) - | C.Sort s -> C.Sort (C.Type 0) + | C.Sort (C.Type [false,u]) -> C.Sort (C.Type [true, u]) + | C.Sort (C.Type _) -> + raise (AssertFailure (lazy ("Cannot type an inferred type: "^ + NCicPp.ppterm ~subst ~metasenv ~context t))) + | C.Sort _ -> C.Sort (C.Type NCicEnvironment.type0) | C.Implicit _ -> raise (AssertFailure (lazy "Implicit found")) | C.Meta (n,l) as t -> let canonical_ctx,ty = @@ -396,7 +423,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 ty_t) then + if not (R.are_convertible ~subst context ty_t ty) then raise (TypeCheckerFailure (lazy (Printf.sprintf @@ -419,7 +446,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 = @@ -429,8 +456,8 @@ let rec typeof ~subst ~metasenv context term = let ty = R.whd ~subst context (typeof_aux context term) in let r',tl = match ty with - C.Const (Ref.Ref (_,_,Ref.Ind _) as r') -> r',[] - | C.Appl (C.Const (Ref.Ref (_,_,Ref.Ind _) as r') :: tl) -> r',tl + C.Const (Ref.Ref (_,Ref.Ind _) as r') -> r',[] + | C.Appl (C.Const (Ref.Ref (_,Ref.Ind _) as r') :: tl) -> r',tl | _ -> raise (TypeCheckerFailure (lazy (Printf.sprintf @@ -496,8 +523,8 @@ let rec typeof ~subst ~metasenv context term = and type_of_branch ~subst context leftno outty cons tycons liftno = match R.whd ~subst context tycons with - | C.Const (Ref.Ref (_,_,Ref.Ind _)) -> C.Appl [S.lift liftno outty ; cons] - | C.Appl (C.Const (Ref.Ref (_,_,Ref.Ind _))::tl) -> + | C.Const (Ref.Ref (_,Ref.Ind _)) -> C.Appl [S.lift liftno outty ; cons] + | C.Appl (C.Const (Ref.Ref (_,Ref.Ind _))::tl) -> let _,arguments = HExtlib.split_nth leftno tl in C.Appl (S.lift liftno outty::arguments@[cons]) | C.Prod (name,so,de) -> @@ -648,7 +675,7 @@ let rec typeof ~subst ~metasenv context term = (PP.ppterm ~subst ~metasenv ~context ind) (PP.ppterm ~subst ~metasenv ~context so) ))); - (match arity1,ta with + (match arity1, R.whd ~subst ((name,C.Decl so)::context) ta with | (C.Sort (C.CProp | C.Type _), C.Sort _) | (C.Sort C.Prop, C.Sort C.Prop) -> () | (C.Sort C.Prop, C.Sort (C.CProp | C.Type _)) -> @@ -681,19 +708,62 @@ and check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl = List.iter (fun (_,_,x,_) -> ignore (typeof ~subst ~metasenv [] x)) tyl; (* let's check if the types of the inductive constructors are well formed. *) let len = List.length tyl in - let tys = List.rev (List.map (fun (_,n,ty,_) -> (n,(C.Decl ty))) tyl) in + let tys = List.rev_map (fun (_,n,ty,_) -> (n,(C.Decl ty))) tyl in ignore (List.fold_right - (fun (_,_,_,cl) i -> + (fun (_,_,ty,cl) i -> + 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) -> - let debruijnedte = debruijn uri len [] te in - ignore (typeof ~subst ~metasenv tys debruijnedte); + let te = debruijn uri len [] te in + let context,te = 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,_ = + HExtlib.split_nth leftno chopped_context_rev in + (try + ignore (List.fold_left2 + (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 + | _,_ -> false + in + if not convertible then + raise (TypeCheckerFailure (lazy + ("Mismatch between the left parameters of the constructor " ^ + "and those of its inductive type"))) + else + item1::context + ) [] sx_context_ty_rev sx_context_te_rev) + with Invalid_argument _ -> 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) -> + if not (E.universe_leq u1 u2) then + raise + (TypeCheckerFailure + (lazy ("The type " ^ PP.ppterm ~metasenv ~subst ~context s1^ + " 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 + (TypeCheckerFailure + (lazy ("Wrong constructor or inductive arity shape")))); (* let's check also the positivity conditions *) if not - (are_all_occurrences_positive ~subst tys uri leftno i 0 len - debruijnedte) + (are_all_occurrences_positive ~subst context uri leftno + (i+leftno) leftno (len+leftno) te) then raise (TypeCheckerFailure @@ -702,27 +772,6 @@ and check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl = i + 1) tyl 1) -and eat_lambdas ~subst ~metasenv context n te = - match (n, R.whd ~subst context te) with - | (0, _) -> (te, context) - | (n, C.Lambda (name,so,ta)) when n > 0 -> - eat_lambdas ~subst ~metasenv ((name,(C.Decl so))::context) (n - 1) ta - | (n, te) -> - raise (AssertFailure (lazy (Printf.sprintf "eat_lambdas (%d, %s)" n - (PP.ppterm ~subst ~metasenv ~context te)))) - -and eat_or_subst_lambdas ~subst ~metasenv n te to_be_subst args - (context, recfuns, x 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 -> - 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 -> - eat_or_subst_lambdas ~subst ~metasenv (n - 1) ta to_be_subst args - (shift_k (name,(C.Decl so)) k) - | (_, te, _, _) -> te, k - and guarded_by_destructors r_uri r_len ~subst ~metasenv context recfuns t = let recursor f k t = U.fold shift_k k (fun k () -> f k) () t in let rec aux (context, recfuns, x as k) t = @@ -754,13 +803,14 @@ and guarded_by_destructors r_uri r_len ~subst ~metasenv context recfuns t = List.iter (aux k) tl | C.Appl ((C.Rel m)::tl) when is_unfolded m recfuns -> let fixed_args = get_fixed_args m recfuns in - list_iter_default2 (fun x b -> if not b then aux k x) tl false fixed_args + HExtlib.list_iter_default2 + (fun x b -> if not b then aux k x) tl false fixed_args | C.Rel m -> (match List.nth context (m-1) with | _,C.Decl _ -> () | _,C.Def (bo,_) -> aux k (S.lift m bo)) | C.Meta _ -> () - | C.Appl (C.Const ((Ref.Ref (_,uri,Ref.Fix (i,recno))) as r)::args) -> + | C.Appl (C.Const ((Ref.Ref (uri,Ref.Fix (i,recno,_))) as r)::args) -> if List.exists (fun t -> try aux k t;false with NotGuarded _ -> true) args then let fl,_,_ = E.get_checked_fixes_or_cofixes r in @@ -773,7 +823,8 @@ and guarded_by_destructors r_uri r_len ~subst ~metasenv context recfuns t = let ctx_len = List.length context in (* we may look for fixed params not only up to j ... *) let fa = fixed_args bos j ctx_len (ctx_len + fl_len) in - list_iter_default2 (fun x b -> if not b then aux k x) args false fa; + HExtlib.list_iter_default2 + (fun x b -> if not b then aux k x) args false fa; let context = context@ctx_tys in let ctx_len = List.length context in let extra_recfuns = @@ -808,7 +859,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 (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 -> let ty = typeof ~subst ~metasenv context term in @@ -842,15 +893,15 @@ and guarded_by_constructors ~subst ~metasenv context t indURI indlen nn = | C.Sort _ | C.Implicit _ | C.Prod _ - | C.Const (Ref.Ref (_,_,Ref.Ind _)) + | C.Const (Ref.Ref (_,Ref.Ind _)) | C.LetIn _ -> raise (AssertFailure (lazy "17")) | C.Lambda (name,so,de) -> does_not_occur ~subst context n nn so && aux ((name,C.Decl so)::context) (n + 1) (nn + 1) h de | 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)) as ref) :: tl) as t -> + | C.Const (Ref.Ref (_,Ref.Con _)) -> true + | C.Appl (C.Const (Ref.Ref (uri, Ref.Con (_,j)) as ref) :: tl) as t -> let _, paramsno, _, _, _ = E.get_checked_indtys ref in let ty_t = typeof ~subst ~metasenv context t in let dc_ctx, dcl, start, stop = @@ -880,8 +931,8 @@ and guarded_by_constructors ~subst ~metasenv context t indURI indlen nn = does_not_occur ~subst context n nn out && does_not_occur ~subst context n nn te && List.for_all (aux context n nn h) pl - | C.Const (Ref.Ref (_,u,(Ref.Fix _| Ref.CoFix _)) as ref) - | C.Appl(C.Const (Ref.Ref(_,u,(Ref.Fix _| Ref.CoFix _)) as ref) :: _) as t -> + | C.Const (Ref.Ref (u,(Ref.Fix _| Ref.CoFix _)) as ref) + | C.Appl(C.Const (Ref.Ref(u,(Ref.Fix _| Ref.CoFix _)) as ref) :: _) as t -> let tl = match t with C.Appl (_::tl) -> tl | _ -> [] in let fl,_,_ = E.get_checked_fixes_or_cofixes ref in let len = List.length fl in @@ -926,15 +977,13 @@ and is_really_smaller | C.Appl (he::_) -> is_really_smaller r_uri r_len ~subst ~metasenv k he | C.Rel _ - | C.Const (Ref.Ref (_,_,Ref.Con _)) -> false + | C.Const (Ref.Ref (_,Ref.Con _)) -> false | C.Appl [] - | C.Const (Ref.Ref (_,_,Ref.Fix _)) -> assert false + | C.Const (Ref.Ref (_,Ref.Fix _)) -> assert false | C.Meta _ -> true - | C.Match (Ref.Ref (_,uri,_) as ref,outtype,term,pl) -> + | C.Match (Ref.Ref (uri,Ref.Ind (isinductive,_)),outtype,term,pl) -> (match term with | C.Rel m | C.Appl (C.Rel m :: _ ) 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 List.for_all (is_really_smaller r_uri r_len ~subst ~metasenv k) pl else @@ -952,26 +1001,37 @@ 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 (false,_)) as ref) - | C.Appl (C.Const (Ref.Ref (_,uri,Ref.Ind (false,_)) as ref)::_) -> + | 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) = +and type_of_constant ((Ref.Ref (uri,_)) as ref) = + let error () = + raise (TypeCheckerFailure (lazy "Inconsistent cached infos in reference")) + in match E.get_checked_obj uri, ref with - | (_,_,_,_,C.Inductive (_,_,tl,_)), Ref.Ref (_,_,Ref.Ind (_,i)) -> + | (_,_,_,_,C.Inductive (isind1,_,tl,_)), Ref.Ref (_,Ref.Ind (isind2,i)) -> + if isind1 <> isind2 then error (); let _,_,arity,_ = List.nth tl i in arity - | (_,_,_,_,C.Inductive (_,_,tl,_)), Ref.Ref (_,_,Ref.Con (i,j)) -> + | (_,_,_,_,C.Inductive (_,_,tl,_)), Ref.Ref (_,Ref.Con (i,j)) -> let _,_,_,cl = List.nth tl i in let _,_,arity = List.nth cl (j-1) in arity - | (_,_,_,_,C.Fixpoint (_,fl,_)), Ref.Ref (_,_,(Ref.Fix (i,_)|Ref.CoFix i)) -> + | (_,_,_,_,C.Fixpoint (_,fl,_)), Ref.Ref (_,Ref.CoFix i) -> let _,_,_,arity,_ = List.nth fl i in arity - | (_,_,_,_,C.Constant (_,_,_,ty,_)), Ref.Ref (_,_,(Ref.Def |Ref.Decl)) -> ty + | (_,h1,_,_,C.Fixpoint (_,fl,_)), Ref.Ref (_,Ref.Fix (i,recno2,h2)) -> + 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) -> + if h1 <> h2 then error (); + ty | _ -> raise (AssertFailure (lazy "type_of_constant: environment/reference")) ;; @@ -985,14 +1045,14 @@ 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 [] ty' ty) then + if not (R.are_convertible ~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"^^ "inferred type:\n%s\nexpected type:\n%s") name - (PP.ppterm ~subst ~metasenv ~context:[] ty') - (PP.ppterm ~subst ~metasenv ~context:[] ty)))) + (PP.ppterm ~subst ~metasenv ~context ty') + (PP.ppterm ~subst ~metasenv ~context ty)))) end; d::context ) context []) @@ -1024,14 +1084,14 @@ 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 [] ty' ty) then + if not (R.are_convertible ~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"^^ "inferred type:\n%s\nexpected type:\n%s") i - (PP.ppterm ~subst ~metasenv ~context:[] ty') - (PP.ppterm ~subst ~metasenv ~context:[] ty)))); + (PP.ppterm ~subst ~metasenv ~context ty') + (PP.ppterm ~subst ~metasenv ~context ty)))); subst @ [conj] ) [] subst) ;; @@ -1080,8 +1140,8 @@ let typecheck_obj (uri,height,metasenv,subst,kind) = match List.hd context with _,C.Decl t -> t | _ -> assert false in match R.whd ~subst (List.tl context) he with - | C.Const (Ref.Ref (_,uri,Ref.Ind _) as ref) - | C.Appl (C.Const (Ref.Ref (_,uri,Ref.Ind _) as ref) :: _) -> + | C.Const (Ref.Ref (uri,Ref.Ind _) as ref) + | C.Appl (C.Const (Ref.Ref (uri,Ref.Ind _) as ref) :: _) -> let _,_,itl,_,_ = E.get_checked_indtys ref in uri, List.length itl | _ -> assert false