Merge PR #12599: Remove the Refiner module

Reviewed-by: ejgallego

6 files changed, 249 insertions, 44 deletions

diff --git a/tactics/class_tactics.ml b/tactics/class_tactics.ml
index 4156d5f0ee..82ce2234e3 100644
--- a/tactics/class_tactics.ml
+++ b/tactics/class_tactics.ml
@@ -1183,7 +1183,7 @@ let resolve_one_typeclass env ?(sigma=Evd.from_env env) gl unique =
       try
         Proofview.V82.of_tactic
         (Search.eauto_tac (modes,st) ~only_classes:true ~depth [hints] ~dep:true) gls
-      with Refiner.FailError _ -> raise Not_found
+      with Tacticals.FailError _ -> raise Not_found
   in
   let evd = sig_sig gls' in
   let t' = mkEvar (ev, subst) in
diff --git a/tactics/eauto.ml b/tactics/eauto.ml
index d275e15255..686303a2ab 100644
--- a/tactics/eauto.ml
+++ b/tactics/eauto.ml
@@ -206,7 +206,7 @@ module SearchProblem = struct
               (ngls, lgls, cost, pptac) :: aux tacl
           with e when CErrors.noncritical e ->
             let e = Exninfo.capture e in
-            Refiner.catch_failerror e; aux tacl
+            Tacticals.catch_failerror e; aux tacl
     in aux l
 
   (* Ordering of states is lexicographic on depth (greatest first) then
diff --git a/tactics/equality.ml b/tactics/equality.ml
index 39017c946f..3aa7626aaa 100644
--- a/tactics/equality.ml
+++ b/tactics/equality.ml
@@ -1047,7 +1047,7 @@ let discr_positions env sigma (lbeq,eqn,(t,t1,t2)) eq_clause cpath dirn =
     let absurd_clause = apply_on_clause (pf,pf_ty) eq_clause in
     let pf = Clenv.clenv_value_cast_meta absurd_clause in
     tclTHENS (assert_after Anonymous false_0)
-      [onLastHypId gen_absurdity; (Refiner.refiner ~check:true EConstr.Unsafe.(to_constr pf))]
+      [onLastHypId gen_absurdity; (Logic.refiner ~check:true EConstr.Unsafe.(to_constr pf))]
 
 let discrEq (lbeq,_,(t,t1,t2) as u) eq_clause =
   let sigma = eq_clause.evd in
@@ -1366,7 +1366,7 @@ let inject_if_homogenous_dependent_pair ty =
         tclTHENS (cut (mkApp (ceq,new_eq_args)))
           [clear [destVar sigma hyp];
            Tacticals.New.pf_constr_of_global inj2 >>= fun inj2 ->
-           Refiner.refiner ~check:true EConstr.Unsafe.(to_constr
+           Logic.refiner ~check:true EConstr.Unsafe.(to_constr
              (mkApp(inj2,[|ar1.(0);mkConst c;ar1.(1);ar1.(2);ar1.(3);ar2.(3);hyp|])))
           ])]
   with Exit ->
@@ -1412,7 +1412,7 @@ let inject_at_positions env sigma l2r (eq,_,(t,t1,t2)) eq_clause posns tac =
       (Proofview.tclIGNORE (Proofview.Monad.List.map
          (fun (pf,ty) -> tclTHENS (cut ty)
            [inject_if_homogenous_dependent_pair ty;
-            Refiner.refiner ~check:true EConstr.Unsafe.(to_constr pf)])
+            Logic.refiner ~check:true EConstr.Unsafe.(to_constr pf)])
          (if l2r then List.rev injectors else injectors)))
       (tac (List.length injectors)))
 
diff --git a/tactics/tacticals.ml b/tactics/tacticals.ml
index 22c5bbe73f..d5358faf59 100644
--- a/tactics/tacticals.ml
+++ b/tactics/tacticals.ml
@@ -23,39 +23,236 @@ open Tactypes
 module RelDecl = Context.Rel.Declaration
 module NamedDecl = Context.Named.Declaration
 
-(************************************************************************)
-(* Tacticals re-exported from the Refiner module                        *)
-(************************************************************************)
+(*********************)
+(*   Tacticals       *)
+(*********************)
 
 type tactic = Proofview.V82.tac
 
