X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Flibrary%2FlibrarySync.ml;h=7363697d5522a96a8b2551ae1264b14874411bf9;hb=2b2b90087f836c2f32291935216549e9370e68c3;hp=707b355b0995304bbe1da901a0a27daac07a1227;hpb=cf3635c0830661f59d16339cd7fc9c3b948fcbc8;p=helm.git

diff --git a/helm/ocaml/library/librarySync.ml b/helm/ocaml/library/librarySync.ml
index 707b355b0..7363697d5 100644
--- a/helm/ocaml/library/librarySync.ml
+++ b/helm/ocaml/library/librarySync.ml
@@ -23,70 +23,87 @@
  * http://helm.cs.unibo.it/
  *)
 
+(* $Id$ *)
+
 exception AlreadyDefined of UriManager.uri
 
 let auxiliary_lemmas_hashtbl = UriManager.UriHashtbl.create 29
 
-let merge_coercions obj =
+(* uri |-->  (derived_coercions_in_the_coercion_DB, derived_coercions_in_lib)
+ * 
+ * in case of remove_coercion uri, the first component is removed from the
+ * coercion DB, while the second is passed to remove_obj (and is not [] only if
+ * add_coercion is called with add_composites 
+ * *)
+let coercion_hashtbl = UriManager.UriHashtbl.create 3
+
+let rec merge_coercions =
+ let module C = Cic in
+ let aux = (fun (u,t) -> u,merge_coercions t) in
+  function
+     C.Rel _ | C.Sort _ | C.Implicit _ as t -> t
+   | C.Meta (n,subst) ->
+      let subst' =
+       List.map
+        (function None -> None | Some t -> Some (merge_coercions t)) subst
+      in
+       C.Meta (n,subst')
+   | C.Cast (te,ty) -> C.Cast (merge_coercions te, merge_coercions ty)
+   | C.Prod (name,so,dest) -> 
+       C.Prod (name, merge_coercions so, merge_coercions dest) 
+   | C.Lambda (name,so,dest) -> 
+       C.Lambda (name, merge_coercions so, merge_coercions dest)
+   | C.LetIn (name,so,dest) -> 
+       C.LetIn (name, merge_coercions so, merge_coercions dest)
+   | Cic.Appl [ c1 ; (Cic.Appl [c2; head]) ] when 
+     CoercGraph.is_a_coercion c1 && CoercGraph.is_a_coercion c2 ->
+       let source_carr = CoercGraph.source_of c2 in
+       let tgt_carr = CoercGraph.target_of c1 in
+       (match CoercGraph.look_for_coercion source_carr tgt_carr 
+       with
+       | CoercGraph.SomeCoercion c -> Cic.Appl [ c ; head ]
+       | _ -> assert false) (* the composite coercion must exist *)
+   | C.Appl l -> C.Appl (List.map merge_coercions l)
+   | C.Var (uri,exp_named_subst) -> 
+       let exp_named_subst = List.map aux exp_named_subst in
+       C.Var (uri, exp_named_subst)
+   | C.Const (uri,exp_named_subst) ->
+       let exp_named_subst = List.map aux exp_named_subst in
+       C.Const (uri, exp_named_subst)
+   | C.MutInd (uri,tyno,exp_named_subst) ->
+       let exp_named_subst = List.map aux 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 aux exp_named_subst in
+       C.MutConstruct (uri,tyno,consno,exp_named_subst)  
+   | C.MutCase (uri,tyno,out,te,pl) ->
+       let pl = List.map merge_coercions pl in
+       C.MutCase (uri,tyno,merge_coercions out,merge_coercions te,pl)
+   | C.Fix (fno, fl) ->
+       let fl = List.map (fun (name,idx,ty,bo)->(name,idx,merge_coercions ty,merge_coercions bo)) fl in
+       C.Fix (fno, fl)
+   | C.CoFix (fno, fl) ->
+       let fl = List.map (fun (name,ty,bo) -> (name, merge_coercions ty, merge_coercions bo)) fl in
+       C.CoFix (fno, fl)
+
+let merge_coercions_in_obj obj =
   let module C = Cic in
-  let rec aux2 = (fun (u,t) -> u,aux t)
-  and aux = function
-    | C.Rel _ | C.Sort _ as t -> t
-    | C.Meta _ | C.Implicit _ -> assert false
-    | C.Cast (te,ty) -> C.Cast (aux te, aux ty)
-    | C.Prod (name,so,dest) -> 
-        C.Prod (name, aux so, aux dest) 
-    | C.Lambda (name,so,dest) -> 
-        C.Lambda (name, aux so, aux dest)
-    | C.LetIn (name,so,dest) -> 
-        C.LetIn (name, aux so, aux dest)
-    | (Cic.Appl [ c1 ; (Cic.Appl [c2; head]) ]) as t when 
-      CoercGraph.is_a_coercion c1 && CoercGraph.is_a_coercion c2 ->
-        let source_carr = CoercGraph.source_of c2 in
-        let tgt_carr = CoercGraph.target_of c1 in
-        (match CoercGraph.look_for_coercion source_carr tgt_carr 
-        with
-        | CoercGraph.SomeCoercion c -> Cic.Appl [ c ; head ]
-        | _ -> assert false) (* the composite coercion must exist *)
-    | C.Appl l -> C.Appl (List.map aux l)
-    | C.Var (uri,exp_named_subst) -> 
-        let exp_named_subst = List.map aux2 exp_named_subst in
-        C.Var (uri, exp_named_subst)
-    | C.Const (uri,exp_named_subst) ->
-        let exp_named_subst = List.map aux2 exp_named_subst in
-        C.Const (uri, exp_named_subst)
-    | C.MutInd (uri,tyno,exp_named_subst) ->
-        let exp_named_subst = List.map aux2 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 aux2 exp_named_subst in
-        C.MutConstruct (uri,tyno,consno,exp_named_subst)  
-    | C.MutCase (uri,tyno,out,te,pl) ->
-        let pl = List.map aux pl in
-        C.MutCase (uri,tyno,aux out,aux te,pl)
-    | C.Fix (fno, fl) ->
-        let fl = List.map (fun (name,idx,ty,bo)->(name,idx,aux ty,aux bo)) fl in
-        C.Fix (fno, fl)
-    | C.CoFix (fno, fl) ->
-        let fl = List.map (fun (name,ty,bo) -> (name, aux ty, aux bo)) fl in
-        C.CoFix (fno, fl)
-  in
   match obj with
   | C.Constant (id, body, ty, params, attrs) -> 
       let body = 
         match body with 
         | None -> None 
-        | Some body -> Some (aux body) 
+        | Some body -> Some (merge_coercions body) 
       in
-      let ty = aux ty in
+      let ty = merge_coercions ty in
         C.Constant (id, body, ty, params, attrs)
   | C.Variable (name, body, ty, params, attrs) ->
       let body = 
         match body with 
         | None -> None 
-        | Some body -> Some (aux body) 
+        | Some body -> Some (merge_coercions body) 
       in
-      let ty = aux ty in
+      let ty = merge_coercions ty in
         C.Variable (name, body, ty, params, attrs)
   | C.CurrentProof (_name, _conjectures, _body, _ty, _params, _attrs) ->
       assert false
@@ -94,8 +111,8 @@ let merge_coercions obj =
       let indtys = 
         List.map 
           (fun (name, ind, arity, cl) -> 
-            let arity = aux arity in
-            let cl = List.map (fun (name, ty) -> (name,aux ty)) cl in
+            let arity = merge_coercions arity in
+            let cl = List.map (fun (name, ty) -> (name,merge_coercions ty)) cl in
             (name, ind, arity, cl))
           indtys
       in
@@ -170,10 +187,10 @@ let index_obj =
 
 let add_single_obj uri obj ~basedir =
   let obj = 
-    if List.mem `Generated (CicUtil.attributes_of_obj obj) &&
+    if (*List.mem `Generated (CicUtil.attributes_of_obj obj) &&*)
        not (CoercGraph.is_a_coercion (Cic.Const (uri, [])))
     then
-      merge_coercions obj 
+      merge_coercions_in_obj obj 
     else
       obj 
   in
@@ -181,7 +198,16 @@ let add_single_obj uri obj ~basedir =
   if CicEnvironment.in_library uri then
     raise (AlreadyDefined uri)
   else begin
+    (*CicUniv.reset_spent_time ();
+    let before = Unix.gettimeofday () in*)
     typecheck_obj uri obj; (* 1 *)
+    (*let after = Unix.gettimeofday () in
+    let univ_time = CicUniv.get_spent_time () in
+    let total_time = after -. before in
+    prerr_endline 
+      (Printf.sprintf "QED: %%univ = %2.5f, total = %2.5f, univ = %2.5f, %s\n" 
+      (univ_time *. 100. /. total_time) (total_time) (univ_time)
+      (UriManager.name_of_uri uri));*)
     let _, ugraph, univlist = 
       CicEnvironment.get_cooked_obj_with_univlist CicUniv.empty_ugraph uri in
     try 
@@ -221,7 +247,7 @@ let remove_single_obj uri =
          HExtlib.rmdir_descend (Filename.dirname file)
       with Http_getter_types.Key_not_found _ -> ());
       ignore (LibraryDb.remove_uri uri);
