module Ref = NReference
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)
+;;
(***** 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)
+ (Ce (lazy ((name',NCic.Decl so),objs))::ctx) tl (ota,ta)
| ((_,objs,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
;;
| 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 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
(function () -> seed := 0)
;;
+exception NotSimilar
+let alpha t1 t2 ref ref' =
+ let rec aux t1 t2 = match t1,t2 with
+ | NCic.Rel n, NCic.Rel m when n=m -> ()
+ | NCic.Appl l1, NCic.Appl l2 -> List.iter2 aux l1 l2
+ | NCic.Lambda (_,s1,t1), NCic.Lambda (_,s2,t2)
+ | 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 (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 _ -> ()
+ | NCic.Sort x,NCic.Sort y when x=y -> ()
+ | NCic.Match (_,t1,t11,tl1), NCic.Match (_,t2,t22,tl2) ->
+ aux t1 t2;aux t11 t22;List.iter2 aux tl1 tl2
+ | _-> raise NotSimilar
+ in
+ try aux t1 t2; true with NotSimilar -> false
+;;
+
exception Found of NReference.reference;;
let cache = Hashtbl.create 313;;
-let same_obj =
+let same_obj ref ref' =
function
- (_,_,_,_,NCic.Fixpoint (_,[_,_,_,ty1,_],_)),
- (_,_,_,_,NCic.Fixpoint (_,[_,_,_,ty2,_],_))
- when ty1 = ty2 -> true
+ | (_,_,_,_,NCic.Fixpoint (_,l1,_)), (_,_,_,_,NCic.Fixpoint (_,l2,_))
+ when List.for_all2 (fun (_,_,_,ty1,bo1) (_,_,_,ty2,bo2) ->
+ alpha ty1 ty2 ref ref' && alpha bo1 bo2 ref ref') l1 l2 ->
+ true
| _ -> false
;;
let find_in_cache name obj ref =
try
List.iter
(function (ref',obj') ->
- let recno =
+ let recno, fixno =
match ref with
- NReference.Ref (_,_,NReference.Fix (_,recno)) -> recno
+ NReference.Ref (_,_,NReference.Fix (fixno,recno)) -> recno,fixno
| _ -> assert false in
- let recno' =
+ let recno',fixno' =
match ref' with
- NReference.Ref (_,_,NReference.Fix (_,recno)) -> recno
+ NReference.Ref (_,_,NReference.Fix (fixno',recno)) -> recno,fixno'
| _ -> assert false in
- if recno = recno' && same_obj (obj,obj') then
-(*(prerr_endline "!!!!!!!!!!! CACHE HIT !!!!!!!!!!";*)
- raise (Found ref')
-(*);*)
+ if recno = recno' && fixno = fixno' && same_obj ref ref' (obj,obj') then (
(*
- else
-(prerr_endline ("CACHE SAME NAME: " ^ NReference.string_of_reference ref ^ " <==> " ^ NReference.string_of_reference ref');
- raise Not_found
-)
-*)
+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 >>>";*)
- Hashtbl.add cache name (ref,obj);
+(* prerr_endline "<<< CACHE MISS >>>"; *)
+ begin
+ match obj, ref with
+ | (_,_,_,_,NCic.Fixpoint (true,fl,_)) , NReference.Ref (x,y,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)
+ | _ -> assert false
+ end;
None
with Found ref -> Some ref
;;
(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
- Fix (r,name,ty) :: bctx, fixpoints_ty @ fixpoints,ty::tys,idx+1)
- fl ([], [], [], 0)
+ bctx @ [Fix (lazy (r,name,ty))],
+ fixpoints_ty @ fixpoints,ty::tys,idx-1)
+ fl ([], [], [], List.length fl-1)
in
let bctx = bctx @ ctx in
let n_fl = List.length fl in
let r = (* recno is dummy here, must be lifted by the ctx len *)
Ref.reference_of_ouri buri (Ref.Fix (idx,recno))
in
- Fix (r,name,ty) :: bctx, fixpoints_ty@fixpoints,ty::tys,idx+1)
- fl ([], [], [], 0)
+ 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)),name, ty) ->
+ Fix (lazy (Ref.reference_of_ouri buri
+ (Ref.Fix (idx,recno+free_decls)),name,ty))
| _ -> assert false) bad_bctx @ ctx
in
let n_fl = List.length fl in
NCic.Fixpoint (true, fl, (`Generated, `Definition)) in
let r = Ref.reference_of_ouri buri (Ref.Fix (fixno,!rno_fixno)) in
let obj,r =
- let _,name,_,_,_ = List.hd fl in
+ let _,name,_,_,_ = List.nth fl fixno in
match find_in_cache name obj r with
Some r' -> [],r'
| None -> [obj],r
| 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),
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.Type _) -> NCic.Sort (NCic.Type 0),[]
+ | Cic.Sort (Cic.Type u) ->
+ NCic.Sort (NCic.Type (CicUniv.get_rank u)),[]
| Cic.Sort Cic.Set -> NCic.Sort (NCic.Type 0),[]
(* calculate depth in the univ_graph*)
| Cic.Appl l ->
| _ -> assert false
) params ([],[])
in
- NCic.Appl (he::ens),objs
+ match ens with
+ [] -> he,objs
+ | _::_ -> NCic.Appl (he::ens),objs
in
aux false [] [] 0 uri t
;;
([], name, ty, cl)::itl, fix_ty @ fix_cl @ acc)
itl ([],[])
in
- NCic.Inductive(ind, leftno + List.length vars, itl, (`Provided, `Regular)),
+ NCic.Inductive(ind, leftno + 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)
+ , itl, (`Provided, `Regular)),
fix_itl
| Cic.Variable _
| Cic.CurrentProof _ -> assert false
projects / helm.git / blobdiff