-[@@@ocaml.warning "-3"]
-
-let tclIDTAC         = Refiner.tclIDTAC
-let tclIDTAC_MESSAGE = Refiner.tclIDTAC_MESSAGE
-let tclORELSE0       = Refiner.tclORELSE0
-let tclORELSE        = Refiner.tclORELSE
-let tclTHEN          = Refiner.tclTHEN
-let tclTHENLIST      = Refiner.tclTHENLIST
-let tclMAP           = Refiner.tclMAP
-let tclTHEN_i        = Refiner.tclTHEN_i
-let tclTHENFIRST     = Refiner.tclTHENFIRST
-let tclTHENLAST      = Refiner.tclTHENLAST
-let tclTHENS         = Refiner.tclTHENS
-let tclTHENSV        = Refiner.tclTHENSV
-let tclTHENSFIRSTn   = Refiner.tclTHENSFIRSTn
-let tclTHENSLASTn    = Refiner.tclTHENSLASTn
-let tclREPEAT        = Refiner.tclREPEAT
-let tclFIRST         = Refiner.tclFIRST
-let tclTRY           = Refiner.tclTRY
-let tclCOMPLETE      = Refiner.tclCOMPLETE
-let tclAT_LEAST_ONCE = Refiner.tclAT_LEAST_ONCE
-let tclFAIL          = Refiner.tclFAIL
-let tclFAIL_lazy     = Refiner.tclFAIL_lazy
-let tclDO            = Refiner.tclDO
-let tclPROGRESS      = Refiner.tclPROGRESS
-let tclSHOWHYPS      = Refiner.tclSHOWHYPS
-let tclTHENTRY       = Refiner.tclTHENTRY
+open Evd
+
+exception FailError of int * Pp.t Lazy.t
+
+let catch_failerror (e, info) =
+  match e with
+  | FailError (lvl,s) when lvl > 0 ->
+    Exninfo.iraise (FailError (lvl - 1, s), info)
+  | e -> Control.check_for_interrupt ()
+
+let unpackage glsig = (ref (glsig.sigma)), glsig.it
+
+let repackage r v = {it = v; sigma = !r; }
+
+let apply_sig_tac r tac g =
+  Control.check_for_interrupt (); (* Breakpoint *)
+  let glsigma = tac (repackage r g) in
+  r := glsigma.sigma;
+  glsigma.it
+
+(* [goal_goal_list : goal sigma -> goal list sigma] *)
+let goal_goal_list gls = {it=[gls.it]; sigma=gls.sigma; }
+
+(* identity tactic without any message *)
+let tclIDTAC gls = goal_goal_list gls
+
+(* the message printing identity tactic *)
+let tclIDTAC_MESSAGE s gls =
+  Feedback.msg_info (hov 0 s); tclIDTAC gls
+
+(* General failure tactic *)
+let tclFAIL_s s gls = user_err ~hdr:"Refiner.tclFAIL_s" (str s)
+
+(* The Fail tactic *)
+let tclFAIL lvl s g = raise (FailError (lvl,lazy s))
+
+let tclFAIL_lazy lvl s g = raise (FailError (lvl,s))
+
+let start_tac gls =
+  let sigr, g = unpackage gls in
+  (sigr, [g])
+
+let finish_tac (sigr,gl) = repackage sigr gl
+
+(* Apply [tacfi.(i)] on the first n subgoals, [tacli.(i)] on the last
+   m subgoals, and [tac] on the others *)
+let thens3parts_tac tacfi tac tacli (sigr,gs) =
+  let nf = Array.length tacfi in
+  let nl = Array.length tacli in
+  let ng = List.length gs in
+  if ng<nf+nl then user_err ~hdr:"Refiner.thensn_tac" (str "Not enough subgoals.");
+  let gll =
+      (List.map_i (fun i ->
+        apply_sig_tac sigr (if i<nf then tacfi.(i) else if i>=ng-nl then tacli.(nl-ng+i) else tac))
+        0 gs) in
+    (sigr,List.flatten gll)
+
+(* Apply [taci.(i)] on the first n subgoals and [tac] on the others *)
+let thensf_tac taci tac = thens3parts_tac taci tac [||]
+
+(* Apply [tac i] on the ith subgoal (no subgoals number check) *)
+let thensi_tac tac (sigr,gs) =
+  let gll =
+    List.map_i (fun i -> apply_sig_tac sigr (tac i)) 1 gs in
+  (sigr, List.flatten gll)
+
+let then_tac tac = thensf_tac [||] tac
+
+(* [tclTHENS3PARTS tac1 [|t1 ; ... ; tn|] tac2 [|t'1 ; ... ; t'm|] gls]
+   applies the tactic [tac1] to [gls] then, applies [t1], ..., [tn] to
+   the first [n] resulting subgoals, [t'1], ..., [t'm] to the last [m]
+   subgoals and [tac2] to the rest of the subgoals in the middle. Raises an
+   error if the number of resulting subgoals is strictly less than [n+m] *)
+let tclTHENS3PARTS tac1 tacfi tac tacli gls =
+  finish_tac (thens3parts_tac tacfi tac tacli (then_tac tac1 (start_tac gls)))
+
+(* [tclTHENSFIRSTn tac1 [|t1 ; ... ; tn|] tac2 gls] applies the tactic [tac1]
+   to [gls] and applies [t1], ..., [tn] to the first [n] resulting
+   subgoals, and [tac2] to the others subgoals. Raises an error if
+   the number of resulting subgoals is strictly less than [n] *)
+let tclTHENSFIRSTn tac1 taci tac = tclTHENS3PARTS tac1 taci tac [||]
+
+(* [tclTHENSLASTn tac1 tac2 [|t1 ;...; tn|] gls] applies the tactic [tac1]
+   to [gls] and applies [t1], ..., [tn] to the last [n] resulting
+   subgoals, and [tac2] to the other subgoals. Raises an error if the
+   number of resulting subgoals is strictly less than [n] *)
+let tclTHENSLASTn tac1 tac taci = tclTHENS3PARTS tac1 [||] tac taci
+
+(* [tclTHEN_i tac taci gls] applies the tactic [tac] to [gls] and applies
+   [(taci i)] to the i_th resulting subgoal (starting from 1), whatever the
+   number of subgoals is *)
+let tclTHEN_i tac taci gls =
+  finish_tac (thensi_tac taci (then_tac tac (start_tac gls)))
+
+(* [tclTHEN tac1 tac2 gls] applies the tactic [tac1] to [gls] and applies
+   [tac2] to every resulting subgoals *)
+let tclTHEN tac1 tac2 = tclTHENS3PARTS tac1 [||] tac2 [||]
+
+(* [tclTHENSV tac1 [t1 ; ... ; tn] gls] applies the tactic [tac1] to
+   [gls] and applies [t1],..., [tn] to the [n] resulting subgoals. Raises
+   an error if the number of resulting subgoals is not [n] *)
+let tclTHENSV tac1 tac2v =
+  tclTHENS3PARTS tac1 tac2v (tclFAIL_s "Wrong number of tactics.") [||]
+
+let tclTHENS tac1 tac2l = tclTHENSV tac1 (Array.of_list tac2l)
+
+(* [tclTHENLAST tac1 tac2 gls] applies the tactic [tac1] to [gls] and [tac2]
+   to the last resulting subgoal *)
+let tclTHENLAST tac1 tac2 = tclTHENSLASTn tac1 tclIDTAC [|tac2|]
+
+(* [tclTHENFIRST tac1 tac2 gls] applies the tactic [tac1] to [gls] and [tac2]
+   to the first resulting subgoal *)
+let tclTHENFIRST tac1 tac2 = tclTHENSFIRSTn tac1 [|tac2|] tclIDTAC
+
+(* [tclTHENLIST [t1;..;tn]] applies [t1] then [t2] ... then [tn]. More
+   convenient than [tclTHEN] when [n] is large. *)
+let rec tclTHENLIST = function
+    [] -> tclIDTAC
+  | t1::tacl -> tclTHEN t1 (tclTHENLIST tacl)
+
+(* [tclMAP f [x1..xn]] builds [(f x1);(f x2);...(f xn)] *)
+let tclMAP tacfun l =
+  List.fold_right (fun x -> (tclTHEN (tacfun x))) l tclIDTAC
+
+(* PROGRESS tac ptree applies tac to the goal ptree and fails if tac leaves
+the goal unchanged *)
+let tclPROGRESS tac ptree =
+  let rslt = tac ptree in
+  if Goal.V82.progress rslt ptree then rslt
+  else user_err ~hdr:"Refiner.PROGRESS" (str"Failed to progress.")
+
+(* Execute tac, show the names of new hypothesis names created by tac
+   in the "as" format and then forget everything. From the logical
+   point of view [tclSHOWHYPS tac] is therefore equivalent to idtac,
+   except that it takes the time and memory of tac and prints "as"
+   information). The resulting (unchanged) goals are printed *after*
+   the as-expression, which forces pg to some gymnastic.
+   TODO: Have something similar (better?) in the xml protocol.
+   NOTE: some tactics delete hypothesis and reuse names (induction,
+   destruct), this is not detected by this tactical. *)
+let tclSHOWHYPS (tac : tactic) (goal: Goal.goal Evd.sigma)
+    : Goal.goal list Evd.sigma =
+  let oldhyps = pf_hyps goal in
+  let rslt:Goal.goal list Evd.sigma = tac goal in
+  let { it = gls; sigma = sigma; } = rslt in
+  let hyps =
+    List.map (fun gl -> pf_hyps { it = gl; sigma=sigma; }) gls in
+  let cmp d1 d2 = Names.Id.equal (NamedDecl.get_id d1) (NamedDecl.get_id d2) in
+  let newhyps =
+    List.map
+      (fun hypl -> List.subtract cmp hypl oldhyps)
+      hyps
+  in
+  let s =
+    let frst = ref true in
+    List.fold_left
+    (fun acc lh -> acc ^ (if !frst then (frst:=false;"") else " | ")
+      ^ (List.fold_left
+           (fun acc d -> (Names.Id.to_string (NamedDecl.get_id d)) ^ " " ^ acc)
+           "" lh))
+    "" newhyps in
+  Feedback.msg_notice
+    (str "<infoH>"
+      ++  (hov 0 (str s))
+      ++  (str "</infoH>"));
+  tclIDTAC goal;;
+
+(* ORELSE0 t1 t2 tries to apply t1 and if it fails, applies t2 *)
+let tclORELSE0 t1 t2 g =
+  try
+    t1 g
+  with (* Breakpoint *)
+    | e when CErrors.noncritical e ->
+      let e = Exninfo.capture e in catch_failerror e; t2 g
+
+(* ORELSE t1 t2 tries to apply t1 and if it fails or does not progress,
+   then applies t2 *)
+let tclORELSE t1 t2 = tclORELSE0 (tclPROGRESS t1) t2
+
+(* applies t1;t2then if t1 succeeds or t2else if t1 fails
+   t2* are called in terminal position (unless t1 produces more than
+   1 subgoal!) *)
+let tclORELSE_THEN t1 t2then t2else gls =
+  match
+    try Some(tclPROGRESS t1 gls)
+    with e when CErrors.noncritical e ->
+      let e = Exninfo.capture e in catch_failerror e; None
+  with
+    | None -> t2else gls
+    | Some sgl ->
+        let sigr, gl = unpackage sgl in
+        finish_tac (then_tac t2then  (sigr,gl))
+
+(* TRY f tries to apply f, and if it fails, leave the goal unchanged *)
+let tclTRY f = (tclORELSE0 f tclIDTAC)
+
+let tclTHENTRY f g = (tclTHEN f (tclTRY g))
+
+(* Try the first tactic that does not fail in a list of tactics *)
+
+let rec tclFIRST = function
+  | [] -> tclFAIL_s "No applicable tactic."
+  |  t::rest -> tclORELSE0 t (tclFIRST rest)
+
+(* Fails if a tactic did not solve the goal *)
+let tclCOMPLETE tac = tclTHEN tac (tclFAIL_s "Proof is not complete.")
+
+(* Iteration tacticals *)
+
+let tclDO n t =
+  let rec dorec k =
+    if k < 0 then user_err ~hdr:"Refiner.tclDO"
+      (str"Wrong argument : Do needs a positive integer.");
+    if Int.equal k 0 then tclIDTAC
+    else if Int.equal k 1 then t else (tclTHEN t (dorec (k-1)))
+  in
+  dorec n
+
+
+(* Beware: call by need of CAML, g is needed *)
+let rec tclREPEAT t g =
+  tclORELSE_THEN t (tclREPEAT t) tclIDTAC g
+
+let tclAT_LEAST_ONCE t = (tclTHEN t (tclREPEAT t))
 
 (************************************************************************)
 (* Tacticals applying on hypotheses                                     *)
