Big commit to let Ferruccio try the merge_coercion patch.

[helm.git] / helm / ocaml / library / librarySync.ml

diff --git a/helm/ocaml/library/librarySync.ml b/helm/ocaml/library/librarySync.ml
index e41316ec628a5bb2714c073c6e0ad1ba791421a2..707b355b0995304bbe1da901a0a27daac07a1227 100644 (file)
--- a/helm/ocaml/library/librarySync.ml
+++ b/helm/ocaml/library/librarySync.ml
@@ -25,6 +25,82 @@
 
 exception AlreadyDefined of UriManager.uri
 
+let auxiliary_lemmas_hashtbl = UriManager.UriHashtbl.create 29
+
+let merge_coercions 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) 
+      in
+      let ty = aux 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) 
+      in
+      let ty = aux ty in
+        C.Variable (name, body, ty, params, attrs)
+  | C.CurrentProof (_name, _conjectures, _body, _ty, _params, _attrs) ->
+      assert false
+  | C.InductiveDefinition (indtys, params, leftno, attrs) ->
+      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
+            (name, ind, arity, cl))
+          indtys
+      in
+        C.InductiveDefinition (indtys, params, leftno, attrs)
+
 let uris_of_obj uri =
  let innertypesuri = UriManager.innertypesuri_of_uri uri in
  let bodyuri = UriManager.bodyuri_of_uri uri in
@@ -93,6 +169,14 @@ let index_obj =
    profiler.HExtlib.profile (fun uri -> MetadataDb.index_obj ~dbd ~uri) uri
 
 let add_single_obj uri obj ~basedir =
+  let obj = 
+    if List.mem `Generated (CicUtil.attributes_of_obj obj) &&
+       not (CoercGraph.is_a_coercion (Cic.Const (uri, [])))
+    then
+      merge_coercions obj 
+    else
+      obj 
+  in
   let dbd = LibraryDb.instance () in
   if CicEnvironment.in_library uri then
     raise (AlreadyDefined uri)
@@ -137,7 +221,7 @@ let remove_single_obj uri =
          HExtlib.rmdir_descend (Filename.dirname file)
       with Http_getter_types.Key_not_found _ -> ());
       ignore (LibraryDb.remove_uri uri);
-      CoercDb.remove_coercion (fun (_,_,u) -> UriManager.eq u uri);
+      CoercGraph.remove_coercion uri;
       CicEnvironment.remove_obj uri)
   to_remove
 
@@ -161,17 +245,28 @@ let generate_elimination_principles ~basedir uri =
 
 let generate_projections ~basedir uri fields =
  let uris = ref [] in
- let projections = CicRecord.projections_of uri fields in
+ let projections = CicRecord.projections_of uri (List.map fst fields) in
   try
-   List.iter
-    (fun (uri, name, bo) ->
+   List.iter2 
+    (fun (uri, name, bo) (_name, coercion) ->
       try
        let ty, ugraph =
          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;
-        uris := uri :: !uris
+        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
+          else  
+            []
+        in
+        uris := uri :: composites @ !uris
       with
          CicTypeChecker.TypeCheckerFailure s ->
           HLog.message
@@ -181,13 +276,12 @@ let generate_projections ~basedir uri fields =
            HLog.message
             ("Unable to create projection " ^ name ^ " because it requires " ^
                depend)
-    ) projections;
+    ) projections fields;
    !uris
   with exn ->
    List.iter remove_single_obj !uris;
    raise exn
 
-let auxiliary_lemmas_hashtbl = UriManager.UriHashtbl.create 29
 
 let add_obj uri obj ~basedir =
  add_single_obj uri obj ~basedir;