exception TypeCheckerFailure of string Lazy.t
exception AssertFailure of string Lazy.t
-let shift_k e (c,rf,x,safes) =
- e::c,List.map (fun (k,v) -> k+1,v) rf,x+1,List.map ((+)1) safes
+type recf_entry =
+ | Evil of int (* rno *)
+ | UnfFix of bool list (* fixed arguments *)
+ | Safe
;;
-(* $Id: cicTypeChecker.ml 8213 2008-03-13 18:48:26Z sacerdot $ *)
+let is_dangerous i l =
+ List.exists (function (j,Evil _) when j=i -> true | _ -> false) l
+;;
-(*
-exception CicEnvironmentError;;
+let is_unfolded i l =
+ List.exists (function (j,UnfFix _) when j=i -> true | _ -> false) l
+;;
-(*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 *)
-(*CSC strictly_positive *)
-(*CSC definizione (giusta???) tratta dalla mail di Hugo ;-) *)
-and weakly_positive context n nn uri te =
- let module C = Cic in
-(*CSC: Che schifo! Bisogna capire meglio e trovare una soluzione ragionevole!*)
- let dummy_mutind =
- C.MutInd (HelmLibraryObjects.Datatypes.nat_URI,0,[])
- in
- (*CSC: mettere in cicSubstitution *)
- let rec subst_inductive_type_with_dummy_mutind =
- function
- C.MutInd (uri',0,_) when UriManager.eq uri' uri ->
- dummy_mutind
- | C.Appl ((C.MutInd (uri',0,_))::tl) when UriManager.eq uri' uri ->
- dummy_mutind
- | C.Cast (te,ty) -> subst_inductive_type_with_dummy_mutind te
- | C.Prod (name,so,ta) ->
- C.Prod (name, subst_inductive_type_with_dummy_mutind so,
- subst_inductive_type_with_dummy_mutind ta)
- | C.Lambda (name,so,ta) ->
- C.Lambda (name, subst_inductive_type_with_dummy_mutind so,
- subst_inductive_type_with_dummy_mutind ta)
- | C.Appl tl ->
- C.Appl (List.map subst_inductive_type_with_dummy_mutind tl)
- | C.MutCase (uri,i,outtype,term,pl) ->
- C.MutCase (uri,i,
- subst_inductive_type_with_dummy_mutind outtype,
- subst_inductive_type_with_dummy_mutind term,
- List.map subst_inductive_type_with_dummy_mutind pl)
- | C.Fix (i,fl) ->
- C.Fix (i,List.map (fun (name,i,ty,bo) -> (name,i,
- subst_inductive_type_with_dummy_mutind ty,
- subst_inductive_type_with_dummy_mutind bo)) fl)
- | C.CoFix (i,fl) ->
- C.CoFix (i,List.map (fun (name,ty,bo) -> (name,
- subst_inductive_type_with_dummy_mutind ty,
- subst_inductive_type_with_dummy_mutind bo)) fl)
- | C.Const (uri,exp_named_subst) ->
- let exp_named_subst' =
- List.map
- (function (uri,t) -> (uri,subst_inductive_type_with_dummy_mutind t))
- exp_named_subst
- in
- C.Const (uri,exp_named_subst')
- | C.MutInd (uri,typeno,exp_named_subst) ->
- let exp_named_subst' =
- List.map
- (function (uri,t) -> (uri,subst_inductive_type_with_dummy_mutind t))
- exp_named_subst
- in
- C.MutInd (uri,typeno,exp_named_subst')
- | C.MutConstruct (uri,typeno,consno,exp_named_subst) ->
- let exp_named_subst' =
- List.map
- (function (uri,t) -> (uri,subst_inductive_type_with_dummy_mutind t))
- exp_named_subst
- in
- C.MutConstruct (uri,typeno,consno,exp_named_subst')
- | t -> t
- in
- match CicReduction.whd context te with
-(*
- C.Appl ((C.MutInd (uri',0,_))::tl) when UriManager.eq uri' uri -> true
-*)
- C.Appl ((C.MutInd (uri',_,_))::tl) when UriManager.eq uri' uri -> true
- | C.MutInd (uri',0,_) when UriManager.eq uri' uri -> true
- | C.Prod (C.Anonymous,source,dest) ->
- strictly_positive context n nn
- (subst_inductive_type_with_dummy_mutind source) &&
- weakly_positive ((Some (C.Anonymous,(C.Decl source)))::context)
- (n + 1) (nn + 1) uri dest
- | C.Prod (name,source,dest) when
- does_not_occur ((Some (name,(C.Decl source)))::context) 0 n dest ->
- (* dummy abstraction, so we behave as in the anonimous case *)
- strictly_positive context n nn
- (subst_inductive_type_with_dummy_mutind source) &&
- weakly_positive ((Some (name,(C.Decl source)))::context)
- (n + 1) (nn + 1) uri dest
- | C.Prod (name,source,dest) ->
- does_not_occur context n nn
- (subst_inductive_type_with_dummy_mutind source)&&
- weakly_positive ((Some (name,(C.Decl source)))::context)
- (n + 1) (nn + 1) uri dest
- | _ ->
- raise (TypeCheckerFailure (lazy "Malformed inductive constructor type"))
+let is_safe i l =
+ List.exists (function (j,Safe) when j=i -> true | _ -> false) l
+;;
-(* instantiate_parameters ps (x1:T1)...(xn:Tn)C *)
-(* returns ((x_|ps|:T_|ps|)...(xn:Tn)C){ps_1 / x1 ; ... ; ps_|ps| / x_|ps|} *)
-and instantiate_parameters params c =
- let module C = Cic in
- match (c,params) with
- (c,[]) -> c
- | (C.Prod (_,_,ta), he::tl) ->
- instantiate_parameters tl
- (CicSubstitution.subst he ta)
- | (C.Cast (te,_), _) -> instantiate_parameters params te
- | (t,l) -> raise (AssertFailure (lazy "1"))
+let get_recno i l =
+ try match List.assoc i l with Evil rno -> rno | _ -> assert false
+ with Not_found -> assert false
+;;
-and strictly_positive context n nn te =
- let module C = Cic in
- let module U = UriManager in
- match CicReduction.whd context te with
- | t when does_not_occur context n nn t -> true
- | C.Rel _ -> true
- | C.Cast (te,ty) ->
- (*CSC: bisogna controllare ty????*)
- strictly_positive context n nn te
- | C.Prod (name,so,ta) ->
- does_not_occur context n nn so &&
- strictly_positive ((Some (name,(C.Decl so)))::context) (n+1) (nn+1) ta
- | C.Appl ((C.Rel m)::tl) when m > n && m <= nn ->
- List.fold_right (fun x i -> i && does_not_occur context n nn x) tl true
- | C.Appl ((C.MutInd (uri,i,exp_named_subst))::tl) ->
- let (ok,paramsno,ity,cl,name) =
- let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in
- match o with
- C.InductiveDefinition (tl,_,paramsno,_) ->
- let (name,_,ity,cl) = List.nth tl i in
- (List.length tl = 1, paramsno, ity, cl, name)
- (* (true, paramsno, ity, cl, name) *)
- | _ ->
- raise
- (TypeCheckerFailure
- (lazy ("Unknown inductive type:" ^ U.string_of_uri uri)))
- in
- let (params,arguments) = split tl paramsno in
- let lifted_params = List.map (CicSubstitution.lift 1) params in
- let cl' =
- List.map
- (fun (_,te) ->
- instantiate_parameters lifted_params
- (CicSubstitution.subst_vars exp_named_subst te)
- ) cl
- in
- ok &&
- List.fold_right
- (fun x i -> i && does_not_occur context n nn x)
- arguments true &&
- (*CSC: MEGAPATCH3 (sara' quella giusta?)*)
- List.fold_right
- (fun x i ->
- i &&
- weakly_positive
- ((Some (C.Name name,(Cic.Decl ity)))::context) (n+1) (nn+1) uri
- x
- ) cl' true
- | t -> false
-
-(* the inductive type indexes are s.t. n < x <= nn *)
-and are_all_occurrences_positive context uri indparamsno i n nn te =
- let module C = Cic in
- match CicReduction.whd context te with
- C.Appl ((C.Rel m)::tl) when m = i ->
- (*CSC: riscrivere fermandosi a 0 *)
- (* let's check if the inductive type is applied at least to *)
- (* indparamsno parameters *)
- let last =
- List.fold_left
- (fun k x ->
- if k = 0 then 0
- else
- match CicReduction.whd context x with
- C.Rel m when m = n - (indparamsno - k) -> k - 1
- | _ ->
- raise (TypeCheckerFailure
- (lazy
- ("Non-positive occurence in mutual inductive definition(s) [1]" ^
- UriManager.string_of_uri uri)))
- ) indparamsno tl
- in
- if last = 0 then
- List.fold_right (fun x i -> i && does_not_occur context n nn x) tl true
- else
- raise (TypeCheckerFailure
- (lazy ("Non-positive occurence in mutual inductive definition(s) [2]"^
- UriManager.string_of_uri uri)))
- | C.Rel m when m = i ->
- if indparamsno = 0 then
- true
- else
- raise (TypeCheckerFailure
- (lazy ("Non-positive occurence in mutual inductive definition(s) [3]"^
- UriManager.string_of_uri uri)))
- | C.Prod (C.Anonymous,source,dest) ->
- let b = strictly_positive context n nn source in
- b &&
- are_all_occurrences_positive
- ((Some (C.Anonymous,(C.Decl source)))::context) uri indparamsno
- (i+1) (n + 1) (nn + 1) dest
- | C.Prod (name,source,dest) when
- does_not_occur ((Some (name,(C.Decl source)))::context) 0 n dest ->
- (* dummy abstraction, so we behave as in the anonimous case *)
- strictly_positive context n nn source &&
- are_all_occurrences_positive
- ((Some (name,(C.Decl source)))::context) uri indparamsno
- (i+1) (n + 1) (nn + 1) dest
- | C.Prod (name,source,dest) ->
- does_not_occur context n nn source &&
- are_all_occurrences_positive ((Some (name,(C.Decl source)))::context)
- uri indparamsno (i+1) (n + 1) (nn + 1) dest
- | _ ->
- raise
- (TypeCheckerFailure (lazy ("Malformed inductive constructor type " ^
- (UriManager.string_of_uri uri))))
+let get_fixed_args i l =
+ try match List.assoc i l with UnfFix fa -> fa | _ -> assert false
+ with Not_found -> assert false
+;;
+
+let shift_k e (c,rf,x) = e::c,List.map (fun (k,v) -> k+1,v) rf,x+1;;
+
+let string_of_recfuns ~subst ~metasenv ~context l =
+ let pp = NCicPp.ppterm ~subst ~metasenv ~context in
+ let safe, rest = List.partition (function (_,Safe) -> true | _ -> false) l in
+ let dang, unf = List.partition (function (_,UnfFix _) -> false | _->true)rest in
+ "\n\tsafes: "^String.concat "," (List.map (fun (i,_)->pp (NCic.Rel i)) safe) ^
+ "\n\tfix : "^String.concat ","
+ (List.map
+ (function (i,UnfFix l)-> pp(NCic.Rel i)^"/"^String.concat "," (List.map
+ string_of_bool l)
+ | _ ->assert false) unf) ^
+ "\n\trec : "^String.concat ","
+ (List.map
+ (function (i,Evil rno)->pp(NCic.Rel i)^"/"^string_of_int rno
+ | _ -> assert false) dang)
+;;
+let fixed_args bos j n nn =
+ let rec aux k acc = function
+ | NCic.Appl (NCic.Rel i::args) when i-k > n && i-k <= nn ->
+ let rec combine l1 l2 =
+ match l1,l2 with
+ [],[] -> []
+ | he1::tl1, he2::tl2 -> (he1,he2)::combine tl1 tl2
+ | he::tl, [] -> (false,NCic.Rel ~-1)::combine tl [] (* dummy term *)
+ | [],_::_ -> assert false
+ in
+ let lefts, _ = HExtlib.split_nth (min j (List.length args)) args in
+ List.map (fun ((b,x),i) -> b && x = NCic.Rel (k-i))
+ (HExtlib.list_mapi (fun x i -> x,i) (combine acc lefts))
+ | t -> NCicUtils.fold (fun _ k -> k+1) k aux acc t
+ in
+ List.fold_left (aux 0)
+ (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 []
+;;
+
+
+(*
(* the boolean h means already protected *)
(* args is the list of arguments the type of the constructor that may be *)
(* found in head position must be applied to. *)
| (_, _) -> raise (AssertFailure (lazy "split_prods"))
;;
-let debruijn ?(cb=fun _ _ -> ()) uri number_of_types =
+let debruijn ?(cb=fun _ _ -> ()) uri number_of_types context =
let rec aux k t =
let res =
match t with
in
cb t res; res
in
- aux 0
+ aux (List.length context)
;;
let sort_of_prod ~metasenv ~subst context (name,s) (t1, t2) =
(TypeCheckerFailure
(lazy (Printf.sprintf
("Appl: wrong application of %s: the parameter %s has type"^^
- "\n%s\nbut is should have type \n%s\n")
+ "\n%s\nbut it should have type \n%s\nContext:\n%s\n")
(NCicPp.ppterm ~subst ~metasenv ~context he)
(NCicPp.ppterm ~subst ~metasenv ~context arg)
(NCicPp.ppterm ~subst ~metasenv ~context ty_arg)
- (NCicPp.ppterm ~subst ~metasenv ~context s))))
+ (NCicPp.ppterm ~subst ~metasenv ~context s)
+ (NCicPp.ppcontext ~subst ~metasenv context))))
| _ ->
raise
(TypeCheckerFailure
aux ty_he args_with_ty
;;
-let fix_lefts_in_constrs ~subst uri paramsno tyl i =
- let len = List.length tyl in
- let _,_,arity,cl = List.nth tyl i in
- let tys = List.map (fun (_,n,ty,_) -> n,C.Decl ty) tyl in
- let cl' =
- List.map
- (fun (_,id,ty) ->
- let debruijnedty = debruijn uri len ty in
- id, snd (split_prods ~subst tys paramsno ty),
- snd (split_prods ~subst tys paramsno debruijnedty))
- cl
+(* instantiate_parameters ps (x1:T1)...(xn:Tn)C *)
+(* returns ((x_|ps|:T_|ps|)...(xn:Tn)C){ps_1 / x1 ; ... ; ps_|ps| / x_|ps|} *)
+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"))
+;;
+
+let specialize_inductive_type ~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 ->
+ 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) ->
+ let arity = instantiate_parameters left_args arity in
+ let cl =
+ List.map (fun (rel, name, ty) ->
+ rel, name, instantiate_parameters left_args ty)
+ cl
+ in
+ rel, name, arity, cl)
+ itl
+ in
+ is_ind, leftno, itl, attrs, i
+ | _ -> assert false
+;;
+
+let fix_lefts_in_constrs ~subst r_uri r_len context ty_term =
+ let _,_,itl,_,i = specialize_inductive_type ~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
in
- let lefts = fst (split_prods ~subst [] paramsno arity) in
- lefts@tys, len, cl'
+ List.map (fun (_,name,arity,_) -> name, C.Decl arity) itl, cl
;;
exception DoesOccur;;
with DoesOccur -> false
;;
+(*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 *)
+(*CSC strictly_positive *)
+(*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
+ (*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)
+ 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 _)))::_)
+ when NUri.eq uri' uri -> true
+ | C.Prod (name,source,dest) when
+ does_not_occur ~subst ((name,C.Decl source)::context) 0 1 dest ->
+ (* dummy abstraction, so we behave as in the anonimous case *)
+ strictly_positive ~subst context n nn
+ (subst_inductive_type_with_dummy () source) &&
+ weakly_positive ~subst ((name,C.Decl source)::context)
+ (n + 1) (nn + 1) uri dest
+ | C.Prod (name,source,dest) ->
+ does_not_occur ~subst context n nn
+ (subst_inductive_type_with_dummy () source)&&
+ weakly_positive ~subst ((name,C.Decl source)::context)
+ (n + 1) (nn + 1) uri dest
+ | _ ->
+ raise (TypeCheckerFailure (lazy "Malformed inductive constructor type"))
+
+and strictly_positive ~subst context n nn te =
+ match R.whd context te with
+ | t when does_not_occur ~subst context n nn t -> true
+ | C.Rel _ -> true
+ | C.Prod (name,so,ta) ->
+ does_not_occur ~subst context n nn so &&
+ 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) ->
+ 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
+ let params, arguments = HExtlib.split_nth paramsno tl in
+ let lifted_params = List.map (S.lift 1) params in
+ let cl =
+ List.map (fun (_,_,te) -> instantiate_parameters lifted_params te) cl
+ in
+ ok &&
+ List.for_all (does_not_occur ~subst context n nn) arguments &&
+ List.for_all
+ (weakly_positive ~subst ((name,C.Decl ity)::context) (n+1) (nn+1) uri) cl
+ | _ -> false
+
+(* 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
+ | C.Appl ((C.Rel m)::tl) as reduct when m = i ->
+ let last =
+ List.fold_left
+ (fun k x ->
+ 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
+ ("Argument "^string_of_int (indparamsno - k + 1) ^ " (of " ^
+ string_of_int indparamsno ^ " fixed) is not homogeneous in "^
+ "appl:\n"^ NCicPp.ppterm ~context ~subst ~metasenv:[] reduct))))
+ indparamsno tl
+ in
+ if last = 0 then
+ List.for_all (does_not_occur ~subst context n nn) tl
+ else
+ raise (TypeCheckerFailure
+ (lazy ("Non-positive occurence in mutual inductive definition(s) [2]"^
+ NUri.string_of_uri uri)))
+ | C.Rel m when m = i ->
+ if indparamsno = 0 then
+ true
+ else
+ raise (TypeCheckerFailure
+ (lazy ("Non-positive occurence in mutual inductive definition(s) [3]"^
+ NUri.string_of_uri uri)))
+ | C.Prod (name,source,dest) when
+ does_not_occur ~subst ((name,C.Decl source)::context) 0 1 dest ->
+ strictly_positive ~subst context n nn source &&
+ are_all_occurrences_positive ~subst
+ ((name,C.Decl source)::context) uri indparamsno
+ (i+1) (n + 1) (nn + 1) dest
+ | C.Prod (name,source,dest) ->
+ if not (does_not_occur ~subst context n nn source) then
+ raise (TypeCheckerFailure (lazy ("Non-positive occurrence in "^
+ NCicPp.ppterm ~context ~metasenv:[] ~subst te)));
+ are_all_occurrences_positive ~subst ((name,C.Decl source)::context)
+ uri indparamsno (i+1) (n + 1) (nn + 1) dest
+ | _ ->
+ raise
+ (TypeCheckerFailure (lazy ("Malformed inductive constructor type " ^
+ (NUri.string_of_uri uri))))
+;;
+
exception NotGuarded of string Lazy.t;;
let rec typeof ~subst ~metasenv context term =
let rec typeof_aux context =
- fun t -> (*prerr_endline (NCicPp.ppterm ~context t); *)
+ fun t -> (*prerr_endline (NCicPp.ppterm ~metasenv ~subst ~context t);*)
match t with
| C.Rel n ->
(try
| 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 leftno = E.get_indty_leftno r in
+ let inductive,leftno,itl,_,_ = E.get_checked_indtys r in
+ let constructorsno =
+ let _,_,_,cl = List.nth itl tyno in List.length cl
+ in
let parameters, arguments =
let ty = R.whd ~subst context (typeof_aux context term) in
let r',tl =
check_allowed_sort_elimination ~subst ~metasenv r context
sort_of_ind_type type_of_sort_of_ind_ty outsort;
(* let's check if the type of branches are right *)
- let leftno,constructorsno =
- let inductive,leftno,itl,_,i = E.get_checked_indtys r in
- let _,name,ty,cl = List.nth itl i in
- let cl_len = List.length cl in
- leftno, cl_len
- in
if List.length pl <> constructorsno then
raise (TypeCheckerFailure (lazy ("Wrong number of cases in a match")));
let j,branches_ok,p_ty, exp_p_ty =
| (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 _)) ->
+ (* TODO: we should pass all these parameters since we
+ * have them already *)
let inductive,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
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.map (fun (_,n,ty,_) -> (n,(C.Decl ty))) tyl in
+ let tys = List.rev (List.map (fun (_,n,ty,_) -> (n,(C.Decl ty))) tyl) in
ignore
(List.fold_right
(fun (_,_,_,cl) i ->
List.iter
(fun (_,name,te) ->
- let debruijnedte = debruijn uri len te in
+ let debruijnedte = debruijn uri len [] te in
ignore (typeof ~subst ~metasenv tys debruijnedte);
(* let's check also the positivity conditions *)
- if false (*
+ if
not
- (are_all_occurrences_positive tys uri indparamsno i 0 len
- debruijnedte) *)
+ (are_all_occurrences_positive ~subst tys uri leftno i 0 len
+ debruijnedte)
then
raise
(TypeCheckerFailure
| (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 "9 (%d, %s)" n
+ raise (AssertFailure (lazy (Printf.sprintf "eat_lambdas (%d, %s)" n
(NCicPp.ppterm ~subst ~metasenv ~context te))))
-and guarded_by_destructors ~subst ~metasenv context recfuns t =
+and eat_or_subst_lambdas
+ ~subst ~metasenv app_all_args n te to_be_subst args (context, recfuns, x as k)
+=
+ match n, R.whd ~subst context te, to_be_subst, args with
+ | (0, _,_,_) when args = [] || not app_all_args -> te, k
+ | (0, _,_,_::_) -> C.Appl (te::args), k
+ | (n, C.Lambda (name,so,ta),true::to_be_subst,arg::args) when n > 0 ->
+ eat_or_subst_lambdas ~subst ~metasenv app_all_args
+ (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 app_all_args
+ (n - 1) ta to_be_subst args (shift_k (name,(C.Decl so)) k)
+ | (n, te, _, _) when args = [] || not app_all_args -> te, k
+ | (n, te, _, _::_) -> C.Appl (te::args), k
+ | (_,_,_,[]) -> assert false (* caml thinks is missing *)
+
+and guarded_by_destructors r_uri r_len ~subst ~metasenv context recfuns t =
let recursor f k t = NCicUtils.fold shift_k k (fun k () -> f k) () t in
- let rec aux (context, recfuns, x, safes as k) = function
- | C.Rel m as t when List.mem_assoc m recfuns ->
+ let rec aux (context, recfuns, x as k) t =
+ let t = R.whd ~delta:max_int ~subst context t in
+(*
+ prerr_endline ("GB:\n" ^
+ NCicPp.ppcontext ~subst ~metasenv context^
+ NCicPp.ppterm ~metasenv ~subst ~context t^
+ string_of_recfuns ~subst ~metasenv ~context recfuns);
+*)
+ try
+ match t with
+ | C.Rel m as t when is_dangerous m recfuns ->
raise (NotGuarded (lazy
- (NCicPp.ppterm ~subst ~metasenv ~context t ^ " passed around")))
- | C.Rel m ->
- (match List.nth context (m-1) with
- | _,C.Decl _ -> ()
- | _,C.Def (bo,_) -> aux (context, recfuns, x, safes) (S.lift m bo))
- | C.Meta _ -> ()
- | C.Appl ((C.Rel m)::tl) as t when List.mem_assoc m recfuns ->
- let rec_no = List.assoc m recfuns in
+ (NCicPp.ppterm ~subst ~metasenv ~context t ^
+ " is a partial application of a fix")))
+ | C.Appl ((C.Rel m)::tl) as t when is_dangerous m recfuns ->
+ let rec_no = get_recno m recfuns in
if not (List.length tl > rec_no) then
raise (NotGuarded (lazy
(NCicPp.ppterm ~context ~subst ~metasenv t ^
" is a partial application of a fix")))
else
let rec_arg = List.nth tl rec_no in
- if not (is_really_smaller ~subst ~metasenv k rec_arg) then
- raise (NotGuarded (lazy
- (NCicPp.ppterm ~context ~subst ~metasenv rec_arg ^ " not smaller")));
+ if not (is_really_smaller r_uri r_len ~subst ~metasenv k rec_arg) then
+ raise (NotGuarded (lazy (Printf.sprintf ("Recursive call %s, %s is not"
+ ^^ " smaller.\ncontext:\n%s") (NCicPp.ppterm ~context ~subst ~metasenv
+ t) (NCicPp.ppterm ~context ~subst ~metasenv rec_arg)
+ (NCicPp.ppcontext ~subst ~metasenv context))));
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
+ | 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,_))) 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 ctx_tys, bos =
+ List.split (List.map (fun (_,name,_,ty,bo) -> (name, C.Decl ty), bo) fl)
+ in
+ let fl_len = List.length fl in
+ let bos = List.map (debruijn uri fl_len context) bos in
+ let j = List.fold_left min max_int (List.map (fun (_,_,i,_,_)->i) fl) in
+ 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;
+ let context = context@ctx_tys in
+ let ctx_len = List.length context in
+ let extra_recfuns =
+ HExtlib.list_mapi (fun _ i -> ctx_len - i, UnfFix fa) ctx_tys
+ in
+ let k = context, extra_recfuns@recfuns, x in
+ let bos_and_ks =
+ HExtlib.list_mapi (fun bo fno ->
+ (* potrebbe anche aggiungere un arg di cui fa push alle safe *)
+ eat_or_subst_lambdas ~subst ~metasenv (fno=i) j bo fa args k) 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 ->
(match R.whd ~subst context term with
- | C.Rel m | C.Appl (C.Rel m :: _ ) as t when List.mem m safes || m = x ->
- let isinductive, paramsno, tl, _, i = E.get_checked_indtys ref in
+ | 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 c_ctx,len,cl = fix_lefts_in_constrs ~subst uri paramsno tl i in
+ 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 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
- (fun p (_,_,bruijnedc) ->
- let rl = recursive_args ~subst ~metasenv c_ctx 0 len bruijnedc in
+ (fun p (_,dc) ->
+ let rl = recursive_args ~subst ~metasenv dc_ctx start stop dc in
let p, k = get_new_safes ~subst k p rl in
aux k p)
- pl cl
+ pl dcl
| _ -> recursor aux k t)
| t -> recursor aux k t
+ with
+ NotGuarded _ as exc ->
+ let t' = R.whd ~delta:0 ~subst context t in
+ if t = t' then raise exc
+ else aux k t'
in
- try aux (context, recfuns, 1, []) t
+ try aux (context, recfuns, 1) t
with NotGuarded s -> raise (TypeCheckerFailure s)
(*
and recursive_args ~subst ~metasenv context n nn te =
match R.whd context te with
- | C.Rel _ | C.Appl _ -> []
+ | C.Rel _ | C.Appl _ | C.Const _ -> []
| C.Prod (name,so,de) ->
(not (does_not_occur ~subst context n nn so)) ::
(recursive_args ~subst ~metasenv
raise (AssertFailure (lazy ("recursive_args:" ^ NCicPp.ppterm ~subst
~metasenv ~context:[] t)))
-and get_new_safes ~subst (context, recfuns, x, safes as k) p rl =
+and get_new_safes ~subst (context, recfuns, x as k) p rl =
match R.whd ~subst context p, rl with
| C.Lambda (name,so,ta), b::tl ->
- let safes = (if b then [0] else []) @ safes in
+ let recfuns = (if b then [0,Safe] else []) @ recfuns in
get_new_safes ~subst
- (shift_k (name,(C.Decl so)) (context, recfuns, x, safes)) ta tl
+ (shift_k (name,(C.Decl so)) (context, recfuns, x)) ta tl
| C.Meta _ as e, _ | e, [] -> e, k
| _ -> raise (AssertFailure (lazy "Ill formed pattern"))
split_prods ~subst ((name,(C.Decl so))::context) (n - 1) ta
| _ -> raise (AssertFailure (lazy "split_prods"))
-and is_really_smaller ~subst ~metasenv (context, recfuns, x, safes as k) te =
+and is_really_smaller
+ r_uri r_len ~subst ~metasenv (context, recfuns, x as k) te
+=
match R.whd ~subst context te with
- | C.Rel m when List.mem m safes -> true
- | C.Rel _ -> false
- | C.LetIn _ -> raise (AssertFailure (lazy "letin after whd"))
- | C.Sort _ | C.Implicit _ | C.Prod _ | C.Lambda _
- | C.Const (Ref.Ref (_,_,(Ref.Decl | Ref.Def | Ref.Ind _ | Ref.CoFix _))) ->
- raise (AssertFailure (lazy "not a constructor"))
- | C.Appl ([]|[_]) -> raise (AssertFailure (lazy "empty/unary appl"))
+ | C.Rel m when is_safe m recfuns -> true
+ | C.Lambda (name, s, t) ->
+ is_really_smaller r_uri r_len ~subst ~metasenv (shift_k (name,C.Decl s) k) t
| C.Appl (he::_) ->
- (*CSC: sulla coda ci vogliono dei controlli? secondo noi no, ma *)
- (*CSC: solo perche' non abbiamo trovato controesempi *)
- (*TASSI: da capire soprattutto se he รจ un altro fix che non ha ridotto...*)
- is_really_smaller ~subst ~metasenv k he
+ is_really_smaller r_uri r_len ~subst ~metasenv k he
+ | C.Appl _
+ | C.Rel _
| C.Const (Ref.Ref (_,_,Ref.Con _)) -> false
| C.Const (Ref.Ref (_,_,Ref.Fix _)) -> assert false
(*| C.Fix (_, fl) ->
is_really_smaller ~subst (tys@context) n_plus_len nn_plus_len kl
x_plus_len safes' bo
) fl true*)
- | C.Meta _ ->
- true (* XXX if this check is repeated when the user completes the
- definition *)
+ | C.Meta _ -> true
| C.Match (Ref.Ref (_,uri,_) as ref,outtype,term,pl) ->
(match term with
- | C.Rel m | C.Appl (C.Rel m :: _ ) when List.mem m safes || m = x ->
- let isinductive, paramsno, tl, _, i = E.get_checked_indtys ref in
+ | 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 ~subst ~metasenv k) pl
+ List.for_all (is_really_smaller r_uri r_len ~subst ~metasenv k) pl
else
- let c_ctx,len,cl = fix_lefts_in_constrs ~subst uri paramsno tl i in
+ 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
List.for_all2
- (fun p (_,_,debruijnedte) ->
- let rl'=recursive_args ~subst ~metasenv c_ctx 0 len debruijnedte in
- let e, k = get_new_safes ~subst k p rl' in
- is_really_smaller ~subst ~metasenv k e)
- pl cl
- | _ -> List.for_all (is_really_smaller ~subst ~metasenv k) pl)
+ (fun p (_,dc) ->
+ let rl = recursive_args ~subst ~metasenv dc_ctx start stop dc in
+ let e, k = get_new_safes ~subst k p rl in
+ is_really_smaller r_uri r_len ~subst ~metasenv k e)
+ pl dcl
+ | _ -> List.for_all (is_really_smaller r_uri r_len ~subst ~metasenv k) pl)
+ | _ -> assert false
and returns_a_coinductive ~subst context ty =
match R.whd ~subst context ty with
check_obj_well_typed uobj;
E.add_obj uobj;
!logger (`Type_checking_completed uri);
- if not (fst (E.get_obj uri)) then
- raise (AssertFailure (lazy "environment error"));
uobj
in
match cobj, ref with
assert (metasenv = [] && subst = []);
match kind with
| C.Constant (_,_,Some te,ty,_) ->
-(*
- prerr_endline ("TY: " ^ NCicPp.ppterm ~subst ~metasenv ~context:[] ty);
- prerr_endline ("BO: " ^ NCicPp.ppterm ~subst ~metasenv ~context:[] te);
-*)
let _ = typeof ~subst ~metasenv [] ty in
let ty_te = typeof ~subst ~metasenv [] te in
-(* prerr_endline "XXXX"; *)
if not (R.are_convertible ~subst ~metasenv [] ty_te ty) then
- raise (TypeCheckerFailure (lazy (Printf.sprintf
- "the type of the body is not the one expected:\n%s\nvs\n%s"
+ 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")
(NCicPp.ppterm ~subst ~metasenv ~context:[] ty_te)
(NCicPp.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
| C.Fixpoint (inductive,fl,_) ->
- let types,kl,len =
+ let types, kl, len =
List.fold_left
(fun (types,kl,len) (_,name,k,ty,_) ->
let _ = typeof ~subst ~metasenv [] ty in
((name,(C.Decl (S.lift len ty)))::types, k::kl,len+1)
) ([],[],0) fl
in
- List.iter (fun (_,name,x,ty,bo) ->
- let bo = debruijn uri len bo in
- let ty_bo = typeof ~subst ~metasenv types bo in
- if not (R.are_convertible ~subst ~metasenv types ty_bo (S.lift len ty))
- then raise (TypeCheckerFailure (lazy ("(Co)Fix: ill-typed bodies")))
- else
- if inductive then begin
- let m, context = eat_lambdas ~subst ~metasenv types (x + 1) bo in
- (* guarded by destructors conditions D{f,k,x,M} *)
- let rec enum_from k =
- function [] -> [] | v::tl -> (k,v)::enum_from (k+1) tl
+ let dfl, kl =
+ List.split (List.map2
+ (fun (_,_,_,_,bo) rno ->
+ let dbo = debruijn uri len [] bo in
+ dbo, Evil rno)
+ fl kl)
+ 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))
+ then raise (TypeCheckerFailure (lazy ("(Co)Fix: ill-typed bodies")))
+ else
+ if inductive then begin
+ let m, context = eat_lambdas ~subst ~metasenv types (x + 1) bo in
+ let r_uri, r_len =
+ let he =
+ match List.hd context with _,C.Decl t -> t | _ -> assert false
in
- guarded_by_destructors
- ~subst ~metasenv context (enum_from (x+2) kl) m
- end else
- match returns_a_coinductive ~subst [] ty with
- | None ->
+ 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) :: _) ->
+ let _,_,itl,_,_ = E.get_checked_indtys ref in
+ uri, List.length itl
+ | _ -> assert false
+ in
+ (* guarded by destructors conditions D{f,k,x,M} *)
+ let rec enum_from k =
+ function [] -> [] | v::tl -> (k,v)::enum_from (k+1) tl
+ in
+ guarded_by_destructors r_uri r_len
+ ~subst ~metasenv context (enum_from (x+2) kl) m
+ 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 0 len false bo [] uri)
+ then
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 0 len false bo [] uri)
- then
- raise (TypeCheckerFailure
- (lazy "CoFix: not guarded by constructors"))
- ) fl
+ (lazy "CoFix: not guarded by constructors"))
+ ) fl dfl
let typecheck_obj = check_obj_well_typed;;
projects / helm.git / blobdiff