X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=components%2Flibrary%2FcoercDb.ml;h=2e93efa0eb8e09c43bc47b7946e83069491ac14c;hb=6bb370c6e1a036e82315765d6dceb1939c30ed23;hp=8b7982ea0576645c531fc82e5c599633ffcf39b2;hpb=d9a1441c59bd7f20ef2c47d40bd29d4253f54876;p=helm.git

diff --git a/components/library/coercDb.ml b/components/library/coercDb.ml
index 8b7982ea0..2e93efa0e 100644
--- a/components/library/coercDb.ml
+++ b/components/library/coercDb.ml
@@ -25,7 +25,13 @@
 
 (* $Id$ *)
 
-type coerc_carr = Uri of UriManager.uri | Sort of Cic.sort | Term of Cic.term
+type coerc_carr = 
+  | Uri of UriManager.uri 
+  | Sort of Cic.sort 
+  | Term of Cic.term
+  | Fun of int 
+;;
+
 exception EqCarrNotImplemented of string Lazy.t
 exception EqCarrOnNonMetaClosed
 
@@ -34,13 +40,18 @@ let db = ref []
 let coerc_carr_of_term t =
  try
   match t with
-     Cic.Sort s -> Sort s
+   | Cic.Sort s -> Sort s
+   | Cic.Prod _ -> Fun 0
    | Cic.Appl (t::_)
    | t -> Uri (CicUtil.uri_of_term t)
  with Invalid_argument _ ->
   Term t
 ;;
 
+let uri_of_carr = function
+  | Uri u -> Some u
+  | _ -> None
+
 let rec name_of_carr = function
   | Uri u -> UriManager.name_of_uri u
   | Sort s -> CicPp.ppsort s
@@ -52,6 +63,8 @@ let rec name_of_carr = function
   | Term t -> 
       prerr_endline ("CoercDb.name_of_carr:" ^ CicPp.ppterm t); 
       "FixTheNameMangler"
+  | Fun i -> "FunClass_" ^ string_of_int i   
+;;
 
 let eq_carr src tgt =
   match src, tgt with
@@ -67,33 +80,102 @@ let eq_carr src tgt =
           (lazy ("Unsupported carr for coercions: " ^ 
           CicPp.ppterm t1 ^ " or " ^ CicPp.ppterm t2)))
       else raise EqCarrOnNonMetaClosed
+  | Fun _,Fun _ -> true (* only one Funclass? *)
+(*   | Fun i,Fun j when i=j -> true *)
+  | Term t, _
+  | _, Term t when not (CicUtil.is_meta_closed t) -> raise EqCarrOnNonMetaClosed
   | _, _ -> false
+;;
 
 let to_list () =
-  !db
-
-let add_coercion c =
-  db := c :: !db
+  List.map (fun (s,t,l) -> s,t,List.map fst l) !db
+;;
 
-let remove_coercion p = 
-  db := List.filter (fun u -> not(p u)) !db
+let rec myfilter p = function
+  | [] -> []
+  | (s,t,l)::tl ->
+      let l = 
+        HExtlib.filter_map 
+          (fun (u,n) -> 
+            if p (s,t,u) then
+              if n = 1 then
+                None
+              else
+                Some (u,n-1)
+            else
+              Some (u,n)) 
+          l 
+      in
+      if l = [] then myfilter p tl else (s,t,l)::myfilter p tl
+;;
+  
+let remove_coercion p = db := myfilter p !db;;
 
 let find_coercion f =
-  List.map (fun (_,_,x) -> x) (List.filter (fun (s,t,_) -> f (s,t)) !db)
-
-let is_a_coercion u =
-  List.exists (fun (_,_,x) -> UriManager.eq x u) !db
+    List.map
+    fst
+    (List.flatten
+    (HExtlib.filter_map (fun (s,t,l) -> if f (s,t) then Some l else None) !db))
+;;
 
 let get_carr uri =
   try
-    let src, tgt, _ = List.find (fun (_,_,x) -> UriManager.eq x uri) !db in
+    let src, tgt, _ = 
+      List.find 
+        (fun (_,_,xl) -> List.exists (fun (x,_) -> UriManager.eq uri x) xl) 
+        !db 
+    in
     src, tgt
   with Not_found -> assert false (* uri must be a coercion *)
+;;
+
+let is_a_coercion u = 
+  List.exists 
+    (fun (_,_,xl) -> List.exists (fun (x,_) -> UriManager.eq u x) xl) 
+    !db
+;;
+
+let is_a_coercion' t = 
+  try
+    let uri = CicUtil.uri_of_term t in
+     is_a_coercion uri
+  with Invalid_argument _ -> false
+;;
+
+let is_a_coercion_to_funclass t =
+  try
+    let uri = CicUtil.uri_of_term t in
+    match snd (get_carr uri) with
+    | Fun i -> Some i
+    | _ -> None
+  with Invalid_argument _ -> None
+  
 
 let term_of_carr = function
   | Uri u -> CicUtil.term_of_uri u
   | Sort s -> Cic.Sort s
+  | Fun _ -> assert false
   | Term _ -> assert false
+;;
   
+let add_coercion (src,tgt,u) =
+  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
+  | (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))
+          l
+        in
+        db := (src,tgt,l')::tl @ rest
+      else
+        db := (src,tgt,(u,1)::l)::tl @ rest
+      
+;;
+