Skip to content

rename unsafe traversals #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 20, 2018
Merged

rename unsafe traversals #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0748dbc
rename unsafe traversals
andrewthad Apr 19, 2018
50edd21
rename last remaining vestige of unsafeTraverseArray
andrewthad Apr 19, 2018
cdc9807
Merge branch 'master' into rename_unsafe_traversals
andrewthad Apr 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Data/Primitive/Array.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module Data.Primitive.Array (
sizeofArray, sizeofMutableArray,
fromListN, fromList,
mapArray',
unsafeTraverseArray
traverseArrayP
) where

import Control.Monad.Primitive
Expand Down Expand Up @@ -521,9 +521,9 @@ traverseArray f = \ !ary ->

{-# RULES
"traverse/ST" forall (f :: a -> ST s b). traverseArray f =
unsafeTraverseArray f
traverseArrayP f
"traverse/IO" forall (f :: a -> IO b). traverseArray f =
unsafeTraverseArray f
traverseArrayP f
#-}
#if MIN_VERSION_base(4,8,0)
{-# RULES
Expand All @@ -538,12 +538,12 @@ traverseArray f = \ !ary ->
-- "affine" 'PrimMonad' instance. In particular, it must only produce
-- *one* result array. 'Control.Monad.Trans.List.ListT'-transformed
-- monads, for example, will not work right at all.
unsafeTraverseArray
traverseArrayP
:: PrimMonad m
=> (a -> m b)
-> Array a
-> m (Array b)
unsafeTraverseArray f = \ !ary ->
traverseArrayP f = \ !ary ->
let
!sz = sizeofArray ary
go !i !mary
Expand All @@ -558,7 +558,7 @@ unsafeTraverseArray f = \ !ary ->
in do
mary <- newArray sz badTraverseValue
go 0 mary
{-# INLINE unsafeTraverseArray #-}
{-# INLINE traverseArrayP #-}

-- | Strict map over the elements of the array.
mapArray' :: (a -> b) -> Array a -> Array b
Expand Down
14 changes: 7 additions & 7 deletions Data/Primitive/SmallArray.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ module Data.Primitive.SmallArray
, smallArrayFromList
, smallArrayFromListN
, mapSmallArray'
, unsafeTraverseSmallArray
, traverseSmallArrayP
) where


Expand Down Expand Up @@ -411,13 +411,13 @@ sizeofSmallMutableArray (SmallMutableArray ma) = sizeofMutableArray ma
-- "affine" 'PrimMonad' instance. In particular, it must only produce
-- *one* result array. 'Control.Monad.Trans.List.ListT'-transformed
-- monads, for example, will not work right at all.
unsafeTraverseSmallArray
traverseSmallArrayP
:: PrimMonad m
=> (a -> m b)
-> SmallArray a
-> m (SmallArray b)
#if HAVE_SMALL_ARRAY
unsafeTraverseSmallArray f = \ !ary ->
traverseSmallArrayP f = \ !ary ->
let
!sz = sizeofSmallArray ary
go !i !mary
Expand All @@ -433,9 +433,9 @@ unsafeTraverseSmallArray f = \ !ary ->
mary <- newSmallArray sz badTraverseValue
go 0 mary
#else
unsafeTraverseSmallArray f (SmallArray ar) = SmallArray `liftM` unsafeTraverseArray f ar
traverseSmallArrayP f (SmallArray ar) = SmallArray `liftM` traverseArrayP f ar
#endif
{-# INLINE unsafeTraverseSmallArray #-}
{-# INLINE traverseSmallArrayP #-}

-- | Strict map over the elements of the array.
mapSmallArray' :: (a -> b) -> SmallArray a -> SmallArray b
Expand Down Expand Up @@ -698,8 +698,8 @@ traverseSmallArray f = \ !ary ->
{-# INLINE [1] traverseSmallArray #-}

{-# RULES
"traverse/ST" forall (f :: a -> ST s b). traverseSmallArray f = unsafeTraverseSmallArray f
"traverse/IO" forall (f :: a -> IO b). traverseSmallArray f = unsafeTraverseSmallArray f
"traverse/ST" forall (f :: a -> ST s b). traverseSmallArray f = traverseSmallArrayP f
"traverse/IO" forall (f :: a -> IO b). traverseSmallArray f = traverseSmallArrayP f
"traverse/Id" forall (f :: a -> Identity b). traverseSmallArray f =
(coerce :: (SmallArray a -> SmallArray (Identity b))
-> SmallArray a -> Identity (SmallArray b)) (fmap f)
Expand Down