X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FoCic2NCic.ml;h=54e12be14ae6fe3bcdda32c5fa6e393770ee09b2;hb=810bbac9ad50436ada9f2f5a9b069b3f59e079ab;hp=0d00f031f18c558cbba117337fe7bda33ca8c440;hpb=bd5488c8eaa88e27d6e9e6c46566f1ed8f1a59b0;p=helm.git diff --git a/helm/software/components/ng_kernel/oCic2NCic.ml b/helm/software/components/ng_kernel/oCic2NCic.ml index 0d00f031f..54e12be14 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 @@ -46,17 +46,79 @@ let splat_args_for_rel ctx t = let splat_args ctx t n_fix = let bound, free, primo_ce_dopo_fix = context_tassonomy ctx in - 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) + 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)) +;; + +exception Nothing_to_do;; + +let fix_outty curi tyno t context outty = + let leftno,rightno = + match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with + Cic.InductiveDefinition (tyl,_,leftno,_) -> + let _,_,arity,_ = List.nth tyl tyno in + let rec count_prods leftno context arity = + match leftno, CicReduction.whd context arity with + 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) -> + count_prods (leftno - 1) (Some (name, Cic.Decl so)::context) ty + | _,_ -> assert false + in +(*prerr_endline (UriManager.string_of_uri curi); +prerr_endline ("LEFTNO: " ^ string_of_int leftno ^ " " ^ CicPp.ppterm arity);*) + leftno, count_prods leftno [] arity + | _ -> assert false in + let ens,args = + let tty,_= CicTypeChecker.type_of_aux' [] context t CicUniv.oblivion_ugraph in + match CicReduction.whd context tty with + Cic.MutInd (_,_,ens) -> ens,[] + | Cic.Appl (Cic.MutInd (_,_,ens)::args) -> + ens,fst (HExtlib.split_nth leftno args) + | _ -> assert false + in + let rec aux n irl context outsort = + match n, CicReduction.whd context outsort with + 0, Cic.Prod _ -> raise Nothing_to_do + | 0, _ -> + let irl = List.rev irl in + let ty = CicSubstitution.lift rightno (Cic.MutInd (curi,tyno,ens)) in + let ty = + if args = [] && irl = [] then ty + else + Cic.Appl (ty::(List.map (CicSubstitution.lift rightno) args)@irl) in + let he = CicSubstitution.lift (rightno + 1) outty in + let t = + if irl = [] then he + else Cic.Appl (he::List.map (CicSubstitution.lift 1) irl) + in + Cic.Lambda (Cic.Anonymous, ty, t) + | n, Cic.Prod (name,so,ty) -> + let ty' = + aux (n - 1) (Cic.Rel n::irl) (Some (name, Cic.Decl so)::context) ty + in + Cic.Lambda (name,so,ty') + | _,_ -> assert false in - NCic.Appl (t:: aux (List.length ctx)) +(*prerr_endline ("RIGHTNO = " ^ string_of_int rightno ^ " OUTTY = " ^ CicPp.ppterm outty);*) + let outsort = + fst (CicTypeChecker.type_of_aux' [] context outty CicUniv.oblivion_ugraph) + in + try aux rightno [] context outsort + with Nothing_to_do -> outty +(*prerr_endline (CicPp.ppterm outty ^ " <==> " ^ CicPp.ppterm outty');*) ;; (* we are lambda-lifting also variables that do not occur *) @@ -74,8 +136,8 @@ let convert_term uri t = 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 - ctx @ [Fix (r,name,ty)], fixpoints_ty @ fixpoints,ty::tys,idx+1) + 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 @@ -99,7 +161,7 @@ let convert_term uri t = 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) -> @@ -108,19 +170,23 @@ let convert_term uri t = (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 - ctx @ [Fix (r,name,ty)], 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 @@ -128,23 +194,24 @@ 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) -> + (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,[],[], + NUri.nuri_of_ouri buri,max_int,[],[], NCic.Fixpoint (true, fl, (`Generated, `Definition)) 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 -> @@ -167,25 +234,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 = @@ -198,16 +262,24 @@ 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.MutCase (curi, tyno, oty, t, branches) -> - let r = NReference.reference_of_ouri curi (NReference.Ind tyno) in - let oty, fixpoints_oty = aux octx ctx n_fix uri oty in + | 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, outty, t, branches) -> + let outty = fix_outty curi tyno t octx outty in + let r = Ref.reference_of_ouri curi (Ref.Ind tyno) in + let outty, fixpoints_outty = aux octx ctx n_fix uri outty in let t, fixpoints_t = aux octx ctx n_fix uri t in let branches, fixpoints = List.fold_right @@ -216,40 +288,85 @@ let convert_term uri t = (t::l,fixpoints@acc)) branches ([],[]) in - NCic.Match (r,oty,t,branches), fixpoints_oty @ fixpoints_t @ fixpoints + NCic.Match (r,outty,t,branches), fixpoints_outty@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 mode 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,mode with + None,ty,`Lambda -> Cic.Lambda (id,ty,t) + | None,ty,`Pi -> Cic.Prod (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 `Pi 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 `Lambda vars bo in + let ty = cook `Pi 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 `Pi 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 `Pi 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 + let obj = NUri.nuri_of_ouri uri,max_int, [], [], o in fixpoints @ [obj] ;;