Ticket #54: nfdata.dpatch

1 patch for repository http://code.haskell.org/vector:

Sat Jan  7 17:09:49 CET 2012  Bas van Dijk <v.dijk.bas@gmail.com>
  * Added NFData instances for all vectors

New patches:

[Added NFData instances for all vectors
Bas van Dijk <v.dijk.bas@gmail.com>**20120107160949
 Ignore-this: 7def955f95e5af88790e772a0373c0c6
] {
hunk ./Data/Vector.hs 1
-{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, TypeFamilies, Rank2Types #-}
+{-# LANGUAGE FlexibleInstances
+           , MultiParamTypeClasses
+           , TypeFamilies
+           , Rank2Types
+           , BangPatterns
+  #-}
 
 -- |
 -- Module      : Data.Vector
hunk ./Data/Vector.hs 164
 import           Data.Primitive.Array
 import qualified Data.Vector.Fusion.Stream as Stream
 
+import Control.DeepSeq ( NFData, rnf )
 import Control.Monad ( MonadPlus(..), liftM, ap )
 import Control.Monad.ST ( ST )
 import Control.Monad.Primitive
hunk ./Data/Vector.hs 200
                        {-# UNPACK #-} !(Array a)
         deriving ( Typeable )
 
+instance NFData a => NFData (Vector a) where
+    rnf (Vector i n arr) = force i
+        where
+          force !ix | ix < n    = rnf (indexArray arr ix) `seq` force (ix+1)
+                    | otherwise = ()
+
 instance Show a => Show (Vector a) where
   showsPrec = G.showsPrec
 
hunk ./Data/Vector/Mutable.hs 57
 import           Data.Primitive.Array
 import           Control.Monad.Primitive
 
+import Control.DeepSeq ( NFData, rnf )
+
 import Prelude hiding ( length, null, replicate, reverse, map, read,
                         take, drop, splitAt, init, tail )
 
hunk ./Data/Vector/Mutable.hs 75
 type IOVector = MVector RealWorld
 type STVector s = MVector s
 
+instance NFData a => NFData (MVector s a) where
+    rnf (MVector i n arr) = unsafeInlineST $ force i
+        where
+          force !ix | ix < n    = do x <- readArray arr ix
+                                     rnf x `seq` force (ix+1)
+                    | otherwise = return ()
+
 instance G.MVector MVector a where
   {-# INLINE basicLength #-}
   basicLength (MVector _ n _) = n
hunk ./Data/Vector/Primitive.hs 143
 import           Data.Primitive.ByteArray
 import           Data.Primitive ( Prim, sizeOf )
 
+import Control.DeepSeq ( NFData )
+
 import Control.Monad ( liftM )
 import Control.Monad.ST ( ST )
 import Control.Monad.Primitive
hunk ./Data/Vector/Primitive.hs 177
                        {-# UNPACK #-} !ByteArray
   deriving ( Typeable )
 
+instance NFData (Vector a)
+
 instance (Show a, Prim a) => Show (Vector a) where
   showsPrec = G.showsPrec
 
hunk ./Data/Vector/Primitive/Mutable.hs 58
 import           Control.Monad.Primitive
 import           Control.Monad ( liftM )
 
+import Control.DeepSeq ( NFData )
+
 import Prelude hiding ( length, null, replicate, reverse, map, read,
                         take, drop, splitAt, init, tail )
 
hunk ./Data/Vector/Primitive/Mutable.hs 76
 type IOVector = MVector RealWorld
 type STVector s = MVector s
 
+instance NFData (MVector s a)
+
 instance Prim a => G.MVector MVector a where
   basicLength (MVector _ n _) = n
   basicUnsafeSlice j m (MVector i n arr)
hunk ./Data/Vector/Storable.hs 149
 import Foreign.Ptr
 import Foreign.Marshal.Array ( advancePtr, copyArray )
 
+import Control.DeepSeq ( NFData )
+
 import Control.Monad.ST ( ST )
 import Control.Monad.Primitive
 
hunk ./Data/Vector/Storable.hs 183
                        {-# UNPACK #-} !(ForeignPtr a)
         deriving ( Typeable )
 
+instance NFData (Vector a)
+
 instance (Show a, Storable a) => Show (Vector a) where
   showsPrec = G.showsPrec
 
hunk ./Data/Vector/Storable/Mutable.hs 60
   unsafeWith
 ) where
 
+import Control.DeepSeq ( NFData )
+
 import qualified Data.Vector.Generic.Mutable as G
 import Data.Vector.Storable.Internal
 
hunk ./Data/Vector/Storable/Mutable.hs 93
 type IOVector = MVector RealWorld
 type STVector s = MVector s
 
+instance NFData (MVector s a)
+
 instance Storable a => G.MVector MVector a where
   {-# INLINE basicLength #-}
   basicLength (MVector n _) = n
hunk ./Data/Vector/Unboxed/Base.hs 25
 
 import qualified Data.Vector.Primitive as P
 
+import Control.DeepSeq ( NFData )
+
 import Control.Monad.Primitive
 import Control.Monad ( liftM )
 
hunk ./Data/Vector/Unboxed/Base.hs 55
 
 class (G.Vector Vector a, M.MVector MVector a) => Unbox a
 
+instance NFData (Vector a)
+instance NFData (MVector s a)
+
 -- -----------------
 -- Data and Typeable
 -- -----------------
hunk ./vector.cabal 174
   Install-Includes:
         vector.h
 
-  Build-Depends: base >= 4 && < 5, primitive >= 0.4.0.1 && < 0.5, ghc-prim
+  Build-Depends: base >= 4 && < 5
+               , primitive >= 0.4.0.1 && < 0.5
+               , ghc-prim
+               , deepseq >= 1.1 && < 1.4
 
   if impl(ghc<6.13)
     Ghc-Options: -finline-if-enough-args -fno-method-sharing
}

Context:

[Allow streams to produce entire vectors as well as individual elements
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20120107110600
 Ignore-this: 727e51c5d236ecb0d1021c5b740b983
 
 This is a signficant extension to the stream fusion mechanism. A Stream is now
 parametrised with a vector type and offers two iteration modes: individual
 elements and individual elements + vectors. This supports significantly more
 efficient implementations of block operations. For instance, (++) will now use
 memcpy where possible rather than iterating through the elements in a loop.
 
 Comments are sorely lacking at the moment.
] 
[Change version number again
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20120107104052
 Ignore-this: d52e18bc0bbf221385cc59cfccdabfba
] 
[Use SPEC in stream comparisons
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20120107103044
 Ignore-this: 59ff46e5b834400450af94e425d025ab
] 
[Export SPEC
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20120107103031
 Ignore-this: 7e2a7f45ba99ad62eea28de474bbdd83
] 
[Bump version
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20120107102613
 Ignore-this: d4ff3ccc4c17210317f430fcd4cd4fb7
] 
[Strictness fix
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20120107102518
 Ignore-this: 904948491a2e1a5a21cbabda0ada5706
] 
[Documentation
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20111231134323
 Ignore-this: 6f836ae502f1b072a851a3bc9fccc625
] 
[Bump version
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20111231134314
 Ignore-this: dac62c46a54308d64912d15865f25bbd
] 
[TAG 0.9.1
Roman Leshchinskiy <rl@cse.unsw.edu.au>**20111231003141
 Ignore-this: ee19d3940a3827eefe4cb13b99a863bf
] 
Patch bundle hash:
778368550298d4ccca504b0b20aff148a5854f16