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_entry_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_entry f c (_, _, b) =
- count_entry_binder f c b
-
-let count_entity f c = function
- | Some entry -> count_entry f c entry
- | None -> f c
+ | _, _, Y.Void -> assert false
let print_counters f c =
let terms =
| 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
+ H.string_of_sort err f h
| B.LRef i ->
let f = function
| Some (id, _) -> F.fprintf frm "@[%s@]" id