BitStringRandomMonad 0.1.1.2 → 0.2.0.0

raw patch · 2 files changed

+23/−11 lines, 2 filesdep ~basePVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base

API changes (from Hackage documentation)

Files

• BitStringRandomMonad.cabal +2/−2
• Crypto/RandomMonad.hs +21/−9

@@ -2,7 +2,7 @@ --  documentation, see http://haskell.org/cabal/users-guide/  name:                BitStringRandomMonad-version:             0.1.1.2+version:             0.2.0.0 description:         A library which turns a bytestring into a random monad.                      Input could be any PRNG which can output a lazy                      bytestring.@@ -19,7 +19,7 @@   exposed-modules:     Crypto.RandomMonad   -- other-modules:   other-extensions:    GeneralizedNewtypeDeriving, FlexibleContexts, TypeFamilies-  build-depends:       base >=4.9 && <4.10,+  build-depends:       base >=4.8 && <4.10,                        transformers,                        bytestring,                        bitstring,

@@ -3,7 +3,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE Trustworthy #-} -module Crypto.RandomMonad (RndT, RndST, RndIO, Rnd, RndState, getRandomM, getRandom2M, runRndT, newRandomElementST, getRandomElement, randomElementsLength, replaceSeedM, addSeedM, getRandomByteStringM, RandomElementsListST(), BitStringToRandomExceptions(..)) where+module Crypto.RandomMonad (RndT, RndST, RndIO, Rnd, RndState, getRandomM, getRandom2M, runRndT, newRandomElementST, getRandomElement, randomElementsLength, replaceSeedM, addSeedM, getRandomByteStringM, RandomElementsListST, RndStateList(..), BitStringToRandomExceptions(..)) where  import Control.Exception (Exception, throw) import Control.Monad.Identity (Identity)@@ -33,10 +33,17 @@   convert' :: Integer -> Bool -> Integer   convert' prev cur = (shiftL prev 1) .|. (case cur of True -> 1 ; False -> 0) -multipleBitstringsSplitAt i x = join' (split' x) [] []+multipleBitstringsSplitAt i (RndStateListSequencial [x]) = let (takers, droppers) = BS.splitAt i x in ([takers], RndStateListSequencial [droppers])+multipleBitstringsSplitAt i (RndStateListSequencial x) = join' (split' x) [] []  where+ split' = map $ BS.splitAt i+ join' [] takers droppers = (takers, RndStateListSequencial droppers)+ join' (x:xs) takers droppers = let (newTake, newDrop) = x in join' xs (newTake:takers) (newDrop:droppers)+multipleBitstringsSplitAt i (RndStateListParallel [x]) = let (takers, droppers) = BS.splitAt i x in ([takers], RndStateListParallel [droppers])+multipleBitstringsSplitAt i (RndStateListParallel x) = join' (split' x) [] []+ where  split' = parMap rpar (\bs -> let (take,drop) = BS.splitAt i bs in (take `using` rseq, drop))- join' [] takers droppers = (takers, droppers)+ join' [] takers droppers = (takers, RndStateListParallel droppers)  join' (x:xs) takers droppers = let (newTake, newDrop) = x in join' xs (newTake:takers) (newDrop:droppers)  multipleBitstringsAssertLength _ [] = False@@ -48,7 +55,7 @@                    else False  -getRandom :: Integer -> [BS.BitString] -> (Integer, [BS.BitString])+getRandom :: Integer -> RndStateList -> (Integer, RndStateList) getRandom 0 x = (0, x) getRandom max string = if has_error                           then error "There was an error acquiring random data"@@ -61,14 +68,14 @@     random = foldl (\i cur -> xor i $ convertBitStringToInteger cur) 0 used     (used, unused) = multipleBitstringsSplitAt (fromIntegral bitsNeeded') string -getRandom2 :: Integer -> Integer -> [BS.BitString] -> (Integer, [BS.BitString])+getRandom2 :: Integer -> Integer -> RndStateList -> (Integer, RndStateList) getRandom2 a b string = getRandom2' (getRandom (max' - min') string)   where   min' = min a b   max' = max a b   getRandom2' (random, unused) = (random + min', unused) -getRandomByteString :: Integer -> [BS.BitString] -> (ByS.ByteString, [BS.BitString])+getRandomByteString :: Integer -> RndStateList -> (ByS.ByteString, RndStateList) getRandomByteString 0 x = (ByS.pack [], x) getRandomByteString len x = let (byte, newState) = getRandom 255 x ; (allBytes, lastState) = getRandomByteString (len - 1) newState in (ByS.cons (fromIntegral byte) allBytes, lastState) @@ -95,7 +102,11 @@   vec <- lift $ readSTRef ref   return $ V.length vec -type RndState = [BS.BitString]+type RndStatePrimitive = [BS.BitString]+data RndStateList = RndStateListSequencial RndStatePrimitive+                  | RndStateListParallel RndStatePrimitive++type RndState = RndStateList newtype RndT m a = RndT   { unRndT :: StateT RndState m a }   deriving (Functor, Applicative, Monad, MonadTrans)@@ -112,10 +123,11 @@ replaceSeedM :: Monad m => RndState -> RndT m () replaceSeedM s = RndT $ put s -addSeedM :: Monad m => RndState -> RndT m ()+addSeedM :: Monad m => RndStatePrimitive -> RndT m () addSeedM s = RndT $ state $ addSeedM s   where-  addSeedM x y = ((),x ++ y)+  addSeedM x (RndStateListSequencial y) = ((),RndStateListSequencial (x ++ y))+  addSeedM x (RndStateListParallel y) = ((),RndStateListParallel (x ++ y))   getRandomM :: Monad m => Integer -> RndT m Integer