module C = Cps
module S = Share
module L = Log
+module Y = Entity
module H = Hierarchy
module B = Bag
module O = BagOutput
log1 "Now checking" c x;
match x with
| B.Sort h ->
- let f h = f x (B.Sort h) in H.apply f g h
+ let h = H.apply g h in f x (B.Sort h)
| B.LRef i ->
let f = function
| Some (_, B.Abst w) -> f x w
B.get f c i
| B.GRef uri ->
let f = function
- | _, _, B.Abst w -> f x w
- | _, _, B.Abbr (B.Cast (w, v)) -> f x w
- | _, _, B.Abbr _ -> assert false
- | _, _, B.Void ->
- error1 "reference to excluded entry" c x
+ | _, _, Y.Abst w -> f x w
+ | _, _, Y.Abbr (B.Cast (w, v)) -> f x w
+ | _, _, Y.Abbr _ -> assert false
+ | _, _, Y.Void -> assert false
in
- E.get_entry f uri
+ E.get_entity f uri
| B.Bind (l, id, B.Abbr v, t) ->
let f xv xt tt =
f (S.sh2 v xv t xt x (B.bind_abbr l id)) (B.bind_abbr l id xv tt)