diff options
| author | Pierre-Marie Pédrot | 2019-05-14 23:21:34 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2019-05-14 23:21:34 +0200 |
| commit | 2a60906dd9d295615bcfa4b1fce8cea9626d965f (patch) | |
| tree | 5681d71e2cd4c038fcff690dfbc3f9d3f994bb87 /proofs/pfedit.ml | |
| parent | 75262c3f8af195a83673ff06a53d0fd0bd23b57e (diff) | |
| parent | 06b60655b98580baab98f35f6c89716e2381934c (diff) | |
Merge PR #10125: Allow run_tactic to return a value, remove hack from ltac2
Ack-by: SkySkimmer
Reviewed-by: ppedrot
Diffstat (limited to 'proofs/pfedit.ml')
| -rw-r--r-- | proofs/pfedit.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/proofs/pfedit.ml b/proofs/pfedit.ml index 4f36354f79..52e15f466f 100644 --- a/proofs/pfedit.ml +++ b/proofs/pfedit.ml @@ -98,7 +98,7 @@ let solve ?with_end_tac gi info_lvl tac pr = else tac in let env = Global.env () in - let (p,(status,info)) = Proof.run_tactic env tac pr in + let (p,(status,info),()) = Proof.run_tactic env tac pr in let env = Global.env () in let sigma = Evd.from_env env in let () = @@ -161,7 +161,7 @@ let refine_by_tactic ~name ~poly env sigma ty tac = let prev_future_goals = save_future_goals sigma in (* Start a proof *) let prf = Proof.start ~name ~poly sigma [env, ty] in - let (prf, _) = + let (prf, _, ()) = try Proof.run_tactic env tac prf with Logic_monad.TacticFailure e as src -> (* Catch the inner error of the monad tactic *) |