X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2FoCic2NCic.ml;h=4aaeb414c4d8330e70b6dc4cd3d224981b254f66;hb=28a4c3ee256336c0f482235f81b8bd5ad622945a;hp=3880e361b9b9cbfbb19028b28022d1795ea396da;hpb=7c3850896b6324306bdbe8ef430f500cc9cb7f83;p=helm.git

diff --git a/helm/software/components/ng_kernel/oCic2NCic.ml b/helm/software/components/ng_kernel/oCic2NCic.ml
index 3880e361b..4aaeb414c 100644
--- a/helm/software/components/ng_kernel/oCic2NCic.ml
+++ b/helm/software/components/ng_kernel/oCic2NCic.ml
@@ -272,40 +272,74 @@ let get_fresh,reset_seed =
   (function () -> seed := 0)
 ;;
 
+exception NotSimilar 
+let alpha t1 t2 ref ref' =
+  let rec aux t1 t2 = match t1,t2 with
+    | NCic.Rel n, NCic.Rel m when n=m -> ()
+    | NCic.Appl l1, NCic.Appl l2 -> List.iter2 aux l1 l2
+    | NCic.Lambda (_,s1,t1), NCic.Lambda (_,s2,t2) 
+    | NCic.Prod (_,s1,t1), NCic.Prod (_,s2,t2) -> aux s1 s2; aux t1 t2
+    | NCic.LetIn (_,s1,ty1,t1), NCic.LetIn (_,s2,ty2,t2) -> 
+         aux s1 s2; aux ty1 ty2; aux t1 t2
+    | NCic.Const r1, 
+      NCic.Const r2 when NReference.eq r1 ref && NReference.eq r2 ref' -> ()
+    | NCic.Const r1, NCic.Const r2 when NReference.eq r1 r2 -> ()
+    | NCic.Meta _,NCic.Meta _ -> ()
+    | NCic.Implicit _,NCic.Implicit _ -> ()
+    | NCic.Sort x,NCic.Sort y when x=y -> ()
+    | NCic.Match (_,t1,t11,tl1), NCic.Match (_,t2,t22,tl2) -> 
+         aux t1 t2;aux t11 t22;List.iter2 aux tl1 tl2 
+    | _-> raise NotSimilar
+  in
+  try aux t1 t2; true  with NotSimilar -> false
+;;
+
 exception Found of NReference.reference;;
 let cache = Hashtbl.create 313;; 
-let same_obj =
+let same_obj ref ref' =
  function
