on master help sign in
encodeUtf8_1: make available with both bytestring versions

--HG-- extra : amend_source : badbc206c5b2b8b827be0e42811becfa35b0c000

commit6b6fcd87c80152e285fe8db9e2173554fa37785e authorBryan O'Sullivan <bos@serpentine.com> dateTue 7 Jan 2014, 00:24 (13 years ago) parente4957a3
1 file changed+5−4
Data/Text/Encoding.hs+5−4
Data/Text/Encoding.hs+5−4
@@ -81,7 +81,7 @@ import Data.ByteString.Internal as B hiding (c2w)
8181#if MIN_VERSION_bytestring(0,10,4)
8282import Data.Monoid ((<>))
8383import qualified Data.ByteString.Builder as B
84−import qualified Data.ByteString.Builder.Internal as B
84+import qualified Data.ByteString.Builder.Internal as B hiding (empty)
8585import qualified Data.ByteString.Builder.Prim as BP
8686import qualified Data.ByteString.Builder.Prim.Internal as BP
8787import qualified Data.ByteString.Lazy as BL
@@ -387,7 +387,7 @@ encodeUtf8BuilderEscaped be =
387387
388388encodeUtf8 = encodeUtf8_0
389389
390−encodeUtf8_0, encodeUtf8_1 :: Text -> ByteString
390+encodeUtf8_0 :: Text -> ByteString
391391encodeUtf8_0 (Text arr off len) = unsafeDupablePerformIO $ do
392392 let size0 = max len 4
393393 mallocByteString size0 >>= start size0 off 0
@@ -431,6 +431,9 @@ encodeUtf8_0 (Text arr off len) = unsafeDupablePerformIO $ do
431431 poke8 (m+2) $ (w .&. 0x3F) + 0x80
432432 go (n+1) (m+3)
433433
434+#endif
435+
436+encodeUtf8_1 :: Text -> ByteString
434437encodeUtf8_1 (Text arr off len)
435438 | len == 0 = B.empty
436439 | otherwise = unsafeDupablePerformIO $ do
@@ -504,8 +507,6 @@ encodeUtf8_1 (Text arr off len)
504507 go4 (n+2) (m+4) fp ptr
505508 hot n0 m0
506509
507−#endif
508−
509510-- | Decode text from little endian UTF-16 encoding.
510511decodeUtf16LEWith :: OnDecodeError -> ByteString -> Text
511512decodeUtf16LEWith onErr bs = F.unstream (E.streamUtf16LE onErr bs)