X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fprelude%2FTysPrim.lhs;fp=compiler%2Fprelude%2FTysPrim.lhs;h=6fc79bda11069699553eba1a6deef8341349677c;hp=6fabd44fcd22ddf338825c607b6e6dad8011eb98;hb=21dcb917858ecc6a851f05815ecd6a097e3b7a9d;hpb=5eb542caabfca8c719be507998aee8cebdf8d505 diff --git a/compiler/prelude/TysPrim.lhs b/compiler/prelude/TysPrim.lhs index 6fabd44..6fc79bd 100644 --- a/compiler/prelude/TysPrim.lhs +++ b/compiler/prelude/TysPrim.lhs @@ -48,7 +48,7 @@ module TysPrim( import Var ( TyVar, mkTyVar ) import Name ( Name, BuiltInSyntax(..), mkInternalName, mkWiredInName ) -import OccName ( mkOccNameFS, tcName, mkTyVarOcc ) +import OccName ( mkTyVarOccFS, mkTcOccFS ) import TyCon ( TyCon, mkPrimTyCon, mkLiftedPrimTyCon, PrimRep(..) ) import Type @@ -100,7 +100,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 +146,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]