module U = NUri
module C = Cps
module L = Log
+module Y = Entity
module B = Bag
module O = BagOutput
module E = BagEnvironment
type whd_result =
| Sort_ of int
| LRef_ of int * B.term option
- | GRef_ of B.entry
+ | GRef_ of B.entity
| Bind_ of int * B.id * B.term * B.term
type ho_whd_result =
| B.Sort h -> f m (Sort_ h)
| B.GRef uri ->
let f entry = f m (GRef_ entry) in
- E.get_entry f uri
+ E.get_entity f uri
| B.LRef i ->
let f = function
| B.Void -> f m (LRef_ (i, None))
| Bind_ (_, _, w, _) ->
let f w = f (Abst w) in unwind_to_term f m w
| LRef_ (_, Some w) -> ho_whd f c m w
- | GRef_ (_, _, B.Abst w) -> ho_whd f c m w
- | GRef_ (_, _, B.Abbr v) -> ho_whd f c m v
+ | GRef_ (_, _, Y.Abst w) -> ho_whd f c m w
+ | GRef_ (_, _, Y.Abbr v) -> ho_whd f c m v
| LRef_ (_, None) -> assert false
- | GRef_ (_, _, B.Void) -> assert false
+ | GRef_ (_, _, Y.Void) -> assert false
in
whd aux c m x
if h1 = h2 then f a else f false
| LRef_ (i1, _), LRef_ (i2, _) ->
if i1 = i2 then are_convertible_stacks f ~si a c m1 m2 else f false
- | GRef_ (a1, _, B.Abst _), GRef_ (a2, _, B.Abst _) ->
+ | GRef_ ((Y.Apix a1 :: _), _, Y.Abst _),
+ GRef_ ((Y.Apix a2 :: _), _, Y.Abst _) ->
if a1 = a2 then are_convertible_stacks f ~si a c m1 m2 else f false
- | GRef_ (a1, _, B.Abbr v1), GRef_ (a2, _, B.Abbr v2) ->
+ | GRef_ ((Y.Apix a1 :: _), _, Y.Abbr v1),
+ GRef_ ((Y.Apix a2 :: _), _, Y.Abbr v2) ->
if a1 = a2 then
let f a =
if a then f a else are_convertible f ~si true c m1 v1 m2 v2
else
if a1 < a2 then whd (aux m1 r1) c m2 v2 else
whd (aux_rev m2 r2) c m1 v1
- | _, GRef_ (_, _, B.Abbr v2) ->
+ | _, GRef_ (_, _, Y.Abbr v2) ->
whd (aux m1 r1) c m2 v2
- | GRef_ (_, _, B.Abbr v1), _ ->
+ | GRef_ (_, _, Y.Abbr v1), _ ->
whd (aux_rev m2 r2) c m1 v1
| Bind_ (l1, id1, w1, t1), Bind_ (l2, id2, w2, t2) ->
let l = B.new_location () in