X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fprelude%2FTysPrim.lhs;h=6e74fd987d64884acb76131e7f162fd4ddc4b32b;hp=6fabd44fcd22ddf338825c607b6e6dad8011eb98;hb=d436c70d43fb905c63220040168295e473f4b90a;hpb=950245d1bec88895e647595039a61744d2f872b1;ds=sidebyside

diff --git a/compiler/prelude/TysPrim.lhs b/compiler/prelude/TysPrim.lhs
index 6fabd44..6e74fd9 100644
--- a/compiler/prelude/TysPrim.lhs
+++ b/compiler/prelude/TysPrim.lhs
@@ -48,9 +48,8 @@ module TysPrim(
 
 import Var		( TyVar, mkTyVar )
 import Name		( Name, BuiltInSyntax(..), mkInternalName, mkWiredInName )
-import OccName		( mkOccNameFS, tcName, mkTyVarOcc )
-import TyCon		( TyCon, mkPrimTyCon, mkLiftedPrimTyCon,
-			  PrimRep(..) )
+import OccName		( mkTyVarOccFS, mkTcOccFS )
+import TyCon		( TyCon, mkPrimTyCon, mkLiftedPrimTyCon )
 import Type
 import SrcLoc
 import Unique		( mkAlphaTyVarUnique, pprUnique )
@@ -100,7 +99,7 @@ primTyCons
 
 mkPrimTc :: FastString -> Unique -> TyCon -> Name
 mkPrimTc fs unique tycon
-  = mkWiredInName gHC_PRIM (mkOccNameFS tcName fs) 
+  = mkWiredInName gHC_PRIM (mkTcOccFS fs) 
 		  unique
 		  (ATyCon tycon)	-- Relevant TyCon
 		  UserSyntax		-- None are built-in syntax
@@ -146,7 +145,7 @@ alphaTyVars is a list of type variables for use in templates:
 \begin{code}
 tyVarList :: Kind -> [TyVar]
 tyVarList kind = [ mkTyVar (mkInternalName (mkAlphaTyVarUnique u) 
-				(mkTyVarOcc (mkFastString name))
+				(mkTyVarOccFS (mkFastString name))
 			 	noSrcSpan) kind
 	         | u <- [2..],
 		   let name | c <= 'z'  = [c]