\ / This software is distributed as is, NO WARRANTY.
V_______________________________________________________________ *)
+module U = NUri
module L = Log
+module Y = Entity
module B = Bag
module E = BagEnvironment
module T = BagType
(* Interface functions ******************************************************)
(* to share *)
-let type_check f ?(si=false) g = function
- | None -> f None None
- | Some (a, uri, B.Abst t) ->
- let f tt entry = f (Some tt) (Some entry) in
- let f xt tt = E.set_entry (f tt) (a, uri, B.Abst xt) in
- L.loc := a; T.type_of f ~si g B.empty_lenv t
- | Some (a, uri, B.Abbr t) ->
- let f tt entry = f (Some tt) (Some entry) in
- let f xt tt = E.set_entry (f tt) (a, uri, B.Abbr xt) in
- L.loc := a; T.type_of f ~si g B.empty_lenv t
- | Some (a, uri, B.Void) ->
- let f entry = f None (Some entry) in
- L.loc := a; E.set_entry f (a, uri, B.Void)
+let type_check 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 f st B.empty_lenv 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 f st B.empty_lenv t
+ | _, _, Y.Void -> assert false