diff options
| author | msozeau | 2010-07-27 13:37:36 +0000 |
|---|---|---|
| committer | msozeau | 2010-07-27 13:37:36 +0000 |
| commit | a73354053c8e6e9c1d02320f622fe8408526b5e6 (patch) | |
| tree | 67eb4e5544423ceebf7048c81b8337276a509bd6 /pretyping | |
| parent | 4d51d7e42125ecfec94768cac77e67026574c6f8 (diff) | |
Minor fixes:
- Document and fix [autounfold]
- Fix warning about default Firstorder tactic object not being defined
- Fix treatment of implicits in Program Lemma.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13334 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/pretyping.ml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml index 618a62f848..dfd92f0c17 100644 --- a/pretyping/pretyping.ml +++ b/pretyping/pretyping.ml @@ -690,7 +690,11 @@ module Pretyping_F (Coercion : Coercion.S) = struct if resolve_classes then ( evdref := Typeclasses.resolve_typeclasses ~onlyargs:false ~split:true ~fail:fail_evar env !evdref); - evdref := consider_remaining_unif_problems env !evdref; + evdref := (try consider_remaining_unif_problems env !evdref + with e when not resolve_classes -> + consider_remaining_unif_problems env + (Typeclasses.resolve_typeclasses ~onlyargs:false + ~split:true ~fail:fail_evar env !evdref)); let c = if expand_evar then nf_evar !evdref c' else c' in if fail_evar then check_evars env Evd.empty !evdref c; c |