projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Follow OccName changes in TysPrim
[ghc-hetmet.git]
/
compiler
/
prelude
/
TysPrim.lhs
diff --git
a/compiler/prelude/TysPrim.lhs
b/compiler/prelude/TysPrim.lhs
index
6fabd44
..
6fc79bd
100644
(file)
--- 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 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
import TyCon ( TyCon, mkPrimTyCon, mkLiftedPrimTyCon,
PrimRep(..) )
import Type
@@
-100,7
+100,7
@@
primTyCons
mkPrimTc :: FastString -> Unique -> TyCon -> Name
mkPrimTc fs unique tycon
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
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)
\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]
noSrcSpan) kind
| u <- [2..],
let name | c <= 'z' = [c]