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

diff --git a/helm/software/components/ng_kernel/oCic2NCic.ml b/helm/software/components/ng_kernel/oCic2NCic.ml
index a9c8d11ef..8b6fd7f45 100644
--- a/helm/software/components/ng_kernel/oCic2NCic.ml
+++ b/helm/software/components/ng_kernel/oCic2NCic.ml
@@ -6,57 +6,65 @@ let cn_to_s = function
 ;;
 
 type ctx = 
-  | Ce of NCic.hypothesis 
+  | Ce of NCic.hypothesis * NCic.obj list
   | Fix of Ref.reference * string * NCic.term
 
 let splat mk_pi ctx t =
   List.fold_left
-    (fun t c -> 
+    (fun (t,l) c -> 
       match c with
-      | 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 (_,name,ty) when mk_pi -> NCic.Prod (name, ty, t)
-      | Fix (_,name,ty) -> NCic.Lambda (name,ty,t))
-    t ctx
+      | Ce ((name, NCic.Def (bo,ty)),l') -> NCic.LetIn (name, ty, bo, t),l@l'
+      | Ce ((name, NCic.Decl ty),l') when mk_pi -> NCic.Prod (name, ty, t),l@l'
+      | Ce ((name, NCic.Decl ty),l') -> NCic.Lambda (name, ty, t),l@l'
+      | Fix (_,name,ty) when mk_pi -> NCic.Prod (name, ty, t),l
+      | Fix (_,name,ty) -> NCic.Lambda (name,ty,t),l)
+    (t,[]) ctx
 ;;
 
 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
+      | _ as l ->
+        let only_decl =
+         List.filter
+          (function Ce ((_, NCic.Decl _),_) | Fix _ -> true | _ -> false) l
+        in
+         acc, List.length l, List.length only_decl, 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
+  let bound, free, _, primo_ce_dopo_fix = context_tassonomy ctx in
   if free = 0 then t 
   else
     let rec aux = function
       | 0 -> []
       | 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)
+         match List.nth ctx (n+bound) with
+         | Fix (refe, _, _) when (n+bound) < primo_ce_dopo_fix ->
+            NCic.Const refe :: aux (n-1)
+         | Fix _ | Ce ((_, NCic.Decl _),_) -> NCic.Rel (n+bound)::aux (n-1)
+         | Ce ((_, NCic.Def _),_) -> 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
+  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
+         | Ce ((_, NCic.Decl _),_) when n <= bound -> NCic.Rel n:: aux (n-1)
          | 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)
+            splat_args_for_rel ctx (NCic.Const refe):: aux (n-1)
+         | Fix _ | Ce ((_, NCic.Decl _),_) -> NCic.Rel (n - n_fix):: aux (n-1)
+         | Ce ((_, NCic.Def _),_) -> aux (n - 1)
+        ) 
    in
    NCic.Appl (t:: aux (List.length ctx))
 ;;
@@ -194,19 +202,26 @@ let fix_outtype t =
   aux [] t
 ;;
 
-let get_fresh =
+let get_fresh,reset_seed =
  let seed = ref 0 in
-  function () ->
+  (function () ->
    incr seed;
-   string_of_int !seed
+   string_of_int !seed),
+  (function () -> seed := 0)
 ;;
 
 (* 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) ->
+  (* k=true if we are converting a term to be pushed in a ctx or if we are
+            converting the type of a fix;
+     k=false if we are converting a term to be put in the body of a fix;
+     in the latter case, we must permute Rels since the Fix abstraction will
+     preceed its lefts parameters; in the former case, there is nothing to
+     permute *)
+  let rec aux k octx (ctx : ctx list) n_fix uri = function
+    | Cic.CoFix (cofixno, fl) ->
         let buri = 
           UriManager.uri_of_string 
            (UriManager.buri_of_uri uri^"/"^
@@ -214,10 +229,10 @@ let convert_term uri t =
         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
+            (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
-              Fix (r,name,ty) :: ctx, 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
@@ -231,9 +246,11 @@ 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_fl buri bo in
-               (([],name,~-1,splat true ctx ty, splat false ctx bo)::l),
-               fixpoints_bo @ fixpoints)
+               let bo, fixpoints_bo = aux false boctx bctx n_fl buri bo in
+               let splty,fixpoints_splty = splat true ctx ty in
+               let splbo,fixpoints_splbo = splat false ctx bo in
+               (([],name,~-1,splty,splbo)::l),
+               fixpoints_bo @ fixpoints_splty @ fixpoints_splbo @ fixpoints)
             fl tys ([],fixpoints_tys)
         in
         let obj = 
