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 /libraries/base/GHC/RTS | |
| 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 'libraries/base/GHC/RTS')
| -rw-r--r-- | libraries/base/GHC/RTS/Flags.hsc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libraries/base/GHC/RTS/Flags.hsc b/libraries/base/GHC/RTS/Flags.hsc index 16764e55c1..308aafbf91 100644 --- a/libraries/base/GHC/RTS/Flags.hsc +++ b/libraries/base/GHC/RTS/Flags.hsc @@ -51,7 +51,7 @@ import GHC.Word type Time = Word64 -- | @'nat'@ defined in @rts/Types.h@ -type Nat = #{type unsigned int} +type RtsNat = #{type unsigned int} data GiveGCStats = NoGCStats @@ -78,19 +78,19 @@ instance Enum GiveGCStats where data GCFlags = GCFlags { statsFile :: Maybe FilePath , giveStats :: GiveGCStats - , maxStkSize :: Nat - , initialStkSize :: Nat - , stkChunkSize :: Nat - , stkChunkBufferSize :: Nat - , maxHeapSize :: Nat - , minAllocAreaSize :: Nat - , minOldGenSize :: Nat - , heapSizeSuggestion :: Nat + , maxStkSize :: RtsNat + , initialStkSize :: RtsNat + , stkChunkSize :: RtsNat + , stkChunkBufferSize :: RtsNat + , maxHeapSize :: RtsNat + , minAllocAreaSize :: RtsNat + , minOldGenSize :: RtsNat + , heapSizeSuggestion :: RtsNat , heapSizeSuggestionAuto :: Bool , oldGenFactor :: Double , pcFreeHeap :: Double - , generations :: Nat - , steps :: Nat + , generations :: RtsNat + , steps :: RtsNat , squeezeUpdFrames :: Bool , compact :: Bool -- ^ True <=> "compact all the time" , compactThreshold :: Double @@ -305,7 +305,7 @@ getGCFlags = do ptr <- getGcFlagsPtr GCFlags <$> (peekFilePath =<< #{peek GC_FLAGS, statsFile} ptr) <*> (toEnum . fromIntegral <$> - (#{peek GC_FLAGS, giveStats} ptr :: IO Nat)) + (#{peek GC_FLAGS, giveStats} ptr :: IO RtsNat)) <*> #{peek GC_FLAGS, maxStkSize} ptr <*> #{peek GC_FLAGS, initialStkSize} ptr <*> #{peek GC_FLAGS, stkChunkSize} ptr @@ -367,7 +367,7 @@ getCCFlags :: IO CCFlags getCCFlags = do ptr <- getCcFlagsPtr CCFlags <$> (toEnum . fromIntegral - <$> (#{peek COST_CENTRE_FLAGS, doCostCentres} ptr :: IO Nat)) + <$> (#{peek COST_CENTRE_FLAGS, doCostCentres} ptr :: IO RtsNat)) <*> #{peek COST_CENTRE_FLAGS, profilerTicks} ptr <*> #{peek COST_CENTRE_FLAGS, msecsPerTick} ptr |