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
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
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
| t,l -> raise (AssertFailure (lazy "1"))
;;
-(* specialized only constructors, arities are left untouched *)
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
- let itl =
- List.map (fun (rel, name, arity, cl) ->
- rel, name, arity,
- List.map (fun (rel, name, ty) ->
- rel, name, instantiate_parameters left_args ty)
- cl)
- itl
- in
- is_ind, leftno, itl, attrs, i
+ let _,_,_,cl = List.nth itl i in
+ List.map
+ (fun (rel,name,ty) -> rel, name, instantiate_parameters left_args ty) cl
| _ -> assert false
;;
-let fix_lefts_in_constrs ~subst r_uri r_len context ty_term =
- let _,_,itl,_,i = specialize_inductive_type_constrs ~subst context ty_term in
- let _,_,_,cl = List.nth itl i in
- let cl =
- List.map (fun (_,id,ty) -> id, debruijn r_uri r_len context ty) cl
+let specialize_and_abstract_constrs ~subst r_uri r_len context ty_term =
+ let cl = specialize_inductive_type_constrs ~subst context ty_term in
+ let len = List.length context in
+ let context_dcl =
+ match E.get_checked_obj r_uri with
+ | _,_,_,_, NCic.Inductive (_,_,tys,_) ->
+ context @ List.map (fun (_,name,arity,_) -> name,C.Decl arity) tys
+ | _ -> assert false
in
- (* since arities are closed they are not lifted *)
- List.map (fun (_,name,arity,_) -> name, C.Decl arity) itl, cl
+ context_dcl,
+ List.map (fun (_,id,ty) -> id, debruijn r_uri r_len context ty) cl,
+ len, len + r_len
;;
exception DoesOccur;;
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
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
| 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
*)
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 =
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
(_,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
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
(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: "^^
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)
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)
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 =
- let t = R.whd ~delta:max_int ~subst context t in
(*
prerr_endline ("GB:\n" ^
PP.ppcontext ~subst ~metasenv context^
| 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 r in
+ let fl,_,_ = E.get_checked_fixes_or_cofixes r in
let ctx_tys, bos =
List.split (List.map (fun (_,name,_,ty,bo) -> (name, C.Decl ty), bo) fl)
in
) 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 itl_ctx,dcl = fix_lefts_in_constrs ~subst r_uri r_len context ty in
+ let dc_ctx, dcl, start, stop =
+ specialize_and_abstract_constrs ~subst r_uri r_len context ty in
let args = match t with C.Appl (_::tl) -> tl | _ -> [] in
- let dc_ctx = context @ itl_ctx in
- let start, stop = List.length context, List.length context + r_len in
aux k outtype;
List.iter (aux k) args;
List.iter2
try aux (context, recfuns, 1) t
with NotGuarded s -> raise (TypeCheckerFailure s)
-and guarded_by_constructors ~subst ~metasenv context t indURI indlen =
+and guarded_by_constructors ~subst ~metasenv context t indURI indlen nn =
let rec aux context n nn h te =
match R.whd ~subst context te with
| C.Rel m when m > n && m <= nn -> h
| 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 (i,j)) as ref) :: tl) as t ->
+ | 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 tys, cl = fix_lefts_in_constrs ~subst indURI indlen context ty_t in
- let len_ctx = List.length context in
- let len_tys = List.length tys in
- let context_c = context @ tys in
- let _,c = List.nth cl (j-1) in
- let rec_params =
- recursive_args ~subst ~metasenv context_c len_ctx (len_ctx+len_tys) c in
+ let dc_ctx, dcl, start, stop =
+ specialize_and_abstract_constrs ~subst indURI indlen context ty_t in
+ let _, dc = List.nth dcl (j-1) in
+(*
+ prerr_endline (PP.ppterm ~subst ~metasenv ~context:dc_ctx dc);
+ prerr_endline (PP.ppcontext ~subst ~metasenv dc_ctx);
+ *)
+ let rec_params = recursive_args ~subst ~metasenv dc_ctx start stop dc in
let rec analyse_instantiated_type rec_spec args =
match rec_spec, args with
| h::rec_spec, he::args ->
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 (_,_,(Ref.Fix _| Ref.CoFix _)) as ref)
- | C.Appl(C.Const (Ref.Ref(_,_,(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 ref in
+ let fl,_,_ = E.get_checked_fixes_or_cofixes ref in
+ let len = List.length fl in
let tys = List.map (fun (_,n,_,ty,_) -> n, C.Decl ty) fl in
List.for_all (does_not_occur ~subst context n nn) tl &&
List.for_all
- (fun (_,_,_,ty,bo) ->
- aux (context@tys) n nn h (debruijn indURI indlen context bo))
+ (fun (_,_,_,_,bo) ->
+ aux (context@tys) n nn h (debruijn u len context bo))
fl
| C.Const _
| C.Appl _ as t -> does_not_occur ~subst context n nn t
in
- aux context 0 indlen false t
+ aux context 0 nn false t
and recursive_args ~subst ~metasenv context n nn te =
match R.whd context te with
is_really_smaller r_uri r_len ~subst ~metasenv (shift_k (name,C.Decl s) k) t
| C.Appl (he::_) ->
is_really_smaller r_uri r_len ~subst ~metasenv k he
- | C.Appl _
| C.Rel _
| C.Const (Ref.Ref (_,_,Ref.Con _)) -> false
+ | C.Appl []
| C.Const (Ref.Ref (_,_,Ref.Fix _)) -> assert false
| C.Meta _ -> true
| C.Match (Ref.Ref (_,uri,_) as ref,outtype,term,pl) ->
List.for_all (is_really_smaller r_uri r_len ~subst ~metasenv k) pl
else
let ty = typeof ~subst ~metasenv context term in
- let itl_ctx,dcl= fix_lefts_in_constrs ~subst r_uri r_len context ty in
- let start, stop = List.length context, List.length context + r_len in
- let dc_ctx = context @ itl_ctx in
+ let dc_ctx, dcl, start, stop =
+ specialize_and_abstract_constrs ~subst r_uri r_len context ty in
List.for_all2
(fun p (_,dc) ->
let rl = recursive_args ~subst ~metasenv dc_ctx start stop dc in
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, _, _, _, _ = E.get_checked_indtys ref in
- if isinductive then None else (Some uri)
+ | 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
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")
| C.Inductive (is_ind, leftno, tyl, _) ->
check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl
| C.Fixpoint (inductive,fl,_) ->
- let types, kl, len =
+ let types, kl =
List.fold_left
- (fun (types,kl,len) (_,name,k,ty,_) ->
+ (fun (types,kl) (_,name,k,ty,_) ->
let _ = typeof ~subst ~metasenv [] ty in
- ((name,(C.Decl (S.lift len ty)))::types, k::kl,len+1)
- ) ([],[],0) fl
+ ((name,C.Decl ty)::types, k::kl)
+ ) ([],[]) fl
in
+ let len = List.length types in
let dfl, kl =
List.split (List.map2
(fun (_,_,_,_,bo) rno ->
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 (S.lift len 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
end else
match returns_a_coinductive ~subst [] ty with
| None ->
- raise (TypeCheckerFailure
- (lazy "CoFix: does not return a coinductive type"))
- | Some uri ->
- (* guarded by constructors conditions C{f,M} *)
- if not
- (guarded_by_constructors ~subst ~metasenv types bo uri len)
- then
- raise (TypeCheckerFailure
- (lazy "CoFix: not guarded by constructors"))
+ raise (TypeCheckerFailure
+ (lazy "CoFix: does not return a coinductive type"))
+ | Some (r_uri, r_len) ->
+ (* guarded by constructors conditions C{f,M} *)
+ if not
+ (guarded_by_constructors ~subst ~metasenv types bo r_uri r_len len)
+ then
+ raise (TypeCheckerFailure
+ (lazy "CoFix: not guarded by constructors"))
) fl dfl
+;;
+
+(* 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 = check_obj_well_typed;;
+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 *)
projects / helm.git / blobdiff