diff options
| author | msozeau | 2012-06-04 14:45:54 +0000 |
|---|---|---|
| committer | msozeau | 2012-06-04 14:45:54 +0000 |
| commit | bb7e5aa54afa577da7661fb43cefc9711ccfe4af (patch) | |
| tree | 3cda768748016bf44a47f79c1e35db1a4193c20d /toplevel/classes.ml | |
| parent | eb52433fbf064ae7c6f76178fb142a5e7b9e2dd1 (diff) | |
Forward-port fixes from 8.4 (15358, 15353, 15333).
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15418 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'toplevel/classes.ml')
| -rw-r--r-- | toplevel/classes.ml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toplevel/classes.ml b/toplevel/classes.ml index b4e44e7d34..dfbc95356e 100644 --- a/toplevel/classes.ml +++ b/toplevel/classes.ml @@ -172,7 +172,7 @@ let new_instance ?(abstract=false) ?(global=false) ctx (instid, bk, cl) props in let env' = push_rel_context ctx env in evars := Evarutil.nf_evar_map !evars; - evars := resolve_typeclasses ~with_goals:false ~fail:true env !evars; + evars := resolve_typeclasses ~filter:Typeclasses.no_goals ~fail:true env !evars; let sigma = !evars in let subst = List.map (Evarutil.nf_evar sigma) subst in if abstract then @@ -262,10 +262,10 @@ let new_instance ?(abstract=false) ?(global=false) ctx (instid, bk, cl) props in let _ = evars := Evarutil.nf_evar_map !evars; - evars := Typeclasses.resolve_typeclasses ~with_goals:false ~fail:true + evars := Typeclasses.resolve_typeclasses ~filter:Typeclasses.no_goals_or_obligations ~fail:true env !evars; (* Try resolving fields that are typeclasses automatically. *) - evars := Typeclasses.resolve_typeclasses ~with_goals:true ~fail:false + evars := Typeclasses.resolve_typeclasses ~filter:Typeclasses.all_evars ~fail:false env !evars in let termtype = Evarutil.nf_evar !evars termtype in |