@@ -241,10 +258,10 @@ let convert_term uri t =
             NCic.Fixpoint (false, fl, (`Generated, `Definition)) 
         in
         splat_args ctx 
-         (NCic.Const (Ref.reference_of_ouri buri (Ref.CoFix k)))
+         (NCic.Const (Ref.reference_of_ouri buri (Ref.CoFix cofixno)))
          n_fix,
         fixpoints @ [obj]
-    | Cic.Fix (k, fl) ->
+    | Cic.Fix (fixno, fl) ->
         let buri = 
           UriManager.uri_of_string 
            (UriManager.buri_of_uri uri^"/"^
@@ -253,18 +270,19 @@ let convert_term uri t =
         let bad_bctx, fixpoints_tys, tys, _ = 
           List.fold_right 
             (fun (name,recno,ty,_) (bctx, fixpoints, tys, idx) -> 
-              let ty, fixpoints_ty = aux octx ctx n_fix uri ty in
+              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)) 
               in
               Fix (r,name,ty) :: bctx, fixpoints_ty@fixpoints,ty::tys,idx+1)
             fl ([], [], [], 0)
         in
-        let _, free, _ = context_tassonomy (bad_bctx @ ctx) in
+        let _, _, free_decls, _ = 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)
+              Fix (Ref.reference_of_ouri buri
+                    (Ref.Fix (idx,recno+free_decls)),name,ty)
             | _ -> assert false) bad_bctx @ ctx
         in
         let n_fl = List.length fl in
@@ -274,15 +292,17 @@ let convert_term uri t =
              (Some (Cic.Name n,(Cic.Decl (CicSubstitution.lift len ty)))::types,
               len+1)) (octx,0) fl
         in
-        let rno_k = ref 0 in
+        let rno_fixno = ref 0 in
         let fl, fixpoints,_ =
           List.fold_right2 
             (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,idx+1)
+               let bo, fixpoints_bo = aux false boctx bctx n_fl buri bo in
+               let splty,fixpoints_splty = splat true ctx ty in
+               let splbo,fixpoints_splbo = splat false ctx bo in
+               let rno = rno + free_decls in
+               if idx = fixno then rno_fixno := rno;
+               (([],name,rno,splty,splbo)::l),
+               fixpoints_bo@fixpoints_splty@fixpoints_splbo@fixpoints,idx+1)
             fl tys ([],fixpoints_tys,0)
         in
         let obj = 
@@ -291,40 +311,46 @@ let convert_term uri t =
         in
         splat_args ctx
           (NCic.Const 
-            (Ref.reference_of_ouri buri (Ref.Fix (k,!rno_k))))
+            (Ref.reference_of_ouri buri (Ref.Fix (fixno,!rno_fixno))))
           n_fix,
         fixpoints @ [obj]
     | Cic.Rel n ->
