X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FoCic2NCic.ml;h=b2591b361c2ba7c5d9f6030ea85a9f7630f55598;hb=c9515ad8b94542e3164ab6affddef5ae3129f2e4;hp=bb5862fda85f5981516944e860cd9a3db06175c3;hpb=8a49ad7c7475e5486ea9ecacc82a07b15fcded6e;p=helm.git

diff --git a/helm/software/components/ng_kernel/oCic2NCic.ml b/helm/software/components/ng_kernel/oCic2NCic.ml
index bb5862fda..b2591b361 100644
--- a/helm/software/components/ng_kernel/oCic2NCic.ml
+++ b/helm/software/components/ng_kernel/oCic2NCic.ml
@@ -5,7 +5,9 @@ let cn_to_s = function
   | Cic.Name s -> s
 ;;
 
-type ctx = Ce of NCic.hypothesis | Fix of int * int
+type ctx = 
+  | Ce of NCic.hypothesis 
+  | Fix of NReference.reference * string * NCic.term
 
 let splat mk_pi ctx t =
   List.fold_left
@@ -14,35 +16,71 @@ let splat mk_pi ctx t =
       | Ce (name, NCic.Def (bo,ty)) -> NCic.LetIn (name, ty, bo, t)
       | Ce (name, NCic.Decl ty) when mk_pi -> NCic.Prod (name, ty, t)
       | Ce (name, NCic.Decl ty) -> NCic.Lambda (name, ty, t)
-      | Fix _ -> t)
+      | Fix (_,name,ty) when mk_pi -> NCic.Prod (name, ty, t)
+      | Fix (_,name,ty) -> NCic.Lambda (name,ty,t))
     t ctx
 ;;
 
-let splat_args ctx t = 
-  let n_args =  
-    List.length (List.filter (function Ce _ -> true | _ -> false) ctx)
-  in  
-  if n_args = 0 then t 
+let context_tassonomy ctx = 
+    let rec split inner acc acc1 = function 
+      | Ce _ :: tl when inner -> split inner (acc+1) (acc1+1) tl
+      | Fix _ ::tl -> split false acc (acc1+1) tl
+      | _ as l -> acc, List.length l, acc1
+    in
+      split true 0 1 ctx
+;;
+
+let splat_args_for_rel ctx t = 
+  let bound, free, primo_ce_dopo_fix = context_tassonomy ctx in
+  if free = 0 then t 
   else
     let rec aux = function
       | 0 -> []
-      | n -> aux (n-1) @ [NCic.Rel n]
+      | n -> 
+         (match List.nth ctx (n+bound) with
+         | 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 n_args)
+    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 idx = ref ~-1 in
-        let bctx = 
-          List.map (fun (_,_,_) -> 
-            incr idx; Fix (~-1,!idx)) fl @ ctx 
-        in
         let buri = 
           UriManager.uri_of_string 
-           (UriManager.string_of_uri uri^string_of_int (List.length ctx)^".con")
+           (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 buri(NReference.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
@@ -51,31 +89,40 @@ let convert_term uri t =
               len+1)) (octx,0) fl
         in
         let fl, fixpoints =
-          List.fold_right 
-            (fun (name,ty,bo) (l,fixpoints) -> 
-               let ty, fixpoints_ty = aux octx ctx n_fix uri ty in
-               let bo, fixpoints_bo = aux boctx bctx (n_fix + n_fl) buri bo in
+          List.fold_right2 
+            (fun (name,_,bo) ty  (l,fixpoints) -> 
+               let bo, fixpoints_bo = aux boctx bctx n_fl buri bo in
                (([],name,~-1,splat true ctx ty, splat false ctx bo)::l),
-               fixpoints_ty @ fixpoints_bo @ fixpoints)
-            fl ([],[])
+               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
-        NCic.Const (NReference.reference_of_ouri uri (NReference.CoFix (k))),
-        obj::fixpoints
+        splat_args ctx 
+         (NCic.Const (NReference.reference_of_ouri buri (NReference.CoFix k)))
+         n_fix,
+        fixpoints @ [obj]
     | Cic.Fix (k, fl) ->
-        let idx = ref ~-1 in
-        let rno = ref 0 in
-        let bctx = 
-          List.map (fun (_,recno,_,_) -> 
-            incr idx; if !idx = k then rno := recno;Fix (recno,!idx)) fl @ ctx 
-        in
         let buri = 
           UriManager.uri_of_string 
-           (UriManager.string_of_uri uri^string_of_int (List.length ctx)^".con")
+           (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, _ = 
+          List.fold_right 
+            (fun (name,recno,ty,_) (ctx, 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)) 
+              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
@@ -84,29 +131,32 @@ let convert_term uri t =
               len+1)) (octx,0) fl
         in
         let fl, fixpoints =
-          List.fold_right 
-            (fun (name,rno,ty,bo) (l,fixpoints) -> 
-               let ty, fixpoints_ty = aux octx ctx n_fix uri ty in
-               let bo, fixpoints_bo = aux boctx bctx (n_fix + n_fl) buri bo in
-               let rno = rno + List.length ctx - n_fix in
+          List.fold_right2 
+            (fun (name,rno,_,bo) ty (l,fixpoints) -> 
+               let bo, fixpoints_bo = aux boctx bctx n_fl buri bo in
+               let _, free, _ = context_tassonomy bctx in
+               let rno = rno + free in
                (([],name,rno,splat true ctx ty, splat false ctx bo)::l),
-               fixpoints_ty @ fixpoints_bo @ fixpoints)
-            fl ([],[])
+               fixpoints_bo @ fixpoints)
+            fl tys ([],fixpoints_tys)
         in
         let obj = 
-          NUri.nuri_of_ouri uri,0,[],[],
+          NUri.nuri_of_ouri buri,0,[],[],
             NCic.Fixpoint (true, fl, (`Generated, `Definition)) 
         in
-        NCic.Const (NReference.reference_of_ouri uri (NReference.Fix (k,!rno))),
-        obj::fixpoints
+        splat_args ctx
+          (NCic.Const 
+            (NReference.reference_of_ouri buri (NReference.Fix (k,!rno))))
+          n_fix,
+        fixpoints @ [obj]
     | Cic.Rel n ->
-        (match List.nth ctx n with
-        | Ce _ -> NCic.Rel (n-n_fix), []
-        | Fix (recno, fixno) ->
-           splat_args ctx 
-           (NCic.Const 
-            (NReference.reference_of_ouri uri (NReference.Fix (fixno,recno)))),
-           [])
+        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_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
@@ -119,25 +169,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 =
@@ -147,7 +194,9 @@ let convert_term uri t =
                (t::l,fixpoints@acc))
              l ([],[])
         in
-        NCic.Appl l, fixpoints
+        (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, _) -> 
@@ -201,5 +250,5 @@ let convert_obj_aux uri = function
 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
+  fixpoints @ [obj]
 ;;