X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FInst.lhs;h=f8630280bee2022a98b5870291741eaf176de9b0;hb=1867a7bb8c59ea514b4f47f5434842543933ec9a;hp=d41e36f63ea73e55ddd963388e900fdff003d399;hpb=04d0ebc95aefb1e619be3078112b4d5c62a3a79f;p=ghc-hetmet.git

diff --git a/compiler/typecheck/Inst.lhs b/compiler/typecheck/Inst.lhs
index d41e36f..f863028 100644
--- a/compiler/typecheck/Inst.lhs
+++ b/compiler/typecheck/Inst.lhs
@@ -61,7 +61,7 @@ import InstEnv
 import FunDeps
 import TcMType
 import TcType
-import DsUtils
+import MkCore
 import Type
 import TypeRep
 import Class
@@ -385,7 +385,7 @@ mkPredName uniq loc pred_ty
 		-- we use the outermost tycon of the lhs, if there is one, to
 		-- improve readability of Core code
 	        baseOcc = case splitTyConApp_maybe ty of
-			    Nothing      -> mkOccName tcName "$"
+			    Nothing      -> mkTcOcc "$"
                             Just (tc, _) -> getOccName tc
 \end{code}
 
@@ -401,7 +401,7 @@ newMethodFromName :: InstOrigin -> BoxyRhoType -> Name -> TcM TcId
 newMethodFromName origin ty name = do
     id <- tcLookupId name
 	-- Use tcLookupId not tcLookupGlobalId; the method is almost
-	-- always a class op, but with -fno-implicit-prelude GHC is
+	-- always a class op, but with -XNoImplicitPrelude GHC is
 	-- meant to find whatever thing is in scope, and that may
 	-- be an ordinary function. 
     loc <- getInstLoc origin
@@ -862,7 +862,7 @@ tcGetInstEnvs = do { eps <- getEps; env <- getGblEnv;
 %*									*
 %************************************************************************
 
-Suppose we are doing the -fno-implicit-prelude thing, and we encounter
+Suppose we are doing the -XNoImplicitPrelude thing, and we encounter
 a do-expression.  We have to find (>>) in the current environment, which is
 done by the rename. Then we have to check that it has the same type as
 Control.Monad.(>>).  Or, more precisely, a compatible type. One 'customer' had