git.iko.soy/text
on master help sign in
Implement and test lazy unlines and unwords

--HG-- extra : convert_revision : b4e6604013cbddc733f57ea77c23bf434028428f

commit8d8633ca3937dccfc10c1c1e1e68e53f48787290 authorBryan O'Sullivan <bos@serpentine.com> dateSun 8 Mar 2009, 03:17 (18 years ago) parentb39bb25
2 files changed+31−17
compare with master
unifiedsplit
Data/Text/Lazy.hs+13−2 tests/Properties.hs+18−15
Data/Text/Lazy.hs+13−2
@@ -116,8 +116,8 @@ module Data.Text.Lazy
116116 -- ** Breaking into lines and words
117117 , lines
118118 , words
119− -- , unlines
120− -- , unwords
119+ , unlines
120+ , unwords
121121
122122 -- * Predicates
123123 -- , isPrefixOf
@@ -732,6 +732,17 @@ words :: Text -> [Text]
732732words = L.filter (not . null) . splitWith isSpace
733733{-# INLINE words #-}
734734
735+-- | /O(n)/ Joins lines, after appending a terminating newline to
736+-- each.
737+unlines :: [Text] -> Text
738+unlines = concat . L.map (`snoc` '\n')
739+{-# INLINE unlines #-}
740+
741+-- | /O(n)/ Joins words using single space characters.
742+unwords :: [Text] -> Text
743+unwords = intercalate (singleton ' ')
744+{-# INLINE unwords #-}
745+
735746revChunks :: [T.Text] -> Text
736747revChunks = L.foldl' (flip chunk) Empty
737748
tests/Properties.hs+18−15
@@ -127,8 +127,8 @@ prop_TL_cons x = ((x:) `eqP` (TL.unpack . TL.cons x))
127127prop_S_snoc x = (++ [x]) `eqP` (unpackT . (flip S.snoc) x)
128128prop_T_snoc x = (++ [x]) `eqP` (unpackT . (flip T.snoc) x)
129129prop_TL_snoc x = (++ [x]) `eqP` (unpackT . (flip TL.snoc) x)
130−prop_T_append s = (s++) `eqP` (unpackT . T.append (T.pack s))
131−prop_T_appendS s = (s++) `eqP` (unpackT . S.unstream . S.append (S.stream (T.pack s)) . S.stream)
130+prop_T_append s = (s++) `eqP` (unpackT . T.append (packT s))
131+prop_T_appendS s = (s++) `eqP` (unpackT . S.unstream . S.append (S.stream (packT s)) . S.stream)
132132
133133uncons (x:xs) = Just (x,xs)
134134uncons _ = Nothing
@@ -157,11 +157,11 @@ prop_T_length = length `eqP` T.length
157157prop_TL_length = length `eqP` (fromIntegral . TL.length)
158158prop_T_map f = map f `eqP` (unpackT . T.map f)
159159prop_TL_map f = map f `eqP` (unpackT . TL.map f)
160−prop_T_intercalate c = L.intercalate c `eq` (unpackT . T.intercalate (T.pack c) . map T.pack)
160+prop_T_intercalate c = L.intercalate c `eq` (unpackT . T.intercalate (packT c) . map packT)
161161prop_TL_intercalate c = L.intercalate c `eq` (unpackT . TL.intercalate (TL.pack c) . map TL.pack)
162162prop_T_intersperse c = L.intersperse c `eqP` (unpackT . T.intersperse c)
163163prop_TL_intersperse c = L.intersperse c `eqP` (unpackT . TL.intersperse c)
164−prop_T_transpose = L.transpose `eq` (map unpackT . T.transpose . map T.pack)
164+prop_T_transpose = L.transpose `eq` (map unpackT . T.transpose . map packT)
165165prop_TL_transpose = L.transpose `eq` (map unpackT . TL.transpose . map TL.pack)
166166prop_T_reverse = L.reverse `eqP` (unpackT . T.reverse)
167167prop_TL_reverse = L.reverse `eqP` (unpackT . TL.reverse)
@@ -186,9 +186,9 @@ prop_TL_foldr f z = L.foldr f z `eqP` TL.foldr f z
186186prop_T_foldr1 f = L.foldr1 f `eqEP` T.foldr1 f
187187prop_TL_foldr1 f = L.foldr1 f `eqEP` TL.foldr1 f
188188
189−prop_T_concat = L.concat `eq` (unpackT . T.concat . map T.pack)
189+prop_T_concat = L.concat `eq` (unpackT . T.concat . map packT)
190190prop_TL_concat = L.concat `eq` (unpackT . TL.concat . map TL.pack)
191−prop_T_concatMap f = L.concatMap f `eqP` (unpackT . T.concatMap (T.pack . f))
191+prop_T_concatMap f = L.concatMap f `eqP` (unpackT . T.concatMap (packT . f))
192192prop_TL_concatMap f = L.concatMap f `eqP` (unpackT . TL.concatMap (TL.pack . f))
193193prop_T_any p = L.any p `eqP` T.any p
194194prop_TL_any p = L.any p `eqP` TL.any p
@@ -295,13 +295,15 @@ prop_T_lines' = lines' `eqP` (map unpackT . T.lines')
295295-}
296296prop_T_words = L.words `eqP` (map unpackT . T.words)
297297prop_TL_words = L.words `eqP` (map unpackT . TL.words)
298−prop_T_unlines = L.unlines `eq` (unpackT . T.unlines . map T.pack)
299−prop_T_unwords = L.unwords `eq` (unpackT . T.unwords . map T.pack)
298+prop_T_unlines = L.unlines `eq` (unpackT . T.unlines . map packT)
299+prop_TL_unlines = L.unlines `eq` (unpackT . TL.unlines . map packT)
300+prop_T_unwords = L.unwords `eq` (unpackT . T.unwords . map packT)
301+prop_TL_unwords = L.unwords `eq` (unpackT . TL.unwords . map packT)
300302
301−prop_T_isPrefixOf s = L.isPrefixOf s`eqP` T.isPrefixOf (T.pack s)
302−prop_T_isPrefixOfS s = L.isPrefixOf s`eqP` (S.isPrefixOf (S.stream $ T.pack s) . S.stream)
303−prop_T_isSuffixOf s = L.isSuffixOf s`eqP` T.isSuffixOf (T.pack s)
304−prop_T_isInfixOf s = L.isInfixOf s `eqP` T.isInfixOf (T.pack s)
303+prop_T_isPrefixOf s = L.isPrefixOf s`eqP` T.isPrefixOf (packT s)
304+prop_T_isPrefixOfS s = L.isPrefixOf s`eqP` (S.isPrefixOf (S.stream $ packT s) . S.stream)
305+prop_T_isSuffixOf s = L.isSuffixOf s`eqP` T.isSuffixOf (packT s)
306+prop_T_isInfixOf s = L.isInfixOf s `eqP` T.isInfixOf (packT s)
305307
306308prop_T_elem c = L.elem c `eqP` T.elem c
307309prop_T_filter p = L.filter p `eqP` (unpackT . T.filter p)
@@ -309,13 +311,13 @@ prop_T_find p = L.find p `eqP` T.find p
309311prop_T_partition p = L.partition p `eqP` (unpack2 . T.partition p)
310312
311313prop_T_index x s = x < L.length s && x >= 0 ==>
312− (L.!!) s x == T.index (T.pack s) x
314+ (L.!!) s x == T.index (packT s) x
313315prop_T_findIndex p = L.findIndex p `eqP` T.findIndex p
314316prop_T_findIndices p = L.findIndices p`eqP` T.findIndices p
315317prop_T_elemIndex c = L.elemIndex c `eqP` T.elemIndex c
316318prop_T_elemIndices c = L.elemIndices c`eqP` T.elemIndices c
317319prop_T_count c = (L.length . L.elemIndices c) `eqP` T.count c
318−prop_T_zipWith c s = L.zipWith c s `eqP` (unpackT . T.zipWith c (T.pack s))
320+prop_T_zipWith c s = L.zipWith c s `eqP` (unpackT . T.zipWith c (packT s))
319321
320322-- Regression tests.
321323prop_S_filter_eq s = S.filter p t == S.streamList (filter p s)
@@ -491,7 +493,8 @@ tests = [
491493 ("prop_T_words", mytest prop_T_words),
492494 ("prop_TL_words", mytest prop_TL_words),
493495 ("prop_T_unlines", mytest prop_T_unlines),
494− ("prop_T_unwords", mytest prop_T_unwords),
496+ ("prop_TL_unlines", mytest prop_TL_unlines),
497+ ("prop_TL_unwords", mytest prop_TL_unwords),
495498
496499 ("prop_T_isPrefixOf", mytest prop_T_isPrefixOf),
497500 ("prop_T_isPrefixOfS", mytest prop_T_isPrefixOfS),