-    (_,_,_,_,NCic.Fixpoint (_,[_,_,_,ty1,_],_)),
-    (_,_,_,_,NCic.Fixpoint (_,[_,_,_,ty2,_],_))
-     when ty1 = ty2 -> true
+  | (_,_,_,_,NCic.Fixpoint (_,l1,_)), (_,_,_,_,NCic.Fixpoint (_,l2,_))
+    when List.for_all2 (fun (_,_,_,ty1,bo1) (_,_,_,ty2,bo2) -> 
+       alpha ty1 ty2 ref ref' && alpha bo1 bo2 ref ref') l1 l2 ->
+     true
   | _ -> false
 ;;
 let find_in_cache name obj ref =
  try
   List.iter
    (function (ref',obj') ->
-     let recno =
+     let recno, fixno =
       match ref with
-         NReference.Ref (_,_,NReference.Fix (_,recno)) -> recno
+         NReference.Ref (_,_,NReference.Fix (fixno,recno)) -> recno,fixno
        | _ -> assert false in
-     let recno' =
+     let recno',fixno' =
       match ref' with
-         NReference.Ref (_,_,NReference.Fix (_,recno)) -> recno
+         NReference.Ref (_,_,NReference.Fix (fixno',recno)) -> recno,fixno'
        | _ -> assert false in
-     if recno = recno' && same_obj (obj,obj') then
-(*(prerr_endline "!!!!!!!!!!! CACHE HIT !!!!!!!!!!";*)
-       raise (Found ref')
-(*);*)
+     if recno = recno' && fixno = fixno' && same_obj ref ref' (obj,obj') then (
 (*
-     else
-(prerr_endline ("CACHE SAME NAME: " ^ NReference.string_of_reference ref ^ " <==> " ^ NReference.string_of_reference ref');
-      raise Not_found
-)
+prerr_endline ("!!!!!!!!!!! CACHE HIT !!!!!!!!!!\n" ^
+NReference.string_of_reference ref ^ "\n" ^
+NReference.string_of_reference ref' ^ "\n"); 
 *)
+       raise (Found ref'));
+
+(*
+prerr_endline ("CACHE SAME NAME: " ^ NReference.string_of_reference ref ^ " <==> " ^ NReference.string_of_reference ref');
+*)
+
   ) (Hashtbl.find_all cache name);
-(*prerr_endline "<<< CACHE MISS >>>";*)
-  Hashtbl.add cache name (ref,obj);
+(*  prerr_endline "<<< CACHE MISS >>>";  *)
+  begin
+    match obj, ref with 
+    | (_,_,_,_,NCic.Fixpoint (true,fl,_)) , NReference.Ref (x,y,NReference.Fix _) ->
+       ignore(List.fold_left (fun i (_,name,rno,_,_) ->
+         let ref = NReference.mk_fix i rno ref in
+         Hashtbl.add cache name (ref,obj);
+         i+1
+       ) 0 fl)
+    | _ -> assert false
+  end;
   None
  with Found ref -> Some ref
 ;;
@@ -321,7 +355,10 @@ let convert_term uri t =
      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) ->
+    | Cic.CoFix _ as cofix ->
+        let octx,ctx,fix,rels = restrict octx ctx cofix in
+        let cofixno,fl =
+         match fix with Cic.CoFix (cofixno,fl)->cofixno,fl | _-> assert false in
         let buri = 
           UriManager.uri_of_string 
            (UriManager.buri_of_uri uri^"/"^
@@ -332,8 +369,8 @@ let convert_term uri t =
             (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) :: bctx, fixpoints_ty @ fixpoints,ty::tys,idx+1)
-            fl ([], [], [], 0)
+              bctx @ [Fix (r,name,ty)], fixpoints_ty @ fixpoints,ty::tys,idx-1)
+            fl ([], [], [], List.length fl-1)
         in
         let bctx = bctx @ ctx in
         let n_fl = List.length fl in
@@ -359,7 +396,7 @@ let convert_term uri t =
         in
         splat_args ctx 
          (NCic.Const (Ref.reference_of_ouri buri (Ref.CoFix cofixno)))
-         n_fix (assert false),
+         n_fix rels,
         fixpoints @ [obj]
     | Cic.Fix _ as fix ->
         let octx,ctx,fix,rels = restrict octx ctx fix in
@@ -377,8 +414,8 @@ let convert_term uri t =
               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)
+              bctx @ [Fix (r,name,ty)], fixpoints_ty@fixpoints,ty::tys,idx-1)
+            fl ([], [], [], List.length fl-1)
         in
         let _, _, free_decls, _ = context_tassonomy (bad_bctx @ ctx) in
         let bctx = 
@@ -413,7 +450,7 @@ let convert_term uri t =
             NCic.Fixpoint (true, fl, (`Generated, `Definition)) in
         let r = Ref.reference_of_ouri buri (Ref.Fix (fixno,!rno_fixno)) in
         let obj,r =
-         let _,name,_,_,_ = List.hd fl in
+         let _,name,_,_,_ = List.nth fl fixno in
          match find_in_cache name obj r with
             Some r' -> [],r'
           | None -> [obj],r
@@ -459,7 +496,8 @@ let convert_term uri t =
         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,[]
-    | Cic.Sort (Cic.Type _) -> NCic.Sort (NCic.Type 0),[] 
+    | Cic.Sort (Cic.Type u) -> 
+          NCic.Sort (NCic.Type (CicUniv.get_rank u)),[] 
     | Cic.Sort Cic.Set -> NCic.Sort (NCic.Type 0),[] 
        (* calculate depth in the univ_graph*)
     | Cic.Appl l -> 
@@ -594,7 +632,14 @@ let convert_obj_aux uri = function
             ([], name, ty, cl)::itl, fix_ty @ fix_cl @ acc)
          itl ([],[])
      in
-     NCic.Inductive(ind, leftno + List.length vars, itl, (`Provided, `Regular)),
+     NCic.Inductive(ind, leftno + List.length 
+       (List.filter (fun v -> 
+          match fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph v) with
+             Cic.Variable (_,Some _,_,_,_) -> false
+           | Cic.Variable (_,None,_,_,_) -> true
+           | _ -> assert false)
+          vars)
+       , itl, (`Provided, `Regular)),
      fix_itl
  | Cic.Variable _ 
  | Cic.CurrentProof _ -> assert false