1. The last commit that fixed unification of compound coercions with

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

diff --git a/helm/ocaml/library/librarySync.ml b/helm/ocaml/library/librarySync.ml
index 92926464ba294eeb82d26c6a3f1e0620e9e3016d..7363697d5522a96a8b2551ae1264b14874411bf9 100644 (file)
--- a/helm/ocaml/library/librarySync.ml
+++ b/helm/ocaml/library/librarySync.ml
@@ -37,66 +37,73 @@ let auxiliary_lemmas_hashtbl = UriManager.UriHashtbl.create 29
  * *)
 let coercion_hashtbl = UriManager.UriHashtbl.create 3
 
-let merge_coercions obj =
+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]) ] 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
@@ -104,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
@@ -183,7 +190,7 @@ let add_single_obj uri obj ~basedir =
     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