diff options
Diffstat (limited to 'libraries/ghci')
| -rw-r--r-- | libraries/ghci/GHCi/BreakArray.hs | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/libraries/ghci/GHCi/BreakArray.hs b/libraries/ghci/GHCi/BreakArray.hs index 05d13bda67..18c1d96b30 100644 --- a/libraries/ghci/GHCi/BreakArray.hs +++ b/libraries/ghci/GHCi/BreakArray.hs @@ -32,20 +32,10 @@ import Control.Monad import Data.Word import GHC.Word -import GHC.Exts hiding (extendWord8#, narrowWord8#) +import GHC.Exts import GHC.IO ( IO(..) ) import System.IO.Unsafe ( unsafeDupablePerformIO ) -#if MIN_VERSION_base(4,16,0) -import GHC.Base (extendWord8#, narrowWord8#) -#else -narrowWord8#, extendWord8# :: Word# -> Word# -narrowWord8# w = w -extendWord8# w = w -{-# INLINE narrowWord8# #-} -{-# INLINE extendWord8# #-} -#endif - data BreakArray = BA (MutableByteArray# RealWorld) breakOff, breakOn :: Word8 @@ -104,22 +94,22 @@ newBreakArray :: Int -> IO BreakArray newBreakArray entries@(I# sz) = do BA array <- allocBA entries case breakOff of - W8# off -> do + off -> do let loop n | isTrue# (n ==# sz) = return () - | otherwise = do writeBA# array n (extendWord8# off); loop (n +# 1#) + | otherwise = do writeBA# array n off; loop (n +# 1#) loop 0# return $ BA array -writeBA# :: MutableByteArray# RealWorld -> Int# -> Word# -> IO () -writeBA# array i word = IO $ \s -> - case writeWord8Array# array i word s of { s -> (# s, () #) } +writeBA# :: MutableByteArray# RealWorld -> Int# -> Word8 -> IO () +writeBA# array i (W8# w) = IO $ \s -> + case writeWord8Array# array i w s of { s -> (# s, () #) } writeBreakArray :: BreakArray -> Int -> Word8 -> IO () -writeBreakArray (BA array) (I# i) (W8# word) = writeBA# array i (extendWord8# word) +writeBreakArray (BA array) (I# i) word = writeBA# array i word readBA# :: MutableByteArray# RealWorld -> Int# -> IO Word8 readBA# array i = IO $ \s -> - case readWord8Array# array i s of { (# s, c #) -> (# s, W8# (narrowWord8# c) #) } + case readWord8Array# array i s of { (# s, c #) -> (# s, W8# c #) } readBreakArray :: BreakArray -> Int -> IO Word8 readBreakArray (BA array) (I# i) = readBA# array i |