[project @ 2000-10-16 08:24:18 by simonpj]

[ghc-hetmet.git] / ghc / compiler / types / TypeRep.lhs

diff --git a/ghc/compiler/types/TypeRep.lhs b/ghc/compiler/types/TypeRep.lhs
index 53e282c..f9643dc 100644 (file)
--- a/ghc/compiler/types/TypeRep.lhs
+++ b/ghc/compiler/types/TypeRep.lhs
@@ -27,18 +27,17 @@ import Var  ( TyVar, UVar )
 import VarEnv
 import VarSet
 
-import Name    ( Name, Provenance(..), ExportFlag(..),
-                 mkWiredInTyConName, mkGlobalName, mkKindOccFS, tcName,
-               )
+import Name    ( Name, mkGlobalName, mkKindOccFS, tcName )
+import OccName ( mkOccFS, tcName )
 import TyCon   ( TyCon, KindCon,
                  mkFunTyCon, mkKindCon, mkSuperKindCon,
                )
 import Class   ( Class )
 
 -- others
-import SrcLoc          ( mkBuiltinSrcLoc )
-import PrelNames       ( pREL_GHC, kindConKey, boxityConKey, boxedConKey, unboxedConKey, 
-                         typeConKey, anyBoxConKey, funTyConKey
+import SrcLoc          ( builtinSrcLoc )
+import PrelNames       ( pREL_GHC, kindConKey, boxityConKey, boxedConKey, 
+                         unboxedConKey, typeConKey, anyBoxConKey, funTyConName
                        )
 \end{code}
 
@@ -223,8 +222,7 @@ in two situations:
 
 
 \begin{code}
-mk_kind_name key str = mkGlobalName key pREL_GHC (mkKindOccFS tcName str)
-                                   (LocalDef mkBuiltinSrcLoc NotExported)
+mk_kind_name key str = mkGlobalName key pREL_GHC (mkKindOccFS tcName str) builtinSrcLoc
        -- mk_kind_name is a bit of a hack
        -- The LocalDef means that we print the name without
        -- a qualifier, which is what we want for these kinds.
@@ -297,7 +295,6 @@ mkArrowKinds arg_kinds result_kind = foldr mkArrowKind result_kind arg_kinds
 We define a few wired-in type constructors here to avoid module knots
 
 \begin{code}
-funTyConName = mkWiredInTyConName funTyConKey pREL_GHC SLIT("(->)") funTyCon
 funTyCon = mkFunTyCon funTyConName (mkArrowKinds [boxedTypeKind, boxedTypeKind] boxedTypeKind)
 \end{code}