d1c7fad · text · git.iko.soy

git.iko.soy/text

Minor cleanups

--HG-- extra : convert_revision : 9c06057618f0777423e52239db1966a95888d489

commitd1c7fadfeb3c02d942ac76a359ddef6eb81ab62f authorBryan O'Sullivan <bos@serpentine.com> dateSun 1 Mar 2009, 06:16 (18 years ago) parentadf55b9

2 files changed+8−7

compare with master

unifiedsplit

Data/Text/Lazy.hs+6−6 Data/Text/Lazy/Fusion.hs+2−1

Data/Text/Lazy.hs+6−6

@@ -179,13 +179,13 @@ instance IsString Text where

179179--

180180-- This function is subject to array fusion.

181181pack :: String -> Text

182−pack = unstream . S.streamList

182+pack s = unstream (S.streamList s)

183183{-# INLINE [1] pack #-}

184184

185185-- | /O(n)/ Convert a 'Text' into a 'String'.

186186-- Subject to array fusion.

187187unpack :: Text -> String

188−unpack = S.unstreamList . stream

188+unpack t = S.unstreamList (stream t)

189189{-# INLINE [1] unpack #-}

190190

191191singleton :: Char -> Text

@@ -193,9 +193,9 @@ singleton c = Chunk (T.singleton c) Empty

193193{-# INLINE [1] singleton #-}

194194

195195{-# RULES

196−"TEXT singleton -> fused" [~1] forall c.

196+"LAZY TEXT singleton -> fused" [~1] forall c.

197197 singleton c = unstream (S.singleton c)

198−"TEXT singleton -> unfused" [1] forall c.

198+"LAZY TEXT singleton -> unfused" [1] forall c.

199199 unstream (S.singleton c) = singleton c

200200 #-}

201201

@@ -216,9 +216,9 @@ append xs ys = foldrChunks Chunk ys xs

216216{-# INLINE append #-}

217217

218218{-# RULES

219−"TEXT append -> fused" [~1] forall t1 t2.

219+"LAZY TEXT append -> fused" [~1] forall t1 t2.

220220 append t1 t2 = unstream (S.append (stream t1) (stream t2))

221−"TEXT append -> unfused" [1] forall t1 t2.

221+"LAZY TEXT append -> unfused" [1] forall t1 t2.

222222 unstream (S.append (stream t1) (stream t2)) = append t1 t2

223223 #-}

224224

Data/Text/Lazy/Fusion.hs+2−1

@@ -73,4 +73,5 @@ unstream :: Stream Char -> Text

7373unstream = unstreamChunks defaultChunkSize

7474{-# INLINE [0] unstream #-}

7575

76−{-# RULES "STREAM stream/unstream fusion" forall s. stream (unstream s) = s #-}

76+{-# RULES "LAZY STREAM stream/unstream fusion" forall s.

77+ stream (unstream s) = s #-}