some work to make tries "printable", fixed comparison of constants in

[helm.git] / helm / software / components / cic / cicInspect.ml

diff --git a/helm/software/components/cic/cicInspect.ml b/helm/software/components/cic/cicInspect.ml
index 3d5d65d59a48e0cbae302ee6d715cd3b653d1f50..cc911df84ac902fe9ae43b2284d1eca430a499ad 100644 (file)
--- a/helm/software/components/cic/cicInspect.ml
+++ b/helm/software/components/cic/cicInspect.ml
@@ -56,9 +56,10 @@ let get_rels_from_premise h t =
         in
         List.fold_left map g ss
       | C.Cast (t1, t2)    -> aux d (aux d g t2) t1
-      | C.LetIn (_, t1, t2)
       | C.Lambda (_, t1, t2)
       | C.Prod (_, t1, t2) -> aux d (aux (succ d) g t2) t1
+      | C.LetIn (_, t1, ty, t2) ->
+         aux d (aux d (aux (succ d) g t2) ty) t1
       | C.MutCase (_, _, t1, t2, ss) ->
         aux d (aux d (List.fold_left (aux d) g ss) t2) t1
       | C.Fix (_, ss) ->
@@ -95,9 +96,9 @@ let get_mutinds_of_uri u t =
         in
         List.fold_left map g ss
       | C.Cast (t1, t2)              -> aux (aux g t2) t1
-      | C.LetIn (_, t1, t2)
       | C.Lambda (_, t1, t2)
-      | C.Prod (_, t1, t2)           -> aux (aux g t2) t1
+      | C.Prod (_, t1, t2) -> aux (aux g t2) t1
+      | C.LetIn (_, t1, ty, t2) -> aux (aux (aux g t2) ty) t1
       | C.MutCase (_, _, t1, t2, ss) ->
         aux (aux (List.fold_left aux g ss) t2) t1
       | C.Fix (_, ss)                ->
@@ -109,3 +110,35 @@ let get_mutinds_of_uri u t =
    in
    let g a = a in
    aux g t S.empty
+
+let rec aux n = function
+   | C.Sort _
+   | C.Implicit _
+   | C.Rel _                      -> succ n
+   | C.Appl ts                    -> List.fold_left aux (succ n) ts
+   | C.Const (_, ss)
+   | C.MutConstruct (_, _, _, ss)
+   | C.MutInd (_, _, ss)
+   | C.Var (_, ss)                -> 
+      let map n (_, t) = aux n t in 
+      List.fold_left map (succ n) ss
+   | C.Meta (_, ss)               ->
+      let map n = function 
+        | None   -> n
+        | Some t -> aux n t
+      in
+      List.fold_left map (succ n) ss
+   | C.Cast (t1, t2)
+   | C.Lambda (_, t1, t2)
+   | C.Prod (_, t1, t2) -> aux (aux (succ n) t2) t1
+   | C.LetIn (_, t1, ty, t2) -> aux (aux (aux (succ n) t2) ty) t1
+   | C.MutCase (_, _, t1, t2, ss) ->
+      aux (aux (List.fold_left aux (succ n) ss) t2) t1
+   | C.Fix (_, ss)                ->
+      let map n (_, _, t1, t2) = aux (aux n t2) t1 in
+      List.fold_left map (succ n) ss
+   | C.CoFix (_, ss)              ->
+      let map n (_, t1, t2) = aux (aux n t2) t1 in
+      List.fold_left map (succ n) ss
+
+let count_nodes = aux