diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2015-05-01 15:05:11 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2015-05-01 15:06:26 +0100 |
| commit | 2f6a0ac7061c59ed68a6dd5a2243e3e690acbd5f (patch) | |
| tree | 3a0cca1160b5479c3ef89f3df565ab470cd62e41 /compiler/prelude/PrelNames.hs | |
| parent | de5d022e1543283effd67c2a03598e2bcaf49930 (diff) | |
| download | haskell-2f6a0ac7061c59ed68a6dd5a2243e3e690acbd5f.tar.gz | |
Move IP, Symbol, Nat to ghc-prim
This motivation is to declare class IP much earlier (in ghc-prim),
so that implicit parameters (which depend on IP) is available
to library code, notably the 'error' function.
* Move class IP from base:GHC.IP
to ghc-prim:GHC.Classes
* Delete module GHC.IP from base
* Move types Symbol and Nat
from base:GHC.TypeLits
to ghc-prim:GHC.Types
There was a name clash in GHC.RTS.Flags, where I renamed
the local type Nat to RtsNat.
Diffstat (limited to 'compiler/prelude/PrelNames.hs')
| -rw-r--r-- | compiler/prelude/PrelNames.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/prelude/PrelNames.hs b/compiler/prelude/PrelNames.hs index 34499f3242..113dfdc507 100644 --- a/compiler/prelude/PrelNames.hs +++ b/compiler/prelude/PrelNames.hs @@ -407,7 +407,7 @@ gHC_PRIM, gHC_TYPES, gHC_GENERICS, gHC_MAGIC, tYPEABLE, tYPEABLE_INTERNAL, gENERICS, rEAD_PREC, lEX, gHC_INT, gHC_WORD, mONAD, mONAD_FIX, mONAD_ZIP, aRROW, cONTROL_APPLICATIVE, gHC_DESUGAR, rANDOM, gHC_EXTS, - cONTROL_EXCEPTION_BASE, gHC_TYPELITS, gHC_IP :: Module + cONTROL_EXCEPTION_BASE, gHC_TYPELITS :: Module gHC_PRIM = mkPrimModule (fsLit "GHC.Prim") -- Primitive types and values gHC_TYPES = mkPrimModule (fsLit "GHC.Types") @@ -461,7 +461,6 @@ gHC_EXTS = mkBaseModule (fsLit "GHC.Exts") cONTROL_EXCEPTION_BASE = mkBaseModule (fsLit "Control.Exception.Base") gHC_GENERICS = mkBaseModule (fsLit "GHC.Generics") gHC_TYPELITS = mkBaseModule (fsLit "GHC.TypeLits") -gHC_IP = mkBaseModule (fsLit "GHC.IP") gHC_PARR' :: Module gHC_PARR' = mkBaseModule (fsLit "GHC.PArr") @@ -1195,7 +1194,7 @@ knownSymbolClassName = clsQual gHC_TYPELITS (fsLit "KnownSymbol") knownSymbolCl -- Implicit parameters ipClassName :: Name -ipClassName = clsQual gHC_IP (fsLit "IP") ipClassNameKey +ipClassName = clsQual gHC_CLASSES (fsLit "IP") ipClassNameKey -- Source Locations callStackDataConName, callStackTyConName, srcLocDataConName :: Name |