module F = Format
module U = NUri
module L = Log
+module O = Options
+module Y = Entity
module H = Hierarchy
-module O = Output
module B = Bag
type counters = {
let f c = count_term_binder f c b in
count_term f c t
-let count_obj_binder f c = function
- | B.Abst w ->
+let count_entity f c = function
+ | _, _, Y.Abst w ->
let c = {c with eabsts = succ c.eabsts} in
count_term f c w
- | B.Abbr v ->
+ | _, _, Y.Abbr v ->
let c = {c with eabbrs = succ c.eabbrs} in
count_term f c v
- | B.Void -> f c
-
-let count_obj f c (_, _, b) =
- count_obj_binder f c b
-
-let count_item f c = function
- | Some obj -> count_obj f c obj
- | None -> f c
+ | _, _, Y.Void -> assert false
let print_counters f c =
let terms =
let rec pp_term c frm = function
| B.Sort h ->
- let f = function
- | Some s -> F.fprintf frm "@[%s@]" s
- | None -> F.fprintf frm "@[*%u@]" h
- in
- H.get_sort f h
+ let err () = F.fprintf frm "@[*%u@]" h in
+ let f s = F.fprintf frm "@[%s@]" s in
+ H.string_of_sort err f h
| B.LRef i ->
let f = function
| Some (id, _) -> F.fprintf frm "@[%s@]" id
let f cc = F.fprintf frm "@[[%s].%a@]" (res l id) (pp_term cc) t in
B.push "output void" f c l id B.Void
-let pp_context frm c =
+let pp_lenv frm c =
let pp_entry frm = function
| l, id, B.Abst w ->
F.fprintf frm "@,@[%s : %a@]" (res l id) (pp_term c) w
B.contents f c
let specs = {
- L.pp_term = pp_term; L.pp_context = pp_context
+ L.pp_term = pp_term; L.pp_lenv = pp_lenv
}