X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Ftactics%2Fdeclarative.ml;h=c248d0cad0bf15c9bbe2119eec36346cf12fed86;hb=6ad533c972e6c9e9db53f38f972e7c0792160f2e;hp=189cd9079b4fd429a330948cbb535b720a3a8593;hpb=63f876b112e1be016e8063e6a00ec47f841ee615;p=helm.git

diff --git a/components/tactics/declarative.ml b/components/tactics/declarative.ml
index 189cd9079..c248d0cad 100644
--- a/components/tactics/declarative.ml
+++ b/components/tactics/declarative.ml
@@ -63,18 +63,24 @@ let by_term_we_proved ~dbd ~universe t ty id ty' =
             ~continuation:just
       )
    | Some id ->
-       let continuation =
+       let ty',continuation =
         match ty' with
-           None -> Tacticals.id_tac
+           None -> ty,just
          | Some ty' ->
-             Tactics.change ~pattern:(None,[id,Cic.Implicit (Some `Hole)],None)
-              (fun _ metasenv ugraph -> ty',metasenv,ugraph)
+            ty',
+            Tacticals.then_
+             ~start:
+               (Tactics.change
+                 ~with_cast:true
+                 ~pattern:(None,[id,Cic.Implicit (Some `Hole)],None)
+                 (fun _ metasenv ugraph -> ty,metasenv,ugraph))
+             ~continuation:just
        in
         Tacticals.thens
         ~start:
-          (Tactics.cut ty
+          (Tactics.cut ty'
             ~mk_fresh_name_callback:(fun _ _ _  ~typ -> Cic.Name id))
-        ~continuations:[ continuation ; just ]
+        ~continuations:[ Tacticals.id_tac ; continuation ]
 ;;
 
 let bydone ~dbd ~universe t =
@@ -123,16 +129,15 @@ let we_need_to_prove t id ty =
 
 let existselim ~dbd ~universe t id1 t1 id2 t2 =
  let aux (proof, goal) = 
-  let (n,metasenv,bo,ty,attrs) = proof in
+  let (n,metasenv,_subst,bo,ty,attrs) = proof in
   let metano,context,_ = CicUtil.lookup_meta goal metasenv in
   let t2, metasenv, _ = t2 (Some (Cic.Name id1, Cic.Decl t1) :: context) metasenv CicUniv.oblivion_ugraph in
-  let proof' = (n,metasenv,bo,ty,attrs) in
-   let pattern = ProofEngineTypes.conclusion_pattern (Some (Cic.Rel 1)) in
+  let proof' = (n,metasenv,_subst,bo,ty,attrs) in
    ProofEngineTypes.apply_tactic (
    Tacticals.thens
     ~start:(Tactics.cut (Cic.Appl [Cic.MutInd (UriManager.uri_of_string "cic:/matita/logic/connectives/ex.ind", 0, []); t1 ; Cic.Lambda (Cic.Name id1, t1, t2)]))
     ~continuations:
-     [ Tactics.elim_intros pattern 
+     [ Tactics.elim_intros (Cic.Rel 1)
         ~mk_fresh_name_callback:
           (let i = ref 0 in
             fun _ _ _  ~typ ->
@@ -147,7 +152,7 @@ let existselim ~dbd ~universe t id1 t1 id2 t2 =
 ;;
 
 let andelim t id1 t1 id2 t2 = 
- Tactics.elim_intros (ProofEngineTypes.conclusion_pattern (Some t))
+ Tactics.elim_intros t
       ~mk_fresh_name_callback:
         (let i = ref 0 in
           fun _ _ _  ~typ ->
@@ -156,7 +161,7 @@ let andelim t id1 t1 id2 t2 =
 
 let rewritingstep ~dbd ~universe lhs rhs just last_step =
  let aux ((proof,goal) as status) =
-  let (curi,metasenv,proofbo,proofty, attrs) = proof in
+  let (curi,metasenv,_subst,proofbo,proofty, attrs) = proof in
   let _,context,gty = CicUtil.lookup_meta goal metasenv in
   let eq,trans =
    match LibraryObjects.eq_URI () with
@@ -166,20 +171,36 @@ let rewritingstep ~dbd ~universe lhs rhs just last_step =
   in
   let ty,_ =
    CicTypeChecker.type_of_aux' metasenv context rhs CicUniv.empty_ugraph in
-  let just =
+  let just' =
    match just with
       `Auto params ->
-        let params =
-         if not (List.exists (fun (k,_) -> k = "paramodulation") params) then
-          ("paramodulation","1")::params
-         else params in
         let params =
          if not (List.exists (fun (k,_) -> k = "timeout") params) then
           ("timeout","3")::params
          else params
         in
-         Tactics.auto ~dbd ~params ~universe
-    | `Term just -> Tactics.apply just 
+        let params' =
+         if not (List.exists (fun (k,_) -> k = "paramodulation") params) then
+          ("paramodulation","1")::params
+         else params
+        in
+         if params = params' then
+          Tactics.auto ~dbd ~params ~universe
+         else
+          Tacticals.first
+           [Tactics.auto ~dbd ~params ~universe ;
+            Tactics.auto ~dbd ~params:params' ~universe]
+    | `Term just -> 
+         let ty,_ =
+           CicTypeChecker.type_of_aux' metasenv context just
+             CicUniv.empty_ugraph         
+         in
+          Tactics.solve_rewrite 
+              ~universe:(Universe.index Universe.empty 
+                 (Universe.key ty) just) ~steps:1 ()
+         (* Tactics.apply just *)
+    | `Proof ->
+        Tacticals.id_tac
   in
    let plhs,prhs,prepare =
     match lhs with
@@ -216,7 +237,7 @@ let rewritingstep ~dbd ~universe lhs rhs just last_step =
 	      FreshNamesGenerator.mk_fresh_name ~subst:[] metasenv context
                (Cic.Name name) ~typ
 	    in
-            let proof = curi,metasenv,proofbo,proofty, attrs in
+            let proof = curi,metasenv,_subst,proofbo,proofty, attrs in
             let proof,goals =
              ProofEngineTypes.apply_tactic
               (Tacticals.thens
@@ -225,8 +246,9 @@ let rewritingstep ~dbd ~universe lhs rhs just last_step =
                 ~continuations:[Tacticals.id_tac ; continuation]) (proof,goal)
             in
              let goals =
-              match goals with
-                 [g1;g2] -> [g2;newmeta;g1]
+              match just,goals with
+                 `Proof, [g1;g2;g3] -> [g2;g3;newmeta;g1]
+               | _, [g1;g2] -> [g2;newmeta;g1]
                | _ -> assert false
              in
               proof,goals)
@@ -234,11 +256,11 @@ let rewritingstep ~dbd ~universe lhs rhs just last_step =
     let continuation =
      if last_step then
       (*CSC:manca controllo sul fatto che rhs sia convertibile con prhs*)
-      just
+      just'
      else
       Tacticals.thens
        ~start:(Tactics.apply ~term:(Cic.Appl [trans;ty;plhs;rhs;prhs]))
-       ~continuations:[just ; Tacticals.id_tac]
+       ~continuations:[just' ; Tacticals.id_tac]
     in
      prepare continuation
  in
@@ -251,8 +273,8 @@ let we_proceed_by_cases_on t pat =
 ;;
 
 let we_proceed_by_induction_on t pat =
- let pattern = Some (fun c m u -> t, m, u), [], Some pat in
- Tactics.elim_intros ~depth:0 pattern
+ let pattern = None, [], Some pat in
+ Tactics.elim_intros ~depth:0 (*~pattern*) t
 ;;
 
 let case id ~params =