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

diff --git a/compiler/prelude/TysPrim.lhs b/compiler/prelude/TysPrim.lhs
index 6fabd44..c69bea1 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 )
@@ -59,7 +58,7 @@ import StaticFlags
 import FastString
 import Outputable
 
-import Char 		( ord, chr )
+import Data.Char
 \end{code}
 
 %************************************************************************
@@ -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
@@ -131,7 +130,7 @@ bcoPrimTyConName 	      = mkPrimTc (fsLit "BCO#") bcoPrimTyConKey bcoPrimTyCon
 weakPrimTyConName  	      = mkPrimTc (fsLit "Weak#") weakPrimTyConKey weakPrimTyCon
 threadIdPrimTyConName  	      = mkPrimTc (fsLit "ThreadId#") threadIdPrimTyConKey threadIdPrimTyCon
 anyPrimTyConName	      = mkPrimTc (fsLit "Any") anyPrimTyConKey anyPrimTyCon
-anyPrimTyCon1Name	      = mkPrimTc (fsLit "Any1") anyPrimTyCon1Key anyPrimTyCon
+anyPrimTyCon1Name	      = mkPrimTc (fsLit "Any1") anyPrimTyCon1Key anyPrimTyCon1
 \end{code}
 
 %************************************************************************
@@ -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]