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 /plugins | |
| 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 'plugins')
| -rw-r--r-- | plugins/derive/derive.ml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/derive/derive.ml b/plugins/derive/derive.ml index 4425e41652..4769c2dc53 100644 --- a/plugins/derive/derive.ml +++ b/plugins/derive/derive.ml @@ -102,6 +102,7 @@ let start_deriving f suchthat lemma = let terminator = Proof_global.make_terminator terminator in let pstate = Proof_global.start_dependent_proof ~ontop:None lemma kind goals terminator in - fst @@ Proof_global.with_current_proof begin fun _ p -> - Proof.run_tactic env Proofview.(tclFOCUS 1 2 shelve) p + Proof_global.simple_with_current_proof begin fun _ p -> + let p,_,() = Proof.run_tactic env Proofview.(tclFOCUS 1 2 shelve) p in + p end pstate |