-let type_check f g = function
- | None -> f None None
- | Some (a, uri, B.Abst t) ->
- let f tt obj = f (Some tt) (Some obj) in
- let f xt tt = E.set_obj (f tt) (a, uri, B.Abst xt) in
- T.type_of f g B.empty_context t
- | Some (a, uri, B.Abbr t) ->
- let f tt obj = f (Some tt) (Some obj) in
- let f xt tt = E.set_obj (f tt) (a, uri, B.Abbr xt) in
- T.type_of f g B.empty_context t
- | Some (a, uri, B.Void) ->
- let f obj = f None (Some obj) in
- E.set_obj f (a, uri, B.Void)
+let type_check err f st = function
+ | a, uri, Y.Abst 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 =
+ 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