@@ -88,7 +88,7 @@ where
8888
8989import Control.Exception (assert)
9090import Control.DeepSeq (NFData(..))
91−import Control.Monad (when)
91+import Control.Monad (when, void)
9292import Control.Monad.IO.Class (MonadIO(..))
9393import Data.Functor.Identity (runIdentity)
9494#if __GLASGOW_HASKELL__ < 808
@@ -208,7 +208,7 @@ foreign import ccall unsafe "string.h memchr" c_memchr
208208
209209-- XXX we are converting Int to CSize
210210memcpy :: Ptr Word8 -> Ptr Word8 -> Int -> IO ()
211−memcpy dst src len = c_memcpy dst src (fromIntegral len) >> return ()
211+memcpy dst src len = void (c_memcpy dst src (fromIntegral len))
212212
213213foreign import ccall unsafe "string.h memcmp" c_memcmp
214214 :: Ptr Word8 -> Ptr Word8 -> CSize -> IO CInt
@@ -293,16 +293,16 @@ unsafeSnoc arr@Array{..} x = do
293293 error "BUG: unsafeSnoc: writing beyond array bounds"
294294 poke aEnd x
295295 touchForeignPtr aStart
296− return $ arr {aEnd = aEnd `plusPtr` (sizeOf (undefined :: a))}
296+ return $ arr {aEnd = aEnd `plusPtr` sizeOf (undefined :: a)}
297297
298298{-# INLINE snoc #-}
299299snoc :: forall a. Storable a => Array a -> a -> IO (Array a)
300−snoc arr@Array {..} x = do
301− if (aEnd == aBound)
300+snoc arr@Array {..} x =
301+ if aEnd == aBound
302302 then do
303303 let oldStart = unsafeForeignPtrToPtr aStart
304304 size = aEnd `minusPtr` oldStart
305− newSize = (size + (sizeOf (undefined :: a)))
305+ newSize = size + sizeOf (undefined :: a)
306306 newPtr <- Malloc.mallocForeignPtrAlignedBytes
307307 newSize (alignment (undefined :: a))
308308 withForeignPtr newPtr $ \pNew -> do
@@ -317,7 +317,7 @@ snoc arr@Array {..} x = do
317317 else do
318318 poke aEnd x
319319 touchForeignPtr aStart
320− return $ arr {aEnd = aEnd `plusPtr` (sizeOf (undefined :: a))}
320+ return $ arr {aEnd = aEnd `plusPtr` sizeOf (undefined :: a)}
321321
322322-- | Reallocate the array to the specified size in bytes. If the size is less
323323-- than the original array the array gets truncated.
@@ -449,7 +449,7 @@ toStreamD Array{..} =
449449 r <- peek p
450450 touchForeignPtr aStart
451451 return r
452− return $ D.Yield x (p `plusPtr` (sizeOf (undefined :: a)))
452+ return $ D.Yield x (p `plusPtr` sizeOf (undefined :: a))
453453
454454{-# INLINE toStreamK #-}
455455toStreamK :: forall t m a. (K.IsStream t, Storable a) => Array a -> t m a
@@ -466,7 +466,7 @@ toStreamK Array{..} =
466466 r <- peek p
467467 touchForeignPtr aStart
468468 return r
469− in x `K.cons` go (p `plusPtr` (sizeOf (undefined :: a)))
469+ in x `K.cons` go (p `plusPtr` sizeOf (undefined :: a))
470470
471471{-# INLINE_NORMAL toStreamDRev #-}
472472toStreamDRev :: forall m a. (Monad m, Storable a) => Array a -> D.Stream m a
@@ -584,7 +584,7 @@ writeNUnsafe n = Fold step initial extract
584584 return $ ArrayUnsafe start end
585585 step (ArrayUnsafe start end) x = do
586586 liftIO $ poke end x
587− return $ (ArrayUnsafe start (end `plusPtr` sizeOf (undefined :: a)))
587+ return $ ArrayUnsafe start (end `plusPtr` sizeOf (undefined :: a))
588588 extract (ArrayUnsafe start end) = return $ Array start end end -- liftIO . shrinkToFit
589589
590590-- XXX The realloc based implementation needs to make one extra copy if we use
@@ -739,7 +739,7 @@ flattenArrays (D.Stream step state) = D.Stream step' (OuterLoop state)
739739 touchForeignPtr startf
740740 return r
741741 return $ D.Yield x (InnerLoop st startf
742− (p `plusPtr` (sizeOf (undefined :: a))) end)
742+ (p `plusPtr` sizeOf (undefined :: a)) end)
743743
744744{-# INLINE_NORMAL flattenArraysRev #-}
745745flattenArraysRev :: forall m a. (MonadIO m, Storable a)
@@ -811,7 +811,7 @@ toListFB c n Array{..} = go (unsafeForeignPtrToPtr aStart)
811811 r <- peek p
812812 touchForeignPtr aStart
813813 return r
814− in c x (go (p `plusPtr` (sizeOf (undefined :: a))))
814+ in c x (go (p `plusPtr` sizeOf (undefined :: a)))
815815
816816-- | Convert an 'Array' into a list.
817817--
@@ -842,9 +842,7 @@ fromList xs = unsafePerformIO $ fromStreamD $ D.fromList xs
842842
843843instance (Storable a, Read a, Show a) => Read (Array a) where
844844 {-# INLINE readPrec #-}
845− readPrec = do
846− xs <- readPrec
847− return (fromList xs)
845+ readPrec = fromList <$> readPrec
848846 readListPrec = readListPrecDefault
849847
850848instance (a ~ Char) => IsString (Array a) where
@@ -1037,7 +1035,7 @@ unlines sep (D.Stream step state) = D.Stream step' (OuterLoop state)
10371035 touchForeignPtr startf
10381036 return r
10391037 return $ D.Yield x (InnerLoop st startf
1040− (p `plusPtr` (sizeOf (undefined :: a))) end)
1038+ (p `plusPtr` sizeOf (undefined :: a)) end)
10411039
10421040-- Splice an array into a pre-reserved mutable array. The user must ensure
10431041-- that there is enough space in the mutable array.
@@ -1048,7 +1046,7 @@ spliceWith dst@(Array _ end bound) src = liftIO $ do
10481046 if end `plusPtr` srcLen > bound
10491047 then error "Bug: spliceIntoUnsafe: Not enough space in the target array"
10501048 else
1051− withForeignPtr (aStart dst) $ \_ -> do
1049+ withForeignPtr (aStart dst) $ \_ ->
10521050 withForeignPtr (aStart src) $ \psrc -> do
10531051 let pdst = aEnd dst
10541052 memcpy (castPtr pdst) (castPtr psrc) srcLen
@@ -1109,7 +1107,7 @@ packArraysChunksOf n (D.Stream step state) =
11091107 then D.Skip (SpliceYielding arr (SpliceInitial s))
11101108 else D.Skip (SpliceBuffering s arr)
11111109 D.Skip s -> return $ D.Skip (SpliceInitial s)
1112− D.Stop -> return $ D.Stop
1110+ D.Stop -> return D.Stop
11131111
11141112 step' gst (SpliceBuffering st buf) = do
11151113 r <- step gst st
@@ -1147,22 +1145,20 @@ lpackArraysChunksOf n (Fold step1 initial1 extract1) =
11471145 -- XXX we can pass the module string from the higher level API
11481146 error $ "Streamly.Internal.Memory.Array.Types.packArraysChunksOf: the size of "
11491147 ++ "arrays [" ++ show n ++ "] must be a natural number"
1150− r1 <- initial1
1151− return (Tuple' Nothing r1)
1148+ Tuple' Nothing <$> initial1
11521149
11531150 extract (Tuple' Nothing r1) = extract1 r1
11541151 extract (Tuple' (Just buf) r1) = do
11551152 r <- step1 r1 buf
11561153 extract1 r
11571154
1158− step (Tuple' Nothing r1) arr = do
1155+ step (Tuple' Nothing r1) arr =
11591156 let len = byteLength arr
11601157 in if len >= n
11611158 then do
11621159 r <- step1 r1 arr
11631160 extract1 r
1164− r1' <- initial1
1165− return (Tuple' Nothing r1')
1161+ Tuple' Nothing <$> initial1
11661162 else return (Tuple' (Just arr) r1)
11671163
11681164 step (Tuple' (Just buf) r1) arr = do
@@ -1176,8 +1172,7 @@ lpackArraysChunksOf n (Fold step1 initial1 extract1) =
11761172 then do
11771173 r <- step1 r1 buf''
11781174 extract1 r
1179− r1' <- initial1
1180− return (Tuple' Nothing r1')
1175+ Tuple' Nothing <$> initial1
11811176 else return (Tuple' (Just buf'') r1)
11821177
11831178#if !defined(mingw32_HOST_OS)
@@ -1222,7 +1217,7 @@ groupIOVecsOf n maxIOVLen (D.Stream step state) =
12221217 then return $ D.Skip (GatherYielding iov' (GatherInitial s))
12231218 else return $ D.Skip (GatherBuffering s iov' len)
12241219 D.Skip s -> return $ D.Skip (GatherInitial s)
1225− D.Stop -> return $ D.Stop
1220+ D.Stop -> return D.Stop
12261221
12271222 step' gst (GatherBuffering st iov len) = do
12281223 r <- step (adaptState gst) st
@@ -1330,7 +1325,7 @@ splitOn byte (D.Stream step state) = D.Stream step' (Initial state)
13301325 Nothing -> D.Skip (Buffering s arr1)
13311326 Just arr2 -> D.Skip (Yielding arr1 (Splitting s arr2))
13321327 D.Skip s -> return $ D.Skip (Initial s)
1333− D.Stop -> return $ D.Stop
1328+ D.Stop -> return D.Stop
13341329
13351330 step' gst (Buffering st buf) = do
13361331 r <- step gst st
@@ -1354,4 +1349,4 @@ splitOn byte (D.Stream step state) = D.Stream step' (Initial state)
13541349 Just arr2 -> D.Skip $ Yielding arr1 (Splitting st arr2)
13551350
13561351 step' _ (Yielding arr next) = return $ D.Yield arr next
1357− step' _ Finishing = return $ D.Stop
1352+ step' _ Finishing = return D.Stop