X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FoCic2NCic.ml;h=b1b08ee3c7821db86fd7186e588c04467f7cf62f;hb=83a4859b0a6fec3953dae70cd6177eecd850d012;hp=cd90fbdf5c0e8327959f3f9bcfacc23f6fb72816;hpb=35e102fec6bad146fee425f299a93520e657e7c2;p=helm.git

diff --git a/helm/software/components/ng_kernel/oCic2NCic.ml b/helm/software/components/ng_kernel/oCic2NCic.ml
index cd90fbdf5..b1b08ee3c 100644
--- a/helm/software/components/ng_kernel/oCic2NCic.ml
+++ b/helm/software/components/ng_kernel/oCic2NCic.ml
@@ -61,6 +61,147 @@ let splat_args ctx t n_fix =
    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
+(*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');*)
+;;
+
+let fix_outtype t =
+ let module C = Cic in
+ let rec aux context =
+  function
+     C.Rel _ as t -> t
+   | C.Var (uri,exp_named_subst) ->
+      let exp_named_subst' =
+       List.map (function i,t -> i, (aux context t)) exp_named_subst in
+        C.Var (uri,exp_named_subst')
+   | C.Implicit _
+   | C.Meta _ -> assert false
+   | C.Sort _ as t -> t
+   | C.Cast (v,t) -> C.Cast (aux context v, aux context t)
+   | C.Prod (n,s,t) ->
+        C.Prod (n, aux context s, aux ((Some (n, C.Decl s))::context) t)
+   | C.Lambda (n,s,t) ->
+       C.Lambda (n, aux context s, aux ((Some (n, C.Decl s))::context) t)
+   | C.LetIn (n,s,ty,t) ->
+      C.LetIn
+       (n, aux context s, aux context ty,
+        aux ((Some (n, C.Def(s,ty)))::context) t)
+   | C.Appl l -> C.Appl (List.map (aux context) l)
+   | C.Const (uri,exp_named_subst) ->
+      let exp_named_subst' =
+       List.map (function i,t -> i, (aux context t)) exp_named_subst
+      in
+       C.Const (uri,exp_named_subst')
+   | C.MutInd (uri,tyno,exp_named_subst) ->
+      let exp_named_subst' =
+       List.map (function i,t -> i, (aux context t)) exp_named_subst
+      in
+       C.MutInd (uri, tyno, exp_named_subst')
+   | C.MutConstruct (uri,tyno,consno,exp_named_subst) ->
+      let exp_named_subst' =
+       List.map (function i,t -> i, (aux context t)) exp_named_subst
+      in
+       C.MutConstruct (uri, tyno, consno, exp_named_subst')
+   | C.MutCase (uri, tyno, outty, term, patterns) ->
+      let outty = fix_outty uri tyno term context outty in
+       C.MutCase (uri, tyno, aux context outty,
+        aux context term, List.map (aux context) patterns)
+   | C.Fix (funno, funs) ->
+      let tys,_ =
+        List.fold_left
+          (fun (types,len) (n,_,ty,_) ->
+            ((Some (C.Name n,(C.Decl (CicSubstitution.lift len ty)))))::types,
+              len+1
+	  ) ([],0) funs
+      in
+       C.Fix (funno,
+        List.map
+         (fun (name, indidx, ty, bo) ->
+           (name, indidx, aux context ty, aux (tys@context) bo)
+         ) funs
+      )
+   | C.CoFix (funno, funs) ->
+      let tys,_ =
+        List.fold_left
+          (fun (types,len) (n,ty,_) ->
+            ((Some (C.Name n,(C.Decl (CicSubstitution.lift len ty)))))::types,
+              len+1
+	  ) ([],0) funs
+      in
+       C.CoFix (funno,
+        List.map
+         (fun (name, ty, bo) ->
+           (name, aux context ty, aux (tys@context) bo)
+         ) funs
+       )
+ in
+  aux [] t
+;;
+
+let get_fresh,reset_seed =
+ let seed = ref 0 in
+  (function () ->
+   incr 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 *)
@@ -70,7 +211,7 @@ let convert_term uri t =
         let buri = 
           UriManager.uri_of_string 
            (UriManager.buri_of_uri uri^"/"^
-            UriManager.name_of_uri uri ^ string_of_int (List.length ctx)^".con")
+            UriManager.name_of_uri uri ^ "___" ^ get_fresh () ^ ".con")
         in
         let bctx, fixpoints_tys, tys, _ = 
           List.fold_right 
@@ -108,7 +249,7 @@ let convert_term uri t =
         let buri = 
           UriManager.uri_of_string 
            (UriManager.buri_of_uri uri^"/"^
-            UriManager.name_of_uri uri ^ string_of_int (List.length ctx)^".con")
+            UriManager.name_of_uri uri ^ "___" ^ get_fresh () ^ ".con")
         in
         let bad_bctx, fixpoints_tys, tys, _ = 
           List.fold_right 
@@ -203,7 +344,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 octx ctx n_fix uri ens
+       aux_ens 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)
@@ -211,14 +352,14 @@ let convert_term uri t =
                NCic.Const (Ref.reference_of_ouri curi Ref.Decl)
         | _ -> assert false)
     | Cic.MutInd (curi, tyno, ens) -> 
-       aux_ens octx ctx n_fix uri ens
+       aux_ens 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 octx ctx n_fix uri ens
+       aux_ens curi octx ctx n_fix uri ens
         (NCic.Const (Ref.reference_of_ouri curi (Ref.Con (tyno,consno))))
-    | Cic.MutCase (curi, tyno, oty, t, branches) ->
+    | Cic.MutCase (curi, tyno, outty, t, branches) ->
         let r = Ref.reference_of_ouri curi (Ref.Ind tyno) in
-        let oty, fixpoints_oty = aux octx ctx n_fix uri oty 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 
@@ -227,53 +368,70 @@ 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 =
+  and aux_ens curi octx ctx n_fix uri ens he =
    match ens with
       [] -> he,[]
     | _::_ ->
+      let params =
+       match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph curi) with
+          Cic.Constant (_,_,_,params,_)
+        | Cic.InductiveDefinition (_,params,_,_) -> params
+        | Cic.Variable _
+        | Cic.CurrentProof _ -> assert false
+      in
       let ens,objs =
        List.fold_right
