X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FoCic2NCic.ml;h=cd90fbdf5c0e8327959f3f9bcfacc23f6fb72816;hb=d0d82efaff995c566c282af806677bd42d8fd9de;hp=b81635581b924c18e1c74378cb1247493d32cee7;hpb=4a4703054e9f022479ac7ab9cb96007984da7ef2;p=helm.git diff --git a/helm/software/components/ng_kernel/oCic2NCic.ml b/helm/software/components/ng_kernel/oCic2NCic.ml index b81635581..cd90fbdf5 100644 --- a/helm/software/components/ng_kernel/oCic2NCic.ml +++ b/helm/software/components/ng_kernel/oCic2NCic.ml @@ -1,4 +1,4 @@ -let convert_term = Obj.magic;; +module Ref = NReference let cn_to_s = function | Cic.Anonymous -> "_" @@ -7,7 +7,7 @@ let cn_to_s = function 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 @@ -30,7 +30,7 @@ let context_tassonomy ctx = split true 0 1 ctx ;; -let splat_args ctx t = +let splat_args_for_rel ctx t = let bound, free, primo_ce_dopo_fix = context_tassonomy ctx in if free = 0 then t else @@ -38,30 +38,49 @@ let splat_args ctx t = | 0 -> [] | n -> (match List.nth ctx (n+bound) with - | Fix (refe, _, _) when n < primo_ce_dopo_fix -> (NCic.Const refe) + | Fix (refe, _, _) when (n+bound) < primo_ce_dopo_fix -> NCic.Const refe | Fix _ | Ce _ -> NCic.Rel (n+bound)) :: aux (n-1) in NCic.Appl (t:: aux free) ;; +let splat_args ctx t n_fix = + let bound, free, primo_ce_dopo_fix = context_tassonomy ctx in + if ctx = [] then t + else + let rec aux = function + | 0 -> [] + | n -> + (match List.nth ctx (n-1) with + | Ce _ when n <= bound -> NCic.Rel n + | Fix (refe, _, _) when n < primo_ce_dopo_fix -> + splat_args_for_rel ctx (NCic.Const refe) + | Fix _ | Ce _ -> NCic.Rel (n - n_fix) + ) :: aux (n-1) + in + NCic.Appl (t:: aux (List.length ctx)) +;; + (* 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 rec aux octx (ctx : ctx list) n_fix uri = function | Cic.CoFix (k, fl) -> + let buri = + UriManager.uri_of_string + (UriManager.buri_of_uri uri^"/"^ + UriManager.name_of_uri uri ^ string_of_int (List.length ctx)^".con") + in let bctx, fixpoints_tys, tys, _ = 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 uri(NReference.CoFix idx) in - ctx @ [Fix (r,name,ty)], fixpoints_ty @ fixpoints,ty::tys,idx+1) - fl (ctx, [], [], 0) - in - let buri = - UriManager.uri_of_string - (UriManager.string_of_uri uri^string_of_int (List.length ctx)^".con") + 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 + let bctx = bctx @ ctx in let n_fl = List.length fl in let boctx,_ = List.fold_left @@ -72,34 +91,41 @@ let convert_term uri t = let fl, fixpoints = List.fold_right2 (fun (name,_,bo) ty (l,fixpoints) -> - let bo, fixpoints_bo = aux boctx bctx (n_fix + n_fl) buri bo in + let bo, fixpoints_bo = aux boctx bctx n_fl buri bo in (([],name,~-1,splat true ctx ty, splat false ctx bo)::l), fixpoints_bo @ fixpoints) fl tys ([],fixpoints_tys) in let obj = - NUri.nuri_of_ouri uri,0,[],[], + NUri.nuri_of_ouri buri,0,[],[], NCic.Fixpoint (false, fl, (`Generated, `Definition)) in splat_args ctx - (NCic.Const (NReference.reference_of_ouri uri (NReference.CoFix k))), - obj::fixpoints + (NCic.Const (Ref.reference_of_ouri buri (Ref.CoFix k))) + n_fix, + fixpoints @ [obj] | Cic.Fix (k, fl) -> - let rno = ref 0 in - let bctx, fixpoints_tys, tys, _ = + let buri = + UriManager.uri_of_string + (UriManager.buri_of_uri uri^"/"^ + UriManager.name_of_uri uri ^ string_of_int (List.length ctx)^".con") + in + 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 uri (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 - ctx @ [Fix (r,name,ty)], fixpoints_ty@fixpoints,ty::tys,idx+1) - fl (ctx, [], [], 0) + Fix (r,name,ty) :: bctx, fixpoints_ty@fixpoints,ty::tys,idx+1) + fl ([], [], [], 0) in - let buri = - UriManager.uri_of_string - (UriManager.string_of_uri uri^string_of_int (List.length ctx)^".con") + 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,_ = @@ -108,29 +134,34 @@ let convert_term uri t = (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) -> - let bo, fixpoints_bo = aux boctx bctx (n_fix + n_fl) buri bo in - let rno = rno + List.length ctx - n_fix in + (fun (name,rno,_,bo) ty (l,fixpoints,idx) -> + let bo, fixpoints_bo = aux boctx bctx n_fl buri bo 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 uri,0,[],[], + NUri.nuri_of_ouri buri,max_int,[],[], NCic.Fixpoint (true, fl, (`Generated, `Definition)) in splat_args ctx (NCic.Const - (NReference.reference_of_ouri uri (NReference.Fix (k,!rno)))), - obj::fixpoints + (Ref.reference_of_ouri buri (Ref.Fix (k,!rno_k)))) + n_fix, + fixpoints @ [obj] | Cic.Rel n -> - let _, _, primo_ce_dopo_fix = context_tassonomy ctx in - (match List.nth ctx n with + 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 -> - splat_args ctx (NCic.Const r), [] - | Fix (_,_,_) | Ce _ -> NCic.Rel (n-n_fix), []) + splat_args_for_rel ctx (NCic.Const r), [] + | Ce _ when n <= bound -> NCic.Rel n, [] + | Fix _ (* BUG 3 fix nested *) + | Ce _ -> NCic.Rel (n-n_fix), []) | Cic.Lambda (name, (s as old_s), t) -> let s, fixpoints_s = aux octx ctx n_fix uri s in let ctx = Ce (cn_to_s name, NCic.Decl s) :: ctx in @@ -143,25 +174,22 @@ let convert_term uri t = let octx = Some (name, Cic.Decl old_s) :: octx in let t, fixpoints_t = aux octx ctx n_fix uri t in NCic.Prod (cn_to_s name, s, t), fixpoints_s @ fixpoints_t - | Cic.LetIn (name, (s as old_s), t) -> - let s, fixpoints_s = aux octx ctx n_fix uri s in - let old_ty,_ = - CicTypeChecker.type_of_aux' [] octx old_s CicUniv.oblivion_ugraph - in - let ty, fixpoints_ty = aux octx ctx n_fix uri old_ty in - let ctx = Ce (cn_to_s name, NCic.Def (s, ty)) :: ctx in - let octx = Some (name, Cic.Def (old_s, Some old_ty)) :: octx in + | Cic.LetIn (name, (te as old_te), (ty as old_ty), t) -> + let te, fixpoints_s = aux octx ctx n_fix uri te in + let ty, fixpoints_ty = aux octx ctx n_fix uri ty in + let ctx = Ce (cn_to_s name, NCic.Def (te, ty)) :: ctx in + let octx = Some (name, Cic.Def (old_te, old_ty)) :: octx in let t, fixpoints_t = aux octx ctx n_fix uri t in - NCic.LetIn (cn_to_s name, ty, s, t), + NCic.LetIn (cn_to_s name, ty, te, t), fixpoints_s @ fixpoints_t @ fixpoints_ty | Cic.Cast (t,ty) -> let t, fixpoints_t = aux octx ctx n_fix uri t in let ty, fixpoints_ty = aux 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.Set -> NCic.Sort NCic.Set,[] | Cic.Sort Cic.CProp -> NCic.Sort NCic.CProp,[] | Cic.Sort (Cic.Type _) -> NCic.Sort (NCic.Type 0),[] + | Cic.Sort Cic.Set -> NCic.Sort (NCic.Type 0),[] (* calculate depth in the univ_graph*) | Cic.Appl l -> let l, fixpoints = @@ -174,15 +202,22 @@ let convert_term uri t = (match l with | (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),[] - | Cic.MutInd (curi, tyno, _) -> - NCic.Const (NReference.reference_of_ouri curi (NReference.Ind tyno)),[] - | Cic.MutConstruct (curi, tyno, consno, _) -> - NCic.Const (NReference.reference_of_ouri curi - (NReference.Con (tyno,consno))),[] + | Cic.Const (curi, ens) -> + aux_ens 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) + | Cic.Constant (_,None,_,_,_) -> + NCic.Const (Ref.reference_of_ouri curi Ref.Decl) + | _ -> assert false) + | Cic.MutInd (curi, tyno, ens) -> + aux_ens octx ctx n_fix uri ens + (NCic.Const (Ref.reference_of_ouri curi (Ref.Ind tyno))) + | Cic.MutConstruct (curi, tyno, consno, ens) -> + aux_ens octx ctx n_fix uri ens + (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 = @@ -194,38 +229,82 @@ let convert_term uri t = in NCic.Match (r,oty,t,branches), fixpoints_oty @ fixpoints_t @ fixpoints | Cic.Implicit _ | Cic.Meta _ | Cic.Var _ -> assert false + and aux_ens octx ctx n_fix uri ens he = + match ens with + [] -> he,[] + | _::_ -> + let ens,objs = + List.fold_right + (fun (_,t) (l,objs) -> + let t,o = aux octx ctx n_fix uri t in + t::l, o@objs + ) ens ([],[]) + in + NCic.Appl (he::ens),objs in aux [] [] 0 uri t ;; +let cook vars t = + let t = CicSubstitution.lift (List.length vars) t in + snd (List.fold_right + (fun uri (n,t) -> + let t = CicSubstitution.subst_vars [uri,Cic.Rel 1] t in + let bo,ty = + match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph uri) with + Cic.Variable (_,bo,ty,_,_) -> bo,ty + | _ -> assert false in + let id = Cic.Name (UriManager.name_of_uri uri) in + let t = + match bo,ty with + None,ty -> Cic.Lambda (id,ty,t) + | Some bo,ty -> Cic.LetIn (id,bo,ty,t) + in + n+1,t + ) vars (1,t)) +;; + let convert_obj_aux uri = function - | Cic.Constant (name, None, ty, _, _) -> + | Cic.Constant (name, None, ty, vars, _) -> + let ty = cook vars ty in let nty, fixpoints = convert_term uri ty in assert(fixpoints = []); NCic.Constant ([], name, None, nty, (`Provided,`Theorem,`Regular)), fixpoints - | Cic.Constant (name, Some bo, ty, _, _) -> + | Cic.Constant (name, Some bo, ty, vars, _) -> + let bo = cook vars bo in + let ty = cook vars ty 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)), fixpoints_bo @ fixpoints_ty - | Cic.InductiveDefinition (_,_,_,_) -> assert false (* + | Cic.InductiveDefinition (itl,vars,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 = cook vars ty in + let ty, fix_ty = convert_term uri ty in + let cl, fix_cl = + List.fold_right + (fun (name, ty) (cl,acc) -> + let ty = cook vars ty in + 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 + List.length vars, 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 - obj, fixpoints + let obj = NUri.nuri_of_ouri uri,max_int, [], [], o in + fixpoints @ [obj] ;;