Implemented:

 "by ... we proved ... that is equivalent to ... done"
and
 "we need to prove ... that is equivalent to ..."

diff --git a/components/tactics/declarative.ml b/components/tactics/declarative.ml
index 413a43fe3a7af542838b1da2379938a85bddc90b..ef052cfcbec5e2db9394eb603978d8a3577e792e 100644 (file)
--- a/components/tactics/declarative.ml
+++ b/components/tactics/declarative.ml
@@ -46,24 +46,35 @@ let suppose t id ty =
 ;;
 
 let by_term_we_proved ~dbd t ty id ty' =
-match id with None -> assert false | Some id ->
  let just =
   match t with
      None -> Tactics.auto ~dbd ~params:[]
    | Some t -> Tactics.apply t
  in
-  let continuation =
-   match ty' with
-      None -> Tacticals.id_tac
-    | Some ty' ->
-        Tactics.change ~pattern:(None,[id,Cic.Implicit (Some `Hole)],None)
-         (fun _ metasenv ugraph -> ty',metasenv,ugraph)
-  in
-   Tacticals.thens
-   ~start:
-     (Tactics.cut ty
-       ~mk_fresh_name_callback:(fun _ _ _  ~typ -> Cic.Name id))
-   ~continuations:[ continuation ; just ]
+  match id with
+     None ->
+      (match ty' with
+          None -> assert false
+        | Some ty' ->
+           Tacticals.then_
+            ~start:(Tactics.change
+              ~pattern:(ProofEngineTypes.conclusion_pattern None)
+              (fun _ metasenv ugraph -> ty',metasenv,ugraph))
+            ~continuation:just
+      )
+   | Some id ->
+       let continuation =
+        match ty' with
+           None -> Tacticals.id_tac
+         | Some ty' ->
+             Tactics.change ~pattern:(None,[id,Cic.Implicit (Some `Hole)],None)
+              (fun _ metasenv ugraph -> ty',metasenv,ugraph)
+       in
+        Tacticals.thens
+        ~start:
+          (Tactics.cut ty
+            ~mk_fresh_name_callback:(fun _ _ _  ~typ -> Cic.Name id))
+        ~continuations:[ continuation ; just ]
 ;;
 
 let bydone ~dbd t =
@@ -76,31 +87,38 @@ let bydone ~dbd t =
 ;;
 
 let we_need_to_prove t id ty =
-match id with None -> assert false | Some id ->
- let aux status =
-  let cont,cutted =
-   match ty with
-      None -> Tacticals.id_tac,t
-    | Some ty ->
-       Tactics.change ~pattern:(None,[id,Cic.Implicit (Some `Hole)],None)
-        (fun _ metasenv ugraph -> t,metasenv,ugraph), ty in
-  let proof,goals =
-   ProofEngineTypes.apply_tactic
-    (Tacticals.thens
-      ~start:
-       (Tactics.cut cutted
-         ~mk_fresh_name_callback:(fun _ _ _  ~typ -> Cic.Name id))
-      ~continuations:[cont])
-    status
-  in
-   let goals' =
-    match goals with
-       [fst; snd] -> [snd; fst]
-     | _ -> assert false
-   in
-    proof,goals'
- in
-  ProofEngineTypes.mk_tactic aux
+ match id with
+    None ->
+     (match ty with
+         None -> Tacticals.id_tac (*BUG: check missing here *)
+       | Some ty ->
+          Tactics.change ~pattern:(ProofEngineTypes.conclusion_pattern None)
+           (fun _ metasenv ugraph -> ty,metasenv,ugraph))
+  | Some id ->
+     let aux status =
+      let cont,cutted =
+       match ty with
+          None -> Tacticals.id_tac,t
+        | Some ty ->
+           Tactics.change ~pattern:(None,[id,Cic.Implicit (Some `Hole)],None)
+             (fun _ metasenv ugraph -> t,metasenv,ugraph), ty in
+      let proof,goals =
+       ProofEngineTypes.apply_tactic
+        (Tacticals.thens
+          ~start:
+           (Tactics.cut cutted
+             ~mk_fresh_name_callback:(fun _ _ _  ~typ -> Cic.Name id))
+          ~continuations:[cont])
+        status
+      in
+       let goals' =
+        match goals with
+           [fst; snd] -> [snd; fst]
+         | _ -> assert false
+       in
+        proof,goals'
+     in
+      ProofEngineTypes.mk_tactic aux
 ;;
 
 let existselim t id1 t1 id2 t2 =