-      CoercGraph.remove_coercion uri;
+      (*CoercGraph.remove_coercion uri;*)
       CicEnvironment.remove_obj uri)
   to_remove
 
@@ -243,6 +269,88 @@ let generate_elimination_principles ~basedir uri =
    List.iter remove_single_obj !uris;
    raise exn
 
+(* COERCIONS ***********************************************************)
+  
+let remove_all_coercions () =
+  UriManager.UriHashtbl.clear coercion_hashtbl;
+  CoercDb.remove_coercion (fun (_,_,u1) -> true)
+
+let add_coercion ~basedir ~add_composites uri =
+  let coer_ty,_ =
+    let coer = CicUtil.term_of_uri uri in
+    CicTypeChecker.type_of_aux' [] [] coer CicUniv.empty_ugraph 
+  in
+  (* we have to get the source and the tgt type uri
+   * in Coq syntax we have already their names, but
+   * since we don't support Funclass and similar I think
+   * all the coercion should be of the form
+   * (A:?)(B:?)T1->T2
+   * So we should be able to extract them from the coercion type
+   * 
+   * Currently only (_:T1)T2 is supported.
+   * should we saturate it with metas in case we insert it?
+   * 
+   *)
+  let extract_last_two_p ty =
+    let rec aux = function
+      | Cic.Prod( _, src, Cic.Prod (n,t1,t2)) -> 
+          assert false
+          (* not implemented: aux (Cic.Prod(n,t1,t2)) *)
+      | Cic.Prod( _, src, tgt) -> src, tgt
+      | _ -> assert false
+    in
+    aux ty
+  in
+  let ty_src, ty_tgt = extract_last_two_p coer_ty in
+  let src_uri = CoercDb.coerc_carr_of_term (CicReduction.whd [] ty_src) in
+  let tgt_uri = CoercDb.coerc_carr_of_term (CicReduction.whd [] ty_tgt) in
+  let new_coercions = CicCoercion.close_coercion_graph src_uri tgt_uri uri in
+  let composite_uris = List.map (fun (_,_,uri,_) -> uri) new_coercions in
+  (* update the DB *)
+  List.iter 
+    (fun (src,tgt,uri,_) -> CoercDb.add_coercion (src,tgt,uri)) 
+      new_coercions;
+  CoercDb.add_coercion (src_uri, tgt_uri, uri);
+  (* add the composites obj and they eventual lemmas *)
+  let lemmas = 
+    if add_composites then
+      List.fold_left
+        (fun acc (_,_,uri,obj) -> 
+          add_single_obj ~basedir uri obj;
+          uri::acc) 
+        composite_uris new_coercions
+    else
+      []
+  in
+  (* store that composite_uris are related to uri. the first component is the
+   * stuff in the DB while the second is stuff for remove_obj *)
+  prerr_endline ("aggiungo: " ^ string_of_bool add_composites ^ UriManager.string_of_uri uri);
+  List.iter (fun u -> prerr_endline (UriManager.string_of_uri u))
+      composite_uris;
+  UriManager.UriHashtbl.add coercion_hashtbl uri 
+    (composite_uris,if add_composites then composite_uris else []);
+  lemmas
+
+let remove_coercion uri =
+  try
+    let (composites_in_db, composites_in_lib) = 
+      UriManager.UriHashtbl.find coercion_hashtbl uri 
+    in
+    prerr_endline ("removing: " ^UriManager.string_of_uri uri);
+    List.iter (fun u -> prerr_endline (UriManager.string_of_uri u))
+      composites_in_db;
+    UriManager.UriHashtbl.remove coercion_hashtbl uri;
+    CoercDb.remove_coercion (fun (_,_,u) -> UriManager.eq uri u);
+    (* remove from the DB *) 
+    List.iter 
+      (fun u -> CoercDb.remove_coercion (fun (_,_,u1) -> UriManager.eq u u1))
+      composites_in_db;
+    (* remove composites from the lib *)
+    List.iter remove_single_obj composites_in_lib
+  with
+    Not_found -> () (* mhh..... *)
+    
+
 let generate_projections ~basedir uri fields =
  let uris = ref [] in
  let projections = CicRecord.projections_of uri (List.map fst fields) in
@@ -254,15 +362,10 @@ let generate_projections ~basedir uri fields =
          CicTypeChecker.type_of_aux' [] [] bo CicUniv.empty_ugraph in
        let attrs = [`Class `Projection; `Generated] in
        let obj = Cic.Constant (name,Some bo,ty,[],attrs) in
-       
         add_single_obj ~basedir uri obj;
         let composites = 
-          if coercion then
-            (* this is _NOT_ the place for THIS!!! *)
-            (* MOO HANDLING IS MISSING *)
-            let toadd = CoercGraph.add_coercion uri in
-            List.iter (fun (uri,o) -> add_single_obj ~basedir uri o) toadd;
-            List.map fst toadd
+         if coercion then
+            add_coercion ~basedir ~add_composites:true uri
           else  
             []
         in
@@ -321,3 +424,4 @@ let remove_obj uri =
     Not_found -> [] (*assert false*)
  in
   List.iter remove_single_obj (uri::uris)
+