\ / This software is distributed as is, NO WARRANTY.
V_______________________________________________________________ *)
-module P = Printf
-module F = Format
-module U = NUri
-module L = Log
-module G = Options
-module E = Entity
-module H = Hierarchy
-module Z = Bag
+module P = Printf
+module F = Format
+module U = NUri
+module L = Log
+module G = Options
+module E = Entity
+module J = Marks
+module H = Hierarchy
+module XD = XmlCrg
+module Z = Bag
+module ZD = BagCrg
type counters = {
eabsts: int;
count_term f c t
let count_entity f c = function
- | _, _, E.Abst w ->
+ | _, _, E.Abst (_, w) ->
let c = {c with eabsts = succ c.eabsts} in
count_term f c w
- | _, _, E.Abbr v ->
+ | _, _, E.Abbr v ->
let c = {c with eabbrs = succ c.eabbrs} in
count_term f c v
- | _, _, E.Void -> assert false
+ | _, _, E.Void -> assert false
let print_counters f c =
let terms =
c.tabbrs
in
let items = c.eabsts + c.eabbrs in
- let locations = Z.locations () in
+ let locations = J.locations () in
L.warn (P.sprintf " Kernel representation summary (basic_ag)");
L.warn (P.sprintf " Total entry items: %7u" items);
L.warn (P.sprintf " Declaration items: %7u" c.eabsts);
L.warn (P.sprintf " Total binder locations: %7u" locations);
f ()
-let res l id =
- if !G.indexes then P.sprintf "#%u" l else id
+let name err frm a =
+ let f n = function
+ | true -> F.fprintf frm "%s" n
+ | false -> F.fprintf frm "-%s" n
+ in
+ E.name err f a
+
+let res a l frm =
+ let err () = F.fprintf frm "@[#%u@]" l in
+ if !G.indexes then err () else name err frm a
let rec pp_term c frm = function
| Z.Sort h ->
let f s = F.fprintf frm "@[%s@]" s in
H.string_of_sort err f h
| Z.LRef i ->
- let f = function
- | Some (id, _) -> F.fprintf frm "@[%s@]" id
- | None -> F.fprintf frm "@[#%u@]" i
- in
- if !G.indexes then f None else Z.get f c i
+ let err () = F.fprintf frm "@[#%u@]" i in
+ let f a _ = name err frm a in
+ if !G.indexes then err () else Z.get err f c i
| Z.GRef s -> F.fprintf frm "@[$%s@]" (U.string_of_uri s)
| Z.Cast (u, t) ->
F.fprintf frm "@[{%a}.%a@]" (pp_term c) u (pp_term c) t
| Z.Appl (v, t) ->
F.fprintf frm "@[(%a).%a@]" (pp_term c) v (pp_term c) t
- | Z.Bind (l, id, Z.Abst w, t) ->
+ | Z.Bind (a, l, Z.Abst w, t) ->
let f cc =
- F.fprintf frm "@[[%s:%a].%a@]" (res l id) (pp_term c) w (pp_term cc) t
+ F.fprintf frm "@[[%t:%a].%a@]" (res a l) (pp_term c) w (pp_term cc) t
in
- Z.push "output abst" f c l id (Z.Abst w)
- | Z.Bind (l, id, Z.Abbr v, t) ->
+ Z.push "output abst" f c a l (Z.Abst w)
+ | Z.Bind (a, l, Z.Abbr v, t) ->
let f cc =
- F.fprintf frm "@[[%s=%a].%a@]" (res l id) (pp_term c) v (pp_term cc) t
+ F.fprintf frm "@[[%t=%a].%a@]" (res a l) (pp_term c) v (pp_term cc) t
in
- Z.push "output abbr" f c l id (Z.Abbr v)
- | Z.Bind (l, id, Z.Void, t) ->
- let f cc = F.fprintf frm "@[[%s].%a@]" (res l id) (pp_term cc) t in
- Z.push "output void" f c l id Z.Void
+ Z.push "output abbr" f c a l (Z.Abbr v)
+ | Z.Bind (a, l, Z.Void, t) ->
+ let f cc = F.fprintf frm "@[[%t].%a@]" (res a l) (pp_term cc) t in
+ Z.push "output void" f c a l Z.Void
let pp_lenv frm c =
let pp_entry frm = function
- | l, id, Z.Abst w ->
- F.fprintf frm "@,@[%s : %a@]" (res l id) (pp_term c) w
- | l, id, Z.Abbr v ->
- F.fprintf frm "@,@[%s = %a@]" (res l id) (pp_term c) v
- | l, id, Z.Void ->
- F.fprintf frm "@,%s" (res l id)
+ | a, l, Z.Abst w ->
+ F.fprintf frm "@,@[%t : %a@]" (res a l) (pp_term c) w
+ | a, l, Z.Abbr v ->
+ F.fprintf frm "@,@[%t = %a@]" (res a l) (pp_term c) v
+ | a, l, Z.Void ->
+ F.fprintf frm "@,%t" (res a l)
in
let iter map frm l = List.iter (map frm) l in
let f es = F.fprintf frm "%a" (iter pp_entry) (List.rev es) in
let specs = {
L.pp_term = pp_term; L.pp_lenv = pp_lenv
}
+
+(* term xml printing ********************************************************)
+
+let export_term =
+ ZD.crg_of_bag XD.export_term