compose tactic restore and added nocomposites keyword

[helm.git] / components / library / coercDb.ml

diff --git a/components/library/coercDb.ml b/components/library/coercDb.ml
index 1f3874912b93ff231ca48563a1c9ad04d6f9e23c..0ca40eb1c2860cef5da6d5def71040cfb7422234 100644 (file)
--- a/components/library/coercDb.ml
+++ b/components/library/coercDb.ml
@@ -41,7 +41,10 @@ let coerc_carr_of_term t =
  try
   match t with
    | Cic.Sort s -> Sort s
-   | Cic.Prod _ -> assert false
+   | Cic.Prod _ -> Fun 0 
+     (* BUG: this should be the real arity. The computation
+      requires menv, context etc.., but since carrs are compared discharging Fun
+      arity... it works *)
    | Cic.Appl (t::_)
    | t -> Uri (CicUtil.uri_of_term t)
  with Invalid_argument _ ->
@@ -70,16 +73,12 @@ let eq_carr ?(exact=false) src tgt =
   match src, tgt with
   | Uri src, Uri tgt -> 
       let coarse_eq = UriManager.eq src tgt in
-      let src_noxpointer = UriManager.strip_xpointer src in
-      if exact && coarse_eq && UriManager.uri_is_ind src_noxpointer then
-        match 
-          fst (CicEnvironment.get_obj CicUniv.oblivion_ugraph src_noxpointer)
-        with
-        | Cic.InductiveDefinition (_,[],m,_) when m = 0 -> true
-        | Cic.Constant _ -> true
-        | _ -> false
-      else
-        coarse_eq
+      let t = CicUtil.term_of_uri src in
+      let ty,_ = CicTypeChecker.type_of_aux' [] [] t CicUniv.oblivion_ugraph in
+      (match ty, exact with
+      | Cic.Prod _, true -> false
+      | Cic.Prod _, false -> coarse_eq
+      | _ -> coarse_eq) 
   | Sort (Cic.Type _), Sort (Cic.Type _) -> true
   | Sort src, Sort tgt when src = tgt -> true
   | Term t1, Term t2 ->
@@ -99,7 +98,7 @@ let eq_carr ?(exact=false) src tgt =
 ;;
 
 let to_list () =
-  List.map (fun (s,t,l) -> s,t,List.map fst l) !db
+  List.map (fun (s,t,l) -> s,t,List.map (fun a,_,b -> a,b) l) !db
 ;;
 
 let rec myfilter p = function
@@ -107,14 +106,14 @@ let rec myfilter p = function
   | (s,t,l)::tl ->
       let l = 
         HExtlib.filter_map 
-          (fun (u,n) -> 
-            if p (s,t,u) then
+          (fun (u,n,saturations) -> 
+            if p (s,t,u,saturations) then
               if n = 1 then
                 None
               else
-                Some (u,n-1)
+                Some (u,n-1,saturations)
             else
-              Some (u,n)) 
+              Some (u,n,saturations)) 
           l 
       in
       if l = [] then myfilter p tl else (s,t,l)::myfilter p tl
@@ -124,7 +123,7 @@ let remove_coercion p = db := myfilter p !db;;
 
 let find_coercion f =
     List.map
-    fst
+    (fun uri,_,saturations -> uri,saturations)
     (List.flatten
     (HExtlib.filter_map (fun (s,t,l) -> if f (s,t) then Some l else None) !db))
 ;;
@@ -133,7 +132,7 @@ let get_carr uri =
   try
     let src, tgt, _ = 
       List.find 
-        (fun (_,_,xl) -> List.exists (fun (x,_) -> UriManager.eq uri x) xl) 
+        (fun (_,_,xl) -> List.exists (fun (x,_,_) -> UriManager.eq uri x) xl) 
         !db 
     in
     src, tgt
@@ -142,7 +141,7 @@ let get_carr uri =
 
 let is_a_coercion u = 
   List.exists 
-    (fun (_,_,xl) -> List.exists (fun (x,_) -> UriManager.eq u x) xl) 
+    (fun (_,_,xl) -> List.exists (fun (x,_,_) -> UriManager.eq u x) xl) 
     !db
 ;;
 
@@ -169,24 +168,25 @@ let term_of_carr = function
   | Term _ -> assert false
 ;;
   
-let add_coercion (src,tgt,u) =
+let add_coercion (src,tgt,u,saturations) =
   let f s t = eq_carr s src && eq_carr t tgt in
   let where = List.filter (fun (s,t,_) -> f s t) !db in
   let rest = List.filter (fun (s,t,_) -> not (f s t)) !db in
   match where with
-  | [] -> db := (src,tgt,[u,1]) :: !db
+  | [] -> db := (src,tgt,[u,1,saturations]) :: !db
   | (src,tgt,l)::tl ->
       assert (tl = []); (* not sure, this may be a feature *)
-      if List.exists (fun (x,_) -> UriManager.eq u x) l then
-        let l' = List.map 
-          (fun (x,n) -> if UriManager.eq u x then (x,n+1) else (x,n))
+      if List.exists (fun (x,_,_) -> UriManager.eq u x) l then
+        let l' = List.map
+          (fun (x,n,saturations') ->
+            if UriManager.eq u x then
+             (x,n+1,saturations)
+            else
+             (x,n,saturations))
           l
         in
         db := (src,tgt,l')::tl @ rest
       else
-        db := (src,tgt,(u,1)::l)::tl @ rest
+        db := (src,tgt,(u,1,saturations)::l)::tl @ rest
       
 ;;
-
-
-