X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FInst.lhs;h=8195a822fc98cefd0056e811b7e15f73a8a17059;hb=474b582b68ea9289f3da4355da816164138604b0;hp=962e4e08f315837e5c7fc964983f4867232c028b;hpb=ab241c5d6187a93acffc609bdbffdae30ff9b284;p=ghc-hetmet.git

diff --git a/compiler/typecheck/Inst.lhs b/compiler/typecheck/Inst.lhs
index 962e4e0..8195a82 100644
--- a/compiler/typecheck/Inst.lhs
+++ b/compiler/typecheck/Inst.lhs
@@ -76,6 +76,8 @@ import DynFlags
 import Maybes
 import Util
 import Outputable
+
+import Data.List
 \end{code}
 
 
@@ -617,8 +619,8 @@ addLocalInst home_ie ispec
 getOverlapFlag :: TcM OverlapFlag
 getOverlapFlag 
   = do 	{ dflags <- getDOpts
-	; let overlap_ok    = dopt Opt_AllowOverlappingInstances dflags
-	      incoherent_ok = dopt Opt_AllowIncoherentInstances  dflags
+	; let overlap_ok    = dopt Opt_OverlappingInstances dflags
+	      incoherent_ok = dopt Opt_IncoherentInstances  dflags
 	      overlap_flag | incoherent_ok = Incoherent
 			   | overlap_ok    = OverlapOk
 			   | otherwise     = NoOverlap
@@ -659,7 +661,7 @@ data LookupInstResult
   | GenInst [Inst] (LHsExpr TcId)	-- The expression and its needed insts
 
 lookupSimpleInst :: Inst -> TcM LookupInstResult
--- This is "simple" in tthat it returns NoInstance for implication constraints
+-- This is "simple" in that it returns NoInstance for implication constraints
 
 -- It's important that lookupInst does not put any new stuff into
 -- the LIE.  Instead, any Insts needed by the lookup are returned in