diff options
author | Maxime Dénès <mail@maximedenes.fr> | 2017-12-14 17:49:08 +0100 |
---|---|---|
committer | Maxime Dénès <mail@maximedenes.fr> | 2017-12-14 17:49:08 +0100 |
commit | b270ad686075e5579dc3826fafdc324ea339785c (patch) | |
tree | ae92f5295953951fab6c56c1c249639551c75b0d /plugins/ltac/tacinterp.ml | |
parent | 71662ab9b00ac657663e192d942a4ba7f241fd59 (diff) | |
parent | 761dcf2355ac673b6fefe319fcbab907b1e8ec2d (diff) |
Merge PR #6386: Catch errors while coercing 'and' intro patterns
Diffstat (limited to 'plugins/ltac/tacinterp.ml')
-rw-r--r-- | plugins/ltac/tacinterp.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/ltac/tacinterp.ml b/plugins/ltac/tacinterp.ml index 32a3b53fd..ded902a8f 100644 --- a/plugins/ltac/tacinterp.ml +++ b/plugins/ltac/tacinterp.ml @@ -890,7 +890,7 @@ let interp_intro_pattern_naming_option ist env sigma = function let interp_or_and_intro_pattern_option ist env sigma = function | None -> sigma, None | Some (ArgVar (loc,id)) -> - (match coerce_to_intro_pattern env sigma (Id.Map.find id ist.lfun) with + (match interp_intro_pattern_var loc ist env sigma id with | IntroAction (IntroOrAndPattern l) -> sigma, Some (loc,l) | _ -> user_err ?loc (str "Cannot coerce to a disjunctive/conjunctive pattern.")) |