@@ -245,10 +442,12 @@ let elimination_sort_of_clause = function
   | None -> elimination_sort_of_goal
   | Some id -> elimination_sort_of_hyp id
 
+(* Change evars *)
+let tclEVARS sigma gls = tclIDTAC {gls with Evd.sigma=sigma}
 
 let pf_with_evars glsev k gls =
   let evd, a = glsev gls in
-    tclTHEN (Refiner.tclEVARS evd) (k a) gls
+    tclTHEN (tclEVARS evd) (k a) gls
 
 let pf_constr_of_global gr k =
   pf_with_evars (fun gls -> pf_apply Evd.fresh_global gls gr) k
@@ -271,7 +470,7 @@ module New = struct
       | None -> Exninfo.reify ()
       | Some info -> info
     in
-    tclZERO ~info (Refiner.FailError (lvl,lazy msg))
+    tclZERO ~info (FailError (lvl,lazy msg))
 
   let tclZEROMSG ?info ?loc msg =
     let info = match info with
@@ -289,7 +488,7 @@ module New = struct
 
   let catch_failerror e =
     try
-      Refiner.catch_failerror e;
+      catch_failerror e;
       tclUNIT ()
     with e when CErrors.noncritical e ->
       let _, info = Exninfo.capture e in
@@ -320,7 +519,7 @@ module New = struct
 
   let tclONCE = Proofview.tclONCE
 
