CicInspect: a function for counting the nodes of a term has been activated

[helm.git] / components / acic_procedural / acic2Procedural.ml

diff --git a/components/acic_procedural/acic2Procedural.ml b/components/acic_procedural/acic2Procedural.ml
index 18e1ecc5b3826b5a287bf3cd13f14c6fc443993a..4ccb78ace32522efbd43d8b9706bbe7f81deca71 100644 (file)
--- a/components/acic_procedural/acic2Procedural.ml
+++ b/components/acic_procedural/acic2Procedural.ml
@@ -25,7 +25,6 @@
 
 module C    = Cic
 module I    = CicInspect
-module D    = Deannotate
 module S    = CicSubstitution
 module TC   = CicTypeChecker 
 module Un   = CicUniv
@@ -60,8 +59,6 @@ type status = {
 
 (* helpers ******************************************************************)
 
-let cic = D.deannotate_term
-
 let split2_last l1 l2 =
 try
    let n = pred (List.length l1) in
@@ -155,7 +152,7 @@ with Invalid_argument _ -> failwith "A2P.get_sort"
 *)
 let get_type msg st bo =
 try   
-   let ty, _ = TC.type_of_aux' [] st.context (cic bo) Un.empty_ugraph in
+   let ty, _ = TC.type_of_aux' [] st.context (H.cic bo) Un.empty_ugraph in
    ty
 with e -> failwith (msg ^ ": " ^ Printexc.to_string e)
 
@@ -199,7 +196,7 @@ let convert st ?name v =
       | None            -> []
       | Some (sty, ety) ->
         let e = Cn.hole "" in
-         let csty, cety = cic sty, cic ety in
+         let csty, cety = H.cic sty, H.cic ety in
         if Ut.alpha_equivalence csty cety then [] else 
         match name with
            | None         -> [T.Change (sty, ety, None, e, "")]
@@ -252,18 +249,18 @@ let mk_rewrite st dtext what qs tl direction =
    [T.Rewrite (direction, what, None, e, dtext); T.Branch (qs, "")]
 
 let rec proc_lambda st name v t =
-   let dno = DTI.does_not_occur 1 (cic t) in
+   let dno = DTI.does_not_occur 1 (H.cic t) in
    let dno = dno && match get_inner_types st t with
       | None          -> true
       | Some (it, et) -> 
-         DTI.does_not_occur 1 (cic it) && DTI.does_not_occur 1 (cic et)
+         DTI.does_not_occur 1 (H.cic it) && DTI.does_not_occur 1 (H.cic et)
    in
    let name = match dno, name with
       | true, _            -> C.Anonymous
       | false, C.Anonymous -> H.mk_fresh_name st.context used_premise 
       | false, name        -> name
    in
-   let entry = Some (name, C.Decl (cic v)) in
+   let entry = Some (name, C.Decl (H.cic v)) in
    let intro = get_intro name in
    proc_proof (add st entry intro) t
 
@@ -282,9 +279,9 @@ and proc_letin st what name v t =
                  let qs = [proc_proof (next st) v; [T.Id ""]] in
                  st, [T.Branch (qs, ""); T.Cut (intro, ity, dtext)]
            in
-           st, C.Decl (cic ity), rqv
+           st, C.Decl (H.cic ity), rqv
         | None          ->
-           st, C.Def (cic v, None), [T.LetIn (intro, v, dtext)]
+           st, C.Def (H.cic v, None), [T.LetIn (intro, v, dtext)]
       in
       let entry = Some (name, hyp) in
       let qt = proc_proof (next (add st entry intro)) t in
@@ -312,12 +309,12 @@ and proc_appl st what hd tl =
       let classes, rc = Cl.classify st.context ty in
       let goal_arity = match get_inner_types st what with
          | None          -> 0
-        | Some (ity, _) -> snd (PEH.split_with_whd (st.context, cic ity))
+        | Some (ity, _) -> snd (PEH.split_with_whd (st.context, H.cic ity))
       in
       let parsno, argsno = List.length classes, List.length tl in
       let decurry = parsno - argsno in
       let diff = goal_arity - decurry in
-      if diff < 0 then failwith (Printf.sprintf "NOT TOTAL: %i %s |--- %s" diff (Pp.ppcontext st.context) (Pp.ppterm (cic hd)));
+      if diff < 0 then failwith (Printf.sprintf "NOT TOTAL: %i %s |--- %s" diff (Pp.ppcontext st.context) (Pp.ppterm (H.cic hd)));
       let rec mk_synth a n =
          if n < 0 then a else mk_synth (I.S.add n a) (pred n)
       in
@@ -358,12 +355,12 @@ and proc_other st what =
 and proc_proof st t = 
    let f st =
       let xtypes, note = match get_inner_types st t with
-         | Some (it, et) -> Some (cic it, cic et), 
+         | Some (it, et) -> Some (H.cic it, H.cic et), 
          (Printf.sprintf "\nInferred: %s\nExpected: %s"
-         (Pp.ppterm (cic it)) (Pp.ppterm (cic et))) 
+         (Pp.ppterm (H.cic it)) (Pp.ppterm (H.cic et))) 
          | None          -> None, "\nNo types"
       in
-      let context, clears = Cn.get_clears st.context (cic t) xtypes in
+      let context, clears = Cn.get_clears st.context (H.cic t) xtypes in
       let note = Pp.ppcontext st.context ^ note in
       {st with context = context; clears = clears; clears_note = note}
    in
@@ -409,8 +406,8 @@ let is_theorem pars =
 let proc_obj st = function
    | C.AConstant (_, _, s, Some v, t, [], pars) when is_theorem pars ->
       let ast = proc_proof st v in
-      let count = T.count_steps 0 ast in
-      let text = Printf.sprintf "tactics: %u" count in
+      let steps, nodes = T.count_steps 0 ast, T.count_nodes 0 ast in
+      let text = Printf.sprintf "tactics: %u\nnodes: %u" steps nodes in
       T.Theorem (Some s, t, "") :: ast @ [T.Qed text]
    | _                                                               ->
       failwith "not a theorem"