X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcSMonad.lhs;h=4965a931467b089ab304871cc8565197c6606efe;hb=b3e722e9ff0aeedceeeeacc67d61e11a5ee5b92a;hp=73a7229bed2da0b7f2a93bae5351057245957eaf;hpb=d2ce0f52d42edf32bb9f13796e6ba6edba8bd516;p=ghc-hetmet.git

diff --git a/compiler/typecheck/TcSMonad.lhs b/compiler/typecheck/TcSMonad.lhs
index 73a7229..4965a93 100644
--- a/compiler/typecheck/TcSMonad.lhs
+++ b/compiler/typecheck/TcSMonad.lhs
@@ -31,7 +31,7 @@ module TcSMonad (
  
     getInstEnvs, getFamInstEnvs,                -- Getting the environments 
     getTopEnv, getGblEnv, getTcEvBinds, getUntouchablesTcS,
-    getTcEvBindsBag, getTcSContext,
+    getTcEvBindsBag, getTcSContext, getTcSTyBinds,
 
 
     newFlattenSkolemTy,                         -- Flatten skolems 
@@ -64,7 +64,6 @@ module TcSMonad (
 import HscTypes
 import BasicTypes 
 import Type
-import TcRnTypes
 
 import Inst
 import InstEnv 
@@ -96,6 +95,8 @@ import HsBinds               -- for TcEvBinds stuff
 import Id 
 import FunDeps
 
+import TcRnTypes
+
 import Control.Monad
 import Data.IORef
 \end{code}
@@ -282,7 +283,8 @@ isGiven (Given {}) = True
 isGiven _          = False 
 
 isDerived :: CtFlavor -> Bool 
-isDerived ctid =  not $ isGiven ctid || isWanted ctid 
+isDerived (Derived {}) = True
+isDerived _            = False
 
 canRewrite :: CtFlavor -> CtFlavor -> Bool 
 -- canRewrite ctid1 ctid2