X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Facic_procedural%2Facic2Procedural.ml;h=3ee088696db48a6bc58eb67372214132f5df906c;hb=750d027aedc76aac9def8885dc2bdb6ccdc049d9;hp=95c4c1a9a7825182daf0dcab6313c2eef0d707b9;hpb=1acfe506c30e7fcc9d6e427d2523130c371a1159;p=helm.git

diff --git a/helm/software/components/acic_procedural/acic2Procedural.ml b/helm/software/components/acic_procedural/acic2Procedural.ml
index 95c4c1a9a..3ee088696 100644
--- a/helm/software/components/acic_procedural/acic2Procedural.ml
+++ b/helm/software/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
@@ -43,6 +42,7 @@ module DTI  = DoubleTypeInference
 module Cl   = ProceduralClassify
 module T    = ProceduralTypes
 module Cn   = ProceduralConversion
+module H    = ProceduralHelpers
 
 type status = {
    sorts : (C.id, A.sort_kind) Hashtbl.t;
@@ -59,8 +59,6 @@ type status = {
 
 (* helpers ******************************************************************)
 
-let cic = D.deannotate_term
-
 let split2_last l1 l2 =
 try
    let n = pred (List.length l1) in
@@ -154,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)
 
@@ -178,6 +176,8 @@ with Invalid_argument _ -> failwith "A2P.get_ind_names"
 
 (* proof construction *******************************************************)
 
+let used_premise = C.Name "USED"
+
 let mk_exp_args hd tl classes synth =
    let meta id = C.AImplicit (id, None) in
    let map v (cl, b) =
@@ -196,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, "")]
@@ -215,16 +215,16 @@ let get_intro = function
    | C.Anonymous -> None
    | C.Name s    -> Some s
 
-let mk_intros st script =
+let mk_intros st what script =
    let intros st script =
       if st.intros = [] then script else
       let count = List.length st.intros in
       T.Intros (Some count, List.rev st.intros, "") :: script
    in
    let clears st script =
-      if st.clears = [] then script else T.Clear (st.clears, st.clears_note) :: script
+      if true (* st.clears = [] *) then script else T.Clear (st.clears, st.clears_note) :: script
    in
-   intros st (clears st script)   
+   intros st (clears st (convert st what @ script))   
 
 let mk_arg st = function
    | C.ARel (_, _, i, name) as what -> convert st ~name:(name, i) what
@@ -249,14 +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 = dno && match get_inner_types st v with
+   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 name = if dno then C.Anonymous else 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
 
@@ -275,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
@@ -285,18 +289,18 @@ and proc_letin st what name v t =
    else
       [T.Apply (what, dtext)]
    in
-   mk_intros st script
+   mk_intros st what script
 
 and proc_rel st what = 
    let _, dtext = test_depth st in
    let text = "assumption" in
    let script = [T.Apply (what, dtext ^ text)] in 
-   mk_intros st script
+   mk_intros st what script
 
 and proc_mutconstruct st what = 
    let _, dtext = test_depth st in
    let script = [T.Apply (what, dtext)] in 
-   mk_intros st script   
+   mk_intros st what script   
 
 and proc_appl st what hd tl =
    let proceed, dtext = test_depth st in
@@ -305,18 +309,18 @@ 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
       let synth = mk_synth I.S.empty decurry in
       let text = "" (* Printf.sprintf "%u %s" parsno (Cl.to_string h) *) in
-      let script = List.rev (mk_arg st hd) @ convert st what in
+      let script = List.rev (mk_arg st hd) in
       match rc with
          | Some (i, j, uri, tyno) ->
 	    let classes, tl, _, where = split2_last classes tl in
@@ -341,21 +345,23 @@ and proc_appl st what hd tl =
    else
       [T.Apply (what, dtext)]
    in
-   mk_intros st script
+   mk_intros st what script
 
 and proc_other st what =
    let text = Printf.sprintf "%s: %s" "UNEXPANDED" (string_of_head what) in
    let script = [T.Note text] in
-   mk_intros st script
+   mk_intros st what script
 
 and proc_proof st t = 
    let f st =
-      let xet = match get_inner_types st t with
-         | Some (_, et) -> Some (cic et)
-         | None         -> None
+      let xtypes, note = match get_inner_types st t with
+         | Some (it, et) -> Some (H.cic it, H.cic et), 
+	  (Printf.sprintf "\nInferred: %s\nExpected: %s"
+	  (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) xet in
-      let note = Pp.ppcontext st.context 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
    match t with
@@ -400,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"