}
let rec count_term_binder f c e = function
- | B.Abst w ->
+ | B.Abst (_, w) ->
let c = {c with tabsts = succ c.tabsts; nodes = succ c.nodes} in
count_term f c e w
- | B.Abbr v ->
+ | B.Abbr (_, v) ->
let c = {c with tabbrs = succ c.tabbrs; xnodes = succ c.xnodes} in
count_term f c e v
- | B.Void ->
+ | B.Void _ ->
let c = {c with tvoids = succ c.tvoids; xnodes = succ c.xnodes} in
f c
f {c with tsorts = succ c.tsorts; nodes = succ c.nodes}
| B.LRef (_, i) ->
let err _ = f {c with tlrefs = succ c.tlrefs; nodes = succ c.nodes} in
- let f _ _ = function
+ let f _ = function
| B.Abst _
- | B.Void ->
+ | B.Void _ ->
f {c with tlrefs = succ c.tlrefs; nodes = succ c.nodes}
| B.Abbr _ ->
f {c with tlrefs = succ c.tlrefs; xnodes = succ c.xnodes}
let c = {c with tappls = succ c.tappls; nodes = succ c.nodes} in
let f c = count_term f c e t in
count_term f c e v
- | B.Bind (a, b, t) ->
+ | B.Bind (b, t) ->
let f c e = count_term f c e t in
- let f c = B.push (f c) e a b in
+ let f c = B.push (f c) e b in
count_term_binder f c e b
let count_obj f c = function
- | (_, u, B.Abst w) ->
+ | (_, u, B.Abst (_, w)) ->
let c = {c with
eabsts = succ c.eabsts; nodes = succ c.nodes; uris = u :: c.uris
} in
count_term f c B.empty_context w
- | (_, _, B.Abbr v) ->
+ | (_, _, B.Abbr (_, v)) ->
let c = {c with eabbrs = succ c.eabbrs; xnodes = succ c.xnodes} in
count_term f c B.empty_context v
- | (_, u, B.Void) ->
+ | (_, u, B.Void _) ->
let c = {c with
evoids = succ c.evoids; nodes = succ c.nodes; uris = u :: c.uris
} in
L.warn (P.sprintf " + Abbreviation nodes: %7u" nodes);
f ()
+(* supplementary annotation *************************************************)
+
+let attrs_of_binder f = function
+ | B.Abst (a, _)
+ | B.Abbr (a, _)
+ | B.Void a -> f a
+
+let rec does_not_occur f n r = function
+ | B.Null -> f true
+ | B.Cons (c, _, b) ->
+ let f n1 r1 =
+ if n1 = n && r1 = r then f false else does_not_occur f n r c
+ in
+ attrs_of_binder (B.name C.err f) b
+
+let rename f c a =
+ let rec aux f c n r =
+ let f = function
+ | true -> f n r
+ | false -> aux f c (n ^ "'") r
+ in
+ does_not_occur f n r c
+ in
+ let f n0 r0 =
+ let f n r = if n = n0 && r = r0 then f a else f (B.Name (r, n) :: a) in
+ aux f c n0 r0
+ in
+ B.name C.err f a
+
+let rename_bind f c = function
+ | B.Abst (a, w) -> let f a = f (B.abst a w) in rename f c a
+ | B.Abbr (a, v) -> let f a = f (B.abbr a v) in rename f c a
+ | B.Void a -> let f a = f (B.Void a) in rename f c a
+
(* context/term pretty printing *********************************************)
let id frm a =
B.name C.err f a
let rec pp_term c frm = function
- | B.Sort (_, h) ->
+ | B.Sort (_, h) ->
let err () = F.fprintf frm "@[*%u@]" h in
let f s = F.fprintf frm "@[%s@]" s in
H.get_sort err f h
- | B.LRef (_, i) ->
+ | B.LRef (_, i) ->
let err i = F.fprintf frm "@[#%u@]" i in
- let f _ a _ = F.fprintf frm "@[%a@]" id a in
+ let f _ = function
+ | B.Abst (a, _)
+ | B.Abbr (a, _)
+ | B.Void a -> F.fprintf frm "@[%a@]" id a
+ in
if !O.indexes then err i else B.get err f c i
- | B.GRef (_, s) -> F.fprintf frm "@[$%s@]" (U.string_of_uri s)
- | B.Cast (_, u, t) ->
+ | B.GRef (_, s) ->
+ F.fprintf frm "@[$%s@]" (U.string_of_uri s)
+ | B.Cast (_, u, t) ->
F.fprintf frm "@[{%a}.%a@]" (pp_term c) u (pp_term c) t
- | B.Appl (_, v, t) ->
+ | B.Appl (_, v, t) ->
F.fprintf frm "@[(%a).%a@]" (pp_term c) v (pp_term c) t
- | B.Bind (a, B.Abst w, t) ->
- let f cc =
+ | B.Bind (B.Abst (a, w), t) ->
+ let f a cc =
F.fprintf frm "@[[%a:%a].%a@]" id a (pp_term c) w (pp_term cc) t
in
- B.push f c a (B.Abst w)
- | B.Bind (a, B.Abbr v, t) ->
- let f cc =
+ let f a = B.push (f a) c (B.abst a w) in
+ rename f c a
+ | B.Bind (B.Abbr (a, v), t) ->
+ let f a cc =
F.fprintf frm "@[[%a=%a].%a@]" id a (pp_term c) v (pp_term cc) t
in
- B.push f c a (B.Abbr v)
- | B.Bind (a, B.Void, t) ->
- let f cc = F.fprintf frm "@[[%a].%a@]" id a (pp_term cc) t in
- B.push f c a B.Void
+ let f a = B.push (f a) c (B.abbr a v) in
+ rename f c a
+ | B.Bind (B.Void a, t) ->
+ let f a cc = F.fprintf frm "@[[%a].%a@]" id a (pp_term cc) t in
+ let f a = B.push (f a) c (B.Void a) in
+ rename f c a
let pp_context frm c =
- let pp_entry f c a = function
- | B.Abst w ->
- F.fprintf frm "@,@[%a : %a@]" id a (pp_term c) w; f ()
- | B.Abbr v ->
- F.fprintf frm "@,@[%a = %a@]" id a (pp_term c) v; f ()
- | B.Void ->
- F.fprintf frm "@,%a" id a; f ()
+ let pp_entry f c = function
+ | B.Abst (a, w) ->
+ let f a = F.fprintf frm "@,@[%a : %a@]" id a (pp_term c) w; f () in
+ rename f c a
+ | B.Abbr (a, v) ->
+ let f a = F.fprintf frm "@,@[%a = %a@]" id a (pp_term c) v; f () in
+ rename f c a
+ | B.Void a ->
+ let f a = F.fprintf frm "@,%a" id a; f () in
+ rename f c a
in
B.rev_iter C.start pp_entry c
in
B.name C.start f a
-let rec exp_term frm = function
+let rec exp_term c frm = function
| B.Sort (a, l) ->
+ let a =
+ let err _ = a in
+ let f s = B.Name (true, s) :: a in
+ H.get_sort err f l
+ in
F.fprintf frm "<Sort position=%S%a/>" (string_of_int l) id a
| B.LRef (a, i) ->
+ let a =
+ let err _ = a in
+ let f n r = B.Name (r, n) :: a in
+ let f _ b = attrs_of_binder (B.name err f) b in
+ B.get err f c i
+ in
F.fprintf frm "<LRef position=%S%a/>" (string_of_int i) id a
| B.GRef (a, u) ->
+ let a = B.Name (true, U.name_of_uri u) :: a in
F.fprintf frm "<GRef uri=%S%a/>" (U.string_of_uri u) id a
| B.Cast (a, w, t) ->
- F.fprintf frm "<Cast%a/>%a%a" id a exp_boxed w exp_term t
+ F.fprintf frm "<Cast%a>%a</Cast>@,%a" id a (exp_boxed c) w (exp_term c) t
| B.Appl (a, v, t) ->
- F.fprintf frm "<Appl%a/>%a%a" id a exp_boxed v exp_term t
- | B.Bind (a, b, t) ->
- F.fprintf frm "%a%a" (exp_bind a) b exp_term t
-
-and exp_boxed frm t =
- F.fprintf frm "@,@[<v3> %a@]@," exp_term t
-
-and exp_bind a frm = function
- | B.Abst w ->
- F.fprintf frm "<Abst%a/>%a" id a exp_boxed w
- | B.Abbr v ->
- F.fprintf frm "<Abbr%a/>%a" id a exp_boxed v
- | B.Void ->
+ F.fprintf frm "<Appl%a>%a</Appl>@,%a" id a (exp_boxed c) v (exp_term c) t
+ | B.Bind (b, t) ->
+ let f b cc = F.fprintf frm "%a@,%a" (exp_bind c) b (exp_term cc) t in
+ let f b = B.push (f b) c b in
+ rename_bind f c b
+
+and exp_boxed c frm t =
+ F.fprintf frm "@,@[<v3> %a@]@," (exp_term c) t
+
+and exp_bind c frm = function
+ | B.Abst (a, w) ->
+ F.fprintf frm "<Abst%a>%a</Abst>" id a (exp_boxed c) w
+ | B.Abbr (a, v) ->
+ F.fprintf frm "<Abbr%a/>%a</Abbr>" id a (exp_boxed c) v
+ | B.Void a ->
F.fprintf frm "<Void%a/>" id a
-let exp_obj frm = function
- | _, uri, B.Abst w ->
- let str = U.string_of_uri uri in
- F.fprintf frm "<ABST uri=%S/>@,%a" str exp_term w
- | _, uri, B.Abbr v ->
- let str = U.string_of_uri uri in
- F.fprintf frm "<ABBR uri=%S/>@,%a" str exp_term v
- | _, uri, B.Void ->
- let str = U.string_of_uri uri in
- F.fprintf frm "<VOID uri=%S/>" str
+let exp_obj c frm = function
+ | _, u, B.Abst (a, w) ->
+ let str = U.string_of_uri u in
+ let a = B.Name (true, U.name_of_uri u) :: a in
+ F.fprintf frm "<ABST uri=%S%a>%a</ABST>" str id a (exp_boxed c) w
+ | _, u, B.Abbr (a, v) ->
+ let str = U.string_of_uri u in
+ let a = B.Name (true, U.name_of_uri u) :: a in
+ F.fprintf frm "<ABBR uri=%S%a>%a</ABBR>" str id a (exp_boxed c) v
+ | _, u, B.Void a ->
+ let str = U.string_of_uri u in
+ let a = B.Name (true, U.name_of_uri u) :: a in
+ F.fprintf frm "<VOID uri=%S%a/>" str id a
let export_obj frm obj =
- F.fprintf frm "@,@[<v3> %a@]@," exp_obj obj
+ F.fprintf frm "@,@[<v3> %a@]@," (exp_obj B.empty_context) obj
projects / helm.git / blobdiff