-let type_check err f ?(si=false) g = function
- | None -> f None None
- | Some (e, uri, B.Abst (a, t)) ->
- let f tt entry = f (Some tt) (Some entry) in
- let f xt tt = E.set_entry (f tt) (e, uri, B.abst a xt) in
- L.loc := e; T.type_of err f ~si g R.empty_kam t
- | Some (e, uri, B.Abbr (a, t)) ->
- let f tt entry = f (Some tt) (Some entry) in
- let f xt tt = E.set_entry (f tt) (e, uri, B.abbr a xt) in
- L.loc := e; T.type_of err f ~si g R.empty_kam t
- | Some (e, uri, (B.Void _ as b)) ->
- let f entry = f None (Some entry) in
- L.loc := e; E.set_entry f (e, uri, b)
+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 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