X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fdeclarative.ml;h=02d7c6144a0f7d1bf1d70474aeed1281f4106877;hb=f9abd21eb0d26cf9b632af4df819225be4d091e3;hp=b9c0779c7ff78541a3da590b9fc7bf86ea6f5334;hpb=2e2648a9ed26d9b813de8e6a10e2776162565f09;p=helm.git

diff --git a/helm/software/components/tactics/declarative.ml b/helm/software/components/tactics/declarative.ml
index b9c0779c7..02d7c6144 100644
--- a/helm/software/components/tactics/declarative.ml
+++ b/helm/software/components/tactics/declarative.ml
@@ -23,6 +23,16 @@
  * http://cs.unibo.it/helm/.
  *)
 
+type just = [ `Term of Cic.term | `Auto of Auto.auto_params ]
+
+let mk_just ~dbd ~automation_cache =
+ function
+    `Auto (l,params) -> 
+       Tactics.auto ~dbd 
+       ~params:(l,("skip_trie_filtering","1")::(*("skip_context","1")::*)params) ~automation_cache
+  | `Term t -> Tactics.apply t
+;;
+
 let assume id t =
   Tacticals.then_
      ~start:
@@ -45,12 +55,8 @@ let suppose t id ty =
       (fun _ metasenv ugraph -> ty,metasenv,ugraph))
 ;;
 
-let by_term_we_proved ~dbd ~universe t ty id ty' =
- let just =
-  match t with
-   | None -> Tactics.auto ~dbd ~params:([],[]) ~universe
-   | Some t -> Tactics.apply t
- in
+let by_just_we_proved ~dbd ~automation_cache just ty id ty' =
+ let just = mk_just ~dbd ~automation_cache just in
   match id with
      None ->
       (match ty' with
@@ -83,13 +89,8 @@ let by_term_we_proved ~dbd ~universe t ty id ty' =
         ~continuations:[ Tacticals.id_tac ; continuation ]
 ;;
 
-let bydone ~dbd ~universe t =
- let just =
-  match t with
-   | None -> Tactics.auto ~dbd ~params:([],[]) ~universe
-   | Some t -> Tactics.apply t
- in
-  just
+let bydone ~dbd ~automation_cache just =
+ mk_just ~dbd ~automation_cache just
 ;;
 
 let we_need_to_prove t id ty =
@@ -127,7 +128,7 @@ let we_need_to_prove t id ty =
       ProofEngineTypes.mk_tactic aux
 ;;
 
-let existselim ~dbd ~universe t id1 t1 id2 t2 =
+let existselim ~dbd ~automation_cache just id1 t1 id2 t2 =
  let aux (proof, goal) = 
   let (n,metasenv,_subst,bo,ty,attrs) = proof in
   let metano,context,_ = CicUtil.lookup_meta goal metasenv in
@@ -143,23 +144,26 @@ let existselim ~dbd ~universe t id1 t1 id2 t2 =
             fun _ _ _  ~typ ->
              incr i;
              if !i = 1 then Cic.Name id1 else Cic.Name id2) ;
-       (match t with
-       | None -> Tactics.auto ~dbd ~params:([],[]) ~universe
-        | Some t -> Tactics.apply t)
+       (mk_just ~dbd ~automation_cache just)
      ]) (proof', goal)
  in
   ProofEngineTypes.mk_tactic aux
 ;;
 
-let andelim t id1 t1 id2 t2 = 
- Tactics.elim_intros t
-      ~mk_fresh_name_callback:
-        (let i = ref 0 in
-          fun _ _ _  ~typ ->
-           incr i;
-           if !i = 1 then Cic.Name id1 else Cic.Name id2)
+let andelim ~dbd ~automation_cache just id1 t1 id2 t2 = 
+   Tacticals.thens
+    ~start:(Tactics.cut (Cic.Appl [Cic.MutInd (UriManager.uri_of_string "cic:/matita/logic/connectives/And.ind", 0, []); t1 ; t2]))
+    ~continuations:
+     [ Tactics.elim_intros (Cic.Rel 1)
+        ~mk_fresh_name_callback:
+          (let i = ref 0 in
+            fun _ _ _  ~typ ->
+             incr i;
+             if !i = 1 then Cic.Name id1 else Cic.Name id2) ;
+       (mk_just ~dbd ~automation_cache just) ]
+;;
 
-let rewritingstep ~dbd ~universe lhs rhs just last_step =
+let rewritingstep ~dbd ~automation_cache lhs rhs just last_step =
  let aux ((proof,goal) as status) =
   let (curi,metasenv,_subst,proofbo,proofty, attrs) = proof in
   let _,context,gty = CicUtil.lookup_meta goal metasenv in
@@ -185,14 +189,16 @@ let rewritingstep ~dbd ~universe lhs rhs just last_step =
          else params
         in
          if params = params' then
-          Tactics.auto ~dbd ~params:(univ, params) ~universe
+          Tactics.auto ~dbd ~params:(univ, params) ~automation_cache
          else
           Tacticals.first
-           [Tactics.auto ~dbd ~params:(univ, params) ~universe ;
-            Tactics.auto ~dbd ~params:(univ, params') ~universe]
+           [Tactics.auto ~dbd ~params:(univ, params) ~automation_cache ;
+            Tactics.auto ~dbd ~params:(univ, params') ~automation_cache]
     | `Term just -> Tactics.apply just
     | `SolveWith term -> 
-         Tactics.solve_rewrite ~universe ~params:([term],["steps","1"]) ()
+                    Tactics.demodulate ~automation_cache ~dbd
+                    ~params:(Some [term],
+                      ["all","1";"steps","1"; "use_context","false"])
     | `Proof ->
         Tacticals.id_tac
   in
@@ -270,7 +276,7 @@ let we_proceed_by_cases_on t pat =
 ;;
 
 let we_proceed_by_induction_on t pat =
- let pattern = None, [], Some pat in
+(*  let pattern = None, [], Some pat in *)
  Tactics.elim_intros ~depth:0 (*~pattern*) t
 ;;