-        (fun (_,t) (l,objs) ->
+        (fun luri (l,objs) ->
+          let t = List.assoc luri ens in
           let t,o = aux octx ctx n_fix uri t in
            t::l, o@objs
-        ) ens ([],[])
+        ) params ([],[])
       in
        NCic.Appl (he::ens),objs
   in
    aux [] [] 0 uri t
 ;;
 
-let cook 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 cook mode vars t =
+ let t = fix_outtype t in
+ let varsno = List.length vars in
+ let t = CicSubstitution.lift varsno t in
+ let rec aux n acc l =
+  let subst =
+   snd(List.fold_left (fun (i,res) uri -> i+1,(uri,Cic.Rel i)::res) (1,[]) acc)
+  in
+  match l with
+     [] -> CicSubstitution.subst_vars subst t
+   | uri::uris ->
     let bo,ty =
      match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph uri) with
-        Cic.Variable (_,bo,ty,_,_) -> bo,ty
+        Cic.Variable (_,bo,ty,_,_) ->
+         HExtlib.map_option fix_outtype bo, fix_outtype ty
       | _ -> assert false in
+    let ty = CicSubstitution.subst_vars subst ty in
+    let bo = HExtlib.map_option (CicSubstitution.subst_vars subst) bo in
     let id = Cic.Name (UriManager.name_of_uri uri) in
-    let t =
-     match bo,ty with
-        None,ty -> Cic.Lambda (id,ty,t)
-      | Some bo,ty -> Cic.LetIn (id,bo,ty,t)
-    in
-     n+1,t
-  ) vars (1,t))
+    let t = aux (n-1) (uri::acc) uris in
+     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
+  aux varsno [] vars
 ;;
 
 let convert_obj_aux uri = function
  | Cic.Constant (name, None, ty, vars, _) ->
-     let ty = cook vars ty in
+     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, vars, _) ->
-     let bo = cook vars bo in
-     let ty = cook vars ty in
+     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 = []);
@@ -284,12 +442,12 @@ let convert_obj_aux uri = function
      let itl, fix_itl = 
        List.fold_right
          (fun (name, _, ty, cl) (itl,acc) ->
-            let ty = cook vars ty in
+            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 vars ty in
+                 let ty = cook `Pi vars ty in
                  let ty, fix_ty = convert_term uri ty in
                  ([], name, ty)::cl, acc @ fix_ty)
                cl ([],[])
@@ -304,6 +462,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]