- common/entity: new format for kernel entities

[helm.git] / helm / software / lambda-delta / basic_ag / bagOutput.ml

diff --git a/helm/software/lambda-delta/basic_ag/bagOutput.ml b/helm/software/lambda-delta/basic_ag/bagOutput.ml
index 400ffc55e5444c92cde8cbdfb89e624504effad6..a97219120dc2cbc1098bafb22ffd24b874efe55a 100644 (file)
--- a/helm/software/lambda-delta/basic_ag/bagOutput.ml
+++ b/helm/software/lambda-delta/basic_ag/bagOutput.ml
@@ -13,6 +13,7 @@ module P = Printf
 module F = Format
 module U = NUri
 module L = Log
+module Y = Entity
 module H = Hierarchy
 module O = Output
 module B = Bag
@@ -62,21 +63,13 @@ and count_term f c = function
       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
 
 let print_counters f c =
    let terms =