From 97f2cb04e369e07dc87dc15d4871b736776614bd Mon Sep 17 00:00:00 2001
From: msozeau
Date: Fri, 23 May 2008 11:47:43 +0000
Subject: - Fix bug #1858, Hint Unfold calling the wrong locate function. - Fix
 typeclass interface: instance_constructor now takes the instance   constrs as
 argument to build and return the corresponding term and   type. - Better
 typeclass error reporting when defining fixpoints.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10975 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 pretyping/typeclasses_errors.ml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'pretyping/typeclasses_errors.ml')

diff --git a/pretyping/typeclasses_errors.ml b/pretyping/typeclasses_errors.ml
index dc3f81f56f..aed42aa04d 100644
--- a/pretyping/typeclasses_errors.ml
+++ b/pretyping/typeclasses_errors.ml
@@ -6,7 +6,7 @@
 (*         *       GNU Lesser General Public License Version 2.1        *)
 (************************************************************************)
 
-(*i $Id:$ i*)
+(*i $Id$ i*)
 
 (*i*)
 open Names
@@ -41,6 +41,10 @@ let unbound_method env cid id = typeclass_error env (UnboundMethod (cid, id))
 
 let no_instance env id args = typeclass_error env (NoInstance (id, args))
 
-let unsatisfiable_constraints env evm = typeclass_error env (UnsatisfiableConstraints evm)
+let unsatisfiable_constraints env evd = 
+  let evd = Evd.undefined_evars evd in
+  let ev = List.hd (Evd.dom (Evd.evars_of evd)) in
+  let loc, _ = Evd.evar_source ev evd in
+    raise (Stdpp.Exc_located (loc, TypeClassError (env, UnsatisfiableConstraints evd)))
 
 let mismatched_ctx_inst env c n m = typeclass_error env (MismatchedContextInstance (c, n, m))
-- 
cgit v1.2.3