-        let bound, _, primo_ce_dopo_fix = context_tassonomy ctx in
+        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), [])
+        | Fix _ when n <= bound -> assert false
+        | Fix _ | Ce _ when k = true -> NCic.Rel n, []
+        | Fix _ | 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
+        let s, fixpoints_s = aux k octx ctx n_fix uri s in
+        let s', fixpoints_s' = aux true octx ctx n_fix uri old_s in
+        let ctx = Ce ((cn_to_s name, NCic.Decl s'),fixpoints_s') :: ctx in
         let octx = Some (name, Cic.Decl old_s) :: octx in
-        let t, fixpoints_t = aux octx ctx n_fix uri t in
+        let t, fixpoints_t = aux k octx ctx n_fix uri t in
         NCic.Lambda (cn_to_s name, s, t), fixpoints_s @ fixpoints_t
     | Cic.Prod (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
+        let s, fixpoints_s = aux k octx ctx n_fix uri s in
+        let s', fixpoints_s' = aux true octx ctx n_fix uri old_s in
+        let ctx = Ce ((cn_to_s name, NCic.Decl s'),fixpoints_s') :: ctx in
         let octx = Some (name, Cic.Decl old_s) :: octx in
-        let t, fixpoints_t = aux octx ctx n_fix uri t in
+        let t, fixpoints_t = aux k octx ctx n_fix uri t in
         NCic.Prod (cn_to_s name, s, t), fixpoints_s @ fixpoints_t
     | 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 te, fixpoints_s = aux k octx ctx n_fix uri te in
+        let te', fixpoints_s' = aux true octx ctx n_fix uri old_te in
+        let ty, fixpoints_ty = aux k octx ctx n_fix uri ty in
+        let ty', fixpoints_ty' = aux true octx ctx n_fix uri old_ty in
+        let fixpoints' = fixpoints_s' @ fixpoints_ty' in
+        let ctx = Ce ((cn_to_s name, NCic.Def (te', ty')),fixpoints') :: 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
+        let t, fixpoints_t = aux k octx ctx n_fix uri t in
         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
+        let t, fixpoints_t = aux k octx ctx n_fix uri t in
+        let ty, fixpoints_ty = aux k 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.CProp -> NCic.Sort NCic.CProp,[]
@@ -335,7 +361,7 @@ let convert_term uri t =
         let l, fixpoints =
           List.fold_right 
              (fun t (l,acc) -> 
-               let t, fixpoints = aux octx ctx n_fix uri t in 
+               let t, fixpoints = aux k octx ctx n_fix uri t in 
                (t::l,fixpoints@acc))
              l ([],[])
         in
@@ -343,7 +369,7 @@ let convert_term uri t =
         | (NCic.Appl l1)::l2 -> NCic.Appl (l1@l2), fixpoints
         | _ -> NCic.Appl l, fixpoints)
     | Cic.Const (curi, ens) -> 
-       aux_ens curi octx ctx n_fix uri ens
+       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)
@@ -351,25 +377,30 @@ let convert_term uri t =
                NCic.Const (Ref.reference_of_ouri curi Ref.Decl)
         | _ -> assert false)
     | Cic.MutInd (curi, tyno, ens) -> 
-       aux_ens curi octx ctx n_fix uri ens
+       aux_ens k curi octx ctx n_fix uri ens
         (NCic.Const (Ref.reference_of_ouri curi (Ref.Ind tyno)))
     | Cic.MutConstruct (curi, tyno, consno, ens) -> 
-       aux_ens curi octx ctx n_fix uri ens
+       aux_ens k curi octx ctx n_fix uri ens
         (NCic.Const (Ref.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,_,_,_) ->
+            aux k octx ctx n_fix uri (CicSubstitution.subst_vars ens bo)
+         | _ -> assert false)
     | Cic.MutCase (curi, tyno, outty, t, branches) ->
         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 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 =
           List.fold_right 
              (fun t (l,acc) -> 
-               let t, fixpoints = aux octx ctx n_fix uri t in 
+               let t, fixpoints = aux k octx ctx n_fix uri t in 
                (t::l,fixpoints@acc))
              branches ([],[])
         in
         NCic.Match (r,outty,t,branches), fixpoints_outty@fixpoints_t@fixpoints
-    | Cic.Implicit _ | Cic.Meta _ | Cic.Var _ -> assert false
-  and aux_ens curi octx ctx n_fix uri ens he =
+    | Cic.Implicit _ | Cic.Meta _ -> assert false
+  and aux_ens k curi octx ctx n_fix uri ens he =
    match ens with
       [] -> he,[]
     | _::_ ->
@@ -382,15 +413,19 @@ let convert_term uri t =
       in
       let ens,objs =
        List.fold_right
-        (fun uri (l,objs) ->
-          let t = List.assoc uri ens in
-          let t,o = aux octx ctx n_fix uri t in
-           t::l, o@objs
+        (fun luri (l,objs) ->
+          match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph luri) with
+             Cic.Variable (_,Some _,_,_,_) -> l, objs
+           | Cic.Variable (_,None,_,_,_) ->
+              let t = List.assoc luri ens in
+              let t,o = aux k octx ctx n_fix uri t in
+               t::l, o@objs
+           | _ -> assert false
         ) params ([],[])
       in
        NCic.Appl (he::ens),objs
   in
-   aux [] [] 0 uri t
+   aux false [] [] 0 uri t
 ;;
 
 let cook mode vars t =
@@ -461,6 +496,7 @@ 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
   fixpoints @ [obj]