diff options
| author | Pierre-Marie Pédrot | 2018-05-25 10:57:55 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2018-05-25 10:57:55 +0200 |
| commit | 2e3fcd691a66683ea3d043c7c7bafbf1bcdfecf4 (patch) | |
| tree | 06a3e6ccd536d69c55d4cae95b5b55a80cbb01b1 /tactics | |
| parent | 46df9a89b530fb076a13c177945323886cc6c575 (diff) | |
| parent | 1f4beb7369a0462502b26476e8748f21cc92ef72 (diff) | |
Merge PR #7196: [tactics] Remove anonymous fix/cofix form.
Diffstat (limited to 'tactics')
| -rw-r--r-- | tactics/tactics.ml | 26 | ||||
| -rw-r--r-- | tactics/tactics.mli | 4 |
2 files changed, 4 insertions, 26 deletions
diff --git a/tactics/tactics.ml b/tactics/tactics.ml index 01351e2492..a42e4b44b5 100644 --- a/tactics/tactics.ml +++ b/tactics/tactics.ml @@ -563,20 +563,7 @@ let mutual_fix f n rest j = Proofview.Goal.enter begin fun gl -> end end -let warning_nameless_fix = - CWarnings.create ~name:"nameless-fix" ~category:"deprecated" Pp.(fun () -> - str "fix/cofix without a name are deprecated, please use the named version.") - -let fix ido n = match ido with - | None -> - warning_nameless_fix (); - Proofview.Goal.enter begin fun gl -> - let name = Proof_global.get_current_proof_name () in - let id = new_fresh_id Id.Set.empty name gl in - mutual_fix id n [] 0 - end - | Some id -> - mutual_fix id n [] 0 +let fix id n = mutual_fix id n [] 0 let rec check_is_mutcoind env sigma cl = let b = whd_all env sigma cl in @@ -619,16 +606,7 @@ let mutual_cofix f others j = Proofview.Goal.enter begin fun gl -> end end -let cofix ido = match ido with - | None -> - warning_nameless_fix (); - Proofview.Goal.enter begin fun gl -> - let name = Proof_global.get_current_proof_name () in - let id = new_fresh_id Id.Set.empty name gl in - mutual_cofix id [] 0 - end - | Some id -> - mutual_cofix id [] 0 +let cofix id = mutual_cofix id [] 0 (**************************************************************) (* Reduction and conversion tactics *) diff --git a/tactics/tactics.mli b/tactics/tactics.mli index 46f782eaa5..ddf78b1d4e 100644 --- a/tactics/tactics.mli +++ b/tactics/tactics.mli @@ -41,9 +41,9 @@ val convert_concl_no_check : types -> cast_kind -> unit Proofview.tactic val convert_hyp_no_check : named_declaration -> unit Proofview.tactic val mutual_fix : Id.t -> int -> (Id.t * int * constr) list -> int -> unit Proofview.tactic -val fix : Id.t option -> int -> unit Proofview.tactic +val fix : Id.t -> int -> unit Proofview.tactic val mutual_cofix : Id.t -> (Id.t * constr) list -> int -> unit Proofview.tactic -val cofix : Id.t option -> unit Proofview.tactic +val cofix : Id.t -> unit Proofview.tactic val convert : constr -> constr -> unit Proofview.tactic val convert_leq : constr -> constr -> unit Proofview.tactic |