-  let tclEXACTLY_ONCE t = Proofview.tclEXACTLY_ONCE (Refiner.FailError(0,lazy (assert false))) t
+  let tclEXACTLY_ONCE t = Proofview.tclEXACTLY_ONCE (FailError(0,lazy (assert false))) t
 
   let tclIFCATCH t tt te =
     tclINDEPENDENT begin
@@ -570,7 +769,7 @@ module New = struct
       begin function (e, info) -> match e with
         | Logic_monad.Tac_Timeout as e ->
           let info = Exninfo.reify () in
-          Proofview.tclZERO ~info (Refiner.FailError (0,lazy (CErrors.print e)))
+          Proofview.tclZERO ~info (FailError (0,lazy (CErrors.print e)))
         | e -> Proofview.tclZERO ~info e
       end
 
diff --git a/tactics/tacticals.mli b/tactics/tacticals.mli
index 88419af836..48a06e6e1d 100644
--- a/tactics/tacticals.mli
+++ b/tactics/tacticals.mli
@@ -15,6 +15,13 @@ open Evd
 open Locus
 open Tactypes
 
+(** A special exception for levels for the Fail tactic *)
+exception FailError of int * Pp.t Lazy.t
+
+(** Takes an exception and either raise it at the next
+   level or do nothing. *)
+val catch_failerror  : Exninfo.iexn -> unit
+
 (** Tacticals i.e. functions from tactics to tactics. *)
 
 type tactic = Proofview.V82.tac
