CicEnvironment.CheckedObj cobj -> cobj
| CicEnvironment.UncheckedObj uobj ->
CicLogger.log (`Start_type_checking uri) ;
+ CicUniv.directly_to_env_begin ();
(* let's typecheck the uncooked obj *)
(match uobj with
C.Constant (_,Some te,ty,_) ->
("Unknown constant:" ^ U.string_of_uri uri))
);
CicEnvironment.set_type_checking_info uri ;
+ CicUniv.directly_to_env_end ();
CicLogger.log (`Type_checking_completed uri) ;
match CicEnvironment.is_type_checked ~trust:false uri with
CicEnvironment.CheckedObj cobj -> cobj
CicEnvironment.CheckedObj (C.Variable (_,_,ty,_)) -> ty
| CicEnvironment.UncheckedObj (C.Variable (_,bo,ty,_)) ->
CicLogger.log (`Start_type_checking uri) ;
+ CicUniv.directly_to_env_begin ();
(* only to check that ty is well-typed *)
let _ = type_of ty in
(match bo with
("Unknown variable:" ^ U.string_of_uri uri))
) ;
CicEnvironment.set_type_checking_info uri ;
+ CicUniv.directly_to_env_end ();
CicLogger.log (`Type_checking_completed uri) ;
ty
| _ ->
CicEnvironment.CheckedObj cobj -> cobj
| CicEnvironment.UncheckedObj uobj ->
CicLogger.log (`Start_type_checking uri) ;
+ CicUniv.directly_to_env_begin ();
check_mutual_inductive_defs uri uobj ;
CicEnvironment.set_type_checking_info uri ;
+ CicUniv.directly_to_env_end ();
CicLogger.log (`Type_checking_completed uri) ;
(match CicEnvironment.is_type_checked ~trust:false uri with
CicEnvironment.CheckedObj cobj -> cobj
CicEnvironment.CheckedObj cobj -> cobj
| CicEnvironment.UncheckedObj uobj ->
CicLogger.log (`Start_type_checking uri) ;
+ (*CicUniv.directly_to_env_begin ();*)
check_mutual_inductive_defs uri uobj ;
CicEnvironment.set_type_checking_info uri ;
+ (*CicUniv.directly_to_env_end ();*)
CicLogger.log (`Type_checking_completed uri) ;
(match CicEnvironment.is_type_checked ~trust:false uri with
CicEnvironment.CheckedObj cobj -> cobj
| C.Fix _
| C.CoFix _ -> raise (AssertFailure "6") (* due to type-checking *)
-and get_new_safes context p c rl safes n nn x =
+and get_new_safes ?(subst = []) context p c rl safes n nn x =
let module C = Cic in
let module U = UriManager in
let module R = CicReduction in
- match (R.whd context c, R.whd context p, rl) with
+ match (R.whd ~subst context c, R.whd ~subst context p, rl) with
(C.Prod (_,so,ta1), C.Lambda (name,_,ta2), b::tl) ->
(* we are sure that the two sources are convertible because we *)
(* have just checked this. So let's go along ... *)
let safes'' =
if b then 1::safes' else safes'
in
- get_new_safes ((Some (name,(C.Decl so)))::context)
+ get_new_safes ~subst ((Some (name,(C.Decl so)))::context)
ta2 ta1 tl safes'' (n+1) (nn+1) (x+1)
| (C.Prod _, (C.MutConstruct _ as e), _)
| (C.Prod _, (C.Rel _ as e), _)
(Printf.sprintf "Get New Safes: c=%s ; p=%s"
(CicPp.ppterm c) (CicPp.ppterm p)))
-and split_prods context n te =
+and split_prods ?(subst = []) context n te =
let module C = Cic in
let module R = CicReduction in
match (n, R.whd context te) with
(0, _) -> context,te
| (n, C.Prod (name,so,ta)) when n > 0 ->
- split_prods ((Some (name,(C.Decl so)))::context) (n - 1) ta
+ split_prods ~subst ((Some (name,(C.Decl so)))::context) (n - 1) ta
| (_, _) -> raise (AssertFailure "8")
-and eat_lambdas context n te =
+and eat_lambdas ?(subst = []) context n te =
let module C = Cic in
let module R = CicReduction in
- match (n, R.whd context te) with
+ match (n, R.whd ~subst context te) with
(0, _) -> (te, 0, context)
| (n, C.Lambda (name,so,ta)) when n > 0 ->
let (te, k, context') =
- eat_lambdas ((Some (name,(C.Decl so)))::context) (n - 1) ta
+ eat_lambdas ~subst ((Some (name,(C.Decl so)))::context) (n - 1) ta
in
(te, k + 1, context')
| (n, te) ->
raise (AssertFailure (sprintf "9 (%d, %s)" n (CicPp.ppterm te)))
-(*CSC: Tutto quello che segue e' l'intuzione di luca ;-) *)
-and check_is_really_smaller_arg context n nn kl x safes te =
+(*CSC: Tutto quello che segue e' l'intuzione di luca ;-) *)
+and check_is_really_smaller_arg ?(subst = []) context n nn kl x safes te =
(*CSC: forse la whd si puo' fare solo quando serve veramente. *)
(*CSC: cfr guarded_by_destructors *)
let module C = Cic in
| C.Implicit _
| C.Cast _
(* | C.Cast (te,ty) ->
- check_is_really_smaller_arg n nn kl x safes te &&
- check_is_really_smaller_arg n nn kl x safes ty*)
+ check_is_really_smaller_arg ~subst n nn kl x safes te &&
+ check_is_really_smaller_arg ~subst n nn kl x safes ty*)
(* | C.Prod (_,so,ta) ->
- check_is_really_smaller_arg n nn kl x safes so &&
- check_is_really_smaller_arg (n+1) (nn+1) kl (x+1)
+ check_is_really_smaller_arg ~subst n nn kl x safes so &&
+ check_is_really_smaller_arg ~subst (n+1) (nn+1) kl (x+1)
(List.map (fun x -> x + 1) safes) ta*)
| C.Prod _ -> raise (AssertFailure "10")
| C.Lambda (name,so,ta) ->
- check_is_really_smaller_arg context n nn kl x safes so &&
- check_is_really_smaller_arg ((Some (name,(C.Decl so)))::context)
+ check_is_really_smaller_arg ~subst context n nn kl x safes so &&
+ check_is_really_smaller_arg ~subst ((Some (name,(C.Decl so)))::context)
(n+1) (nn+1) kl (x+1) (List.map (fun x -> x + 1) safes) ta
| C.LetIn (name,so,ta) ->
- check_is_really_smaller_arg context n nn kl x safes so &&
- check_is_really_smaller_arg ((Some (name,(C.Def (so,None))))::context)
+ check_is_really_smaller_arg ~subst context n nn kl x safes so &&
+ check_is_really_smaller_arg ~subst ((Some (name,(C.Def (so,None))))::context)
(n+1) (nn+1) kl (x+1) (List.map (fun x -> x + 1) safes) ta
| C.Appl (he::_) ->
(*CSC: sulla coda ci vogliono dei controlli? secondo noi no, ma *)
(*CSC: solo perche' non abbiamo trovato controesempi *)
- check_is_really_smaller_arg context n nn kl x safes he
+ check_is_really_smaller_arg ~subst context n nn kl x safes he
| C.Appl [] -> raise (AssertFailure "11")
| C.Const _
| C.MutInd _ -> raise (AssertFailure "12")
let cl' =
List.map
(fun (id,ty) ->
- (id, snd (split_prods tys paramsno ty))) cl
+ (id, snd (split_prods ~subst tys paramsno ty))) cl
in
(tys,List.length tl,isinductive,paramsno,cl')
| _ ->
if not isinductive then
List.fold_right
(fun p i ->
- i && check_is_really_smaller_arg context n nn kl x safes p)
+ i && check_is_really_smaller_arg ~subst context n nn kl x safes p)
pl true
else
List.fold_right
recursive_args tys 0 len debrujinedte
in
let (e,safes',n',nn',x',context') =
- get_new_safes context p c rl' safes n nn x
+ get_new_safes ~subst context p c rl' safes n nn x
in
i &&
- check_is_really_smaller_arg context' n' nn' kl x' safes' e
+ check_is_really_smaller_arg ~subst context' n' nn' kl x' safes' e
) (List.combine pl cl) true
| C.Appl ((C.Rel m)::tl) when List.mem m safes || m = x ->
let (tys,len,isinductive,paramsno,cl) =
let cl' =
List.map
(fun (id,ty) ->
- (id, snd (split_prods tys paramsno ty))) cl
+ (id, snd (split_prods ~subst tys paramsno ty))) cl
in
(tys,List.length tl,isinductive,paramsno,cl')
| _ ->
if not isinductive then
List.fold_right
(fun p i ->
- i && check_is_really_smaller_arg context n nn kl x safes p)
+ i && check_is_really_smaller_arg ~subst context n nn kl x safes p)
pl true
else
(*CSC: supponiamo come prima che nessun controllo sia necessario*)
get_new_safes context p c rl' safes n nn x
in
i &&
- check_is_really_smaller_arg context' n' nn' kl x' safes' e
+ check_is_really_smaller_arg ~subst context' n' nn' kl x' safes' e
) (List.combine pl cl) true
| _ ->
List.fold_right
(fun p i ->
- i && check_is_really_smaller_arg context n nn kl x safes p
+ i && check_is_really_smaller_arg ~subst context n nn kl x safes p
) pl true
)
| C.Fix (_, fl) ->
List.fold_right
(fun (_,_,ty,bo) i ->
i &&
- check_is_really_smaller_arg (tys@context) n_plus_len nn_plus_len kl
+ check_is_really_smaller_arg ~subst (tys@context) n_plus_len nn_plus_len kl
x_plus_len safes' bo
) fl true
| C.CoFix (_, fl) ->
List.fold_right
(fun (_,ty,bo) i ->
i &&
- check_is_really_smaller_arg (tys@context) n_plus_len nn_plus_len kl
+ check_is_really_smaller_arg ~subst (tys@context) n_plus_len nn_plus_len kl
x_plus_len safes' bo
) fl true
-and guarded_by_destructors context n nn kl x safes =
+and guarded_by_destructors ?(subst = []) context n nn kl x safes =
let module C = Cic in
let module U = UriManager in
function
| Some (_,C.Def (bo,_)) ->
guarded_by_destructors context m nn kl x safes
(CicSubstitution.lift m bo)
- | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis")
+ | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis")
)
| C.Meta _
| C.Sort _
(fun param i ->
i && guarded_by_destructors context n nn kl x safes param
) tl true &&
- check_is_really_smaller_arg context n nn kl x safes (List.nth tl k)
+ check_is_really_smaller_arg ~subst context n nn kl x safes (List.nth tl k)
| C.Appl tl ->
List.fold_right
(fun t i -> i && guarded_by_destructors context n nn kl x safes t)
List.map
(fun (id,ty) ->
let debrujinedty = debrujin_constructor uri len ty in
- (id, snd (split_prods tys paramsno ty),
- snd (split_prods tys paramsno debrujinedty)
+ (id, snd (split_prods ~subst tys paramsno ty),
+ snd (split_prods ~subst tys paramsno debrujinedty)
)) cl
in
(tys,len,isinductive,paramsno,cl')
let cl' =
List.map
(fun (id,ty) ->
- (id, snd (split_prods tys paramsno ty))) cl
+ (id, snd (split_prods ~subst tys paramsno ty))) cl
in
(tys,List.length tl,isinductive,paramsno,cl')
| _ ->
(match CicReduction.whd ((Some (name,(C.Decl so)))::context) ta with
C.Sort C.Prop
| C.Sort C.Set -> true
- | C.Sort C.CProp -> true
+ | C.Sort C.CProp -> true
| C.Sort (C.Type _) ->
- (* TASSI: da verificare *)
+ (* TASSI: da verificare *)
(match CicEnvironment.get_obj uri with
C.InductiveDefinition (itl,_,paramsno) ->
let (_,_,_,cl) = List.nth itl i in
metavariable is consitent - up to relocation via the relocation list l -
with the actual context *)
-and check_metasenv_consistency metasenv context canonical_context l =
+and check_metasenv_consistency ?(subst=[]) metasenv context canonical_context l =
let module C = Cic in
let module R = CicReduction in
let module S = CicSubstitution in
- let lifted_canonical_context =
+ let lifted_canonical_context =
let rec aux i =
function
[] -> []
| (Some (n,C.Def (t,Some ty)))::tl ->
(Some (n,C.Def ((S.lift_meta l (S.lift i t)),Some (S.lift_meta l (S.lift i ty)))))::(aux (i+1) tl)
in
- aux 1 canonical_context
+ aux 1 canonical_context
in
List.iter2
(fun t ct ->
match (t,ct) with
| _,None -> ()
| Some t,Some (_,C.Def (ct,_)) ->
- if not (R.are_convertible context t ct) then
+ if not (R.are_convertible ~subst ~metasenv context t ct) then
raise (TypeCheckerFailure (sprintf
"Not well typed metavariable local context: expected a term convertible with %s, found %s"
(CicPp.ppterm ct) (CicPp.ppterm t)))
| Some t,Some (_,C.Decl ct) ->
- let type_t = type_of_aux' metasenv context t in
- if not (R.are_convertible context type_t ct) then
+ let type_t = type_of_aux' ~subst metasenv context t in
+ if not (R.are_convertible ~subst ~metasenv context type_t ct) then
+ (* debug *)
raise (TypeCheckerFailure (sprintf
"Not well typed metavariable local context: expected a term of type %s, found %s of type %s"
(CicPp.ppterm ct) (CicPp.ppterm t) (CicPp.ppterm type_t)))
) l lifted_canonical_context
(* type_of_aux' is just another name (with a different scope) for type_of_aux *)
-and type_of_aux' metasenv context t =
+and type_of_aux' ?(subst = []) metasenv context t =
let rec type_of_aux context =
let module C = Cic in
let module R = CicReduction in
| Some (_,C.Def (bo,None)) ->
debug_print "##### CASO DA INVESTIGARE E CAPIRE" ;
type_of_aux context (S.lift n bo)
- | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis")
+ | None -> raise (TypeCheckerFailure "Reference to deleted hypothesis")
with
_ ->
raise (TypeCheckerFailure "unbound variable")
)
| C.Var (uri,exp_named_subst) ->
incr fdebug ;
- check_exp_named_subst context exp_named_subst ;
+ check_exp_named_subst ~subst context exp_named_subst ;
let ty =
CicSubstitution.subst_vars exp_named_subst (type_of_variable uri)
in
decr fdebug ;
ty
| C.Meta (n,l) ->
- let (_,canonical_context,ty) = CicUtil.lookup_meta n metasenv in
- check_metasenv_consistency metasenv context canonical_context l;
- CicSubstitution.lift_meta l ty
+ (try
+ let (canonical_context,term,ty) = CicUtil.lookup_subst n subst in
+ check_metasenv_consistency
+ ~subst metasenv context canonical_context l;
+ (* assuming subst is well typed !!!!! *)
+ CicSubstitution.lift_meta l ty
+ (* type_of_aux context (CicSubstitution.lift_meta l term) *)
+ with CicUtil.Subst_not_found _ ->
+ let (_,canonical_context,ty) = CicUtil.lookup_meta n metasenv in
+ check_metasenv_consistency
+ ~subst metasenv context canonical_context l;
+ CicSubstitution.lift_meta l ty)
(* TASSI: CONSTRAINTS *)
| C.Sort (C.Type t) ->
let t' = CicUniv.fresh() in
if not (CicUniv.add_gt t' t ) then
- assert false (* t' is fresh! an error in CicUniv *)
- else
+ assert false (* t' is fresh! an error in CicUniv *)
+ else
C.Sort (C.Type t')
(* TASSI: CONSTRAINTS *)
| C.Sort s -> C.Sort (C.Type (CicUniv.fresh ()))
| C.Implicit _ -> raise (AssertFailure "21")
| C.Cast (te,ty) as t ->
let _ = type_of_aux context ty in
- if R.are_convertible context (type_of_aux context te) ty then
+ if R.are_convertible ~subst ~metasenv context (type_of_aux context te) ty then
ty
else
raise (TypeCheckerFailure
| C.Prod (name,s,t) ->
let sort1 = type_of_aux context s
and sort2 = type_of_aux ((Some (name,(C.Decl s)))::context) t in
- sort_of_prod context (name,s) (sort1,sort2)
+ let res = sort_of_prod ~subst context (name,s) (sort1,sort2) in
+ res
| C.Lambda (n,s,t) ->
let sort1 = type_of_aux context s in
- (match R.whd context sort1 with
+ (match R.whd ~subst context sort1 with
C.Meta _
| C.Sort _ -> ()
| _ ->
(CicSubstitution.subst s
(type_of_aux ((Some (n,(C.Def (s,Some ty))))::context) t))
| C.Appl (he::tl) when List.length tl > 0 ->
- let hetype = type_of_aux context he
- and tlbody_and_type = List.map (fun x -> (x, type_of_aux context x)) tl in
- eat_prods context hetype tlbody_and_type
+ let hetype = type_of_aux context he in
+ let tlbody_and_type = List.map (fun x -> (x, type_of_aux context x)) tl in
+ eat_prods ~subst context hetype tlbody_and_type
| C.Appl _ -> raise (AssertFailure "Appl: no arguments")
| C.Const (uri,exp_named_subst) ->
incr fdebug ;
- check_exp_named_subst context exp_named_subst ;
+ check_exp_named_subst ~subst context exp_named_subst ;
let cty =
CicSubstitution.subst_vars exp_named_subst (type_of_constant uri)
in
cty
| C.MutInd (uri,i,exp_named_subst) ->
incr fdebug ;
- check_exp_named_subst context exp_named_subst ;
+ check_exp_named_subst ~subst context exp_named_subst ;
let cty =
CicSubstitution.subst_vars exp_named_subst
(type_of_mutual_inductive_defs uri i)
decr fdebug ;
cty
| C.MutConstruct (uri,i,j,exp_named_subst) ->
- check_exp_named_subst context exp_named_subst ;
+ check_exp_named_subst ~subst context exp_named_subst ;
let cty =
CicSubstitution.subst_vars exp_named_subst
(type_of_mutual_inductive_constr uri i j)
| C.MutCase (uri,i,outtype,term,pl) ->
let outsort = type_of_aux context outtype in
let (need_dummy, k) =
- let rec guess_args context t =
- let outtype = CicReduction.whd context t in
- match outtype with
- C.Sort _ -> (true, 0)
- | C.Prod (name, s, t) ->
- let (b, n) = guess_args ((Some (name,(C.Decl s)))::context) t in
- if n = 0 then
- (* last prod before sort *)
- match CicReduction.whd context s with
+ let rec guess_args context t =
+ let outtype = CicReduction.whd ~subst context t in
+ match outtype with
+ C.Sort _ -> (true, 0)
+ | C.Prod (name, s, t) ->
+ let (b, n) =
+ guess_args ((Some (name,(C.Decl s)))::context) t in
+ if n = 0 then
+ (* last prod before sort *)
+ match CicReduction.whd ~subst context s with
(*CSC: for _ see comment below about the missing named_exp_subst ?????????? *)
- C.MutInd (uri',i',_) when U.eq uri' uri && i' = i ->
- (false, 1)
+ C.MutInd (uri',i',_) when U.eq uri' uri && i' = i ->
+ (false, 1)
(*CSC: for _ see comment below about the missing named_exp_subst ?????????? *)
- | C.Appl ((C.MutInd (uri',i',_)) :: _)
- when U.eq uri' uri && i' = i -> (false, 1)
- | _ -> (true, 1)
- else
- (b, n + 1)
- | _ ->
- raise (TypeCheckerFailure (sprintf
- "Malformed case analasys' output type %s" (CicPp.ppterm outtype)))
- in
- (*CSC whd non serve dopo type_of_aux ? *)
- let (b, k) = guess_args context outsort in
- if not b then (b, k - 1) else (b, k)
+ | C.Appl ((C.MutInd (uri',i',_)) :: _)
+ when U.eq uri' uri && i' = i -> (false, 1)
+ | _ -> (true, 1)
+ else
+ (b, n + 1)
+ | _ ->
+ raise
+ (TypeCheckerFailure
+ (sprintf
+ "Malformed case analasys' output type %s"
+ (CicPp.ppterm outtype)))
in
+ let (b, k) = guess_args context outsort in
+ if not b then (b, k - 1) else (b, k) in
let (parameters, arguments, exp_named_subst) =
- match R.whd context (type_of_aux context term) with
- (*CSC manca il caso dei CAST *)
-(*CSC: ma servono i parametri (uri,i)? Se si', perche' non serve anche il *)
-(*CSC: parametro exp_named_subst? Se no, perche' non li togliamo? *)
-(*CSC: Hint: nella DTD servono per gli stylesheet. *)
- C.MutInd (uri',i',exp_named_subst) as typ ->
- if U.eq uri uri' && i = i' then ([],[],exp_named_subst)
- else raise (TypeCheckerFailure (sprintf
- "Case analysys: analysed term type is %s, but is expected to be (an application of) %s#1/%d{_}"
- (CicPp.ppterm typ) (U.string_of_uri uri) i))
- | C.Appl ((C.MutInd (uri',i',exp_named_subst) as typ):: tl) as typ' ->
- if U.eq uri uri' && i = i' then
- let params,args =
- split tl (List.length tl - k)
- in params,args,exp_named_subst
- else raise (TypeCheckerFailure (sprintf
- "Case analysys: analysed term type is %s, but is expected to be (an application of) %s#1/%d{_}"
- (CicPp.ppterm typ') (U.string_of_uri uri) i))
- | _ ->
- raise (TypeCheckerFailure (sprintf
- "Case analysis: analysed term %s is not an inductive one"
- (CicPp.ppterm term)))
+ match R.whd ~subst context (type_of_aux context term) with
+ C.MutInd (uri',i',exp_named_subst) as typ ->
+ if U.eq uri uri' && i = i' then ([],[],exp_named_subst)
+ else raise
+ (TypeCheckerFailure
+ (sprintf
+ "Case analysys: analysed term type is %s,
+ but is expected to be (an application of) %s#1/%d{_}"
+ (CicPp.ppterm typ) (U.string_of_uri uri) i))
+ | C.Appl ((C.MutInd (uri',i',exp_named_subst) as typ):: tl) as typ' ->
+ if U.eq uri uri' && i = i' then
+ let params,args =
+ split tl (List.length tl - k)
+ in params,args,exp_named_subst
+ else raise
+ (TypeCheckerFailure
+ (sprintf
+ "Case analysys: analysed term type is %s,
+ but is expected to be (an application of) %s#1/%d{_}"
+ (CicPp.ppterm typ') (U.string_of_uri uri) i))
+ | _ ->
+ raise
+ (TypeCheckerFailure
+ (sprintf
+ "Case analysis: analysed term %s is not an inductive one"
+ (CicPp.ppterm term)))
in
- (* let's control if the sort elimination is allowed: [(I q1 ... qr)|B] *)
- let sort_of_ind_type =
+ (* let's control if the sort elimination is allowed: [(I q1 ... qr)|B] *)
+ let sort_of_ind_type =
if parameters = [] then
- C.MutInd (uri,i,exp_named_subst)
+ C.MutInd (uri,i,exp_named_subst)
else
- C.Appl ((C.MutInd (uri,i,exp_named_subst))::parameters)
- in
- if not (check_allowed_sort_elimination context uri i need_dummy
- sort_of_ind_type (type_of_aux context sort_of_ind_type) outsort)
- then
- raise
+ C.Appl ((C.MutInd (uri,i,exp_named_subst))::parameters) in
+ if not
+ (check_allowed_sort_elimination context uri i need_dummy
+ sort_of_ind_type (type_of_aux context sort_of_ind_type) outsort)
+ then
+ raise
(TypeCheckerFailure ("Case analasys: sort elimination not allowed"));
(* let's check if the type of branches are right *)
- let parsno =
- match CicEnvironment.get_cooked_obj ~trust:false uri with
+ let parsno =
+ match CicEnvironment.get_cooked_obj ~trust:false uri with
C.InductiveDefinition (_,_,parsno) -> parsno
| _ ->
raise (TypeCheckerFailure
("Unknown mutual inductive definition:" ^
- UriManager.string_of_uri uri))
- in
- let (_,branches_ok) =
- List.fold_left
- (fun (j,b) p ->
+ UriManager.string_of_uri uri))
+ in
+ let (_,branches_ok) =
+ List.fold_left
+ (fun (j,b) p ->
let cons =
- if parameters = [] then
- (C.MutConstruct (uri,i,j,exp_named_subst))
- else
- (C.Appl (C.MutConstruct (uri,i,j,exp_named_subst)::parameters))
- in
-(*
- (j + 1, b &&
-*)
- (j + 1,
-let res = b &&
- R.are_convertible context (type_of_aux context p)
- (type_of_branch context parsno need_dummy outtype cons
- (type_of_aux context cons))
-in if not res then debug_print ("#### " ^ CicPp.ppterm (type_of_aux context p) ^ " <==> " ^ CicPp.ppterm (type_of_branch context parsno need_dummy outtype cons (type_of_aux context cons))) ; res
- )
- ) (1,true) pl
- in
- if not branches_ok then
- raise
- (TypeCheckerFailure "Case analysys: wrong branch type");
- if not need_dummy then
- C.Appl ((outtype::arguments)@[term])
- else if arguments = [] then
- outtype
- else
- C.Appl (outtype::arguments)
+ if parameters = [] then
+ (C.MutConstruct (uri,i,j,exp_named_subst))
+ else
+ (C.Appl
+ (C.MutConstruct (uri,i,j,exp_named_subst)::parameters)) in
+ (j + 1,
+ let res =
+ b &&
+ R.are_convertible
+ ~subst ~metasenv context (type_of_aux context p)
+ (type_of_branch context parsno need_dummy outtype cons
+ (type_of_aux context cons)) in
+ if not res then
+ debug_print ("#### " ^ CicPp.ppterm (type_of_aux context p) ^ " <==> " ^ CicPp.ppterm (type_of_branch context parsno need_dummy outtype cons (type_of_aux context cons))) ; res
+ )
+ ) (1,true) pl
+ in
+ if not branches_ok then
+ raise
+ (TypeCheckerFailure "Case analysys: wrong branch type");
+ if not need_dummy then
+ C.Appl ((outtype::arguments)@[term])
+ else if arguments = [] then
+ outtype
+ else
+ C.Appl (outtype::arguments)
| C.Fix (i,fl) ->
- let types_times_kl =
+ let types_times_kl =
List.rev
- (List.map
- (fun (n,k,ty,_) ->
- let _ = type_of_aux context ty in
- (Some (C.Name n,(C.Decl ty)),k)) fl)
- in
- let (types,kl) = List.split types_times_kl in
+ (List.map
+ (fun (n,k,ty,_) ->
+ let _ = type_of_aux context ty in
+ (Some (C.Name n,(C.Decl ty)),k)) fl)
+ in
+ let (types,kl) = List.split types_times_kl in
let len = List.length types in
- List.iter
- (fun (name,x,ty,bo) ->
- if
- (R.are_convertible (types@context) (type_of_aux (types@context) bo)
- (CicSubstitution.lift len ty))
- then
- begin
- let (m, eaten, context') =
- eat_lambdas (types @ context) (x + 1) bo
- in
- (*let's control the guarded by destructors conditions D{f,k,x,M}*)
+ List.iter
+ (fun (name,x,ty,bo) ->
if
- not
- (guarded_by_destructors context' eaten (len + eaten) kl 1 [] m)
+ (R.are_convertible
+ ~subst ~metasenv (types@context) (type_of_aux (types@context) bo)
+ (CicSubstitution.lift len ty))
then
- raise
- (TypeCheckerFailure ("Fix: not guarded by destructors"))
- end
- else
- raise (TypeCheckerFailure ("Fix: ill-typed bodies"))
- ) fl ;
-
+ begin
+ let (m, eaten, context') =
+ eat_lambdas ~subst (types @ context) (x + 1) bo in
+ (*let's control the guarded by destructors conditions D{f,k,x,M}*)
+ if
+ not (guarded_by_destructors context'
+ eaten (len + eaten) kl 1 [] m)
+ then
+ raise
+ (TypeCheckerFailure ("Fix: not guarded by destructors"))
+ end
+ else
+ raise (TypeCheckerFailure ("Fix: ill-typed bodies"))
+ ) fl ;
(*CSC: controlli mancanti solo su D{f,k,x,M} *)
- let (_,_,ty,_) = List.nth fl i in
- ty
+ let (_,_,ty,_) = List.nth fl i in
+ ty
| C.CoFix (i,fl) ->
- let types =
+ let types =
List.rev
(List.map
(fun (n,ty,_) ->
- let _ = type_of_aux context ty in Some (C.Name n,(C.Decl ty))) fl)
- in
+ let _ = type_of_aux context ty in Some (C.Name n,(C.Decl ty))) fl)
+ in
let len = List.length types in
- List.iter
+ List.iter
(fun (_,ty,bo) ->
- if
- (R.are_convertible (types @ context)
- (type_of_aux (types @ context) bo) (CicSubstitution.lift len ty))
- then
- begin
- (* let's control that the returned type is coinductive *)
- match returns_a_coinductive context ty with
- None ->
- raise
- (TypeCheckerFailure
- ("CoFix: does not return a coinductive type"))
- | Some uri ->
- (*let's control the guarded by constructors conditions C{f,M}*)
- if
- not
- (guarded_by_constructors (types @ context) 0 len false bo
- [] uri)
- then
- raise
- (TypeCheckerFailure ("CoFix: not guarded by constructors"))
- end
- else
- raise
- (TypeCheckerFailure ("CoFix: ill-typed bodies"))
+ if
+ (R.are_convertible
+ ~subst ~metasenv (types @ context)
+ (type_of_aux (types @ context) bo) (CicSubstitution.lift len ty))
+ then
+ begin
+ (* let's control that the returned type is coinductive *)
+ match returns_a_coinductive context ty with
+ None ->
+ raise
+ (TypeCheckerFailure
+ ("CoFix: does not return a coinductive type"))
+ | Some uri ->
+ (*let's control the guarded by constructors conditions C{f,M}*)
+ if
+ not
+ (guarded_by_constructors
+ (types @ context) 0 len false bo [] uri)
+ then
+ raise
+ (TypeCheckerFailure ("CoFix: not guarded by constructors"))
+ end
+ else
+ raise
+ (TypeCheckerFailure ("CoFix: ill-typed bodies"))
) fl ;
-
- let (_,ty,_) = List.nth fl i in
+ let (_,ty,_) = List.nth fl i in
ty
- and check_exp_named_subst context =
- let rec check_exp_named_subst_aux substs =
+ and check_exp_named_subst ?(subst = []) context =
+ let rec check_exp_named_subst_aux esubsts =
function
[] -> ()
- | ((uri,t) as subst)::tl ->
+ | ((uri,t) as item)::tl ->
let typeofvar =
- CicSubstitution.subst_vars substs (type_of_variable uri) in
- (match CicEnvironment.get_cooked_obj ~trust:false uri with
- Cic.Variable (_,Some bo,_,_) ->
- raise
- (TypeCheckerFailure
- ("A variable with a body can not be explicit substituted"))
- | Cic.Variable (_,None,_,_) -> ()
- | _ ->
- raise (TypeCheckerFailure
- ("Unknown variable definition:" ^
- UriManager.string_of_uri uri))
- ) ;
+ CicSubstitution.subst_vars esubsts (type_of_variable uri) in
let typeoft = type_of_aux context t in
- if CicReduction.are_convertible context typeoft typeofvar then
- check_exp_named_subst_aux (substs@[subst]) tl
- else
+ if CicReduction.are_convertible
+ ~subst ~metasenv context typeoft typeofvar then
+ check_exp_named_subst_aux (esubsts@[item]) tl
+ else
begin
- CicReduction.fdebug := 0 ;
- ignore (CicReduction.are_convertible context typeoft typeofvar) ;
- fdebug := 0 ;
- debug typeoft [typeofvar] ;
- raise (TypeCheckerFailure "Wrong Explicit Named Substitution")
+ CicReduction.fdebug := 0 ;
+ ignore (CicReduction.are_convertible ~subst ~metasenv context typeoft typeofvar) ;
+ fdebug := 0 ;
+ debug typeoft [typeofvar] ;
+ raise (TypeCheckerFailure "Wrong Explicit Named Substitution")
end
in
check_exp_named_subst_aux []
- and sort_of_prod context (name,s) (t1, t2) =
+ and sort_of_prod ?(subst = []) context (name,s) (t1, t2) =
let module C = Cic in
- let t1' = CicReduction.whd context t1 in
- let t2' = CicReduction.whd ((Some (name,C.Decl s))::context) t2 in
+ let t1' = CicReduction.whd ~subst context t1 in
+ let t2' = CicReduction.whd ~subst ((Some (name,C.Decl s))::context) t2 in
match (t1', t2') with
(C.Sort s1, C.Sort s2)
when (s2 = C.Prop or s2 = C.Set or s2 = C.CProp) ->
- (* different from Coq manual!!! *)
+ (* different from Coq manual!!! *)
C.Sort s2
| (C.Sort (C.Type t1), C.Sort (C.Type t2)) ->
(* TASSI: CONSRTAINTS: the same in doubletypeinference, cicrefine *)
C.Sort (C.Type t')
| (C.Sort _,C.Sort (C.Type t1)) ->
(* TASSI: CONSRTAINTS: the same in doubletypeinference, cicrefine *)
- C.Sort (C.Type t1) (* c'e' bisogno di un fresh? *)
+ C.Sort (C.Type t1) (* c'e' bisogno di un fresh? *)
| (C.Meta _, C.Sort _) -> t2'
| (C.Meta _, (C.Meta (_,_) as t))
| (C.Sort _, (C.Meta (_,_) as t)) when CicUtil.is_closed t ->
"Prod: expected two sorts, found = %s, %s" (CicPp.ppterm t1')
(CicPp.ppterm t2')))
- and eat_prods context hetype =
+ and eat_prods ?(subst = []) context hetype =
(*CSC: siamo sicuri che le are_convertible non lavorino con termini non *)
(*CSC: cucinati *)
function
[] -> hetype
| (hete, hety)::tl ->
- (match (CicReduction.whd context hetype) with
+ (match (CicReduction.whd ~subst context hetype) with
Cic.Prod (n,s,t) ->
- if CicReduction.are_convertible context hety s then
+ if CicReduction.are_convertible ~subst ~metasenv context hety s then
(CicReduction.fdebug := -1 ;
- eat_prods context (CicSubstitution.subst hete t) tl
+ eat_prods ~subst context (CicSubstitution.subst hete t) tl
)
else
begin
CicReduction.fdebug := 0 ;
- ignore (CicReduction.are_convertible context s hety) ;
+ ignore (CicReduction.are_convertible ~subst ~metasenv context s hety) ;
fdebug := 0 ;
debug s [hety] ;
raise (TypeCheckerFailure (sprintf
*)
;;
+(* tassi FIXME: not sure where is this called... no history here... *)
let typecheck uri =
let module C = Cic in
let module R = CicReduction in
let module U = UriManager in
- match CicEnvironment.is_type_checked ~trust:false uri with
- CicEnvironment.CheckedObj _ -> ()
+ (*match CicEnvironment.is_type_checked ~trust:false uri with*)
+ match CicEnvironment.is_type_checked ~trust:true uri with
+ CicEnvironment.CheckedObj cobj -> cobj
| CicEnvironment.UncheckedObj uobj ->
(* let's typecheck the uncooked object *)
CicLogger.log (`Start_type_checking uri) ;
+ CicUniv.directly_to_env_begin ();
(match uobj with
C.Constant (_,Some te,ty,_) ->
let _ = type_of ty in
check_mutual_inductive_defs uri uobj
) ;
CicEnvironment.set_type_checking_info uri ;
- CicLogger.log (`Type_checking_completed uri)
+ CicUniv.directly_to_env_end ();
+ CicLogger.log (`Type_checking_completed uri);
+ uobj
;;
projects / helm.git / blobdiff