-let convert_term = Obj.magic;;
+module Ref = NReference
let cn_to_s = function
| Cic.Anonymous -> "_"
type ctx =
| Ce of NCic.hypothesis
- | Fix of NReference.reference * string * NCic.term
+ | Fix of Ref.reference * string * NCic.term
let splat mk_pi ctx t =
List.fold_left
List.fold_right
(fun (name,ty,_) (ctx, fixpoints, tys, idx) ->
let ty, fixpoints_ty = aux octx ctx n_fix uri ty in
- let r = NReference.reference_of_ouri buri(NReference.CoFix idx) in
+ let r = Ref.reference_of_ouri buri(Ref.CoFix idx) in
Fix (r,name,ty) :: ctx, fixpoints_ty @ fixpoints,ty::tys,idx+1)
fl ([], [], [], 0)
in
NCic.Fixpoint (false, fl, (`Generated, `Definition))
in
splat_args ctx
- (NCic.Const (NReference.reference_of_ouri buri (NReference.CoFix k)))
+ (NCic.Const (Ref.reference_of_ouri buri (Ref.CoFix k)))
n_fix,
fixpoints @ [obj]
| Cic.Fix (k, fl) ->
(UriManager.buri_of_uri uri^"/"^
UriManager.name_of_uri uri ^ string_of_int (List.length ctx)^".con")
in
- let rno = ref 0 in
- let bctx, fixpoints_tys, tys, _ =
+ let bad_bctx, fixpoints_tys, tys, _ =
List.fold_right
- (fun (name,recno,ty,_) (ctx, fixpoints, tys, idx) ->
+ (fun (name,recno,ty,_) (bctx, fixpoints, tys, idx) ->
let ty, fixpoints_ty = aux octx ctx n_fix uri ty in
- if idx = k then rno := recno;
- let r =
- NReference.reference_of_ouri buri (NReference.Fix (idx,recno))
+ 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) :: ctx, fixpoints_ty@fixpoints,ty::tys,idx+1)
+ Fix (r,name,ty) :: bctx, fixpoints_ty@fixpoints,ty::tys,idx+1)
fl ([], [], [], 0)
in
- let bctx = bctx @ ctx in
+ let _, free, _ = context_tassonomy (bad_bctx @ ctx) 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)),name,ty)
+ | _ -> assert false) bad_bctx @ ctx
+ in
let n_fl = List.length fl in
let boctx,_ =
List.fold_left
(Some (Cic.Name n,(Cic.Decl (CicSubstitution.lift len ty)))::types,
len+1)) (octx,0) fl
in
- let fl, fixpoints =
+ let rno_k = ref 0 in
+ let fl, fixpoints,_ =
List.fold_right2
- (fun (name,rno,_,bo) ty (l,fixpoints) ->
+ (fun (name,rno,_,bo) ty (l,fixpoints,idx) ->
let bo, fixpoints_bo = aux boctx bctx n_fl buri bo in
- let _, free, _ = context_tassonomy bctx in
let rno = rno + free in
+ if idx = k then rno_k := rno;
(([],name,rno,splat true ctx ty, splat false ctx bo)::l),
- fixpoints_bo @ fixpoints)
- fl tys ([],fixpoints_tys)
+ fixpoints_bo @ fixpoints,idx+1)
+ fl tys ([],fixpoints_tys,0)
in
let obj =
NUri.nuri_of_ouri buri,0,[],[],
in
splat_args ctx
(NCic.Const
- (NReference.reference_of_ouri buri (NReference.Fix (k,!rno))))
+ (Ref.reference_of_ouri buri (Ref.Fix (k,!rno_k))))
n_fix,
fixpoints @ [obj]
| Cic.Rel n ->
| (NCic.Appl l1)::l2 -> NCic.Appl (l1@l2), fixpoints
| _ -> NCic.Appl l, fixpoints)
| Cic.Const (curi, _) ->
- NCic.Const (NReference.reference_of_ouri curi NReference.Def),[]
+ (match fst(CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
+ | Cic.Constant (_,Some _,_,_,_) ->
+ NCic.Const (Ref.reference_of_ouri curi Ref.Def),[]
+ | Cic.Constant (_,None,_,_,_) ->
+ NCic.Const (Ref.reference_of_ouri curi Ref.Decl),[]
+ | _ -> assert false)
| Cic.MutInd (curi, tyno, _) ->
- NCic.Const (NReference.reference_of_ouri curi (NReference.Ind tyno)),[]
+ NCic.Const (Ref.reference_of_ouri curi (Ref.Ind tyno)),[]
| Cic.MutConstruct (curi, tyno, consno, _) ->
- NCic.Const (NReference.reference_of_ouri curi
- (NReference.Con (tyno,consno))),[]
+ NCic.Const (Ref.reference_of_ouri curi
+ (Ref.Con (tyno,consno))),[]
| Cic.MutCase (curi, tyno, oty, t, branches) ->
- let r = NReference.reference_of_ouri curi (NReference.Ind tyno) in
+ let r = Ref.reference_of_ouri curi (Ref.Ind tyno) in
let oty, fixpoints_oty = aux octx ctx n_fix uri oty in
let t, fixpoints_t = aux octx ctx n_fix uri t in
let branches, fixpoints =
assert(fixpoints_ty = []);
NCic.Constant ([], name, Some nbo, nty, (`Provided,`Theorem,`Regular)),
fixpoints_bo @ fixpoints_ty
- | Cic.InductiveDefinition (_,_,_,_) -> assert false (*
+ | Cic.InductiveDefinition (itl,_,leftno,_) ->
let ind = let _,x,_,_ = List.hd itl in x in
- let itl =
- List.map
- (fun name, _, ty, cl ->
- [], name, convert_term ty,
- List.map (fun name, ty -> [], name, convert_term ty) cl)
- itl
+ let itl, fix_itl =
+ List.fold_right
+ (fun (name, _, ty, cl) (itl,acc) ->
+ let ty, fix_ty = convert_term uri ty in
+ let cl, fix_cl =
+ List.fold_right
+ (fun (name, ty) (cl,acc) ->
+ let ty, fix_ty = convert_term uri ty in
+ ([], name, ty)::cl, acc @ fix_ty)
+ cl ([],[])
+ in
+ ([], name, ty, cl)::itl, fix_ty @ fix_cl @ acc)
+ itl ([],[])
in
- NCic.Inductive (ind, leftno, itl, (`Provided, `Regular)) *)
+ NCic.Inductive (ind, leftno, itl, (`Provided, `Regular)),
+ fix_itl
| Cic.Variable _
| Cic.CurrentProof _ -> assert false
;;
let convert_obj uri obj =
let o, fixpoints = convert_obj_aux uri obj in
- let obj = NUri.nuri_of_ouri uri,0, [], [], o in
+ let obj = NUri.nuri_of_ouri uri,max_int, [], [], o in
fixpoints @ [obj]
;;