diff --git a/tactics/tactics.ml b/tactics/tactics.ml
index 3133f9be1e..af23747d43 100644
--- a/tactics/tactics.ml
+++ b/tactics/tactics.ml
@@ -30,7 +30,6 @@ open Genredexpr
 open Tacmach.New
 open Logic
 open Clenv
-open Refiner
 open Tacticals
 open Hipattern
 open Coqlib
@@ -355,7 +354,7 @@ let fresh_id_in_env avoid id env =
   next_ident_away_in_goal id avoid
 
 let fresh_id avoid id gl =
-  fresh_id_in_env avoid id (pf_env gl)
+  fresh_id_in_env avoid id (Tacmach.pf_env gl)
 
 let new_fresh_id avoid id gl =
   fresh_id_in_env avoid id (Proofview.Goal.env gl)
@@ -1007,7 +1006,7 @@ let find_intro_names ctxt gl =
       let name = fresh_id avoid (default_id env gl.sigma decl) gl in
       let newenv = push_rel decl env in
       (newenv, name :: idl, Id.Set.add name avoid))
-    ctxt (pf_env gl, [], Id.Set.empty) in
+    ctxt (Tacmach.pf_env gl, [], Id.Set.empty) in
   List.rev res
 
 let build_intro_tac id dest tac = match dest with
@@ -1383,7 +1382,7 @@ let clenv_refine_in ?err with_evars targetid id sigma0 clenv tac =
   if not with_evars && occur_meta clenv.evd new_hyp_typ then
     error_uninstantiated_metas new_hyp_typ clenv;
   let new_hyp_prf = clenv_value clenv in
-  let exact_tac = Refiner.refiner ~check:false EConstr.Unsafe.(to_constr new_hyp_prf) in
+  let exact_tac = Logic.refiner ~check:false EConstr.Unsafe.(to_constr new_hyp_prf) in
   let naming = NamingMustBe (CAst.make targetid) in
   let with_clear = do_replace (Some id) naming in
   Tacticals.New.tclTHEN