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 _ ->
;;
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
| (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
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))
;;
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
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
;;
| 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
;;
-
-
-