+(*
+ ||M|| This file is part of HELM, an Hypertextual, Electronic
+ ||A|| Library of Mathematics, developed at the Computer Science
+ ||T|| Department, University of Bologna, Italy.
+ ||I||
+ ||T|| HELM is free software; you can redistribute it and/or
+ ||A|| modify it under the terms of the GNU General Public License
+ \ / version 2 or (at your option) any later version.
+ \ / This software is distributed as is, NO WARRANTY.
+ V_______________________________________________________________ *)
+
+(* $Id$ *)
+
module Ref = NReference
+let nuri_of_ouri o = NUri.uri_of_string (UriManager.string_of_uri o);;
+
+let mk_type n =
+ if n = 0 then
+ [false, NUri.uri_of_string ("cic:/matita/pts/Type.univ")]
+ else
+ [false, NUri.uri_of_string ("cic:/matita/pts/Type"^string_of_int n^".univ")]
+;;
+
+let mk_cprop n =
+ if n = 0 then
+ [false, NUri.uri_of_string ("cic:/matita/pts/CProp.univ")]
+ else
+ [false, NUri.uri_of_string ("cic:/matita/pts/CProp"^string_of_int n^".univ")]
+;;
+
+let is_proof_irrelevant context ty =
+ match
+ CicReduction.whd context
+ (fst (CicTypeChecker.type_of_aux' [] context ty CicUniv.oblivion_ugraph))
+ with
+ Cic.Sort Cic.Prop -> true
+ | Cic.Sort _ -> false
+ | _ -> assert false
+;;
+
+exception InProp;;
+
+let get_relevance ty =
+ let rec aux context ty =
+ match CicReduction.whd context ty with
+ Cic.Prod (n,s,t) ->
+ not (is_proof_irrelevant context s)::aux (Some (n,Cic.Decl s)::context) t
+ | _ -> []
+ in aux [] ty
+(* | ty -> if is_proof_irrelevant context ty then raise InProp else []
+ in
+ try aux [] ty
+ with InProp -> []*)
+;;
+
+(* porcatissima *)
+type reference = Ref of NUri.uri * NReference.spec
+let reference_of_ouri u indinfo =
+ let u = nuri_of_ouri u in
+ NReference.reference_of_string
+ (NReference.string_of_reference (Obj.magic (Ref (u,indinfo))))
+;;
+
type ctx =
- | Ce of NCic.hypothesis * NCic.obj list
- | Fix of Ref.reference * string * NCic.term
+ | Ce of (NCic.hypothesis * NCic.obj list) Lazy.t
+ | Fix of (Ref.reference * string * NCic.term) Lazy.t
+
+let strictify =
+ function
+ Ce l -> `Ce (Lazy.force l)
+ | Fix l -> `Fix (Lazy.force l)
+;;
+
+let count_vars vars =
+ List.length
+ (List.filter (fun v ->
+ match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph v) with
+ Cic.Variable (_,Some _,_,_,_) -> false
+ | Cic.Variable (_,None,_,_,_) -> true
+ | _ -> assert false) vars)
+;;
+
(***** A function to restrict the context of a term getting rid of unsed
variables *******)
aux (m+1) acc (CicSubstitution.subst odummy ot)
(NCicSubstitution.subst dummy t) (otl,tl)
else
- (match ohe,he with
+ (match ohe,strictify he with
None,_ -> assert false
- | Some (name,Cic.Decl oty),Ce ((name', NCic.Decl ty),objs) ->
+ | Some (name,Cic.Decl oty),`Ce ((name', NCic.Decl ty),objs) ->
aux (m+1) ((m+1,objs,None)::acc) (Cic.Lambda (name,oty,ot))
(NCic.Lambda (name',ty,t)) (otl,tl)
- | Some (name,Cic.Decl oty),Fix (ref,name',ty) ->
+ | Some (name,Cic.Decl oty),`Fix (ref,name',ty) ->
aux (m+1) ((m+1,[],Some ref)::acc) (Cic.Lambda (name,oty,ot))
(NCic.Lambda (name',ty,t)) (otl,tl)
- | Some (name,Cic.Def (obo,oty)),Ce ((name', NCic.Def (bo,ty)),objs) ->
+ | Some (name,Cic.Def (obo,oty)),`Ce ((name', NCic.Def (bo,ty)),objs) ->
aux (m+1) ((m+1,objs,None)::acc) (Cic.LetIn (name,obo,oty,ot))
(NCic.LetIn (name',bo,ty,t)) (otl,tl)
| _,_ -> assert false)
([], _, _) -> octx,ctx,ote
| ((_,objs,None)::tl, Cic.Lambda(name,oso,ota), NCic.Lambda(name',so,ta)) ->
split_lambdas_and_letins ((Some(name,(Cic.Decl oso)))::octx)
- (Ce ((name',NCic.Decl so),objs)::ctx) tl (ota,ta)
- | ((_,objs,Some r)::tl,Cic.Lambda(name,oso,ota),NCic.Lambda(name',so,ta)) ->
+ (Ce (lazy ((name',NCic.Decl so),objs))::ctx) tl (ota,ta)
+ | ((_,_,Some r)::tl,Cic.Lambda(name,oso,ota),NCic.Lambda(name',so,ta)) ->
split_lambdas_and_letins ((Some(name,(Cic.Decl oso)))::octx)
- (Fix (r,name',so)::ctx) tl (ota,ta)
+ (Fix (lazy (r,name',so))::ctx) tl (ota,ta)
| ((_,objs,None)::tl,Cic.LetIn(name,obo,oty,ota),NCic.LetIn(nam',bo,ty,ta))->
split_lambdas_and_letins ((Some (name,(Cic.Def (obo,oty))))::octx)
- (Ce ((nam',NCic.Def (bo,ty)),objs)::ctx) tl (ota,ta)
+ (Ce (lazy ((nam',NCic.Def (bo,ty)),objs))::ctx) tl (ota,ta)
| (_, _, _) -> assert false
in
let long_t,infos = aux 0 [] ot dummy (octx,ctx) in
let splat mk_pi ctx t =
List.fold_left
(fun (t,l) c ->
- match c with
- | Ce ((name, NCic.Def (bo,ty)),l') -> NCic.LetIn (name, ty, bo, t),l@l'
- | Ce ((name, NCic.Decl ty),l') when mk_pi -> NCic.Prod (name, ty, t),l@l'
- | Ce ((name, NCic.Decl ty),l') -> NCic.Lambda (name, ty, t),l@l'
- | Fix (_,name,ty) when mk_pi -> NCic.Prod (name, ty, t),l
- | Fix (_,name,ty) -> NCic.Lambda (name,ty,t),l)
+ match strictify c with
+ | `Ce ((name, NCic.Def (bo,ty)),l') -> NCic.LetIn (name, ty, bo, t),l@l'
+ | `Ce ((name, NCic.Decl ty),l') when mk_pi -> NCic.Prod (name, ty, t),l@l'
+ | `Ce ((name, NCic.Decl ty),l') -> NCic.Lambda (name, ty, t),l@l'
+ | `Fix (_,name,ty) when mk_pi -> NCic.Prod (name, ty, t),l
+ | `Fix (_,name,ty) -> NCic.Lambda (name,ty,t),l)
(t,[]) ctx
;;
+let osplat mk_pi ctx t =
+ List.fold_left
+ (fun t c ->
+ match c with
+ | Some (name, Cic.Def (bo,ty)) -> Cic.LetIn (name, ty, bo, t)
+ | Some (name, Cic.Decl ty) when mk_pi -> Cic.Prod (name, ty, t)
+ | Some (name, Cic.Decl ty) -> Cic.Lambda (name, ty, t)
+ | None -> assert false)
+ t ctx
+;;
+
let context_tassonomy ctx =
let rec split inner acc acc1 = function
| Ce _ :: tl when inner -> split inner (acc+1) (acc1+1) tl
| Fix _ ::tl -> split false acc (acc1+1) tl
| _ as l ->
- let only_decl =
+ let only_decl () =
List.filter
- (function Ce ((_, NCic.Decl _),_) | Fix _ -> true | _ -> false) l
+ (function
+ Ce _ as ce ->
+ (match strictify ce with
+ `Ce ((_, NCic.Decl _),_) -> true
+ | _ -> false)
+ | Fix _ -> true) l
in
- acc, List.length l, List.length only_decl, acc1
+ acc, List.length l, lazy (List.length (only_decl ())), acc1
in
split true 0 1 ctx
;;
let rec aux = function
| n,_ when n = bound + n_fix -> []
| n,he::tl ->
- (match List.nth ctx (n-1) with
- | Fix (refe, _, _) when n < primo_ce_dopo_fix ->
+ (match strictify (List.nth ctx (n-1)) with
+ | `Fix (refe, _, _) when n < primo_ce_dopo_fix ->
NCic.Const refe :: aux (n-1,tl)
- | Fix _ | Ce ((_, NCic.Decl _),_)-> NCic.Rel (he - n_fix)::aux(n-1,tl)
- | Ce ((_, NCic.Def _),_) -> aux (n-1,tl))
+ | `Fix _ | `Ce ((_, NCic.Decl _),_) ->
+ NCic.Rel (he - n_fix)::aux(n-1,tl)
+ | `Ce ((_, NCic.Def _),_) -> aux (n-1,tl))
| _,_ -> assert false
in
- NCic.Appl (t:: aux (List.length ctx,rels))
+ let args = aux (List.length ctx,rels) in
+ match args with
+ [] -> t
+ | _::_ -> NCic.Appl (t::args)
;;
let splat_args ctx t n_fix rels =
- let bound, free, _, primo_ce_dopo_fix = context_tassonomy ctx in
+ let bound, _, _, primo_ce_dopo_fix = context_tassonomy ctx in
if ctx = [] then t
else
let rec aux = function
| 0,[] -> []
| n,he::tl ->
- (match List.nth ctx (n-1) with
- | Ce ((_, NCic.Decl _),_) when n <= bound -> NCic.Rel he:: aux (n-1,tl)
- | Fix (refe, _, _) when n < primo_ce_dopo_fix ->
+ (match strictify (List.nth ctx (n-1)) with
+ | `Ce ((_, NCic.Decl _),_) when n <= bound ->
+ NCic.Rel he:: aux (n-1,tl)
+ | `Fix (refe, _, _) when n < primo_ce_dopo_fix ->
splat_args_for_rel ctx (NCic.Const refe) ~rels n_fix :: aux (n-1,tl)
- | Fix _ | Ce ((_, NCic.Decl _),_) -> NCic.Rel (he - n_fix)::aux(n-1,tl)
- | Ce ((_, NCic.Def _),_) -> aux (n - 1,tl)
+ | `Fix _ | `Ce((_, NCic.Decl _),_)-> NCic.Rel (he - n_fix)::aux(n-1,tl)
+ | `Ce ((_, NCic.Def _),_) -> aux (n - 1,tl)
)
| _,_ -> assert false
in
- NCic.Appl (t:: aux ((List.length ctx,rels)))
+ let args = aux (List.length ctx,rels) in
+ match args with
+ [] -> t
+ | _::_ -> NCic.Appl (t::args)
;;
exception Nothing_to_do;;
0, Cic.Sort _ -> 0
| 0, Cic.Prod (name,so,ty) ->
1 + count_prods 0 (Some (name, Cic.Decl so)::context) ty
- | n, Cic.Prod (name,so,ty) ->
+ | _, Cic.Prod (name,so,ty) ->
count_prods (leftno - 1) (Some (name, Cic.Decl so)::context) ty
| _,_ -> assert false
in
| NCic.Prod (_,s1,t1), NCic.Prod (_,s2,t2) -> aux s1 s2; aux t1 t2
| NCic.LetIn (_,s1,ty1,t1), NCic.LetIn (_,s2,ty2,t2) ->
aux s1 s2; aux ty1 ty2; aux t1 t2
- | NCic.Const r1,
- NCic.Const r2 when NReference.eq r1 ref && NReference.eq r2 ref' -> ()
+ | NCic.Const (NReference.Ref (uu1,xp1)),
+ NCic.Const (NReference.Ref (uu2,xp2)) when
+ let NReference.Ref (u1,_) = ref in
+ let NReference.Ref (u2,_) = ref' in
+ NUri.eq uu1 u1 && NUri.eq uu2 u2 && xp1 = xp2
+ -> ()
| NCic.Const r1, NCic.Const r2 when NReference.eq r1 r2 -> ()
| NCic.Meta _,NCic.Meta _ -> ()
| NCic.Implicit _,NCic.Implicit _ -> ()
let cache = Hashtbl.create 313;;
let same_obj ref ref' =
function
- | (_,_,_,_,NCic.Fixpoint (_,l1,_)), (_,_,_,_,NCic.Fixpoint (_,l2,_))
+ | (_,_,_,_,NCic.Fixpoint (b1,l1,_)), (_,_,_,_,NCic.Fixpoint (b2,l2,_))
when List.for_all2 (fun (_,_,_,ty1,bo1) (_,_,_,ty2,bo2) ->
- alpha ty1 ty2 ref ref' && alpha bo1 bo2 ref ref') l1 l2 ->
+ alpha ty1 ty2 ref ref' && alpha bo1 bo2 ref ref') l1 l2 && b1=b2->
true
| _ -> false
;;
(function (ref',obj') ->
let recno, fixno =
match ref with
- NReference.Ref (_,_,NReference.Fix (fixno,recno)) -> recno,fixno
+ NReference.Ref (_,NReference.Fix (fixno,recno,_)) -> recno,fixno
+ | NReference.Ref (_,NReference.CoFix (fixno)) -> ~-1,fixno
| _ -> assert false in
let recno',fixno' =
match ref' with
- NReference.Ref (_,_,NReference.Fix (fixno',recno)) -> recno,fixno'
+ NReference.Ref (_,NReference.Fix (fixno',recno,_)) -> recno,fixno'
+ | NReference.Ref (_,NReference.CoFix (fixno')) -> ~-1,fixno'
| _ -> assert false in
if recno = recno' && fixno = fixno' && same_obj ref ref' (obj,obj') then (
(*
prerr_endline ("!!!!!!!!!!! CACHE HIT !!!!!!!!!!\n" ^
NReference.string_of_reference ref ^ "\n" ^
NReference.string_of_reference ref' ^ "\n");
-*)
+ *)
raise (Found ref'));
-
(*
prerr_endline ("CACHE SAME NAME: " ^ NReference.string_of_reference ref ^ " <==> " ^ NReference.string_of_reference ref');
-*)
-
+ *)
) (Hashtbl.find_all cache name);
-(* prerr_endline "<<< CACHE MISS >>>"; *)
+(* prerr_endline "<<< CACHE MISS >>>"; *)
begin
match obj, ref with
- | (_,_,_,_,NCic.Fixpoint (true,fl,_)) , NReference.Ref (x,y,NReference.Fix _) ->
+ | (_,_,_,_,NCic.Fixpoint (true,fl,_)) ,
+ NReference.Ref (_,NReference.Fix _) ->
ignore(List.fold_left (fun i (_,name,rno,_,_) ->
let ref = NReference.mk_fix i rno ref in
Hashtbl.add cache name (ref,obj);
i+1
) 0 fl)
+ | (_,_,_,_,NCic.Fixpoint (false,fl,_)) ,
+ NReference.Ref (_,NReference.CoFix _) ->
+ ignore(List.fold_left (fun i (_,name,_,_,_) ->
+ let ref = NReference.mk_cofix i ref in
+ Hashtbl.add cache name (ref,obj);
+ i+1
+ ) 0 fl)
| _ -> assert false
end;
None
with Found ref -> Some ref
;;
-(* we are lambda-lifting also variables that do not occur *)
-(* ctx does not distinguish successive blocks of cofix, since there may be no
- * lambda separating them *)
-let convert_term uri t =
+let cache1 = UriManager.UriHashtbl.create 313;;
+let rec get_height =
+ function u ->
+ try
+ UriManager.UriHashtbl.find cache1 u
+ with
+ Not_found ->
+ let h = ref 0 in
+ let res =
+ match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph u) with
+ Cic.Constant (_,Some bo,ty,params,_)
+ | Cic.Variable (_,Some bo,ty,params,_) ->
+ ignore (height_of_term ~h bo);
+ ignore (height_of_term ~h ty);
+ List.iter (function uri -> h := max !h (get_height uri)) params;
+ 1 + !h
+ | _ -> 0
+ in
+ UriManager.UriHashtbl.add cache1 u res;
+ res
+and height_of_term ?(h=ref 0) t =
+ let rec aux =
+ function
+ Cic.Rel _
+ | Cic.Sort _ -> ()
+ | Cic.Implicit _ -> assert false
+ | Cic.Var (uri,exp_named_subst)
+ | Cic.Const (uri,exp_named_subst)
+ | Cic.MutInd (uri,_,exp_named_subst)
+ | Cic.MutConstruct (uri,_,_,exp_named_subst) ->
+ h := max !h (get_height uri);
+ List.iter (function (_,t) -> aux t) exp_named_subst
+ | Cic.Meta (_,l) -> List.iter (function None -> () | Some t -> aux t) l
+ | Cic.Cast (t1,t2)
+ | Cic.Prod (_,t1,t2)
+ | Cic.Lambda (_,t1,t2) -> aux t1; aux t2
+ | Cic.LetIn (_,s,ty,t) -> aux s; aux ty; aux t
+ | Cic.Appl l -> List.iter aux l
+ | Cic.MutCase (_,_,outty,t,pl) -> aux outty; aux t; List.iter aux pl
+ | Cic.Fix (_, fl) -> List.iter (fun (_, _, ty, bo) -> aux ty; aux bo) fl; incr h
+ | Cic.CoFix (_, fl) -> List.iter (fun (_, ty, bo) -> aux ty; aux bo) fl; incr h
+ in
+ aux t;
+ 1 + !h
+;;
+
(* k=true if we are converting a term to be pushed in a ctx or if we are
converting the type of a fix;
k=false if we are converting a term to be put in the body of a fix;
List.fold_right
(fun (name,ty,_) (bctx, fixpoints, tys, idx) ->
let ty, fixpoints_ty = aux true octx ctx n_fix uri ty in
- let r = Ref.reference_of_ouri buri(Ref.CoFix idx) in
- bctx @ [Fix (r,name,ty)], fixpoints_ty @ fixpoints,ty::tys,idx-1)
+ let r = reference_of_ouri buri(Ref.CoFix idx) in
+ bctx @ [Fix (lazy (r,name,ty))],
+ fixpoints_ty @ fixpoints,ty::tys,idx-1)
fl ([], [], [], List.length fl-1)
in
let bctx = bctx @ ctx in
fl tys ([],fixpoints_tys)
in
let obj =
- NUri.nuri_of_ouri buri,0,[],[],
+ nuri_of_ouri buri,0,[],[],
NCic.Fixpoint (false, fl, (`Generated, `Definition))
in
- splat_args ctx
- (NCic.Const (Ref.reference_of_ouri buri (Ref.CoFix cofixno)))
- n_fix rels,
- fixpoints @ [obj]
+ let r = reference_of_ouri buri (Ref.CoFix cofixno) in
+ let obj,r =
+ let _,name,_,_,_ = List.nth fl cofixno in
+ match find_in_cache name obj r with
+ Some r' -> [],r'
+ | None -> [obj],r
+ in
+ splat_args ctx (NCic.Const r) n_fix rels, fixpoints @ obj
| Cic.Fix _ as fix ->
let octx,ctx,fix,rels = restrict octx ctx fix in
let fixno,fl =
let buri =
UriManager.uri_of_string
(UriManager.buri_of_uri uri^"/"^
- UriManager.name_of_uri uri ^ "___" ^ get_fresh () ^ ".con")
- in
+ UriManager.name_of_uri uri ^ "___" ^ get_fresh () ^ ".con") in
+ let height = height_of_term fix - 1 in
let bad_bctx, fixpoints_tys, tys, _ =
List.fold_right
(fun (name,recno,ty,_) (bctx, fixpoints, tys, idx) ->
let ty, fixpoints_ty = aux true octx ctx n_fix uri ty in
let r = (* recno is dummy here, must be lifted by the ctx len *)
- Ref.reference_of_ouri buri (Ref.Fix (idx,recno))
+ reference_of_ouri buri (Ref.Fix (idx,recno,height))
in
- bctx @ [Fix (r,name,ty)], fixpoints_ty@fixpoints,ty::tys,idx-1)
+ bctx @ [Fix (lazy (r,name,ty))],
+ fixpoints_ty@fixpoints,ty::tys,idx-1)
fl ([], [], [], List.length fl-1)
in
let _, _, free_decls, _ = context_tassonomy (bad_bctx @ ctx) in
+ let free_decls = Lazy.force free_decls in
let bctx =
- List.map (function
- | Fix (Ref.Ref (_,_,Ref.Fix (idx, recno)),name, ty) ->
- Fix (Ref.reference_of_ouri buri
- (Ref.Fix (idx,recno+free_decls)),name,ty)
+ List.map (function ce -> match strictify ce with
+ | `Fix (Ref.Ref (_,Ref.Fix (idx, recno,height)),name, ty) ->
+ Fix (lazy (reference_of_ouri buri
+ (Ref.Fix (idx,recno+free_decls,height)),name,ty))
| _ -> assert false) bad_bctx @ ctx
in
let n_fl = List.length fl in
let rno_fixno = ref 0 in
let fl, fixpoints,_ =
List.fold_right2
- (fun (name,rno,_,bo) ty (l,fixpoints,idx) ->
+ (fun (name,rno,oty,bo) ty (l,fixpoints,idx) ->
let bo, fixpoints_bo = aux false boctx bctx n_fl buri bo in
let splty,fixpoints_splty = splat true ctx ty in
let splbo,fixpoints_splbo = splat false ctx bo in
let rno = rno + free_decls in
if idx = fixno then rno_fixno := rno;
- (([],name,rno,splty,splbo)::l),
+ ((get_relevance (osplat true octx oty),name,rno,splty,splbo)::l),
fixpoints_bo@fixpoints_splty@fixpoints_splbo@fixpoints,idx+1)
fl tys ([],fixpoints_tys,0)
in
let obj =
- NUri.nuri_of_ouri buri,max_int,[],[],
+ nuri_of_ouri buri,height,[],[],
NCic.Fixpoint (true, fl, (`Generated, `Definition)) in
- let r = Ref.reference_of_ouri buri (Ref.Fix (fixno,!rno_fixno)) in
+(*prerr_endline ("H(" ^ UriManager.string_of_uri buri ^ ") = " ^ string_of_int * height);*)
+ let r = reference_of_ouri buri (Ref.Fix (fixno,!rno_fixno,height)) in
let obj,r =
let _,name,_,_,_ = List.nth fl fixno in
match find_in_cache name obj r with
| Cic.Rel n ->
let bound, _, _, primo_ce_dopo_fix = context_tassonomy ctx in
(match List.nth ctx (n-1) with
- | Fix (r,_,_) when n < primo_ce_dopo_fix ->
+ | Fix l when n < primo_ce_dopo_fix ->
+ let r,_,_ = Lazy.force l in
splat_args_for_rel ctx (NCic.Const r) n_fix, []
| Ce _ when n <= bound -> NCic.Rel n, []
| Fix _ when n <= bound -> assert false
| Fix _ | Ce _ -> NCic.Rel (n-n_fix), [])
| Cic.Lambda (name, (s as old_s), t) ->
let s, fixpoints_s = aux k octx ctx n_fix uri s in
- let s', fixpoints_s' = aux true octx ctx n_fix uri old_s in
- let ctx = Ce ((cn_to_s name, NCic.Decl s'),fixpoints_s') :: ctx in
+ let s'_and_fixpoints_s' = lazy (aux true octx ctx n_fix uri old_s) in
+ let ctx =
+ Ce (lazy
+ let s',fixpoints_s' = Lazy.force s'_and_fixpoints_s' in
+ ((cn_to_s name, NCic.Decl s'),fixpoints_s'))::ctx in
let octx = Some (name, Cic.Decl old_s) :: octx in
let t, fixpoints_t = aux k octx ctx n_fix uri t in
NCic.Lambda (cn_to_s name, s, t), fixpoints_s @ fixpoints_t
| Cic.Prod (name, (s as old_s), t) ->
let s, fixpoints_s = aux k octx ctx n_fix uri s in
- let s', fixpoints_s' = aux true octx ctx n_fix uri old_s in
- let ctx = Ce ((cn_to_s name, NCic.Decl s'),fixpoints_s') :: ctx in
+ let s'_and_fixpoints_s' = lazy (aux true octx ctx n_fix uri old_s) in
+ let ctx =
+ Ce (lazy
+ let s',fixpoints_s' = Lazy.force s'_and_fixpoints_s' in
+ ((cn_to_s name, NCic.Decl s'),fixpoints_s'))::ctx in
let octx = Some (name, Cic.Decl old_s) :: octx in
let t, fixpoints_t = aux k octx ctx n_fix uri t in
NCic.Prod (cn_to_s name, s, t), fixpoints_s @ fixpoints_t
| Cic.LetIn (name, (te as old_te), (ty as old_ty), t) ->
let te, fixpoints_s = aux k octx ctx n_fix uri te in
- let te', fixpoints_s' = aux true octx ctx n_fix uri old_te in
+ let te_and_fixpoints_s' = lazy (aux true octx ctx n_fix uri old_te) in
let ty, fixpoints_ty = aux k octx ctx n_fix uri ty in
- let ty', fixpoints_ty' = aux true octx ctx n_fix uri old_ty in
- let fixpoints' = fixpoints_s' @ fixpoints_ty' in
- let ctx = Ce ((cn_to_s name, NCic.Def (te', ty')),fixpoints') :: ctx in
+ let ty_and_fixpoints_ty' = lazy (aux true octx ctx n_fix uri old_ty) in
+ let ctx =
+ Ce (lazy
+ let te',fixpoints_s' = Lazy.force te_and_fixpoints_s' in
+ let ty',fixpoints_ty' = Lazy.force ty_and_fixpoints_ty' in
+ let fixpoints' = fixpoints_s' @ fixpoints_ty' in
+ ((cn_to_s name, NCic.Def (te', ty')),fixpoints'))::ctx in
let octx = Some (name, Cic.Def (old_te, old_ty)) :: octx in
let t, fixpoints_t = aux k octx ctx n_fix uri t in
NCic.LetIn (cn_to_s name, ty, te, t),
let ty, fixpoints_ty = aux k octx ctx n_fix uri ty in
NCic.LetIn ("cast", ty, t, NCic.Rel 1), fixpoints_t @ fixpoints_ty
| Cic.Sort Cic.Prop -> NCic.Sort NCic.Prop,[]
- | Cic.Sort Cic.CProp -> NCic.Sort NCic.CProp,[]
+ | Cic.Sort (Cic.CProp u) ->
+ NCic.Sort (NCic.Type (mk_cprop (CicUniv.get_rank u))),[]
| Cic.Sort (Cic.Type u) ->
- NCic.Sort (NCic.Type (CicUniv.get_rank u)),[]
- | Cic.Sort Cic.Set -> NCic.Sort (NCic.Type 0),[]
+ NCic.Sort (NCic.Type (mk_type (CicUniv.get_rank u))),[]
+ | Cic.Sort Cic.Set -> NCic.Sort (NCic.Type (mk_type 0)),[]
(* calculate depth in the univ_graph*)
| Cic.Appl l ->
let l, fixpoints =
aux_ens k curi octx ctx n_fix uri ens
(match fst(CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
| Cic.Constant (_,Some _,_,_,_) ->
- NCic.Const (Ref.reference_of_ouri curi Ref.Def)
+ NCic.Const (reference_of_ouri curi (Ref.Def (get_height curi)))
| Cic.Constant (_,None,_,_,_) ->
- NCic.Const (Ref.reference_of_ouri curi Ref.Decl)
+ NCic.Const (reference_of_ouri curi Ref.Decl)
| _ -> assert false)
| Cic.MutInd (curi, tyno, ens) ->
- aux_ens k curi octx ctx n_fix uri ens
- (NCic.Const (Ref.reference_of_ouri curi (Ref.Ind tyno)))
+ let is_inductive, lno =
+ match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
+ Cic.InductiveDefinition ([],vars,lno,_) -> true, lno + count_vars vars
+ | Cic.InductiveDefinition ((_,b,_,_)::_,vars,lno,_) -> b, lno + count_vars vars
+ | _ -> assert false
+ in
+ aux_ens k curi octx ctx n_fix uri ens
+ (NCic.Const (reference_of_ouri curi (Ref.Ind (is_inductive,tyno,lno))))
| Cic.MutConstruct (curi, tyno, consno, ens) ->
+ let lno =
+ match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
+ Cic.InductiveDefinition (_,vars,lno,_) -> lno + count_vars vars
+ | _ -> assert false
+ in
aux_ens k curi octx ctx n_fix uri ens
- (NCic.Const (Ref.reference_of_ouri curi (Ref.Con (tyno,consno))))
+ (NCic.Const (reference_of_ouri curi (Ref.Con (tyno,consno,lno))))
| Cic.Var (curi, ens) ->
(match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
Cic.Variable (_,Some bo,_,_,_) ->
aux k octx ctx n_fix uri (CicSubstitution.subst_vars ens bo)
| _ -> assert false)
| Cic.MutCase (curi, tyno, outty, t, branches) ->
- let r = Ref.reference_of_ouri curi (Ref.Ind tyno) in
+ let is_inductive,lno =
+ match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
+ Cic.InductiveDefinition ([],vars,lno,_) -> true, lno + count_vars vars
+ | Cic.InductiveDefinition ((_,b,_,_)::_,vars,lno,_) -> b, lno + count_vars vars
+ | _ -> assert false in
+ let r = reference_of_ouri curi (Ref.Ind (is_inductive,tyno,lno)) in
let outty, fixpoints_outty = aux k octx ctx n_fix uri outty in
let t, fixpoints_t = aux k octx ctx n_fix uri t in
let branches, fixpoints =
| _ -> assert false
) params ([],[])
in
- NCic.Appl (he::ens),objs
- in
+ match ens with
+ [] -> he,objs
+ | _::_ -> NCic.Appl (he::ens),objs
+;;
+
+(* we are lambda-lifting also variables that do not occur *)
+(* ctx does not distinguish successive blocks of cofix, since there may be no
+ * lambda separating them *)
+let convert_term uri t =
aux false [] [] 0 uri t
;;
let ty = cook `Pi vars ty in
let nty, fixpoints = convert_term uri ty in
assert(fixpoints = []);
- NCic.Constant ([], name, None, nty, (`Provided,`Theorem,`Regular)),
+ NCic.Constant (get_relevance ty, name, None, nty, (`Provided,`Theorem,`Regular)),
fixpoints
| Cic.Constant (name, Some bo, ty, vars, _) ->
let bo = cook `Lambda vars bo in
let nbo, fixpoints_bo = convert_term uri bo in
let nty, fixpoints_ty = convert_term uri ty in
assert(fixpoints_ty = []);
- NCic.Constant ([], name, Some nbo, nty, (`Provided,`Theorem,`Regular)),
+ NCic.Constant (get_relevance ty, name, Some nbo, nty, (`Provided,`Theorem,`Regular)),
fixpoints_bo @ fixpoints_ty
| Cic.InductiveDefinition (itl,vars,leftno,_) ->
let ind = let _,x,_,_ = List.hd itl in x in
List.fold_right
(fun (name, _, ty, cl) (itl,acc) ->
let ty = cook `Pi vars ty in
- let ty, fix_ty = convert_term uri ty in
+ let nty, fix_ty = convert_term uri ty in
let cl, fix_cl =
List.fold_right
(fun (name, ty) (cl,acc) ->
let ty = cook `Pi vars ty in
- let ty, fix_ty = convert_term uri ty in
- ([], name, ty)::cl, acc @ fix_ty)
+ let nty, fix_ty = convert_term uri ty in
+ (get_relevance ty, name, nty)::cl, acc @ fix_ty)
cl ([],[])
in
- ([], name, ty, cl)::itl, fix_ty @ fix_cl @ acc)
+ (get_relevance ty, name, nty, cl)::itl, fix_ty @ fix_cl @ acc)
itl ([],[])
in
- NCic.Inductive(ind, leftno + List.length vars, itl, (`Provided, `Regular)),
+ NCic.Inductive(ind, leftno + count_vars vars, itl, (`Provided, `Regular)),
fix_itl
| Cic.Variable _
| Cic.CurrentProof _ -> assert false
let convert_obj uri obj =
reset_seed ();
let o, fixpoints = convert_obj_aux uri obj in
- let obj = NUri.nuri_of_ouri uri,max_int, [], [], o in
+ let obj = nuri_of_ouri uri,get_height uri, [], [], o in
+(*prerr_endline ("H(" ^ UriManager.string_of_uri uri ^ ") = " ^ string_of_int * (get_height uri));*)
fixpoints @ [obj]
;;
+
+let clear () =
+ Hashtbl.clear cache;
+ UriManager.UriHashtbl.clear cache1
+;;
+
+(*
+let convert_context uri =
+ let name_of = function Cic.Name s -> s | _ -> "_" in
+ List.fold_right
+ (function
+ | (Some (s, Cic.Decl t) as e) -> fun (nc,auxc,oc) ->
+ let t, _ = aux true oc auxc 0 uri t in
+ (name_of s, NCic.Decl t) :: nc,
+ Ce (lazy ((name_of s, NCic.Decl t),[])) :: auxc, e :: oc
+ | (Some (Cic.Name s, Cic.Def (t,ty)) as e) -> fun (nc,auxc,oc) ->
+ let t, _ = aux true oc auxc 0 uri t in
+ let t, _ = aux true oc auxc 0 uri ty in
+ (name_of s, NCic.Def (t,ty)) :: nc,
+ Ce (lazy ((name_of s, NCic.Def (t,ty)),[])) :: auxc, e :: oc
+ | None -> nc, , e :: oc
+;;
+
+let convert_term uri ctx t =
+ aux false [] [] 0 uri t
+;;
+*)
projects / helm.git / blobdiff