From 530eb0b1cbaf8d918aafee6f1aa4849804eebdb7 Mon Sep 17 00:00:00 2001
From: herbelin
Date: Wed, 11 Nov 2009 13:52:28 +0000
Subject: Fixing bug #2167 + attempt to test the compatibility of a more robust
 check of unconvertibility when providing "with" arguments to "apply".

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12498 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 pretyping/clenv.ml    |   4 +++-
 test-suite/csdp.cache | Bin 44878 -> 45094 bytes
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pretyping/clenv.ml b/pretyping/clenv.ml
index e838cb2e06..a3106b3980 100644
--- a/pretyping/clenv.ml
+++ b/pretyping/clenv.ml
@@ -406,9 +406,11 @@ let clenv_unify_binding_type clenv c t u =
       let evd,c = w_coerce_to_type (cl_env clenv) clenv.evd c t u in
       TypeProcessed, { clenv with evd = evd }, c
     with 
+      | Exc_located (_,Type_errors.TypeError (_,TypeError.ActualType _))
       | PretypeError (_,NotClean _) as e -> raise e
       | e when precatchable_exception e ->
-	  TypeNotProcessed, clenv, c
+(*	  TypeNotProcessed, clenv, c*)
+	  raise e
 
 let clenv_assign_binding clenv k (sigma,c) =
   let k_typ = clenv_hnf_constr clenv (clenv_meta_type clenv k) in
diff --git a/test-suite/csdp.cache b/test-suite/csdp.cache
index 645de69cda..17133cc8de 100644
Binary files a/test-suite/csdp.cache and b/test-suite/csdp.cache differ
-- 
cgit v1.2.3