type uri = E.uri
type id = E.id
-type attrs = E.node_attrs
+type n_attrs = E.node_attrs
+type b_attrs = E.bind_attrs
-type bind = Abst of N.layer * term (* layer, type *)
- | Abbr of term (* body *)
- | Void (* *)
-and term = TSort of attrs * int (* attrs, hierarchy index *)
- | TLRef of attrs * int (* attrs, position indexe *)
- | TGRef of attrs * uri (* attrs, reference *)
- | TCast of attrs * term * term (* attrs, domain, element *)
- | TAppl of attrs * term * term (* attrs, argument, function *)
- | TBind of attrs * bind * term (* attrs, binder, scope *)
- | TProj of attrs * lenv * term (* attrs, closure, member *)
+type bind = Abst of bool * N.layer * term (* x-reduced?, layer, type *)
+ | Abbr of term (* body *)
+ | Void (* *)
-and lenv = ESort (* top *)
- | EBind of lenv * attrs * bind (* environment, attrs, binder *)
- | EAppl of lenv * attrs * term (* environment, attrs, argument *)
- | EProj of lenv * attrs * lenv (* environment, attrs, closure *)
+and term = TSort of int (* hierarchy index *)
+ | TLRef of n_attrs * int (* attrs, position indexe *)
+ | TGRef of n_attrs * uri (* attrs, reference *)
+ | TCast of term * term (* domain, element *)
+ | TAppl of bool * term * term (* extended?, argument, function *)
+ | TBind of b_attrs * bind * term (* attrs, binder, scope *)
+ | TProj of lenv * term (* closure, member *)
+
+and lenv = ESort (* top *)
+ | EBind of lenv * n_attrs * b_attrs * bind (* environment, attrs, binder *)
+ | EAppl of lenv * bool * term (* environment, extended?, argument *)
+ | EProj of lenv * lenv (* environment, closure *)
type entity = term E.entity
let empty_lenv = ESort
-let push_bind f a b lenv = f (EBind (lenv, a, b))
+let push_bind f a y b lenv = f (EBind (lenv, a, y, b))
-let push_appl f a t lenv = f (EAppl (lenv, a, t))
+let push_appl f x t lenv = f (EAppl (lenv, x, t))
-let push_proj f a e lenv = f (EProj (lenv, a, e))
+let push_proj f e lenv = f (EProj (lenv, e))
-let add_bind f a b t = f (TBind (a, b, t))
+let add_bind f y b t = f (TBind (y, b, t))
-let add_appl f a v t = f (TAppl (a, v, t))
+let add_appl f x v t = f (TAppl (x, v, t))
-let add_proj f a e t = f (TProj (a, e, t))
+let add_proj f e t = f (TProj (e, t))
let rec shift f c t = match c with
- | ESort -> f t
- | EBind (e, a, b) -> add_bind (shift f e) a b t
- | EAppl (e, a, v) -> add_appl (shift f e) a v t
- | EProj (e, a, d) -> add_proj (shift f e) a d t
+ | ESort -> f t
+ | EBind (e, _, y, b) -> add_bind (shift f e) y b t
+ | EAppl (e, x, v) -> add_appl (shift f e) x v t
+ | EProj (e, d) -> add_proj (shift f e) d t
let rec append f c = function
- | ESort -> f c
- | EBind (e, a, b) -> append (push_bind f a b) c e
- | EAppl (e, a, t) -> append (push_appl f a t) c e
- | EProj (e, a, d) -> append (push_proj f a d) c e
+ | ESort -> f c
+ | EBind (e, a, y, b) -> append (push_bind f a y b) c e
+ | EAppl (e, x, t) -> append (push_appl f x t) c e
+ | EProj (e, d) -> append (push_proj f d) c e
let resolve_lref err f id lenv =
let rec aux i = function
- | ESort -> err ()
- | EAppl (tl, _, _) -> aux i tl
- | EBind (tl, a, _) ->
- let f id0 _ = if id0 = id then f a i else aux (succ i) tl in
+ | ESort -> err ()
+ | EAppl (tl, _, _) -> aux i tl
+ | EBind (tl, a, y, _) ->
+ let f id0 _ = if id0 = id then f a y i else aux (succ i) tl in
let err () = aux (succ i) tl in
- E.name err f a
- | EProj (tl, _, d) -> append (aux i) tl d
+ E.name err f y
+ | EProj (tl, d) -> append (aux i) tl d
in
aux 0 lenv
let rec get_name err f i = function
- | ESort -> err i
- | EAppl (tl, _, _) -> get_name err f i tl
- | EBind (_, a, _) when i = 0 ->
+ | ESort -> err i
+ | EAppl (tl, _, _) -> get_name err f i tl
+ | EBind (_, _, y, _) when i = 0 ->
let err () = err i in
- E.name err f a
- | EBind (tl, _, _) -> get_name err f (pred i) tl
- | EProj (tl, _, e) ->
+ E.name err f y
+ | EBind (tl, _, _, _) -> get_name err f (pred i) tl
+ | EProj (tl, e) ->
let err i = get_name err f i tl in
get_name err f i e
let rec get e i = match e with
- | ESort -> ESort, E.empty_node, Void
- | EBind (e, a, b) when i = 0 -> e, a, b
- | EBind (e, _, _) -> get e (pred i)
- | EAppl (e, _, _) -> get e i
- | EProj (e, _, d) -> get (append C.start e d) i
+ | ESort -> ESort, E.empty_node, E.empty_bind, Void
+ | EBind (e, a, y, b) when i = 0 -> e, a, y, b
+ | EBind (e, _, _, _) -> get e (pred i)
+ | EAppl (e, _, _) -> get e i
+ | EProj (e, d) -> get (append C.start e d) i
let rec sub_list_strict f e l = match e, l with
- | _, [] -> f e
- | EBind (e, _, Abst _), _ :: tl -> sub_list_strict f e tl
- | _ -> assert false
+ | _, [] -> f e
+ | EBind (e, _, _, Abst _), _ :: tl -> sub_list_strict f e tl
+ | _ -> assert false
let rec fold_names f map x = function
- | ESort -> f x
- | EBind (e, {E.n_name = Some n}, Abst _) -> fold_names f map (map x n) e
- | _ -> assert false
-
-let rec mem err f e b = match e with
- | ESort -> err ()
- | EBind (e, a, _) ->
- if a.E.n_name = b.E.n_name then f () else mem err f e b
- | EAppl (e, _, _) -> mem err f e b
- | EProj (e, _, d) ->
- let err () = mem err f e b in mem err f d b
-
-let replace f n0 e =
+ | ESort -> f x
+ | EBind (e, _, {E.b_name = Some n}, Abst _) -> fold_names f map (map x n) e
+ | _ -> assert false
+
+let rec mem err f e y0 = match e with
+ | ESort -> err ()
+ | EBind (e, _, y, _) ->
+ if y.E.b_name = y0.E.b_name then f () else mem err f e y0
+ | EAppl (e, _, _) -> mem err f e y0
+ | EProj (e, d) ->
+ let err () = mem err f e y0 in mem err f d y0
+
+let set_layer f n0 e =
let rec aux f = function
- | ESort -> f ESort
- | EBind (e, a, Abst (n, w)) -> aux (push_bind f a (Abst (n0, w))) e
- | EBind (e, a, b) -> aux (push_bind f a b) e
- | EAppl (e, a, v) -> aux (push_appl f a v) e
- | EProj (e, a, d) -> let f d = aux (push_proj f a d) e in aux f d
+ | ESort -> f ESort
+ | EBind (e, a, y, Abst (r, n, w)) -> aux (push_bind f a y (Abst (r, n0, w))) e
+ | EBind (e, a, y, b) -> aux (push_bind f a y b) e
+ | EAppl (e, x, v) -> aux (push_appl f x v) e
+ | EProj (e, d) -> let f d = aux (push_proj f d) e in aux f d
+ in
+ aux f e
+let set_attrs f y0 e =
+ let rec aux f = function
+ | ESort -> f ESort
+ | EBind (e, a, y, b) ->
+ let y = E.compose y y0 in
+ aux (push_bind f a y b) e
+ | EAppl (e, x, v) ->
+ aux (push_appl f x v) e
+ | EProj (e, d) ->
+ let f d = aux (push_proj f d) e in
+ aux f d
in
aux f e