Commit 21dcb917 authored by batterseapower's avatar batterseapower
Browse files

Follow OccName changes in TysPrim

parent 5eb542ca
...@@ -48,7 +48,7 @@ module TysPrim( ...@@ -48,7 +48,7 @@ module TysPrim(
import Var ( TyVar, mkTyVar ) import Var ( TyVar, mkTyVar )
import Name ( Name, BuiltInSyntax(..), mkInternalName, mkWiredInName ) import Name ( Name, BuiltInSyntax(..), mkInternalName, mkWiredInName )
import OccName ( mkOccNameFS, tcName, mkTyVarOcc ) import OccName ( mkTyVarOccFS, mkTcOccFS )
import TyCon ( TyCon, mkPrimTyCon, mkLiftedPrimTyCon, import TyCon ( TyCon, mkPrimTyCon, mkLiftedPrimTyCon,
PrimRep(..) ) PrimRep(..) )
import Type import Type
...@@ -100,7 +100,7 @@ primTyCons ...@@ -100,7 +100,7 @@ primTyCons
mkPrimTc :: FastString -> Unique -> TyCon -> Name mkPrimTc :: FastString -> Unique -> TyCon -> Name
mkPrimTc fs unique tycon mkPrimTc fs unique tycon
= mkWiredInName gHC_PRIM (mkOccNameFS tcName fs) = mkWiredInName gHC_PRIM (mkTcOccFS fs)
unique unique
(ATyCon tycon) -- Relevant TyCon (ATyCon tycon) -- Relevant TyCon
UserSyntax -- None are built-in syntax UserSyntax -- None are built-in syntax
...@@ -146,7 +146,7 @@ alphaTyVars is a list of type variables for use in templates: ...@@ -146,7 +146,7 @@ alphaTyVars is a list of type variables for use in templates:
\begin{code} \begin{code}
tyVarList :: Kind -> [TyVar] tyVarList :: Kind -> [TyVar]
tyVarList kind = [ mkTyVar (mkInternalName (mkAlphaTyVarUnique u) tyVarList kind = [ mkTyVar (mkInternalName (mkAlphaTyVarUnique u)
(mkTyVarOcc (mkFastString name)) (mkTyVarOccFS (mkFastString name))
noSrcSpan) kind noSrcSpan) kind
| u <- [2..], | u <- [2..],
let name | c <= 'z' = [c] let name | c <= 'z' = [c]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment