X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FnCic2OCic.ml;h=57465b0748440403093d87efb67a562f20752ffe;hb=f2f9699ce6c656e62ae18148bce61f8bb945dc7a;hp=70d174e60c84ce3ba4b274b39f679b91cea1fb68;hpb=1859726f40a0a14c2e1b4f1b44041ce1e552f729;p=helm.git

diff --git a/helm/software/components/ng_kernel/nCic2OCic.ml b/helm/software/components/ng_kernel/nCic2OCic.ml
index 70d174e60..57465b074 100644
--- a/helm/software/components/ng_kernel/nCic2OCic.ml
+++ b/helm/software/components/ng_kernel/nCic2OCic.ml
@@ -1,3 +1,20 @@
+(*
+    ||M||  This file is part of HELM, an Hypertextual, Electronic        
+    ||A||  Library of Mathematics, developed at the Computer Science     
+    ||T||  Department, University of Bologna, Italy.                     
+    ||I||                                                                
+    ||T||  HELM is free software; you can redistribute it and/or         
+    ||A||  modify it under the terms of the GNU General Public License   
+    \   /  version 2 or (at your option) any later version.      
+     \ /   This software is distributed as is, NO WARRANTY.     
+      V_______________________________________________________________ *)
+
+(* $Id$ *)
+
+let ouri_of_nuri u = UriManager.uri_of_string (NUri.string_of_uri u);;
+
+let ouri_of_reference (NReference.Ref (_,u,_)) = ouri_of_nuri u;;
+
 let nn_2_on = function
   | "_" -> Cic.Anonymous
   | s -> Cic.Name s
@@ -12,29 +29,33 @@ let convert_term uri n_fl t =
      Cic.Prod (nn_2_on n,convert_term k s, convert_term (k+1) t)
  | NCic.Lambda  (n,s,t) -> 
      Cic.Lambda(nn_2_on n,convert_term k s, convert_term (k+1) t)
- | NCic.LetIn (n,_,s,t) -> 
-     Cic.LetIn (nn_2_on n,convert_term k s, convert_term (k+1) t)
+ | NCic.LetIn (n,ty_s,s,t) -> 
+     Cic.LetIn (nn_2_on n,convert_term k s,convert_term k ty_s, convert_term (k+1) t)
  | NCic.Sort NCic.Prop -> Cic.Sort Cic.Prop 
  | NCic.Sort NCic.CProp -> Cic.Sort Cic.CProp 
- | NCic.Sort NCic.Set -> Cic.Sort Cic.Set 
  | NCic.Sort (NCic.Type _) -> Cic.Sort (Cic.Type (CicUniv.fresh ()))
  | NCic.Implicit _ -> assert false
- | NCic.Const (NReference.Ref (_,u,NReference.Ind i)) -> 
-     Cic.MutInd (NUri.ouri_of_nuri u,i,[])
+ | NCic.Const (NReference.Ref (_,u,NReference.Ind (_,i))) -> 
+     Cic.MutInd (ouri_of_nuri u,i,[])
  | NCic.Const (NReference.Ref (_,u,NReference.Con (i,j))) -> 
-     Cic.MutConstruct (NUri.ouri_of_nuri u,i,j,[])
+     Cic.MutConstruct (ouri_of_nuri u,i,j,[])
  | NCic.Const (NReference.Ref (_,u,NReference.Def))
  | NCic.Const (NReference.Ref (_,u,NReference.Decl)) ->
-     Cic.Const (NUri.ouri_of_nuri u,[])
- | NCic.Match (NReference.Ref (_,u,NReference.Ind i),oty,t,pl) ->
-     Cic.MutCase (NUri.ouri_of_nuri u,i, convert_term k oty, convert_term k t,
+     Cic.Const (ouri_of_nuri u,[])
+ | NCic.Match (NReference.Ref (_,u,NReference.Ind (_,i)),oty,t,pl) ->
+     Cic.MutCase (ouri_of_nuri u,i, convert_term k oty, convert_term k t,
        List.map (convert_term k) pl)
  | NCic.Const (NReference.Ref (_,u,NReference.Fix (i,_))) 
  | NCic.Const (NReference.Ref (_,u,NReference.CoFix i)) ->
     if NUri.eq u uri then             
       Cic.Rel (n_fl - i + k)
     else
-      Cic.Const (NUri.ouri_of_nuri u,[])
+     let ouri = ouri_of_nuri u in
+     let ouri =
+      UriManager.uri_of_string 
+       (UriManager.buri_of_uri ouri ^ "/" ^
+        UriManager.name_of_uri ouri ^ string_of_int i ^ ".con") in
+      Cic.Const (ouri,[])
  | _ -> assert false
  in
   convert_term 0 t
@@ -62,15 +83,16 @@ let convert_fix is_fix uri k fl =
 
 let convert_nobj = function 
  | u,_,_,_,NCic.Constant (_, name, Some bo, ty, _) ->
-     [NUri.ouri_of_nuri u,Cic.Constant 
+     [ouri_of_nuri u,Cic.Constant 
         (name, Some (convert_term u 0 bo), convert_term u 0 ty, [],[])]
  | u,_,_,_,NCic.Constant (_, name,  None, ty, _) ->
-     [NUri.ouri_of_nuri u,Cic.Constant (name, None, convert_term u 0 ty, [],[])]
+     [ouri_of_nuri u,Cic.Constant (name, None, convert_term u 0 ty, [],[])]
  | u,_,_,_,NCic.Fixpoint (is_fix, fl, _) ->
      List.map 
       (fun nth ->
-        let name = UriManager.name_of_uri (NUri.ouri_of_nuri u) in
-        let buri = UriManager.buri_of_uri (NUri.ouri_of_nuri u) in
+        let name =
+         UriManager.name_of_uri (ouri_of_nuri u) ^ string_of_int nth in
+        let buri = UriManager.buri_of_uri (ouri_of_nuri u) in
         let uri = UriManager.uri_of_string (buri ^"/"^name^".con") in
         uri,
         Cic.Constant (name,