220f2b9 · text · git.iko.soy

Data/Text.hs+11−1

compare with master

unifiedsplit

@@ -80,7 +80,7 @@ module Data.Text

80 -- , scanr1

81

82 -- ** Accumulating maps

83− -- , mapAccumL

83+ , mapAccumL

84 -- , mapAccumR

85

86 -- ** Generation and unfolding

@@ -504,6 +504,16 @@ scanl1 f t | null t = empty

504 | otherwise = scanl f (head t) (tail t)

505{-# INLINE scanl1 #-}

506

507+-- | /O(n)/ Like a combination of 'map' and 'foldl'. Applies a

508+-- function to each element of a 'Text', passing an accumulating

509+-- parameter from left to right, and returns a final 'Text'.

510+--

511+-- /Note/: Unlike the version over lists, this function does not return a

512+-- final value for the accumulator.

513+mapAccumL :: (a -> Char -> (a,Char)) -> a -> Text -> Text

514+mapAccumL f z t = unstream (S.mapAccumL f z (stream t))

515+{-# INLINE mapAccumL #-}

516+

507-- -----------------------------------------------------------------------------

517-- -----------------------------------------------------------------------------

508-- ** Generating and unfolding 'Text's

518-- ** Generating and unfolding 'Text's

509

519

Data/Text/Fusion.hs+17

@@ -64,6 +64,9 @@ module Data.Text.Fusion

64 -- ** Scans

65 , scanl

66

67+ -- ** Accumulating maps

68+ , mapAccumL

69+

67 -- ** Generation and unfolding

70 -- ** Generation and unfolding

68 , replicate

71 , replicate

69 , unfoldr

72 , unfoldr

@@ -559,6 +562,20 @@ scanl f z0 (Stream next0 s0 len) = Stream next (S1 :!: z0 :!: s0) (len+1)

559 Done -> Done

562 Done -> Done

560{-# INLINE [0] scanl #-}

563{-# INLINE [0] scanl #-}

561

564

565+-- -----------------------------------------------------------------------------

566+-- ** Accumulating maps

567+

568+mapAccumL :: (a -> Char -> (a,Char)) -> a -> Stream Char -> Stream Char

569+mapAccumL f z0 (Stream next0 s0 len) = Stream next (s0 :!: z0) len

570+ where

571+ {-# INLINE next #-}

572+ next (s :!: z) = case next0 s of

573+ Yield x s' -> let (z',y) = f z x

574+ in Yield y (s' :!: z')

575+ Skip s' -> Skip (s' :!: z)

576+ Done -> Done

577+{-# INLINE [0] mapAccumL #-}

578+

562-- -----------------------------------------------------------------------------

579-- -----------------------------------------------------------------------------

563-- ** Generating and unfolding streams

580-- ** Generating and unfolding streams

564

581

tests/Properties.hs+5

@@ -74,6 +74,9 @@ prop_minimum = L.minimum `eqEP` T.minimum

74prop_scanl f z = L.scanl f z `eqP` (unpack . T.scanl f z)

75prop_scanl1 f = L.scanl1 f `eqP` (unpack . T.scanl1 f)

76

77+prop_mapAccumL f z = (snd . L.mapAccumL f z)`eqP` (unpack . T.mapAccumL f z)

78+ where types = f :: Int -> Char -> (Int,Char)

79+

77prop_replicate n = L.replicate n `eq` (unpack . T.replicate n)

80prop_replicate n = L.replicate n `eq` (unpack . T.replicate n)

78prop_unfoldr n = L.unfoldr f `eq` (unpack . T.unfoldr f)

81prop_unfoldr n = L.unfoldr f `eq` (unpack . T.unfoldr f)

79 where f c | fromEnum c * 100 > n = Nothing

82 where f c | fromEnum c * 100 > n = Nothing

@@ -162,6 +165,8 @@ tests = [

162 ("prop_scanl", mytest prop_scanl),

165 ("prop_scanl", mytest prop_scanl),

163 ("prop_scanl1", mytest prop_scanl1),

166 ("prop_scanl1", mytest prop_scanl1),

164

167

168+ ("prop_mapAccumL", mytest prop_mapAccumL),

169+

165 ("prop_replicate", mytest prop_replicate),

170 ("prop_replicate", mytest prop_replicate),

166 ("prop_unfoldr", mytest prop_unfoldr),

171 ("prop_unfoldr", mytest prop_unfoldr),

167 ("prop_unfoldrN", mytest prop_unfoldrN),

172 ("prop_unfoldrN", mytest prop_unfoldrN),