From 3e2887bbcba6846ce3a18898fcfebe48632b72b9 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Mon, 26 Feb 2018 18:31:32 +0100
Subject: Adding informative variant of shelve_unifiable returning set of
 shelved evars.

---
 engine/proofview.ml  | 10 ++++++++--
 engine/proofview.mli |  3 +++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/engine/proofview.ml b/engine/proofview.ml
index 22271dd02c..b7014c542e 100644
--- a/engine/proofview.ml
+++ b/engine/proofview.ml
@@ -710,13 +710,19 @@ let partition_unifiable sigma l =
 (** Shelves the unifiable goals under focus, i.e. the goals which
     appear in other goals under focus (the unfocused goals are not
     considered). *)
-let shelve_unifiable =
+let shelve_unifiable_informative =
   let open Proof in
   Pv.get >>= fun initial ->
   let (u,n) = partition_unifiable initial.solution initial.comb in
   Comb.set n >>
   InfoL.leaf (Info.Tactic (fun () -> Pp.str"shelve_unifiable")) >>
-  Shelf.modify (fun gls -> gls @ CList.map drop_state u)
+  let u = CList.map drop_state u in
+  Shelf.modify (fun gls -> gls @ u) >>
+  tclUNIT u
+
+let shelve_unifiable =
+  let open Proof in
+  shelve_unifiable_informative >>= fun _ -> tclUNIT ()
 
 (** [guard_no_unifiable] returns the list of unifiable goals if some
     goals are unifiable (see {!shelve_unifiable}) in the current focus. *)
diff --git a/engine/proofview.mli b/engine/proofview.mli
index e7be665527..804f1543d0 100644
--- a/engine/proofview.mli
+++ b/engine/proofview.mli
@@ -326,6 +326,9 @@ val unifiable : Evd.evar_map -> Evar.t -> Evar.t list -> bool
     considered). *)
 val shelve_unifiable : unit tactic
 
+(** Idem but also returns the list of shelved variables *)
+val shelve_unifiable_informative : Evar.t list tactic
+
 (** [guard_no_unifiable] returns the list of unifiable goals if some
     goals are unifiable (see {!shelve_unifiable}) in the current focus. *)
 val guard_no_unifiable : Names.Name.t list option tactic
-- 
cgit v1.2.3


From a7946816d96cb66aa7d62302e8aa602a3a9f3c99 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Tue, 27 Feb 2018 06:09:21 +0100
Subject: Export Proofview.undefined as "unsafe" primitive.

---
 engine/proofview.ml  | 2 ++
 engine/proofview.mli | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/engine/proofview.ml b/engine/proofview.ml
index b7014c542e..639f48e77c 100644
--- a/engine/proofview.ml
+++ b/engine/proofview.ml
@@ -1041,6 +1041,8 @@ module Unsafe = struct
 
   let advance = Evarutil.advance
 
+  let undefined = undefined
+
   let mark_as_unresolvable p gl =
     { p with solution = mark_in_evm ~goal:false p.solution gl }
 
diff --git a/engine/proofview.mli b/engine/proofview.mli
index 804f1543d0..1905686fe7 100644
--- a/engine/proofview.mli
+++ b/engine/proofview.mli
@@ -469,6 +469,12 @@ module Unsafe : sig
       solved. *)
   val advance : Evd.evar_map -> Evar.t -> Evar.t option
 
+  (** [undefined sigma l] applies [advance] to the goals of [l], then
+      returns the subset of resulting goals which have not yet been
+      defined *)
+  val undefined : Evd.evar_map -> Proofview_monad.goal_with_state list ->
+    Proofview_monad.goal_with_state list
+
   val typeclass_resolvable : unit Evd.Store.field
 
 end
-- 
cgit v1.2.3


From 3c1c101a8757c438379441a334f31f5fe656ef55 Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Mon, 26 Feb 2018 18:35:48 +0100
Subject: Adding tacticals tclBINDFIRST/tclBINDLAST.

Design choice: Failing with an anomaly or with a catchable Ltac error
"Fail": we fail with a Fail as it was the case with the related
constrained version of tclTHENFIRST/tclTHENLAST.
---
 tactics/tacticals.ml  | 27 +++++++++++++++++++++++++++
 tactics/tacticals.mli |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/tactics/tacticals.ml b/tactics/tacticals.ml
index 958a205a15..a97ae8f655 100644
--- a/tactics/tacticals.ml
+++ b/tactics/tacticals.ml
@@ -369,9 +369,36 @@ module New = struct
     tclTHENSFIRSTn t1 l (tclUNIT())
   let tclTHENFIRST t1 t2 =
     tclTHENFIRSTn t1 [|t2|]
+
+  let tclBINDFIRST t1 t2 =
+    t1 >>= fun ans ->
+    Proofview.Unsafe.tclGETGOALS >>= fun gls ->
+    match gls with
+    | [] -> tclFAIL 0 (str "Expect at least one goal.")
+    | hd::tl ->
+    Proofview.Unsafe.tclSETGOALS [hd] <*> t2 ans >>= fun ans ->
+    Proofview.Unsafe.tclNEWGOALS tl <*>
+    Proofview.tclUNIT ans
+
   let tclTHENLASTn t1 l =
     tclTHENS3PARTS t1 [||] (tclUNIT()) l
   let tclTHENLAST t1 t2 = tclTHENLASTn t1 [|t2|]
+
+  let option_of_failure f x = try Some (f x) with Failure _ -> None
+
+  let tclBINDLAST t1 t2 =
+    t1 >>= fun ans ->
+    Proofview.Unsafe.tclGETGOALS >>= fun gls ->
+    match option_of_failure List.sep_last gls with
+    | None -> tclFAIL 0 (str "Expect at least one goal.")
+    | Some (last,firstn) ->
+    Proofview.Unsafe.tclSETGOALS [last] <*> t2 ans >>= fun ans ->
+    Proofview.Unsafe.tclGETGOALS >>= fun newgls ->
+    tclEVARMAP >>= fun sigma ->
+    let firstn = Proofview.Unsafe.undefined sigma firstn in
+    Proofview.Unsafe.tclSETGOALS (firstn@newgls) <*>
+    Proofview.tclUNIT ans
+
   let tclTHENS t l =
     tclINDEPENDENT begin
       t <*>Proofview.tclORELSE (* converts the [SizeMismatch] error into an ltac error *)
diff --git a/tactics/tacticals.mli b/tactics/tacticals.mli
index f0ebac780e..340d8fbf3d 100644
--- a/tactics/tacticals.mli
+++ b/tactics/tacticals.mli
@@ -196,8 +196,10 @@ module New : sig
   (** [tclTHENFIRST tac1 tac2 gls] applies the tactic [tac1] to [gls]
       and [tac2] to the first resulting subgoal *)
   val tclTHENFIRST : unit tactic -> unit tactic -> unit tactic
+  val tclBINDFIRST : 'a tactic -> ('a -> 'b tactic) -> 'b tactic
   val tclTHENLASTn : unit tactic -> unit tactic array -> unit tactic
   val tclTHENLAST  : unit tactic -> unit tactic -> unit tactic
+  val tclBINDLAST  : 'a tactic -> ('a -> 'b tactic) -> 'b tactic
   (* [tclTHENS t l = t <*> tclDISPATCH l] *)
   val tclTHENS : unit tactic -> unit tactic list -> unit tactic
   (* [tclTHENLIST [t1;…;tn]] is [t1<*>…<*>tn] *)
-- 
cgit v1.2.3