X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fdeclarative.ml;h=be4724b55509124678137083d36c040e519d8dab;hb=87fdda71e8e0dcf886852f70be9a4b3d627b8e9c;hp=110f72fb1fb4c5fb511be332f50ff552e858c539;hpb=c2d8fcd86793151c8cf24f45fc3064b97f16f596;p=helm.git

diff --git a/helm/software/components/tactics/declarative.ml b/helm/software/components/tactics/declarative.ml
index 110f72fb1..be4724b55 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 ~universe =
+ function
+    `Auto (l,params) -> 
+       Tactics.auto ~dbd 
+       ~params:(l,("skip_trie_filtering","1")::("skip_context","1")::params) ~universe
+  | `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 ~universe just ty id ty' =
+ let just = mk_just ~dbd ~universe just in
   match id with
      None ->
       (match ty' with
@@ -63,27 +69,28 @@ 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 =
- let just =
-  match t with
-     None -> Tactics.auto ~dbd ~params:[] ~universe
-   | Some t -> Tactics.apply t
- in
-  just
+let bydone ~dbd ~universe just =
+ mk_just ~dbd ~universe just
 ;;
 
 let we_need_to_prove t id ty =
@@ -121,12 +128,12 @@ let we_need_to_prove t id ty =
       ProofEngineTypes.mk_tactic aux
 ;;
 
-let existselim ~dbd ~universe t id1 t1 id2 t2 =
+let existselim ~dbd ~universe just 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 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)]))
@@ -137,25 +144,28 @@ 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 ~universe 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 ~universe 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 ~universe just) ]
+;;
 
 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
@@ -164,21 +174,31 @@ let rewritingstep ~dbd ~universe lhs rhs just last_step =
       Cic.MutInd (uri,0,[]), Cic.Const (LibraryObjects.trans_eq_URI ~eq:uri,[])
   in
   let ty,_ =
-   CicTypeChecker.type_of_aux' metasenv context rhs CicUniv.empty_ugraph in
-  let just =
+   CicTypeChecker.type_of_aux' metasenv context rhs CicUniv.oblivion_ugraph in
+  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
+      `Auto (univ, params) ->
         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:(univ, params) ~universe
+         else
+          Tacticals.first
+           [Tactics.auto ~dbd ~params:(univ, params) ~universe ;
+            Tactics.auto ~dbd ~params:(univ, params') ~universe]
+    | `Term just -> Tactics.apply just
+    | `SolveWith term -> 
+         Tactics.solve_rewrite ~universe ~params:([term],["steps","1"]) ()
+    | `Proof ->
+        Tacticals.id_tac
   in
    let plhs,prhs,prepare =
     match lhs with
@@ -215,7 +235,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
@@ -224,20 +244,24 @@ 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]
-               | _ -> assert false
+              match just,goals with
+                 `Proof, [g1;g2;g3] -> [g2;g3;newmeta;g1]
+               | _, [g1;g2] -> [g2;newmeta;g1]
+               | _, l -> 
+                 prerr_endline (String.concat "," (List.map string_of_int l));
+                 prerr_endline (CicMetaSubst.ppmetasenv [] metasenv);
+                 assert false
              in
               proof,goals)
    in
     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
@@ -250,8 +274,8 @@ let we_proceed_by_cases_on t pat =
 ;;
 
 let we_proceed_by_induction_on t pat =
- (*BUG here: pat unused *)
- Tactics.elim_intros ~depth:0 t
+ let pattern = None, [], Some pat in
+ Tactics.elim_intros ~depth:0 (*~pattern*) t
 ;;
 
 let case id ~params =