X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcSimplify.lhs;h=11e202be9b3e57ecfa8e86a58ecfc16bb367eb78;hb=8897e76874e10daa4dc695342e68b15e114a6de0;hp=7aaa1ae7ca2901a1fc8c2b4ea92d661f88e59a54;hpb=e94ca46c4a4b5522a9eb3b971b6330b3bfbe2285;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcSimplify.lhs b/compiler/typecheck/TcSimplify.lhs
index 7aaa1ae..11e202b 100644
--- a/compiler/typecheck/TcSimplify.lhs
+++ b/compiler/typecheck/TcSimplify.lhs
@@ -1637,7 +1637,7 @@ this bracket again at its usage site.
 \begin{code}
 tcSimplifyBracket :: [Inst] -> TcM ()
 tcSimplifyBracket wanteds
-  = do	{ tryHardCheckLoop doc wanteds
+  = do	{ _ <- tryHardCheckLoop doc wanteds
 	; return () }
   where
     doc = text "tcSimplifyBracket"
@@ -2903,12 +2903,16 @@ disambigGroup :: [Type]			-- The default types
 	      -> TcM ()	-- Just does unification, to fix the default types
 
 disambigGroup default_tys dicts
-  = try_default default_tys
+  = do { mb_chosen_ty <- try_default default_tys
+       ; case mb_chosen_ty of
+            Nothing        -> return ()
+            Just chosen_ty -> do { _ <- unifyType chosen_ty (mkTyVarTy tyvar) 
+	    	 	         ; warnDefault dicts chosen_ty } }
   where
     (_,_,tyvar) = ASSERT(not (null dicts)) head dicts	-- Should be non-empty
     classes = [c | (_,c,_) <- dicts]
 
-    try_default [] = return ()
+    try_default [] = return Nothing
     try_default (default_ty : default_tys)
       = tryTcLIE_ (try_default default_tys) $
     	do { tcSimplifyDefault [mkClassPred clas [default_ty] | clas <- classes]
@@ -2918,10 +2922,7 @@ disambigGroup default_tys dicts
 		-- For example, if Real a is reqd, but the only type in the
 		-- default list is Int.
 
-		-- After this we can't fail
-	   ; warnDefault dicts default_ty
-	   ; unifyType default_ty (mkTyVarTy tyvar) 
-	   ; return () -- TOMDO: do something with the coercion
+	   ; return (Just default_ty) -- TOMDO: do something with the coercion
 	   }