X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FoCic2NCic.ml;h=9f0bfc21133253c1f80f7ade3f62d5217cebc43f;hb=738ff6e752f9e5facba4e92bdb64453062f52c7d;hp=cfc2816cb6c84d54dd6e11bb52918a13bbb2c639;hpb=e8bc22fd878eefb14d6c78dc6bcf1d620b4022b3;p=helm.git

diff --git a/helm/software/components/ng_kernel/oCic2NCic.ml b/helm/software/components/ng_kernel/oCic2NCic.ml
index cfc2816cb..9f0bfc211 100644
--- a/helm/software/components/ng_kernel/oCic2NCic.ml
+++ b/helm/software/components/ng_kernel/oCic2NCic.ml
@@ -13,6 +13,16 @@
 
 module Ref = NReference
 
+let nuri_of_ouri o = NUri.uri_of_string (UriManager.string_of_uri o);;
+
+(* porcatissima *)
+type reference = Ref of int *  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 (max_int,u,indinfo))))
+;;
+
 type ctx = 
   | Ce of (NCic.hypothesis * NCic.obj list) Lazy.t
   | Fix of (Ref.reference * string * NCic.term) Lazy.t
@@ -412,7 +422,7 @@ let convert_term uri t =
           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
+              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)
@@ -436,10 +446,10 @@ let convert_term uri t =
             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
-        let r = Ref.reference_of_ouri buri (Ref.CoFix cofixno) in
+        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
@@ -461,7 +471,7 @@ let convert_term uri t =
             (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)) 
               in
               bctx @ [Fix (lazy (r,name,ty))],
                fixpoints_ty@fixpoints,ty::tys,idx-1)
@@ -472,7 +482,7 @@ let convert_term uri t =
         let bctx = 
           List.map (function ce -> match strictify ce with
             | `Fix (Ref.Ref (_,_,Ref.Fix (idx, recno)),name, ty) ->
-              Fix (lazy (Ref.reference_of_ouri buri
+              Fix (lazy (reference_of_ouri buri
                     (Ref.Fix (idx,recno+free_decls)),name,ty))
             | _ -> assert false) bad_bctx @ ctx
         in
@@ -497,9 +507,9 @@ let convert_term uri t =
             fl tys ([],fixpoints_tys,0)
         in
         let obj = 
-          NUri.nuri_of_ouri buri,max_int,[],[],
+          nuri_of_ouri buri,max_int,[],[],
             NCic.Fixpoint (true, fl, (`Generated, `Definition)) in
-        let r = Ref.reference_of_ouri buri (Ref.Fix (fixno,!rno_fixno)) in
+        let r = reference_of_ouri buri (Ref.Fix (fixno,!rno_fixno)) in
         let obj,r =
          let _,name,_,_,_ = List.nth fl fixno in
          match find_in_cache name obj r with
@@ -577,9 +587,9 @@ let convert_term uri t =
        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)
         | 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) -> 
        let is_inductive =
@@ -589,10 +599,10 @@ let convert_term uri t =
          | _ -> assert false
        in
         aux_ens k curi octx ctx n_fix uri ens
-         (NCic.Const (Ref.reference_of_ouri curi (Ref.Ind (is_inductive,tyno))))
+         (NCic.Const (reference_of_ouri curi (Ref.Ind (is_inductive,tyno))))
     | Cic.MutConstruct (curi, tyno, consno, ens) -> 
        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))))
     | Cic.Var (curi, ens) ->
        (match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
            Cic.Variable (_,Some bo,_,_,_) ->
@@ -604,7 +614,7 @@ let convert_term uri t =
             Cic.InductiveDefinition ([],_,_,_) -> true
           | Cic.InductiveDefinition ((_,b,_,_)::_,_,_,_) -> b
           | _ -> assert false in
-        let r = Ref.reference_of_ouri curi (Ref.Ind (is_inductive,tyno)) in
+        let r = reference_of_ouri curi (Ref.Ind (is_inductive,tyno)) 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 =
@@ -723,6 +733,6 @@ let convert_obj_aux uri = function
 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,max_int, [], [], o in
   fixpoints @ [obj]
 ;;