c0afa59 · typeable/aeson

git.iko.soy/typeable/aeson

Use scientific >= 0.3.1

scientific-0.3.1 exports the Text and ByteString Scientific Builders from the following modules respectively: - Data.Text.Lazy.Builder.Scientific - Data.ByteString.Builder.Scientific

commitc0afa596e5f6ac8b95a616efdb6215ebf8f93bd9 authorBas van Dijk <v.dijk.bas@gmail.com> dateMon 12 May 2014, 10:35 (12 years ago) parentee42339

3 files changed+6−4

compare with master

unifiedsplit

Data/Aeson/Encode.hs+2−1 Data/Aeson/Encode/ByteString.hs+3−2 aeson.cabal+1−1

Data/Aeson/Encode.hs+2−1

@@ -34,9 +34,10 @@ module Data.Aeson.Encode

3434

3535import Data.Aeson.Types (Value(..))

3636import Data.Monoid (mappend)

37−import Data.Scientific (Scientific, coefficient, base10Exponent, scientificBuilder)

37+import Data.Scientific (Scientific, coefficient, base10Exponent)

3838import Data.Text.Lazy.Builder

3939import Data.Text.Lazy.Builder.Int (decimal)

40+import Data.Text.Lazy.Builder.Scientific (scientificBuilder)

4041import Numeric (showHex)

4142import qualified Data.HashMap.Strict as H

4243import qualified Data.Text as T

Data/Aeson/Encode/ByteString.hs+3−2

@@ -19,11 +19,12 @@ module Data.Aeson.Encode.ByteString

1919import Prelude hiding (null)

2020import Data.Aeson.Types (ToJSON(..), Value(..))

2121import Data.Char (ord)

22−import Data.Scientific (Scientific, coefficient, base10Exponent, formatScientific, FPFormat(Generic))

22+import Data.Scientific (Scientific, coefficient, base10Exponent)

2323import Data.Word (Word8)

2424import Data.Monoid (mappend)

2525import Data.ByteString.Builder as B

2626import Data.ByteString.Builder.Prim as BP

27+import Data.ByteString.Builder.Scientific (scientificBuilder)

2728import qualified Data.ByteString.Lazy as L

2829import qualified Data.HashMap.Strict as HMS

2930import qualified Data.Text as T

@@ -95,7 +96,7 @@ string t =

9596

9697number :: Scientific -> Builder

9798number s

98− | e < 0 = B.string8 $ formatScientific Generic Nothing s

99+ | e < 0 = scientificBuilder s

99100 | otherwise = B.integerDec (coefficient s * 10 ^ e)

100101 where

101102 e = base10Exponent s

aeson.cabal+1−1

@@ -119,7 +119,7 @@ library

119119 hashable >= 1.1.2.0,

120120 mtl,

121121 old-locale,

122− scientific >= 0.2 && < 0.3,

122+ scientific >= 0.3.1,

123123 syb,

124124 template-haskell >= 2.4,

125125 time,