diff options
| author |  Hugo Herbelin <Hugo.Herbelin@inria.fr> | 2017-12-06 09:32:51 +0100 |
|---|---|---|
| committer |  Maxime Dénès <mail@maximedenes.fr> | 2018-03-08 21:58:32 +0100 |
| commit | 6f30f76def8f6cf1abe7859f482b68c91b4c8709 (patch) | |
| tree | fbee213ff8e429ae89c58d60f55242df9a256235 /tactics | |
| parent | b731022c022cfeae9203f6b10b4e1f68b85d9071 (diff) | |
Proof engine: support for nesting tactic-in-term within other tactics.
Tactic-in-term can be called from within a tactic itself. We have to
preserve the preexisting future_goals (if called from pretyping) and
we have to inform of the existence of pending goals, using
future_goals which is the only way to tell it in the absence of being
part of an encapsulating proofview.
This fixes #6313.
Conversely, future goals, created by pretyping, can call ltac:(giveup) or
ltac:(shelve), and this has to be remembered. So, we do it.
Diffstat (limited to 'tactics')
| -rw-r--r-- | tactics/class_tactics.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tactics/class_tactics.ml b/tactics/class_tactics.ml index f386e804e..031f0bc0e 100644 --- a/tactics/class_tactics.ml +++ b/tactics/class_tactics.ml @@ -966,8 +966,7 @@ module Search = struct top_sort evm' goals else List.map (fun (ev, _) -> ev) (Evar.Map.bindings goals) in - let fgoals = Evd.future_goals evm in - let pgoal = Evd.principal_future_goal evm in + let fgoals = Evd.save_future_goals evm in let _, pv = Proofview.init evm' [] in let pv = Proofview.unshelve goals pv in try @@ -983,7 +982,8 @@ module Search = struct (str "leaking evar " ++ int (Evar.repr ev) ++ spc () ++ pr_ev evm' ev); acc && okev) evm' true); - let evm' = Evd.restore_future_goals evm' (shelved @ fgoals, pgoal) in + let fgoals = Evd.shelve_on_future_goals shelved fgoals in + let evm' = Evd.restore_future_goals evm' fgoals in let evm' = evars_reset_evd ~with_conv_pbs:true ~with_univs:false evm' evm in Some evm' else raise Not_found |