on master help sign in
Merge pull request #617 from RyanGlScott/master

Remove some CPP by using recent versions of text

commita4e4cab44d174145512efea49de5d029583f5ad2 authorAdam Bergmark <adam@bergmark.nl> dateTue 2 Jan 2018, 04:58 (9 years ago) parent1a845c8e440b63
6 files changed+8−76
Data/Aeson/Encoding/Builder.hs+1−74 aeson.cabal+1−1 benchmarks/aeson-benchmarks.cabal+1−1 stack-bench.yaml+1 stack-ffi-unescape.yaml+2 stack-nightly.yaml+2
Data/Aeson/Encoding/Builder.hs+1−74
@@ -1,5 +1,4 @@
11{-# LANGUAGE BangPatterns #-}
2−{-# LANGUAGE CPP #-}
32
43-- |
54-- Module: Data.Aeson.Encoding.Builder
@@ -47,6 +46,7 @@ import Data.ByteString.Builder.Scientific (scientificBuilder)
4746import Data.Char (chr, ord)
4847import Data.Monoid ((<>))
4948import Data.Scientific (Scientific, base10Exponent, coefficient)
49+import Data.Text.Encoding (encodeUtf8BuilderEscaped)
5050import Data.Time (UTCTime(..))
5151import Data.Time.Calendar (Day(..), toGregorian)
5252import Data.Time.LocalTime
@@ -55,20 +55,6 @@ import qualified Data.HashMap.Strict as HMS
5555import qualified Data.Text as T
5656import qualified Data.Vector as V
5757
58−#if MIN_VERSION_bytestring(0,10,4)
59−import Data.Text.Encoding (encodeUtf8BuilderEscaped)
60−#else
61−import Data.Bits ((.&.))
62−import Data.Text.Internal (Text(..))
63−import Data.Text.Internal.Unsafe.Shift (shiftR)
64−import Foreign.Ptr (minusPtr, plusPtr)
65−import Foreign.Storable (poke)
66−import qualified Data.ByteString.Builder.Internal as B
67−import qualified Data.ByteString.Builder.Prim.Internal as BP
68−import qualified Data.Text.Array as A
69−import qualified Data.Text.Internal.Encoding.Utf16 as U16
70−#endif
71−
7258-- | Encode a JSON value to a "Data.ByteString" 'B.Builder'.
7359--
7460-- Use this function if you are encoding over the wire, or need to
@@ -268,62 +254,3 @@ twoDigits a = T (digit hi) (digit lo)
268254
269255digit :: Int -> Char
270256digit x = chr (x + 48)
271−
272−#if !(MIN_VERSION_bytestring(0,10,4))
273−-- | Encode text using UTF-8 encoding and escape the ASCII characters using
274−-- a 'BP.BoundedPrim'.
275−--
276−-- Use this function is to implement efficient encoders for text-based formats
277−-- like JSON or HTML.
278−{-# INLINE encodeUtf8BuilderEscaped #-}
279−-- TODO: Extend documentation with references to source code in @blaze-html@
280−-- or @aeson@ that uses this function.
281−encodeUtf8BuilderEscaped :: BP.BoundedPrim Word8 -> Text -> B.Builder
282−encodeUtf8BuilderEscaped be =
283− -- manual eta-expansion to ensure inlining works as expected
284− \txt -> B.builder (mkBuildstep txt)
285− where
286− bound = max 4 $ BP.sizeBound be
287−
288− mkBuildstep (Text arr off len) !k =
289− outerLoop off
290− where
291− iend = off + len
292−
293− outerLoop !i0 br@(B.BufferRange op0 ope)
294− | i0 >= iend = k br
295− | outRemaining > 0 = goPartial (i0 + min outRemaining inpRemaining)
296− -- TODO: Use a loop with an integrated bound's check if outRemaining
297− -- is smaller than 8, as this will save on divisions.
298− | otherwise = return $ B.bufferFull bound op0 (outerLoop i0)
299− where
300− outRemaining = (ope `minusPtr` op0) `div` bound
301− inpRemaining = iend - i0
302−
303− goPartial !iendTmp = go i0 op0
304− where
305− go !i !op
306− | i < iendTmp = case A.unsafeIndex arr i of
307− w | w <= 0x7F ->
308− BP.runB be (fromIntegral w) op >>= go (i + 1)
309− | w <= 0x7FF -> do
310− poke8 0 $ (w `shiftR` 6) + 0xC0
311− poke8 1 $ (w .&. 0x3f) + 0x80
312− go (i + 1) (op `plusPtr` 2)
313− | 0xD800 <= w && w <= 0xDBFF -> do
314− let c = ord $ U16.chr2 w (A.unsafeIndex arr (i+1))
315− poke8 0 $ (c `shiftR` 18) + 0xF0
316− poke8 1 $ ((c `shiftR` 12) .&. 0x3F) + 0x80
317− poke8 2 $ ((c `shiftR` 6) .&. 0x3F) + 0x80
318− poke8 3 $ (c .&. 0x3F) + 0x80
319− go (i + 2) (op `plusPtr` 4)
320− | otherwise -> do
321− poke8 0 $ (w `shiftR` 12) + 0xE0
322− poke8 1 $ ((w `shiftR` 6) .&. 0x3F) + 0x80
323− poke8 2 $ (w .&. 0x3F) + 0x80
324− go (i + 1) (op `plusPtr` 3)
325− | otherwise =
326− outerLoop i (B.BufferRange op ope)
327− where
328− poke8 j v = poke (op `plusPtr` j) (fromIntegral v :: Word8)
329−#endif
aeson.cabal+1−1
@@ -125,7 +125,7 @@ library
125125 scientific >= 0.3.4.7 && < 0.4,
126126 tagged >=0.8.3 && <0.9,
127127 template-haskell >= 2.7,
128− text >= 1.1.1.0,
128+ text >= 1.2.3,
129129 th-abstraction >= 0.2.2 && < 0.3,
130130 time >= 1.1.1.4,
131131 time-locale-compat >= 0.1.1 && < 0.2,
benchmarks/aeson-benchmarks.cabal+1−1
@@ -43,7 +43,7 @@ library
4343 syb,
4444 tagged >=0.8.3 && <0.9,
4545 template-haskell >= 2.4,
46− text >= 1.1.1.0,
46+ text >= 1.2.3,
4747 th-abstraction >= 0.2.2 && < 0.3,
4848 time,
4949 transformers,
stack-bench.yaml+1
@@ -11,3 +11,4 @@ packages:
1111- benchmarks
1212extra-deps:
1313- aeson-1.2.3.0
14+- text-1.2.3.0
stack-ffi-unescape.yaml+2
@@ -5,3 +5,5 @@ flags:
55 aeson:
66 fast: true
77 cffi: true
8+extra-deps:
9+- text-1.2.3.0
stack-nightly.yaml+2
@@ -7,3 +7,5 @@ flags:
77 fast: true
88 attoparsec-iso8601:
99 fast: true
10+extra-deps:
11+- text-1.2.3.0