-let type_check f ?(si=false) g = function
- | None -> f None None
- | Some (e, uri, B.Abst t) ->
- let f tt obj = f (Some tt) (Some obj) in
- let f xt tt = E.set_obj (f tt) (e, uri, B.Abst xt) in
- L.loc := e; T.type_of f ~si g B.empty_context t
- | Some (e, uri, B.Abbr t) ->
- let f tt obj = f (Some tt) (Some obj) in
- let f xt tt = E.set_obj (f tt) (e, uri, B.Abbr xt) in
- L.loc := e; T.type_of f ~si g B.empty_context t
- | Some (e, uri, B.Void) ->
- let f obj = f None (Some obj) in
- L.loc := e; E.set_obj f (e, uri, B.Void)
+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)