module S = Share
module L = Log
module H = Hierarchy
-module I = AutItem
module B = Bag
module O = BagOutput
module E = BagEnvironment
let map t v = B.Appl (v, t) in
List.fold_left map (B.GRef u) l
-let add_coercion f t (i, uri, vs) =
- let rec add f x = match x with
- | B.Sort _
- | B.LRef _
- | B.GRef _ -> f x
- | B.Cast (u, t) ->
- let f uu =
- let f tt = f (S.sh2 u uu t tt x B.cast) in
- add f t
- in
- add f u
- | B.Appl (v, t) ->
- let f vv =
- let f tt = f (S.sh2 v vv t tt x B.appl) in
- add f t
- in
- add f v
- | B.Bind (l, _, _, _) when i = l ->
- if U.eq uri I.imp then f (mk_gref I.mt (vs @ [x])) else
- if U.eq uri I.all then f (mk_gref I.alli (vs @ [x])) else
- assert false
- | B.Bind (l, id, B.Abst w, t) ->
- let f ww =
- let f tt = f (S.sh2 w ww t tt x (B.bind_abst l id)) in
- add f t
- in
- add f w
- | B.Bind (l, id, B.Abbr v, t) ->
- let f vv =
- let f tt = f (S.sh2 v vv t tt x (B.bind_abbr l id)) in
- add f t
- in
- add f v
- | B.Bind (l, id, B.Void, t) ->
- let f tt = f (S.sh1 t tt x (B.bind l id B.Void)) in
- add f t
- in
- add f t
-
-let add_coercions f = C.list_fold_left f add_coercion
-
(* Interface functions ******************************************************)
let rec b_type_of f g c x =
L.box (succ level);
L.log O.specs (succ level) (L.t_items1 "Just scanned" c w);
L.unbox (succ level);
- let f = function
- | Some [] -> f (S.sh2 v xv t xt x B.appl) (B.appl xv tt)
- | Some l ->
- L.log O.specs level (L.items1 "Rechecking coerced term");
- let f xv = b_type_of f g c (S.sh2 v xv t xt x B.appl) in
- add_coercions f xv l
- | None -> error3 c xv vv w
+ let f a =
+ L.box (succ level);
+ L.warn (Printf.sprintf "Convertible: %b" a);
+ L.unbox (succ level);
+ if a then f (S.sh2 v xv t xt x B.appl) (B.appl xv tt)
+ else error3 c xv vv w
in
R.are_convertible f c w vv
-(* inserting a missing "modus ponens" *)
- | R.GRef (uri, vs) when U.eq uri I.imp && !R.ext = R.No ->
- L.log O.specs level (L.items1 "Rechecking coerced term");
- b_type_of f g c (mk_gref I.mp (vs @ [xv; xt]))
- | R.GRef (uri, vs) when U.eq uri I.all && !R.ext = R.No ->
- L.log O.specs level (L.items1 "Rechecking coerced term");
- b_type_of f g c (mk_gref I.alle (vs @ [xt; xv]))
| _ ->
error1 "not a function" c xt
in
let f xv vv = b_type_of (f xv vv) g c t in
type_of f g c v
| B.Cast (u, t) ->
- let f xu xt tt = function
- | Some [] -> f (S.sh2 u xu t xt x B.cast) xu
- | Some l ->
- L.log O.specs level (L.items1 "Rechecking coerced term");
- let f xt = b_type_of f g c (S.sh2 u xu t xt x B.cast) in
- add_coercions f xt l
- | None -> error3 c xt tt xu
+ let f xu xt tt a =
+ L.box (succ level);
+ L.warn (Printf.sprintf "Convertible: %b" a);
+ L.unbox (succ level);
+ if a then f (S.sh2 u xu t xt x B.cast) xu else error3 c xt tt xu
in
let f xu xt tt = R.are_convertible (f xu xt tt) c xu tt in
let f xu _ = b_type_of (f xu) g c t in