diff options
author | Simon Peyton Jones <simonpj@microsoft.com> | 2012-12-19 17:35:51 +0000 |
---|---|---|
committer | Simon Peyton Jones <simonpj@microsoft.com> | 2012-12-19 17:35:51 +0000 |
commit | aad93f5c9eb9d53cddf85019192ba0da6004d17e (patch) | |
tree | 257cd475eb97501cf121eda180a1459477fa8e88 /compiler/prelude/TysPrim.lhs | |
parent | 8c1aab0d75ce7499408c5493cf4aacdb196fa915 (diff) | |
download | haskell-aad93f5c9eb9d53cddf85019192ba0da6004d17e.tar.gz |
Move the kind Nat and Symbol out of TysPrim and into TysWiredIn
They properly belong in TysWiredIn, since they are defined in Haskell
in GHC.TypeLits.
Moveover, make them WiredIn (again as they should be) and use
checkWiredInTyCon when encountering them in TcHsType.tc_hs_type,
so that the interface file is loaded. This fixes Trac #7502.
Diffstat (limited to 'compiler/prelude/TysPrim.lhs')
-rw-r--r-- | compiler/prelude/TysPrim.lhs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/compiler/prelude/TysPrim.lhs b/compiler/prelude/TysPrim.lhs index 8c8b4b7bf3..8b9cbf9ac2 100644 --- a/compiler/prelude/TysPrim.lhs +++ b/compiler/prelude/TysPrim.lhs @@ -34,7 +34,6 @@ module TysPrim( -- Kinds anyKind, liftedTypeKind, unliftedTypeKind, openTypeKind, constraintKind, mkArrowKind, mkArrowKinds, - typeNatKind, typeStringKind, funTyCon, funTyConName, primTyCons, @@ -344,12 +343,6 @@ unliftedTypeKind = kindTyConType unliftedTypeKindTyCon openTypeKind = kindTyConType openTypeKindTyCon constraintKind = kindTyConType constraintKindTyCon -typeNatKind :: Kind -typeNatKind = kindTyConType (mkKindTyCon typeNatKindConName superKind) - -typeStringKind :: Kind -typeStringKind = kindTyConType (mkKindTyCon typeStringKindConName superKind) - -- | Given two kinds @k1@ and @k2@, creates the 'Kind' @k1 -> k2@ mkArrowKind :: Kind -> Kind -> Kind mkArrowKind k1 k2 = FunTy k1 k2 |