(* Interface functions ******************************************************)
(* to share *)
-let type_check err f ?(si=false) g = function
+let type_check err f st = function
| a, uri, Y.Abst t ->
- let f xt tt = E.set_entity (f tt) (a, uri, Y.Abst xt) in
- L.loc := U.string_of_uri uri; T.type_of err f ~si g R.empty_kam t
+ let f xt tt =
+ let e = E.set_entity (a, uri, Y.Abst xt) in f tt e
+ in
+ L.loc := U.string_of_uri uri; T.type_of err f st R.empty_kam t
| a, uri, Y.Abbr t ->
- let f xt tt = E.set_entity (f tt) (a, uri, Y.Abbr xt) in
- L.loc := U.string_of_uri uri; T.type_of err f ~si g R.empty_kam t
+ let f xt tt =
+ let xt = match xt with
+ | B.Cast _ -> xt
+ | _ -> B.Cast ([], tt, xt)
+ in
+ let e = E.set_entity (a, uri, Y.Abbr xt) in f tt e
+ in
+ L.loc := U.string_of_uri uri; T.type_of err f st R.empty_kam t
+ | _, _, Y.Void -> assert false