e89e5c1 · streamly · git.iko.soy

git.iko.soy/streamly

Change signature of getIndex to return Maybe

commite89e5c1d6db1f58649e71d3f06661b446d7e9d0e authorRanjeet Kumar Ranjan <ranjeetr@composewell.com> dateFri 14 Jul 2023, 19:49 (3 years ago) parenta87bf85

2 files changed+9−7

compare with master

unifiedsplit

core/src/Streamly/Internal/Data/Array/Generic/Mut/Type.hs+3−3 core/src/Streamly/Internal/Data/Array/Mut/Type.hs+6−4

core/src/Streamly/Internal/Data/Array/Generic/Mut/Type.hs+3−3

@@ -468,11 +468,11 @@ getIndexUnsafe n MutArray {..} =

468468-- | /O(1)/ Lookup the element at the given index. Index starts from 0.

469469--

470470{-# INLINE getIndex #-}

471−getIndex :: MonadIO m => Int -> MutArray a -> m a

471+getIndex :: MonadIO m => Int -> MutArray a -> m (Maybe a)

472472getIndex i arr@MutArray {..} =

473473 if i >= 0 && i < arrLen

474− then getIndexUnsafe i arr

475− else invalidIndex "getIndex" i

474+ then Just <$> getIndexUnsafe i arr

475+ else return Nothing

476476

477477-------------------------------------------------------------------------------

478478-- Subarrays

core/src/Streamly/Internal/Data/Array/Mut/Type.hs+6−4

@@ -994,12 +994,12 @@ getIndexUnsafe i MutArray{..} = do

994994-- | /O(1)/ Lookup the element at the given index. Index starts from 0.

995995--

996996{-# INLINE getIndex #-}

997−getIndex :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m a

997+getIndex :: forall m a. (MonadIO m, Unbox a) => Int -> MutArray a -> m (Maybe a)

998998getIndex i MutArray{..} = do

999999 let index = INDEX_OF(arrStart,i,a)

10001000 if i >= 0 && INDEX_VALID(index,arrEnd,a)

1001− then liftIO $ peekWith arrContents index

1002− else invalidIndex "getIndex" i

1001+ then liftIO $ Just <$> peekWith arrContents index

1002+ else return Nothing

10031003

10041004-- | /O(1)/ Lookup the element at the given index from the end of the array.

10051005-- Index starts from 0.

@@ -1038,7 +1038,9 @@ getIndicesD liftio (D.Stream stepi sti) = Unfold step inject

10381038 case r of

10391039 D.Yield i s -> do

10401040 x <- liftio $ getIndex i (MutArray contents start end undefined)

1041− return $ D.Yield x (GetIndicesState contents start end s)

1041+ case x of

1042+ Just v -> return $ D.Yield v (GetIndicesState contents start end s)

1043+ Nothing -> error "Invalid Index"

10421044 D.Skip s -> return $ D.Skip (GetIndicesState contents start end s)

10431045 D.Stop -> return D.Stop

10441046