(* $Id$ *)
module C = NCic
-module R = NCicReduction
module Ref = NReference
+module R = NCicReduction
module S = NCicSubstitution
module U = NCicUtils
module E = NCicEnvironment
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 *)
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
(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.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 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.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
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.Type u1), C.Sort (C.Type u2) -> C.Sort (C.Type (max 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.Sort C.Prop -> t2
+ | C.Sort (C.Type u1), C.Sort (C.Type u2) -> C.Sort (C.Type (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
(PP.ppterm ~subst ~metasenv ~context t2))))
;;
-let eat_prods ~subst ~metasenv context he ty_he args_with_ty =
- let rec aux ty_he = function
- | [] -> 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));
-*)
- if R.are_convertible ~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"^^
- "\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)
- (PP.ppterm ~subst ~metasenv ~context ty_arg)
- (PP.ppterm ~subst ~metasenv ~context s)
- (PP.ppcontext ~subst ~metasenv context))))
- | _ ->
- raise
- (TypeCheckerFailure
- (lazy (Printf.sprintf
- "Appl: %s is not a function, it cannot be applied"
- (PP.ppterm ~subst ~metasenv ~context
- (let res = List.length tl in
- let eaten = List.length args_with_ty - res in
- (C.Appl
- (he::List.map fst
- (fst (HExtlib.split_nth eaten args_with_ty)))))))))
- in
- aux ty_he args_with_ty
-;;
+(* REMINDER: eat_prods was here *)
(* instantiate_parameters ps (x1:T1)...(xn:Tn)C *)
(* returns ((x_|ps|:T_|ps|)...(xn:Tn)C){ps_1 / x1 ; ... ; ps_|ps| / x_|ps|} *)
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
let len = List.length context in
let context_dcl =
match E.get_checked_obj r_uri with
- | _,_,_,_, NCic.Inductive (_,_,tys,_) ->
+ | _,_,_,_, C.Inductive (_,_,tys,_) ->
context @ List.map (fun (_,name,arity,_) -> name,C.Decl arity) tys
| _ -> assert false
in
(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
(*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,_))))::_)
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 ->
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
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))))
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))))
| (_,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 =
| 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 get_relevance context ty_t ty) then
raise
(TypeCheckerFailure
(lazy (Printf.sprintf
| 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) ->
+ | 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
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
let ty_branch =
type_of_branch ~subst context leftno outtype cons ty_cons 0
in
- j+1, R.are_convertible ~subst context ty_p ty_branch,
+ j+1, R.are_convertible ~subst get_relevance context ty_p ty_branch,
ty_p, ty_branch
else
j,false,old_p_ty,old_exp_p_ty
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) ->
(_,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 ~subst get_relevance tl t1 t2) then
raise
(TypeCheckerFailure
(lazy (Printf.sprintf
with Failure _ -> t)
| _ -> t
in
- if not (R.are_convertible ~subst context optimized_t ct)
+ if not (R.are_convertible ~subst get_relevance 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 context type_t ct) then
+ if not (R.are_convertible ~subst get_relevance context type_t ct) then
raise (TypeCheckerFailure
(lazy (Printf.sprintf
("Not well typed metavariable local context: "^^
"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
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 ~subst get_relevance 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 context so ind) then
+ if not (R.are_convertible ~subst get_relevance context so ind) then
raise (TypeCheckerFailure (lazy (Printf.sprintf
"In outtype: expected %s, found %s"
(PP.ppterm ~subst ~metasenv ~context ind)
(PP.ppterm ~subst ~metasenv ~context so)
)));
- (match arity1,ta with
- | (C.Sort (C.CProp | C.Type _), C.Sort _)
+ (match arity1, R.whd ~subst ((name,C.Decl so)::context) ta with
+ | (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")));
in
typeof_aux context term
-and check_mutual_inductive_defs uri ~metasenv ~subst is_ind leftno tyl =
+and eat_prods ~subst ~metasenv context he ty_he args_with_ty =
+ let rec aux ty_he = function
+ | [] -> ty_he
+ | (arg, ty_arg)::tl ->
+ match R.whd ~subst context ty_he with
+ | C.Prod (_,s,t) ->
+ if R.are_convertible ~subst get_relevance 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"^^
+ "\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)
+ (PP.ppterm ~subst ~metasenv ~context ty_arg)
+ (PP.ppterm ~subst ~metasenv ~context s)
+ (PP.ppcontext ~subst ~metasenv context))))
+ | _ ->
+ raise
+ (TypeCheckerFailure
+ (lazy (Printf.sprintf
+ "Appl: %s is not a function, it cannot be applied"
+ (PP.ppterm ~subst ~metasenv ~context
+ (let res = List.length tl in
+ let eaten = List.length args_with_ty - res in
+ (C.Appl
+ (he::List.map fst
+ (fst (HExtlib.split_nth eaten args_with_ty)))))))))
+ in
+ aux ty_he args_with_ty
+
+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. *)
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 (it_relev,_,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);
+ (fun (k_relev,_,te) ->
+ let _,k_relev = HExtlib.split_nth leftno k_relev in
+ 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 get_relevance context ty1 ty2
+ | (n1,C.Def (bo1,ty1)),(n2,C.Def (bo2,ty2)) ->
+ n1 = n2
+ && R.are_convertible ~subst get_relevance context ty1 ty2
+ && R.are_convertible ~subst get_relevance 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.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
- (lazy ("Non positive occurence in "^NUri.string_of_uri uri))))
+ (lazy ("Non positive occurence in "^NUri.string_of_uri
+ uri)))
+ else check_relevance ~subst ~metasenv context k_relev te)
cl;
- i + 1)
+ check_relevance ~subst ~metasenv [] it_relev ty;
+ i+1)
tyl 1)
+and check_relevance ~subst ~metasenv context relevance ty =
+ let error context ty =
+ raise (TypeCheckerFailure
+ (lazy ("Wrong relevance declaration: " ^
+ String.concat "," (List.map string_of_bool relevance)^
+ "\nfor type: "^PP.ppterm ~metasenv ~subst ~context ty)))
+ in
+ let rec aux context relevance ty =
+ match R.whd ~subst context ty with
+ | C.Prod (name,so,de) ->
+ let sort = typeof ~subst ~metasenv context so in
+ (match (relevance,R.whd ~subst context sort) with
+ | [],_ -> ()
+ | false::tl,C.Sort C.Prop -> aux ((name,(C.Decl so))::context) tl de
+ | true::_,C.Sort C.Prop
+ | false::_,C.Sort _
+ | false::_,C.Meta _ -> error context ty
+ | true::tl,C.Sort _
+ | true::tl,C.Meta _ -> aux ((name,(C.Decl so))::context) tl de
+ | _ -> raise (AssertFailure (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)))))
+ | _ -> (match relevance with
+ | [] -> ()
+ | _::_ -> error context ty)
+ in aux context relevance ty
+
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 =
| _,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
) 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
| 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 ->
- let _, paramsno, _, _, _ = E.get_checked_indtys ref in
+ | C.Const (Ref.Ref (_,Ref.Con _)) -> true
+ | 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
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
| 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 (_,Ref.Ind (isinductive,_,_)),_,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
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,lno1,tl,_)),Ref.Ref(_,Ref.Ind (isind2,i,lno2))->
+ if isind1 <> isind2 || lno1 <> lno2 then error ();
let _,_,arity,_ = List.nth tl i in arity
- | (_,_,_,_,C.Inductive (_,_,tl,_)), Ref.Ref (_,_,Ref.Con (i,j)) ->
+ | (_,_,_,_,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.Fix (i,_)|Ref.CoFix i)) ->
+ | (_,_,_,_,C.Fixpoint (false,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 (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
+ | (_,_,_,_,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"))
+
+and get_relevance ~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 (name,so,de) ->
+ 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);
+ prerr_endline ("sort: " ^ PP.ppterm ~subst ~metasenv:[]
+ ~context sort);*)
+ (match R.whd ~subst context sort with
+ | C.Sort C.Prop ->
+ false::(aux context new_ty tl)
+ | C.Sort _
+ | 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)))))
+ | _ ->
+ raise
+ (TypeCheckerFailure
+ (lazy (Printf.sprintf
+ "Appl: %s is not a function, it cannot be applied"
+ (PP.ppterm ~subst ~metasenv:[] ~context
+ (let res = List.length tl in
+ let eaten = List.length args - res in
+ (C.Appl
+ (t::fst
+ (HExtlib.split_nth eaten args))))))))
+ in aux context ty args
;;
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 ~subst get_relevance 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')
+ name (PP.ppterm ~subst ~metasenv ~context ty')
(PP.ppterm ~subst ~metasenv ~context ty))))
end;
d::context
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 ~subst get_relevance 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"^^
) [] 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 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
+ if not (R.are_convertible ~subst get_relevance [] 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")
(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 ~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 ~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
+ check_relevance ~subst ~metasenv [] relevance ty;
((name,C.Decl ty)::types, k::kl)
) ([],[]) fl
in
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)
+ if not (R.are_convertible ~subst get_relevance types ty_bo ty)
then raise (TypeCheckerFailure (lazy ("(Co)Fix: ill-typed bodies")))
else
if inductive then begin
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