aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorppedrot2013-08-04 19:00:54 +0000
committerppedrot2013-08-04 19:00:54 +0000
commit494ba41794a2febd712a6bb9c4dd9b2c2b8dcde3 (patch)
tree5d5259d900cb3923635a016c9484ba03b7554e32
parentd91e0f86111718bc3146a6925d6f39c53ee990f1 (diff)
Fixing #3062. Computation of the value of a fresh identifier was
done too early and lead to dynamic conflicts. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16660 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--tactics/tactics.ml6
1 files changed, 3 insertions, 3 deletions
diff --git a/tactics/tactics.ml b/tactics/tactics.ml
index 228498a476..ea85730527 100644
--- a/tactics/tactics.ml
+++ b/tactics/tactics.ml
@@ -2028,11 +2028,11 @@ let induct_discharge dests avoid' tac (avoid,ra) names gl =
let id' = next_ident_away (add_prefix "IH" id) avoid in
(pat, [dloc, IntroIdentifier id'])
| _ -> consume_pattern avoid recvarname deprec gl names in
- let hyprec,names = consume_pattern avoid hyprecname depind gl names in
let dest = get_recarg_dest dests in
- safe_dest_intros_patterns avoid thin dest [recpat] (fun ids thin ->
+ safe_dest_intros_patterns avoid thin dest [recpat] (fun ids thin gl ->
+ let hyprec,names = consume_pattern avoid hyprecname depind gl names in
safe_dest_intros_patterns avoid thin MoveLast [hyprec] (fun ids' thin ->
- peel_tac ra' (update_dest dests ids') names thin))
+ peel_tac ra' (update_dest dests ids') names thin) gl)
gl
| (IndArg,dep,hyprecname) :: ra' ->
(* Rem: does not happen in Coq schemes, only in user-defined schemes *)