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 )
import FastString
import Outputable
-import Char ( ord, chr )
+import Data.Char
\end{code}
%************************************************************************
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
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}
%************************************************************************
\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]