let lenv_iter map_bind map_appl map_proj st e lenv out tab =
let rec aux = function
| D.ESort -> e
- | D.EBind (e, a, b) ->
+ | D.EBind (e, a, b) ->
let e = aux e in
(* NOTE: the inner binders are alpha-converted first *)
let a = R.alpha D.mem e a in
map_bind st e a b out tab; D.EBind (e, a, b)
- | D.EAppl (e, a, v) ->
+ | D.EAppl (e, a, x, v) ->
let e = aux e in
- map_appl st e a v out tab; D.EAppl (e, a, v)
+ map_appl st e a x v out tab; D.EAppl (e, a, x, v)
| D.EProj (e, a, d) ->
let e = aux e in
map_proj st e a d out tab; D.EProj (e, a, d)
let f n r = {a with E.n_name = Some (n, r)} in
D.get_name err f i e
in
- let attrs = [XL.position i; XL.name a] in
+ let attrs = [XL.position i; XL.name a ] in
XL.tag XL.lref attrs out tab
| D.TGRef (a, n) ->
let a = {a with E.n_name = Some (U.name_of_uri n, true)} in
- let attrs = [XL.uri n; XL.name a; XL.apix a] in
+ let attrs = [XL.uri n; XL.name a ] in
XL.tag XL.gref attrs out tab
| D.TCast (a, u, t) ->
let attrs = [] in
XL.tag XL.cast attrs ~contents:(exp_term st e u) out tab;
exp_term st e t out tab
- | D.TAppl (a, v, t) ->
+ | D.TAppl (a, x, v, t) ->
let attrs = [] in
- XL.tag XL.appl attrs ~contents:(exp_term st e v) out tab;
+ XL.tag (XL.appl x) attrs ~contents:(exp_term st e v) out tab;
exp_term st e t out tab
| D.TProj (a, lenv, t) ->
let attrs = [] in
exp_bind st e a b out tab;
exp_term st (D.push_bind C.start a b e) t out tab
-and exp_appl st e a v out tab =
+and exp_appl st e a x v out tab =
let attrs = [] in
- XL.tag XL.appl attrs ~contents:(exp_term st e v) out tab;
+ XL.tag (XL.appl x) attrs ~contents:(exp_term st e v) out tab;
and exp_bind st e a b out tab = match b with
- | D.Abst (n, w) ->
- let attrs = [XL.level st n; XL.name a; XL.kind a] in
+ | D.Abst (_, n, w) ->
+ let attrs = XL.layer st n :: XL.name a :: XL.main a in
XL.tag XL.abst attrs ~contents:(exp_term st e w) out tab
- | D.Abbr v ->
+ | D.Abbr v ->
let attrs = [XL.name a] in
XL.tag XL.abbr attrs ~contents:(exp_term st e v) out tab
- | D.Void ->
+ | D.Void ->
let attrs = [XL.name a] in
XL.tag XL.void attrs out tab