X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Frename%2FRnEnv.lhs;h=417d873092dc73bfcd1418c4e02d8a01ba71cb2a;hb=568d3f41cb2da3fe4887e13d69f152d66cbcb755;hp=b0a69968939c0234cc32a026066e84868db67df7;hpb=7473349e010c1f8f5d78afbe2b7c66345818406c;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/RnEnv.lhs b/ghc/compiler/rename/RnEnv.lhs
index b0a6996..417d873 100644
--- a/ghc/compiler/rename/RnEnv.lhs
+++ b/ghc/compiler/rename/RnEnv.lhs
@@ -48,7 +48,8 @@ import TcRnMonad
 import Name		( Name, nameIsLocalOrFrom, mkInternalName, isInternalName,
 			  nameSrcLoc, nameOccName, nameModuleName, nameParent )
 import NameSet
-import OccName		( tcName, isDataOcc, occNameFlavour, reportIfUnused )
+import OccName		( tcName, isDataOcc, occNameFlavour, reportIfUnused,
+			  isVarOcc )
 import Module		( Module, ModuleName, moduleName, mkHomeModule )
 import PrelNames	( mkUnboundName, rOOT_MAIN_Name, iNTERACTIVE )
 import UniqSupply
@@ -721,9 +722,12 @@ shadowedNameWarn doc shadow
     $$ doc
 
 unknownNameErr name
-  = sep [ptext SLIT("Not in scope:"), text flavour <+> quotes (ppr name)]
+  = sep [ptext SLIT("Not in scope:"), 
+	 if isVarOcc occ_name then quotes (ppr name)
+			      else text (occNameFlavour occ_name) 
+					<+> quotes (ppr name)]
   where
-    flavour = occNameFlavour (rdrNameOcc name)
+    occ_name = rdrNameOcc name
 
 unknownInstBndrErr cls op
   = quotes (ppr op) <+> ptext SLIT("is not a (visible) method of class") <+> quotes (ppr cls)