module C = Cps
module U = NUri
module L = Log
+module Y = Entity
+module X = Library
module H = Hierarchy
module O = Output
module B = Brg
let f c = B.push (f c) e b in
count_term_binder f c e b
-let count_entry f c = function
- | (_, u, B.Abst (_, w)) ->
+let count_entity f c = function
+ | _, u, Y.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_lenv w
- | (_, _, B.Abbr (_, v)) ->
+ | _, _, Y.Abbr v ->
let c = {c with eabbrs = succ c.eabbrs; xnodes = succ c.xnodes} in
count_term f c B.empty_lenv v
- | (_, u, B.Void _) ->
- let c = {c with
- evoids = succ c.evoids; nodes = succ c.nodes; uris = u :: c.uris
- } in
- f c
-
-let count_entity f c = function
- | Some entry -> count_entry f c entry
- | None -> f c
let print_counters f c =
let terms =
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
+ attrs_of_binder (Y.name C.err f) b
let rename f c a =
let rec aux f c n r =
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
+ let f n r = if n = n0 && r = r0 then f a else f (Y.Name (n, r) :: a) in
aux f c n0 r0
in
- B.name C.err f a
+ Y.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
(* lenv/term pretty printing ************************************************)
-let id frm a =
+let name frm a =
let f n = function
| true -> F.fprintf frm "%s" n
| false -> F.fprintf frm "^%s" n
in
- B.name C.err f a
+ Y.name C.err f a
let rec pp_term c frm = function
| B.Sort (_, h) ->
let f _ = function
| B.Abst (a, _)
| B.Abbr (a, _)
- | B.Void a -> F.fprintf frm "@[%a@]" id a
+ | B.Void a -> F.fprintf frm "@[%a@]" name a
in
if !O.indexes then err () else B.get err f c i
| B.GRef (_, s) ->
F.fprintf frm "@[(%a).%a@]" (pp_term c) v (pp_term c) t
| 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
+ F.fprintf frm "@[[%a:%a].%a@]" name a (pp_term c) w (pp_term cc) t
in
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
+ F.fprintf frm "@[[%a=%a].%a@]" name a (pp_term c) v (pp_term cc) t
in
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 cc = F.fprintf frm "@[[%a].%a@]" name a (pp_term cc) t in
let f a = B.push (f a) c (B.Void a) in
rename f c a
let pp_lenv frm c =
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
+ let f a = F.fprintf frm "@,@[%a : %a@]" name 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
+ let f a = F.fprintf frm "@,@[%a = %a@]" name 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
+ let f a = F.fprintf frm "@,%a" name a; f () in
rename f c a
in
B.rev_iter C.start pp_entry c
(* term xml printing ********************************************************)
-let id frm a =
- let f s = function
- | true -> F.fprintf frm " name=%S" s
- | false -> F.fprintf frm " name=%S" ("^" ^ s)
- in
- B.name C.start f a
-
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
+ let f s = Y.Name (s, true) :: a in
H.get_sort err f l
in
- F.fprintf frm "<Sort position=%S%a/>" (string_of_int l) id a
+ F.fprintf frm "<Sort position=%S%a/>" (string_of_int l) X.old_name 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
+ let f n r = Y.Name (n, r) :: a in
+ let f _ b = attrs_of_binder (Y.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
+ F.fprintf frm "<LRef position=%S%a/>" (string_of_int i) X.old_name 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
+ let a = Y.Name (U.name_of_uri u, true) :: a in
+ F.fprintf frm "<GRef uri=%S%a/>" (U.string_of_uri u) X.old_name a
| B.Cast (a, w, t) ->
- F.fprintf frm "<Cast%a>%a</Cast>@,%a" id a (exp_boxed c) w (exp_term c) t
+ F.fprintf frm "<Cast%a>%a</Cast>@,%a" X.old_name a (exp_boxed c) w (exp_term c) t
| B.Appl (a, v, t) ->
- F.fprintf frm "<Appl%a>%a</Appl>@,%a" id a (exp_boxed c) v (exp_term c) t
+ F.fprintf frm "<Appl%a>%a</Appl>@,%a" X.old_name 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
and exp_bind c frm = function
| B.Abst (a, w) ->
- F.fprintf frm "<Abst%a>%a</Abst>" id a (exp_boxed c) w
+ F.fprintf frm "<Abst%a>%a</Abst>" X.old_name a (exp_boxed c) w
| B.Abbr (a, v) ->
- F.fprintf frm "<Abbr%a/>%a</Abbr>" id a (exp_boxed c) v
+ F.fprintf frm "<Abbr%a/>%a</Abbr>" X.old_name a (exp_boxed c) v
| B.Void a ->
- F.fprintf frm "<Void%a/>" id a
-
-let exp_entry 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
+ F.fprintf frm "<Void%a/>" X.old_name a
-let export_entry frm entry =
- F.fprintf frm "@,@[<v3> %a@]@," (exp_entry B.empty_lenv) entry
+let export_term frm t =
+ F.fprintf frm "%a" (exp_boxed B.empty_lenv) t
projects / helm.git / blobdiff